修改

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -56,7 +56,7 @@
               @change="hand"
             >
               <el-option
-                v-for="item in dict.product_status"
+                v-for="item in dict.cut_product_status"
                 :label="item.label"
                 :value="item.value"
               />
@@ -303,7 +303,7 @@ const defaultForm = {
 }
 export default {
   name: 'Slittingproductionplan',
-  dicts: ['product_area', 'order_type', 'product_status', 'IS_OR_NOT', 'ware_house', 'paper_tube_or_frp'],
+  dicts: ['product_area', 'order_type', 'cut_product_status', 'IS_OR_NOT', 'ware_house', 'paper_tube_or_frp'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -393,7 +393,7 @@ export default {
       })
     },
     formatStatusName(row) {
-      return this.dict.label.product_status[row.status]
+      return this.dict.label.cut_product_status[row.status]
     },
     formatTypeName(row) {
       return this.dict.label.order_type[row.order_type]

lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue

@@ -55,10 +55,10 @@
           @change="billTypeChange"
         >
           <el-option
-            v-for="item in billtypelist"
-            :key="item.code"
-            :label="item.name"
-            :value="item.code"
+            v-for="item in dict.ST_INV_IN_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
         </el-select>
       </el-form-item>
@@ -200,9 +200,9 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: { crudOperation, AddDtl, MaterDtl },
+  components: { AddDtl, MaterDtl },
   mixins: [crud(), form(defaultForm)],
-  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used'],
+  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_INV_IN_TYPE'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -252,23 +252,11 @@ export default {
       crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
         this.storlist = res.content
       })
-      /* // 获取单据类型
-      crudRawAssist.getType({ 'io_code': '0001', 'io_flag': '00' }).then(res => {
-        this.billtypelist = res
-      })*/
     },
     close() {
       this.$emit('AddChanged')
     },
     [CRUD.HOOK.afterToEdit]() {
-      // 编辑时，给按钮的状态赋值
-      if (this.form.bill_type === '000101') {
-        this.bill_btn = false
-        this.mater_btn = true
-      } else if (this.form.bill_type === '000102') {
-        this.bill_btn = true
-        this.mater_btn = false
-      }
       // 获取入库单明细
       crudRawAssist.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -96,10 +96,10 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in billtypelist"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
+                v-for="item in dict.ST_INV_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               />
             </el-select>
           </el-form-item>
@@ -241,7 +241,7 @@ export default {
     return CRUD({
       title: '',
       optShow: { add: true, reset: true },
-      query: { buss_type: '0001' },
+      query: { bill_type: '0001' },
       idField: 'iostorinv_id',
       url: '/api/in/rawAssist',
       crudMethod: { ...rawAssist }
@@ -249,7 +249,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['io_bill_status', 'ST_CREATE_MODE'],
+  dicts: ['io_bill_status', 'ST_CREATE_MODE','ST_INV_IN_TYPE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -271,7 +271,6 @@ export default {
       bussConfig: null,
       currentRow: null,
       storlist: [],
-      billtypelist: [],
       createtypelist: [],
       statuslist: []
     }
@@ -291,9 +290,6 @@ export default {
     crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
       this.storlist = res.content
     })
-    crudRawAssist.getType({ 'io_code': '0001', 'io_flag': '00' }).then(res => {
-      this.billtypelist = res
-    })
   },
   methods: {
     fun(val) {
@@ -340,11 +336,7 @@ export default {
       }
     },
     bill_typeFormat(row, column) {
-      for (const item of this.billtypelist) {
-        if (item.code == row.bill_type) {
-          return item.name
-        }
-      }
+      return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
     },
     toView(index, row) {
       this.mstrow = row