huang_an hace 1 año
padre
commit
10f680ed58

+ 2 - 1
src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/boxTabPage.vue

@@ -25,7 +25,7 @@
     name: 'boxTabPage',
     components: {
       tab1: () => import('./detailDialog.vue'),
-      tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
+      tab2: () => import('@/views/bpm/outgoingManagement/outbound2.vue')
     },
     props: {
       taskDefinitionKey: {
@@ -85,6 +85,7 @@
     },
     async created() {
       this.form = await getPurchaseOutSourceSendDetailAPI(this.businessId);
+      console.log(this.form, 'sssssssssssssssssssssssssssssss');
     },
     methods: {
       isValidComponent(componentName) {

+ 14 - 13
src/views/bpm/handleTask/components/selectedCollectionOutbound/boxTabPage.vue

@@ -1,21 +1,22 @@
 <template>
   <div>
     <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane
-        v-for="item in tabOption"
-        :label="item.label"
-        :name="item.name"
-      >
-      </el-tab-pane>
-    </el-tabs> -->
+        <el-tab-pane
+          v-for="item in tabOption"
+          :label="item.label"
+          :name="item.name"
+        >
+        </el-tab-pane>
+      </el-tabs> -->
     <keep-alive>
       <!-- <component
-        v-if="activeName && isValidComponent(activeName)"
-        :is="activeName"
-        :key="activeName"
-        ref="componentRef"
-        v-bind="activeNameProps"
-      /> -->
+          v-if="activeName && isValidComponent(activeName)"
+          :is="activeName"
+          :key="activeName"
+          ref="componentRef"
+          v-bind="activeNameProps"
+        /> -->
+
       <outbound :activeNameProps="activeNameProps"></outbound>
     </keep-alive>
   </div>

+ 6 - 4
src/views/bpm/outgoingManagement/outbound.vue

@@ -580,7 +580,7 @@
       saleProductList: { type: Array, default: () => [] },
       // extractedList: { type: Array, default: () => [] },
       // wwType: { type: Number, default: null },
-      activeNameProps: { type: Object, default: () => {} }
+      activeNameProps: { type: Object, default: {} }
     },
     directives: {
       'el-table-infinite-scroll': elTableInfiniteScroll
@@ -684,7 +684,6 @@
         });
       },
       getPickOrderDetail() {
-        console.log(this.activeNameProps, 99999999999999999999);
         getPickOrderById(this.activeNameProps.businessId).then((data) => {
           data.detailList = data.detailList.map((item) => {
             item.code = data.code;
@@ -971,7 +970,6 @@
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
             workOrderIds: this.extractedList.map((item) => item.workOrderId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId),
             outsourceBatchNos: this.extractedList.map(
               (item) => item.outsourceBatchNo
             ),
@@ -1008,7 +1006,11 @@
           let pData2 = {
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId)
+            workOrderIds: this.extractedList.map((item) => item.workOrderId),
+            outsourceBatchNos: this.extractedList.map(
+              (item) => item.outsourceBatchNo
+            ),
+            outsourceCodes: this.extractedList.map((item) => item.outsourceCode)
           };
           storageApi
             .getHierarchyFifo(this.wwType == 3 ? pData2 : pData)

+ 0 - 1
src/views/bpm/outgoingManagement/outbound2.vue

@@ -904,7 +904,6 @@
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
             workOrderIds: this.extractedList.map((item) => item.workOrderId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId),
             outsourceBatchNos: this.extractedList.map(
               (item) => item.outsourceBatchNo
             ),

+ 5 - 2
src/views/bpm/outgoingManagement/outbound3.vue

@@ -970,7 +970,6 @@
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
             workOrderIds: this.extractedList.map((item) => item.workOrderId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId),
             outsourceBatchNos: this.extractedList.map(
               (item) => item.outsourceBatchNo
             ),
@@ -1007,7 +1006,11 @@
           let pData2 = {
             type: this.wwType,
             taskIds: this.extractedList.map((item) => item.taskId),
-            workOrderIds: this.extractedList.map((item) => item.workOrderId)
+            workOrderIds: this.extractedList.map((item) => item.workOrderId),
+            outsourceBatchNos: this.extractedList.map(
+              (item) => item.outsourceBatchNo
+            ),
+            outsourceCodes: this.extractedList.map((item) => item.outsourceCode)
           };
           storageApi
             .getHierarchyFifo(this.wwType == 3 ? pData2 : pData)