发货通知单-和销售订单表头保持一致

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

@@ -119,11 +119,7 @@
                 <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="是否有第三方运费(otherFee)" v-bind="validateInfos.otherFee" id="SaleOrderForm-otherFee" name="otherFee" >
                 <a-select v-model:value="formData.otherFee">
@@ -520,6 +516,11 @@
         formData.delivery=data[0].delivery
         formData.invoiceHeader=data[0].invoiceHeader
         formData.invoiceAddress=data[0].invoiceAddress
+        formData.deliveryAddress=data[0].deliveryAddress
+        formData.isExport = data[0].isExport
+        formData.packagebRequirement = data[0].packagebRequirement
+        formData.warrantyPeriod = data[0].warrantyPeriod
+        formData.invoiceHeader = data[0].invoiceHeader
         getShipList(data[0].headId)
       }
       function getShipList(id){

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

@@ -96,10 +96,10 @@
 							</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 label="开票抬头(invoice header)" v-bind="validateInfos.invoiceHeader" id="SaleOrderForm-invoiceHeader" name="invoiceHeader">
+                <a-input v-model:value="formData.invoiceHeader" 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>