修改bug

src/views/produce/components/jobBooking/components/batchPackagingGrouping.vue

@@ -1134,15 +1134,10 @@
 
         console.log(arr);
 
-        console.log(this.DispositionListes, 'this.DispositionListes');
-        console.log(this.Usertype, 'this.Usertype');
-
         this.newDispositionList = this.DispositionListes.filter(
           (it) => it.code == this.Usertype && it.sort != '0'
         );
 
-        console.log(this.newDispositionList, 'this.newDispositionList');
-
         this.newDispositionList.map((v, i) => {
           v.splitList = arr[i].list;
           v.titel = textList[i];

src/views/produce/components/outsourcing/details.vue

@@ -56,8 +56,8 @@
         <div v-if="row.type == 1">采购委外</div>
         <div v-if="row.type == 2">直接发货委外</div>
         <div v-if="row.type == 3">无采购委外</div>
-        <div v-if="row.type == 4">有料委外</div>
-        <div v-if="row.type == 5">无料委外</div>
+        <div v-if="row.type == 4">带料委外</div>
+        <div v-if="row.type == 5">不带料委外</div>
       </template>
 
       <template v-slot:status="{ row }">

src/views/produce/components/outsourcing/index.vue

@@ -371,7 +371,8 @@
           supplierName: '',
           taskIdes: [],
           factoriesId: '',
-          factoriesName: ''
+          factoriesName: '',
+          taskDataList: []
         },
         isInWarehouse: true,
         produceList: [],
@@ -619,6 +620,7 @@
         this.attributeData.supplierId = '';
         this.attributeData.taskIdes = [];
         this.attributeData.factoriesId = '';
+        this.attributeData.taskDataList = [];
       },
 
       //跳转
@@ -633,16 +635,39 @@
                 );
                 this.attributeData.supplierName = obj ? obj.name : '';
               }
+
+              this.attributeData.taskIdes.forEach((it) => {
+                this.newStepsList.filter((i) => {
+                  if (i.taskId == it) {
+                    this.attributeData.taskDataList.push(i);
+                  }
+                });
+              });
               this.attributeData.taskIds =
                 this.attributeData.taskIdes.join(',');
+              console.log(
+                this.attributeData.taskDataList,
+                'this.attributeData.taskDataList1'
+              );
               this.$emit('changePlugIn', this.attributeData, this.activeName);
             } else if (this.activeName == '2') {
               const obj = this.factoryList.find(
                 (item) => item.id === this.attributeData.factoriesId
               );
               this.attributeData.factoriesName = obj ? obj.name : '';
+              this.attributeData.taskIdes.forEach((it) => {
+                this.newStepsList.filter((i) => {
+                  if (i.taskId == it) {
+                    this.attributeData.taskDataList.push(i);
+                  }
+                });
+              });
               this.attributeData.taskIds =
                 this.attributeData.taskIdes.join(',');
+              console.log(
+                this.attributeData.taskDataList,
+                'this.attributeData.taskDataList2'
+              );
               console.log(this.attributeData);
               this.$emit('changePlugIn', this.attributeData, this.activeName);
             }

src/views/produce/components/outsourcing/outsourceList.vue

@@ -364,14 +364,14 @@
       <el-tab-pane label="产出清单" name="2">
         <div class="materialList">
           <div class="u-reset">
-            <el-button
+            <!-- <el-button
               type="primary"
               size="small"
               class="u-reset-button"
               @click="openPicking(3, 'output')"
             >
               添加
-            </el-button>
+            </el-button> -->
           </div>
           <div v-for="(item, index) in standardOutputList" :key="index">
             <label class="listBox rx-bs">
@@ -394,7 +394,7 @@
                     >{{ item[itm.prop] }}
                   </div>
 
-                  <div class="items content_num">
+                  <div class="items">
                     <span>数量</span>
                     <input
                       style="width: 30% !important"
@@ -402,6 +402,22 @@
                     />
                   </div>
 
+                  <div
+                    class="items"
+                    v-if="item.isSelection && item.isSelection == '1'"
+                  >
+                    <span>产出工序</span>
+                    <el-select v-model="item.taskId" placeholder="请选择">
+                      <el-option
+                        v-for="item in outObj.taskDataList"
+                        :key="item.taskId"
+                        :label="item.taskTypeName"
+                        :value="item.taskId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </div>
+
                   <div>
                     <el-button
                       type="text"
@@ -513,7 +529,8 @@
 
         warehouseList: [],
         pickOutInListSelect: [],
-        selectionIds: []
+        selectionIds: [],
+        newStepsList: []
       };
     },
 
@@ -574,7 +591,18 @@
           }
         } else if (e == 3) {
           if (item.length) {
-            this.standardOutputList = item;
+            item.map((it) => {
+              it.isSelection = '1';
+              it.categoryCode = it.code;
+              it.feedQuantity = 1;
+              it.categoryId = it.id;
+              it.newWeight = it.weight;
+              it.rootCategoryLevelId = it.categoryLevelPathIdParent;
+              it.taskId = '';
+              it.taskName = '';
+              this.standardOutputList.push(this.deepCopy(it));
+            });
+            // this.standardOutputList = item;
           }
         }
       },
@@ -950,7 +978,7 @@
 
   .items {
     font-size: 12px;
-    width: 25%;
+    width: 23%;
     display: flex;
     align-items: center;
     white-space: nowrap;