销售订单/发货通知单-增加开票地址字段

src/views/saleCode/deliveryNotice/components/deliveryNoticeForm.vue

@@ -113,7 +113,17 @@
 							<a-form-item label="提单号(B/L NO)" v-bind="validateInfos.blno" id="quotationFormForm-blno" name="blno">
 								<a-input v-model:value="formData.blno" placeholder="请输入"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
-						</a-col>						
+						</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="备注(notes)" v-bind="validateInfos.notes" id="quotationFormForm-notes" name="notes" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.notes" placeholder="请输入备注(notes)"  allow-clear AutoComplete="off"></a-input>
@@ -272,7 +282,8 @@
         fnumber:"",
         blno: '',   
         notes: '',   
-        
+        invoiceHeader:'',
+        invoiceHeader:'',
       });
 
       //表单验证
@@ -494,6 +505,8 @@
         formData.currency =data[0].currency
         formData.deliveryTerms =data[0].deliveryTerms
         formData.delivery=data[0].delivery
+        formData.invoiceHeader=data[0].invoiceHeader
+        formData.invoiceAddress=data[0].invoiceAddress
         getShipList(data[0].headId)
       }
       function getShipList(id){

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

@@ -101,63 +101,67 @@
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="质保期(warranty period)" v-bind="validateInfos.warrantyPeriod" id="SaleOrderForm-warrantyPeriod" name="warrantyPeriod">
-                <a-input v-model:value="formData.warrantyPeriod" placeholder="请输入" style="width: 85%;margin-right: 1%;" AutoComplete="off"/>月(month)
+							<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>               
             <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-input v-model:value="formData.packagebRequirement" placeholder="请输入包装要求(package requirement)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>   
             <a-col :span="12">
-							<a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="SaleOrderForm-isExport" name="isExport">
+							<a-form-item label="质保期(warranty period)" v-bind="validateInfos.warrantyPeriod" id="SaleOrderForm-warrantyPeriod" name="warrantyPeriod" >
+                <a-input v-model:value="formData.warrantyPeriod" placeholder="请输入" style="width: 85%;margin-right: 1%;" AutoComplete="off"/>月(month)
+							</a-form-item>
+						</a-col>
+            <a-col :span="12">
+							<a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="SaleOrderForm-isExport" name="isExport" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
                 <JDictSelectTag v-model:value="formData.isExport" placeholder="请选择" dictCode="yes_or_no" AutoComplete="off"/>
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
-							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleOrderForm-saleDepartment" name="saleDepartment" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="销售部门(sale department)" v-bind="validateInfos.saleDepartment" id="SaleOrderForm-saleDepartment" name="saleDepartment" >
 								<a-input v-model:value="formData.saleDepartment" placeholder="请输入"  allow-clear disabled ></a-input>
 							</a-form-item>
 						</a-col>   
-            <a-col :span="12">
-							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="SaleOrderForm-salesman" name="salesman">
-								<a-input v-model:value="formData.salesman" placeholder="请输入业务员(salesman)"  allow-clear disabled ></a-input>
-							</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-input v-model:value="formData.customerOrder" placeholder="请输入客户订单号(custormer order number)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
-							<a-form-item label="折上折(double discount)" v-bind="validateInfos.doubleDiscount" id="SaleOrderForm-doubleDiscount" name="doubleDiscount">
-								<a-input v-model:value="formData.doubleDiscount" placeholder="请输入折上折(double discount)"  allow-clear AutoComplete="off"></a-input>
+							<a-form-item label="业务员(salesman)" v-bind="validateInfos.salesman" id="SaleOrderForm-salesman" name="salesman" >
+								<a-input v-model:value="formData.salesman" placeholder="请输入业务员(salesman)"  allow-clear disabled ></a-input>
 							</a-form-item>
-						</a-col>     
+						</a-col>    
             <a-col :span="12">
-							<a-form-item label="折后金额(converted amount)" v-bind="validateInfos.convertedAmount" id="SaleOrderForm-convertedAmount" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1" name="convertedAmount">
+							<a-form-item label="折后金额(converted amount)" v-bind="validateInfos.convertedAmount" id="SaleOrderForm-convertedAmount"  name="convertedAmount"  :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.convertedAmount" placeholder="请输入折后金额(converted amount)"  allow-clear disabled></a-input>
 							</a-form-item>
+						</a-col>  
+            <a-col :span="12">
+							<a-form-item label="折上折(double discount)" v-bind="validateInfos.doubleDiscount" id="SaleOrderForm-doubleDiscount" name="doubleDiscount">
+								<a-input v-model:value="formData.doubleDiscount" placeholder="请输入折上折(double discount)"  allow-clear AutoComplete="off"></a-input>
+							</a-form-item>
 						</a-col>     
             <a-col :span="12">
-							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" id="SaleOrderForm-warrantyTerms" name="warrantyTerms">
+							<a-form-item label="质保条款(warranty terms)" v-bind="validateInfos.warrantyTerms" id="SaleOrderForm-warrantyTerms" name="warrantyTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col> 
             <a-col :span="12">
-							<a-form-item label="预付比例(advance ratio)" v-bind="validateInfos.advanceRatio" id="SaleOrderForm-advanceRatio" name="advanceRatio" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<a-form-item label="预付比例(advance ratio)" v-bind="validateInfos.advanceRatio" id="SaleOrderForm-advanceRatio" name="advanceRatio" >
 								<a-input v-model:value="formData.advanceRatio" placeholder="请输入"  allow-clear AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
-							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes">
+							<a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
 								<a-input v-model:value="formData.notes" AutoComplete="off"></a-input>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
-							<a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
+							<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>
@@ -313,6 +317,7 @@ import { InputNumberItem } from '/@/layouts/default/setting/components';
         deliveryTime: '',  
         deliveryAddress:'', 
         invoiceHeader:'', 
+        invoiceAddress:'',
         warrantyPeriod: '',   
         isExport:'',
         packagebRequirement:'',