增加级别字段

src/store/getters.js

@@ -17,7 +17,6 @@ export default {
       return item.dictCode == dictCode;
     });
     console.log(obj, 'dict');
-
     return obj && obj.dictValue;
   }
 };

src/utils/dict/index.js

@@ -17,13 +17,14 @@ export const useDict = (dict) => {
 };
 //获取字典label
 export const useDictLabel = (dict) => {
+  console.log('dict--------');
+  console.log(dict);
   if (!dict || !Array.isArray(dict)) {
     console.error('请传入正确的字典');
     return '';
   }
   return (code) => {
-    // console.log(code, 'label');
-    const obj = dict.find((item) => (item && item.code) == code);
+    const obj = dict.find((item) => item.code == code);
     return obj && obj.label;
   };
 };

src/views/warehouseManagement/stockManagement/add.vue

@@ -990,7 +990,7 @@
                 <span v-else> {{ row.clientCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="刻码" prop="engrave">
+            <el-table-column label="刻码" prop="engrave" width="140">
               <template slot-scope="{ row, $index }">
                 <el-input
                   v-if="!row.isPack"
@@ -1205,7 +1205,7 @@
                 <span v-else>{{ row.clientCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="刻码" prop="engrave">
+            <el-table-column label="刻码" prop="engrave" width="140">
               <template slot-scope="{ row, $index }">
                 <el-input
                   v-if="!row.isPack"

src/views/warehouseManagement/stockManagement/add_export.vue

@@ -210,6 +210,13 @@
                   <template v-else>{{ row[item.prop] }}</template>
                 </template>
               </el-table-column>
+              <el-table-column
+                label="级别"
+                prop="level"
+                width="100"
+                align="center"
+              >
+              </el-table-column>
               <el-table-column
                 label="批号"
                 width="100"
@@ -761,6 +768,24 @@
     },
     data() {
       return {
+        levelOptions: [
+          {
+            label: '特级',
+            value: '0'
+          },
+          {
+            label: '一级',
+            value: '1'
+          },
+          {
+            label: '二级',
+            value: '2'
+          },
+          {
+            label: '三级',
+            value: '3'
+          }
+        ],
         pageSize: 20,
         wrapPageNum: 1,
         materielPageNum: 1,

src/views/warehouseManagement/stockManagement/details.vue

@@ -164,6 +164,14 @@
                     <template v-else>{{ row[item.prop] }}</template>
                   </template>
                 </el-table-column>
+                <el-table-column
+                  v-if="clientEnvironmentId == 4"
+                  label="级别"
+                  prop="level"
+                  width="100"
+                  align="center"
+                >
+                </el-table-column>
                 <el-table-column
                   label="批号"
                   prop="manualBatchNo"
@@ -585,7 +593,24 @@
         stepsTitle: '已完成',
         stepsStatus: 'success',
         active: 0,
-
+        levelOptions: [
+          {
+            label: '特级',
+            value: '0'
+          },
+          {
+            label: '一级',
+            value: '1'
+          },
+          {
+            label: '二级',
+            value: '2'
+          },
+          {
+            label: '三级',
+            value: '3'
+          }
+        ],
         // 条码类型枚举
         codeTypeObj: {
           生产设备: 'EQUIPMENT',

src/views/warehouseManagement/warehouseDefinition/components/WarehouseEdit.vue

@@ -208,7 +208,9 @@
               remarks: '',
               factoryId: '',
               status: 1,
-              lockStatus: 0
+              lockStatus: 0,
+              ownerId: '',
+              departmentId: ''
             };
           }
         }
@@ -250,6 +252,18 @@
               this.loadingVis = false;
             }, 2000);
           });
+        } else {
+          this.formData = {
+            code: '',
+            name: '',
+            inventoryType: '',
+            remarks: '',
+            factoryId: '',
+            status: 1,
+            lockStatus: 0,
+            ownerId: '',
+            departmentId: ''
+          };
         }
 
         // if (type === '新建') {
@@ -338,15 +352,23 @@
         }
       },
       changeOwner(val) {
-        this.$forceUpdate();
-        this.$set(this.formData, 'ownerId', val);
-        this.$set(
-          this.formData,
-          'ownerName',
-          this.userList.find((item) => {
-            return item.id == val;
-          }).name
-        );
+        this.formData.ownerId = val;
+        this.formData.ownerName = this.userList.find((item) => {
+          return item.id == val;
+        }).name;
+        // this.$nextTick(() => {
+        //   this.$forceUpdate();
+        // });
+        // this.$set(this.formData, 'ownerId', val);
+        // this.$set(
+        //   this.formData,
+        //   'ownerName',
+        //   this.userList.find((item) => {
+        //     return item.id == val;
+        //   }).name
+        // );
+        // console.log(this.formData);
+        // this.$forceUpdate();
       },
       changeLocation(val) {
         this.$set(this.formData, 'province', val[0]); //省

src/views/warehouseManagement/warehouseDefinition/index.vue

@@ -163,7 +163,8 @@
     warehouseDefinition_statusList,
     useDictLabel
   } from '@/utils/dict/index';
-
+  import { mapGetters, mapActions } from 'vuex';
+  import dictEnum from '@/enum/dict';
   // import selectTree from '@/components/selectTree';
   import WarehouseEdit from './components/WarehouseEdit';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
@@ -171,6 +172,9 @@
   export default {
     // components: { selectTree, tablePagination, WarehouseEdit },
     components: { WarehouseEdit },
+    computed: {
+      ...mapGetters(['dict', 'getDict', 'getDictValue'])
+    },
     // mixins: [dictMixins],
     data() {
       return {
@@ -194,6 +198,7 @@
         factoryList: [],
         treeList: [],
         warehouse: [],
+        typeList: [],
         warehouseLabel: [
           {
             label: '状态',
@@ -203,7 +208,9 @@
           {
             label: '仓库类型',
             key: 'inventoryType',
-            filter: useDictLabel(warehouseDefinition_inventoryList)
+            filter: (value) => {
+              return this.getDictValue('仓库类型', value);
+            }
           },
           { label: '库区数', key: 'areaNumber' },
           { label: '货架数', key: 'goodNumber' },
@@ -213,10 +220,12 @@
         ]
       };
     },
-    created() {
+    async created() {
+      this.requestDict('仓库类型');
       this.initData();
     },
     methods: {
+      ...mapActions('dict', ['requestDict']),
       filterFactoryId(factoryId) {
         let obj = this.factoryList.find((f) => f.id === factoryId);
         return obj.name;
@@ -235,6 +244,8 @@
         try {
           this.loading = true;
           const res = await warehouseDefinition.list(this.formData);
+          console.log('res--------------------');
+          console.log(res);
           this.warehouse = res;
         } finally {
           this.loading = false;