Procházet zdrojové kódy

fix: 生产入库颜色取值问题

liujt před 5 měsíci
rodič
revize
7b119bea70

+ 2 - 1
src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -22,7 +22,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        :loading="isSaveLoading"
+        v-click-once
         @click="storeManagerApprove"
         >申请入库
       </el-button>
@@ -30,6 +30,7 @@
         icon="el-icon-circle-close"
         type="danger"
         size="mini"
+        v-click-once
         @click="handleAudit(0)"
         >驳回
       </el-button>

+ 2 - 2
src/views/bpm/stockManagement/storage.vue

@@ -2000,8 +2000,8 @@
                 categoryModel: item.modelType, // 物品型号
                 specification: item.specification, // 规格
                 brandNum: item.brandNum, // 牌号
-                colorKey: item.colorKey ? item.colorKey.split(',') : '', // 颜色
-                modelKey: item.modelKey ? item.modelKey.split(',') : '', // 机型
+                colorKey: this.bizType == 1 ? (this.form.colorKey ? this.form.colorKey.split(',') : '') : item.colorKey ? item.colorKey.split(',') : '', // 颜色
+                modelKey: this.bizType == 1 ? (this.form.modelKey ? this.form.modelKey.split(',') : '') : item.modelKey ? item.modelKey.split(',') : '', // 机型
                 batchNo: [1, 3, 6].includes(this.bizType)
                   ? this.detailList[0]?.batchNo || batchNo
                   : batchNo, // 批次号