فهرست منبع

委外发货单添加自定义变量

yusheng 9 ماه پیش
والد
کامیت
0f8aea7949

+ 3 - 3
src/BIZComponents/outboundDetailsDialog.vue

@@ -36,12 +36,12 @@
                 <!--                <span>{{ getSceneState(infoData.bizType) }}</span>-->
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="infoData.bizType == 3">
+            <el-col :span="8" >
               <el-form-item label="客户名称">
                 <span>{{ infoData.clientName }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="infoData.bizType == 3">
+            <!-- <el-col :span="8" v-if="infoData.bizType == 3">
               <el-form-item label="客户联系人">
                 <span>{{ infoData.clientUser }}</span>
               </el-form-item>
@@ -50,7 +50,7 @@
               <el-form-item label="客户电话">
                 <span>{{ infoData.clientPhone }}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="8">
               <el-form-item

+ 5 - 3
src/BIZComponents/outdetails.vue

@@ -38,11 +38,12 @@
                   <span>{{ extInfo?.documentSource }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-if="infoData.bizType == 3">
+              <el-col :span="8" >
                 <el-form-item label="客户名称:">
                   <span>{{ infoData.clientName }}</span>
                 </el-form-item> </el-col
-              ><el-col :span="8" v-if="infoData.bizType == 3">
+              >
+              <!-- <el-col :span="8" v-if="infoData.bizType == 3">
                 <el-form-item label="客户联系人:">
                   <span>{{ infoData.clientUser }}</span>
                 </el-form-item> </el-col
@@ -50,7 +51,8 @@
                 <el-form-item label="客户电话:">
                   <span>{{ infoData.clientPhone }}</span>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
+
               <el-col :span="8">
                 <el-form-item
                   :label="infoData.bizType == 4 ? '领料单:' : '来源单据:'"

+ 12 - 12
src/views/purchasingManage/purchaseOrder/outSourceSend/components/addOrEditDialog.vue

@@ -89,7 +89,6 @@
         <el-col :span="12">
           <el-form-item prop="sendFiles" label="附件">
             <fileMain v-model="form.files"></fileMain>
-      
           </el-form-item>
         </el-col>
         <el-col :span="12"> </el-col>
@@ -144,6 +143,7 @@
   import { getByIdCondition } from '@/api/purchasingManage/purchaseOrder';
   // import fileMain from '@/components/addDoc/index.vue';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
+  import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
 
   export default {
     props: {
@@ -155,7 +155,7 @@
       // fileMain,
       fileUpload,
       inventoryTable,
-      orderListDialog,
+      orderListDialog
     },
     data() {
       return {
@@ -271,7 +271,7 @@
               partbLinkName,
               productList,
               sourceTypeName,
-              sourceType,
+              sourceType
             } = data;
             if (productList && productList.length > 0) {
               productList.forEach((v) => {
@@ -287,8 +287,7 @@
               orderId: id,
               sourceTypeName,
               sourceType,
-              productList,
-              
+              productList
             });
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(productList);
@@ -387,6 +386,12 @@
         const data = await getPurchaseOutSourceSendDetailAPI(
           this.businessId || res
         );
+
+        let storemanIds = '';
+        let ids = data.productList.map((item) => item.warehouseId);
+        let warehouseList = await getWarehouseListByIds(ids || []);
+        storemanIds = warehouseList.map((item) => item.ownerId);
+
         this.processSubmitDialogFlag = true;
         this.$nextTick(() => {
           let params = {
@@ -396,14 +401,9 @@
             variables: {
               businessCode: data.code,
               businessName: data.supplierName,
-              businessType: '委外发货单'
+              businessType: '委外发货单',
+              storemanIds: storemanIds.toString()
             }
-            // callBackMethodType : '1',
-            // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
-            // pcHandle : '/bpm/handleTask/components/project-manage/plan-manage/submit.vue',
-            // pcView : '/bpm/handleTask/components/project-manage/plan-manage/detailDialog.vue',
-            // miniHandle : '',
-            // miniView : '',
           };
 
           this.$refs.processSubmitDialogRef.init(params);

+ 11 - 10
src/views/purchasingManage/purchaseOrder/outSourceSend/index.vue

@@ -157,7 +157,7 @@
   import searchTable from './components/searchTable.vue';
   import addOrEditDialog from './components/addOrEditDialog.vue';
   import popModal from '@/components/pop-modal';
-  import { reviewStatus} from '@/enum/dict';
+  import { reviewStatus } from '@/enum/dict';
 
   import detailDialog from './components/detailDialog.vue';
 
@@ -174,9 +174,10 @@
   import { getPurchaseOutSourceSendDetailAPI } from '@/api/purchasingManage/outSourceSend';
   import { getWarehouseOutStock } from '@/api/saleManage/saleorder';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
 
   export default {
-    mixins: [dictMixins,tabMixins],
+    mixins: [dictMixins, tabMixins],
     components: {
       processSubmitDialog,
       addInvoiceDialog,
@@ -295,7 +296,7 @@
             fixed: 'right'
           }
         ],
-        cacheKeyUrl:'eos-aba18b2f-purchaseOrder-outSourceSend'
+        cacheKeyUrl: 'eos-aba18b2f-purchaseOrder-outSourceSend'
       };
     },
     computed: {},
@@ -318,8 +319,7 @@
       /* 刷新表格 */
       reload(where) {
         this.$refs.table.reload({ page: 1, where });
-        this.$emit('getToDoReminder')
-
+        this.$emit('getToDoReminder');
       },
 
       //新增编辑
@@ -379,7 +379,6 @@
       async sendSubmit(res) {
         const data = await getPurchaseOutSourceSendDetailAPI(res.id);
         const tabName = await this.warehouseOutStock(data);
-        console.log(tabName);
 
         if (tabName.filter((item) => !item.is).length > 0) {
           this.$message.error(
@@ -388,7 +387,10 @@
           );
           return;
         }
-
+        let storemanIds = '';
+        let ids = data.productList.map((item) => item.warehouseId);
+        let warehouseList = await getWarehouseListByIds(ids || []);
+        storemanIds = warehouseList.map((item) => item.ownerId);
         this.processSubmitDialogFlag = true;
         this.$nextTick(() => {
           let params = {
@@ -398,14 +400,13 @@
             variables: {
               businessCode: res.code,
               businessName: res.supplierName,
-              businessType: '委外发货单'
+              businessType: '委外发货单',
+              storemanIds: storemanIds.toString()
             }
-
           };
 
           this.$refs.processSubmitDialogRef.init(params);
         });
-
       },
       //查看详情
       openorderDetail(row, type) {