销售报价单-子表计算

src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -488,7 +488,7 @@
           var obj = await getRowRate(item)
           item.taxRate = obj.rateNumber
           item.grossMargin = obj.grossMargin
-          item.discount= formData.custumerDiscount!==''?formData.custumerDiscount:''
+          item.discount= formData.custumerDiscount
         }
         var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
         saleQuotationFormProductTable.dataSource=arrProduct    
@@ -517,7 +517,7 @@
           if(saleQuotationFormProductTable.dataSource.length>0){
             var newArr = [...saleQuotationFormProductTable.dataSource]
             newArr.map(item=>{
-              item.discount =  formData.custumerDiscount
+              item.discount = formData.custumerDiscount
             })
             saleQuotationFormProductTable.dataSource = newArr
           }
@@ -660,7 +660,7 @@
             if(event.value==formData.quotationCustomer){
               item.intermediatorCommission = event.intermediatorCommission,
               item.customerCommision = event.commission
-              formData.custumerDiscount=event.discount
+              formData.custumerDiscount=event.discoun
               item.discount = event.discount
               formData.paymentTerms = event.paymentTerms
               formData.currency=event.currency
@@ -679,7 +679,8 @@
         formData.deliveryDayHead =  data[0].deliveryDayChild
         formData.currency =  '美元'
         formData.exchangeRate =  '1'
-        getShipList(data[0].headId)
+        await getShipList(data[0].headId)
+        // await changeDiscountOrExchangeRate()
       }
       function getShipList(id){
         let params = {id:id}
@@ -717,11 +718,13 @@
           return obj
       }
       function changeValues(prop){
+        formData.exchangeRate = (formData.exchangeRate==''||formData.exchangeRate===null)?1:formData.exchangeRate
+        prop.row.customerCommision = (prop.row.customerCommision==''||prop.row.customerCommision===null||!prop.row.customerCommision)?0:prop.row.customerCommision
+        prop.row.discount = (prop.row.discount==''||prop.row.discount===null||!prop.row.discount)?0:prop.row.discount
+        prop.row.tariff = (prop.row.tariff==''||prop.row.tariff===null||!prop.row.tariff)?0:prop.row.tariff
+        prop.row.intermediatorCommission = (prop.row.intermediatorCommission==''||prop.row.intermediatorCommission===null||!prop.row.intermediatorCommission)?0:prop.row.intermediatorCommission
         if(prop.col.key=='purchasePrice'||prop.col.key=='taxRate'||prop.col.key=='tariff'||prop.col.key=='discount'||prop.col.key=='grossMargin'||prop.col.key=='customerCommision'||prop.col.key=='intermediatorCommission'){
           //汇率默认为1
-            formData.exchangeRate = (formData.exchangeRate==''||formData.exchangeRate===null)?1:formData.exchangeRate
-            prop.row.customerCommision = (prop.row.customerCommision==''||prop.row.customerCommision===null||!prop.row.customerCommision)?0:prop.row.customerCommision
-            prop.row.intermediatorCommission = (prop.row.intermediatorCommission==''||prop.row.intermediatorCommission===null||!prop.row.intermediatorCommission)?0:prop.row.intermediatorCommission
             var num= prop.row.purchasePrice/Number(formData.exchangeRate)*(1+prop.row.taxRate/100)*(1+prop.row.tariff/100)*(1-prop.row.discount/100)/(1-prop.row.grossMargin/100-prop.row.customerCommision/100-prop.row.intermediatorCommission/100)
             
             prop.row.salePrice = !isNaN(num)?num.toFixed(2):''
@@ -742,9 +745,10 @@
         if(saleQuotationFormProductTable.dataSource.length>0){
           const xTable = saleQuotationFormProductTableRef.value!.getXTable();
           var newArr = [...xTable.data]
-          formData.exchangeRate = (formData.exchangeRate==''||formData.exchangeRate===null)?1:formData.exchangeRate
+          formData.exchangeRate = (formData.exchangeRate==''||formData.exchangeRate===null||!formData.exchangeRate)?1:formData.exchangeRate
           newArr.map(item=>{
-                item.discount =  (formData.custumerDiscount==''||formData.custumerDiscount===null)?formData.custumerDiscount:item.discount
+                item.discount =  (formData.custumerDiscount==''||formData.custumerDiscount===null||!formData.custumerDiscount)?0:formData.custumerDiscount
+                item.tariff =  (item.tariff==''||item.tariff===null||!item.tariff)?0:item.tariff
                 item.customerCommision = (item.customerCommision==''||item.customerCommision===null||!item.customerCommision)?0:item.customerCommision
                 item.intermediatorCommission = (item.intermediatorCommission==''||item.intermediatorCommission===null||!item.intermediatorCommission)?0:item.intermediatorCommission
                 //汇率默认为1