Browse Source

采购订单-可选择多个单号的销售订单

jingbb 1 tháng trước cách đây
mục cha
commit
38ec578829

+ 33 - 12
src/views/publicComponents/SelectSaleOrderModal.vue

@@ -472,6 +472,31 @@
         if(fatherType.value=='payRequest'){
             emit('selectSaleOrder', selectionRows.value)
             handleCancel()
+        }else if(fatherType.value=='purOrder'){
+            var 
+            arrSupplier=[],
+            arrProject=[]
+            selectionRows.value.map(item=>{
+                arrSupplier.push(item.supplierId)
+                arrProject.push(item.project)
+            })
+            if(fatherSupplier.value&&fatherSupplier.value!==''){
+                arrSupplier.push(fatherSupplier.value)
+            }
+            if(fatherProject.value&&fatherProject.value!==''){
+                arrProject.push(fatherProject.value)
+            }
+            if(selectedRowKeys.value.length==0){
+                message.error('请勾选数据');
+            }else if(new Set(arrSupplier).size!==1){
+                message.error('请勾选供应商相同的数据');
+            }else if(new Set(arrProject).size!==1){
+                message.error('请勾选项目相同的数据');
+            }else{
+                emit('selectSaleOrder', selectionRows.value)
+                handleCancel()
+            }
+
         }else{
             var arr = [],
             arrSupplier=[]
@@ -528,20 +553,15 @@
         }else{
             fatherProject.value = ''
         }
-        if(formData.sourceCode&&formData.sourceCode!==''){
-            fatherSourceCode.value = formData.sourceCode2
-        }else{
-            fatherSourceCode.value = ''
-        }
-        if(formData.sourceCode&&formData.sourceCode!==''){
-            fatherSourceCode.value = formData.sourceCode2
-        }else{
-            fatherSourceCode.value = ''
-        }
-        fatherType.value='other'
         // getListUrl.value ='/saleCode/saleOrder/selectSaleOrderDetailAlert'
         //发货通知单里使用不显示供应商
         if(data=='delivery'){
+            if(formData.sourceCode&&formData.sourceCode!==''){
+                fatherSourceCode.value = formData.sourceCode2
+            }else{
+                fatherSourceCode.value = ''
+            }
+            fatherType.value='other'
             showCustomer.value = 'yes'
             getListUrl.value ='/saleCode/saleOrder/selectSaleOrderDetailAlertDelivery'
             columns= columns1.filter(function(value, i) {
@@ -552,7 +572,8 @@
             }else{
                 fatherCustomer.value = ''
             }
-        }else  if(data=='purOrder'){                        
+        }else  if(data=='purOrder'){       
+            fatherType.value='purOrder'                 
             showCustomer.value = 'no'
             columns= columns1.filter(function(value, i) {
                 return i !== 5;

+ 1 - 1
src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -666,7 +666,7 @@
         var arrProduct = xTable.data.concat(data);
         purOrderFormShipFormProductTable.dataSource = arrProduct;
         notAllowEdit.value = true;
-        formData.sourceCode2 = data[0].billCode;
+        formData.sourceCode2 = formData.sourceCode2==''?data[0].billCode: formData.sourceCode2+','+data[0].billCode
         if (formData.sourceCode == '') {
           formData.project = data[0].project;
           formData.projectName = data[0].projectName;