refactor(入库申请单): 入库申请带出颜色和机型

src/views/bpm/done/detailDialog.vue

@@ -25,9 +25,9 @@
       </div>
     </div>
     <div v-show="activeComp === 'main'">
-      <div class="row">主题: {{ form.businessName }}</div>
+      <!-- <div class="row">主题: {{ form.businessName }}</div>
       <div class="row">提交人: {{ form.processInstance?.startUserNickname }}</div>
-      <div class="row">提交时间: {{ form.createTime }}</div>
+      <div class="row">提交时间: {{ form.createTime }}</div> -->
       <fm-generate-form
         v-if="Object.keys(form?.formJson || {}).length !== 0"
         :data="jsonData"

src/views/bpm/handleTask/components/productionWarehousing/submit.vue

@@ -76,11 +76,10 @@
         if (!storageData) {
           return;
         }
-        console.log('res~~~~~~~~~~~~~~~~', res);
+        console.log('我需要的~~~~~~~~~~~~~~~~', res);
         // 入库来源isSkip 0-正常  1-外部(外部跳过内部审核流程)
         storageData.isSkip = 1;
         console.log('storageData~~~~~~~~~~~~~~~~', storageData);
-        
         // 验证outInDetailList中是否存在数量为空的情况
         // if (storageData.outInDetailList && storageData.outInDetailList.some(item => item.number ==undefined || item.number == '' || item.number == null)) {
         //   this.$message.error('计量数量不为空');

src/views/bpm/stockManagement/storage.vue

@@ -2001,6 +2001,8 @@
                 categoryModel: item.modelType, // 物品型号
                 specification: item.specification, // 规格
                 brandNum: item.brandNum, // 牌号
+                colorKey: item.colorKey ? item.colorKey.split(',') : '', // 颜色
+                modelKey: item.modelKey ? item.modelKey.split(',') : '', // 机型
                 batchNo: [1, 3, 6].includes(this.bizType)
                   ? this.detailList[0]?.batchNo || batchNo
                   : batchNo, // 批次号
@@ -2086,8 +2088,8 @@
             // 生产包装
             this.packingList = this.detailList.map((item, index) => {
               // if (item.isAllPackageData != 1) {
-              console.log(item.packingUnit, 'itemitemitemitemitemitem1');
-              console.log(item.packingUnit, 'itemitemitemitemitemitem2');
+              // console.log(item, 'itemitemitemitemitemitem1');
+              // console.log(item.packingUnit, 'itemitemitemitemitemitem2');
               // 换算重量
               let weight = 0;
               if (
@@ -2164,7 +2166,7 @@
               } else if (this.bizType != 2) {
                 clientCode = item.clientCode || item.extInfo?.clientCode;
               }
-
+      
               return {
                 index: this.isMoreProduct
                   ? this.productList.find(
@@ -2187,6 +2189,8 @@
                 specification:
                   item.specification || this.productList[0].specification, // 规格
                 brandNum: item.productBrand || this.productList[0].brandNum, // 牌号
+                colorKey: (item.colorKey ? item.colorKey.split(',') : '') || this.productList[0].colorKey, // 颜色
+                modelKey: (item.modelKey ? item.modelKey.split(',') : '') || this.productList[0].modelKey, // 机型
                 parentIndex: this.isMoreProduct
                   ? this.productList.find(
                       (val) => val.categoryCode == item.productCode