销售订单-字段修改

src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -64,49 +64,44 @@
                 <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" disabled/>
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
+						<!-- <a-col :span="12">
 							<a-form-item label="汇率(exchange rate)" v-bind="validateInfos.exchangeRate" id="SaleOrderForm-exchangeRate" name="exchangeRate" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.exchangeRate" placeholder="请输入"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
-						</a-col>
+						</a-col> -->
 						<a-col :span="12">
-							<a-form-item label="交货条款(delivery term)" v-bind="validateInfos.deliveryTerms" id="SaleOrderForm-deliveryTerms" name="deliveryTerms">
+							<a-form-item label="交货条款(delivery term)" v-bind="validateInfos.deliveryTerms" id="SaleOrderForm-deliveryTerms" name="deliveryTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
                 <JDictSelectTag v-model:value="formData.deliveryTerms" placeholder="请选择" dictCode="delivery_terms"/>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms" >
                 <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" disabled/>
 							</a-form-item>
 						</a-col>
             
             <a-col :span="12">
-							<a-form-item label="交期(delivery time)" v-bind="validateInfos.deliveryTime" id="SaleOrderForm-deliveryTime" name="deliveryTime">
+							<a-form-item label="交期(delivery time)" v-bind="validateInfos.deliveryTime" id="SaleOrderForm-deliveryTime" name="deliveryTime" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-date-picker placeholder="请选择交期(delivery time)"  v-model:value="formData.deliveryTime"  value-format="YYYY-MM-DD" format="YYYY-MM-DD" @change="changeMainDeliveryTime" style="width: 100%"  allow-clear />
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="SaleOrderForm-delivery" name="delivery" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="SaleOrderForm-delivery" name="delivery" >
                 <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_sale_order" />
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="交货地点(delivery address)" v-bind="validateInfos.deliveryAddress" id="SaleOrderForm-deliveryAddress" name="deliveryAddress">
+							<a-form-item label="交货地点(delivery address)" v-bind="validateInfos.deliveryAddress" id="SaleOrderForm-deliveryAddress" name="deliveryAddress" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
                 <a-input v-model:value="formData.deliveryAddress" placeholder="请输入" AutoComplete="off"/>
 							</a-form-item>
 						</a-col>
-            <a-col :span="12">
-							<a-form-item label="开票抬头(invoice header)" v-bind="validateInfos.invoiceHeader" id="SaleOrderForm-invoiceHeader" name="invoiceHeader" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
-                <a-input v-model:value="formData.invoiceHeader" placeholder="请输入" AutoComplete="off"/>
-							</a-form-item>
-						</a-col>
             <a-col :span="12">
 							<a-form-item label="开票地址(invoice address)" v-bind="validateInfos.invoiceAddress" id="SaleOrderForm-invoiceAddress" name="invoiceAddress" >
                 <a-input v-model:value="formData.invoiceAddress" placeholder="请输入" AutoComplete="off"/>
 							</a-form-item>
 						</a-col>               
             <a-col :span="12">
-							<a-form-item label="包装要求(package requirement)" v-bind="validateInfos.packagebRequirement" id="SaleOrderForm-packagebRequirement" name="packagebRequirement" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="包装要求(package requirement)" v-bind="validateInfos.packagebRequirement" id="SaleOrderForm-packagebRequirement" name="packagebRequirement":labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1" >
 								<a-input v-model:value="formData.packagebRequirement" placeholder="请输入包装要求(package requirement)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>   
@@ -126,7 +121,7 @@
 							</a-form-item>
 						</a-col>   
             <a-col :span="12">
-							<a-form-item label="客户订单号(custormer order)" v-bind="validateInfos.customerOrder" id="SaleOrderForm-customerOrder" name="customerOrder" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="客户订单号(custormer order)" v-bind="validateInfos.customerOrder" id="SaleOrderForm-customerOrder" name="customerOrder":labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1" >
 								<a-input v-model:value="formData.customerOrder" placeholder="请输入客户订单号(custormer order number)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col> 
@@ -161,7 +156,7 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs">
+							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs" >
 								<JUpload v-model:value="formData.attachs"></JUpload>
 							</a-form-item>
 						</a-col>
@@ -230,7 +225,7 @@
   import { defineComponent, ref, reactive, computed, toRaw,nextTick} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { querySaleOrderFormShipFormShippTable,ClassList, querySaleOrderFormProductListByMainId, queryDataById, saveOrUpdate,queryVersonHistoryById,querysaleVersonFormShipListByMainId, querySaleVersonProductListByMainId} from '../SaleOrderyForm.api';
