修改设备

src/components/AssetDialog/categoryDialog.vue

@@ -36,7 +36,7 @@
           id="4"
         /> -->
       </el-col>
-      <el-col :span="18">
+      <el-col class="table_box" :span="18">
         <el-table
           ref="dialogMultipleTable"
           :data="tableData"
@@ -69,6 +69,19 @@
           <el-table-column type="selection" width="55" align="center">
           </el-table-column>
         </el-table>
+        <div class="pagination">
+          <el-pagination
+            background
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+            :page-sizes="[10, 30, 50]"
+            :page-size="pageSize"
+            :current-page.sync="pageNum"
+            @current-change="handleCurrent"
+            @size-change="handleSize"
+          >
+          </el-pagination>
+        </div>
       </el-col>
     </el-row>
 
@@ -111,7 +124,10 @@
         tableData: [],
         currentTreeData: {},
         selectionList: [],
-        rootId: null
+        rootId: null,
+        pageNum: 1,
+        pageSize: 10,
+        total: 0
       };
     },
     created() {
@@ -151,12 +167,21 @@
         this.currentTreeData = data;
         this._getClassificationList();
       },
+      handleCurrent(page) {
+        this.pageNum = page;
+        this._getClassificationList();
+      },
+      handleSize(size) {
+        this.pageNum = 1;
+        this.pageSize = size;
+        this._getClassificationList();
+      },
       // 获取添物品信息表格数据
       async _getClassificationList() {
         this.tableLoading = true;
         let params = {
-          pageNum: 1,
-          size: 10,
+          pageNum: this.pageNum,
+          size: this.pageSize,
           categoryLevelId: this.currentTreeData.id,
           rootCategoryLevelId: this.rootId,
           code: this.code
@@ -164,6 +189,7 @@
         const res = await getAssetList(params);
         this.tableLoading = false;
         if (res.list.length) {
+          this.total = res.count;
           this.tableData = res.list;
           // 切换树节点时回显添加了的备品备件
           this.$nextTick(() => {
@@ -232,4 +258,17 @@
       margin-right: 10px;
     }
   }
+  .table_box {
+    display: flex;
+    flex-direction: column;
+    .el-table {
+      flex: 1;
+    }
+    .pagination {
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
 </style>

src/store/modules/user.js

@@ -37,7 +37,7 @@ export default {
   namespaced: true,
   state: {
     // 当前登录用户信息
-    info: null,
+    info: JSON.parse(localStorage.getItem('info')) || null,
     // 当前登录用户的菜单
     menus: null,
     // 当前登录用户的权限
@@ -49,23 +49,24 @@ export default {
   },
   mutations: {
     // 设置登录用户的信息
-    setUserInfo (state, info) {
+    setUserInfo(state, info) {
+      localStorage.setItem('info', JSON.stringify(info));
       state.info = info;
     },
     // 设置登录用户的菜单
-    setMenus (state, menus) {
+    setMenus(state, menus) {
       state.menus = menus;
     },
     // 设置登录用户的权限
-    setAuthorities (state, authorities) {
+    setAuthorities(state, authorities) {
       state.authorities = authorities;
     },
     // 设置登录用户的权限路由
-    setAuthoritiesRouter (state, authoritiesRouter) {
+    setAuthoritiesRouter(state, authoritiesRouter) {
       state.authoritiesRouter = authoritiesRouter;
     },
     // 设置登录用户的角色
-    setRoles (state, roles) {
+    setRoles(state, roles) {
       state.roles = roles;
     }
   },
@@ -103,7 +104,7 @@ export default {
     //   return { menus, homePath };
     // },
     //动态路由
-    async fetchUserInfo ({ commit }) {
+    async fetchUserInfo({ commit }) {
       const result = await getResourcesTree().catch(() => {});
       const list = result.filter((i) => i.path === '/page-eam');
       if (!list.length) {
@@ -155,19 +156,19 @@ export default {
     /**
      * 更新用户信息
      */
-    setInfo ({ commit }, value) {
+    setInfo({ commit }, value) {
       commit('setUserInfo', value);
     },
     /**
      * 更新菜单数据
      */
-    setMenus ({ commit }, value) {
+    setMenus({ commit }, value) {
       commit('setMenus', value);
     },
     /**
      * 更新菜单的badge
      */
-    setMenuBadge ({ commit, state }, { path, value, color }) {
+    setMenuBadge({ commit, state }, { path, value, color }) {
       const menus = formatTreeData(state.menus, (m) => {
         if (path === m.path) {
           return {

src/views/home/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="home">
-    <div class="top_bar">
+    <!-- <div class="top_bar">
       <div class="title">
         <div class="line"></div>
         <div class="text">常用功能</div>
@@ -12,7 +12,7 @@
           <div>{{ item.title }}</div>
         </div>
       </div>
-    </div>
+    </div> -->
     <div class="warning_bar">
       <i class="el-icon-message-solid"></i>
       <div>5条 备品低于安全库存，请即时处理!</div>
@@ -378,7 +378,7 @@
 
 <style lang="scss" scoped>
   #home {
-    height: calc(100% - 20px);
+    height: calc(100vh - 116px);
     width: calc(100% - 20px);
     margin: 10px;
     background-color: #f0f3f3;

src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -33,6 +33,7 @@
           size="small"
           icon="el-icon-download"
           class="ele-btn-icon"
+          type="primary"
           @click="exportFile"
         >
           导出
@@ -55,7 +56,7 @@
         >
           设置片区负责人
         </el-button>
-        <el-button size="small" class="ele-btn-icon" @click="handlDelete"
+        <!-- <el-button size="small" class="ele-btn-icon" @click="handlDelete"
           >删除</el-button
         >
         <el-button
@@ -64,7 +65,7 @@
           :disabled="checkRadioData.length == 0"
           class="ele-btn-icon"
           >移动到</el-button
-        >
+        > -->
       </template>
       <!-- 编码列 -->
       <template v-slot:code="{ row }">
@@ -310,15 +311,21 @@
     },
     computed: {
       clientEnvironmentId() {
+        console.log('this.$store.state.user.---computed---');
+        console.log(this.$store.state.user);
         return this.$store.state.user.info.clientEnvironmentId;
       }
     },
     created() {
+      console.log('this.$store.state.user.-------------------');
+      console.log(this.$store.state.user);
       this.requestDict('网络状态');
       this.getAssetLevelOptions();
     },
     methods: {
       allPrinting() {
+        console.log('this.clientEnvironmentId-------------');
+        console.log(this.clientEnvironmentId);
         if (this.clientEnvironmentId == 2) {
           this.$refs.printSrRef.open(this.checkRadioData);
         } else if (this.clientEnvironmentId == 3) {

src/views/ledgerAssets/material/components/material-list.vue

@@ -27,7 +27,7 @@
         >
           新建
         </el-button>
-        <el-button
+        <!-- <el-button
           size="small"
           type="primary"
           icon="el-icon-download"
@@ -35,7 +35,7 @@
           @click="btnExport"
         >
           导出
-        </el-button>
+        </el-button> -->
       </template>
       <!-- 编码列 -->
       <template v-slot:code="{ row }">

src/views/ledgerAssets/turnoverCar/edit.vue

@@ -390,7 +390,7 @@
             par.deviceLocationName = par.location
               ? par.location.toString()
               : '';
-            par.extInfo = { ...this.form.category.categoryVehicle };
+            par.extInfo = null;
             let obj = {};
             par.extInfoSelf.forEach((item) => {
               obj[item.key] = item.value;

src/views/ledgerAssets/turnoverDisks/components/equipment-list.vue

@@ -32,6 +32,7 @@
           size="small"
           icon="el-icon-download"
           class="ele-btn-icon"
+          type="primary"
           @click="exportFile"
         >
           导出

src/views/maintenance/delivery/plan/details.vue

@@ -918,6 +918,9 @@
     padding: 10px 0;
   }
   .box-card {
+    height: 350px;
+    display: flex;
+    flex-direction: column;
     .store-box {
       width: 80%;
       .store-box-span {
@@ -931,6 +934,9 @@
         margin: 2px;
       }
     }
+    .el-card__body {
+      flex: 1;
+    }
   }
   .vacant {
     background: #3196fb;

src/views/maintenance/equipment/workOrder/index.vue

@@ -38,7 +38,9 @@
             报工
           </el-link>
           <el-link
-            v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
+            v-if="
+              row.orderStatus !== 3 && row.orderStatus !== 4 && row.isGroup != 1
+            "
             type="primary"
             :underline="false"
             icon="el-icon-edit"

src/views/maintenance/patrol/workOrder/index.vue

@@ -27,7 +27,9 @@
             报工
           </el-link>
           <el-link
-            v-if="row.orderStatus !== 3 && row.orderStatus !== 4"
+            v-if="
+              row.orderStatus !== 3 && row.orderStatus !== 4 && row.isGroup != 1
+            "
             type="primary"
             :underline="false"
             icon="el-icon-edit"