+  import { querySaleOrderFormShipFormShippTable,ClassList, querySaleOrderFormProductListByMainId,CustomerOption, queryDataById, saveOrUpdate,queryVersonHistoryById,querysaleVersonFormShipListByMainId, querySaleVersonProductListByMainId} from '../SaleOrderyForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {saleOrderShipColumns, saleOrderProductColumns} from '../SaleOrderForm.data';
   import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
@@ -523,7 +518,7 @@
         var arrProduct = data.concat(SaleOrderFormShipFormProductTable.dataSource)
         SaleOrderFormShipFormProductTable.dataSource=arrProduct  
       }
-      function addQuotation(data){
+      async function addQuotation(data){
         var allDiscountPrice = 0
         data.map(item=>{
           item.model = item.childModel
@@ -539,6 +534,7 @@
           item.discountedAmount =Number(item.discountedPrice) *Number(item.quantity)
           item.discountedPrice =  (item.discountedPrice).toFixed(2)
           item.discountedAmount = (item.discountedAmount).toFixed(2)
+          item.deliveryTime=moment(formData.billDate).add(Number(item.deliveryDayChild), 'days').format('YYYY-MM-DD')
           allDiscountPrice=allDiscountPrice+Number(item.discountedAmount)
         })
         var arrProduct = data.concat(SaleOrderFormShipFormProductTable.dataSource)
@@ -549,6 +545,7 @@
         formData.convertedAmount = Number(formData.convertedAmount).toFixed(2)
         if(!formData.sourceCode2&&formData.sourceCode2==''){
           formData.project = data[0].quotationProject
+          formData.deliveryTerms = data[0].deliveryTerms
           formData.projectName = data[0].quotationProjectName
           formData.customer =data[0].quotationCustomer
           formData.customerName =data[0].quotationCustomerName
@@ -560,27 +557,23 @@
           formData.paymentTerms =data[0].paymentTerms
           formData.intermediator =data[0].intermediator
           formData.intermediatorName =data[0].intermediatorName
+          formData.deliveryTime=moment(formData.billDate).add(Number(data[0].deliveryDayHead), 'days').format('YYYY-MM-DD')
           getShipList(data[0].headId,'quotation')
+          var params = {id:formData.customer}
+          var obj = await CustomerOption(params)
+          formData.invoiceAddress =obj.records[0].invoiceAddress
         }
       }
       function changeDiscount(){
         var detail =[...SaleOrderFormShipFormProductTable.dataSource]
         var num = 0
         detail.map(item=>{
-          if(formData.doubleDiscount&&formData.doubleDiscount!==''){
-            item.discountedPrice = ((Number(item.taxPrice) *(1-Number(formData.doubleDiscount)/100))).toFixed(2)
-          }else{
-            item.discountedPrice = Number(item.taxPrice)
-          }
-          item.discountedAmount =Number(item.discountedPrice) *Number(item.quantity)
-          item.discountedAmount = (item.discountedAmount).toFixed(2)
           num=num+Number(item.discountedAmount)
         })
-        SaleOrderFormShipFormProductTable.dataSource=detail 
-        formData.convertedAmount=num 
+        formData.convertedAmount=num *(1-Number(formData.doubleDiscount)/100)
         formData.convertedAmount = Number(formData.convertedAmount).toFixed(2)
       }
-      function addContract(data){
+      async function addContract(data){
         var allDiscountPrice = 0
          data.map(item=>{
             item.model = item.childModel
@@ -607,6 +600,7 @@
             formData.project = data[0].quotationProject
             formData.projectName = data[0].quotationProjectName
             formData.customer =data[0].quotationCustomer
+            formData.deliveryTerms = data[0].deliveryTerms
             formData.customerName =data[0].quotationCustomerName
             formData.priority =data[0].priority
             formData.productionClass =data[0].productionClass
@@ -617,6 +611,9 @@
             formData.intermediator =data[0].intermediator
             formData.intermediatorName =data[0].intermediatorName
             getShipList(data[0].headId,'contract')
+            var params = {id:formData.customer}
+            var obj = await CustomerOption(params)
+            formData.invoiceAddress =obj.records[0].invoiceAddress
           }
           
       }
@@ -715,7 +712,8 @@
         notAllowEdit,
         ClassList,
         changeValues,
-        changeDiscount
+        changeDiscount,
+        CustomerOption
       }
     }
   });