diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
index 13149bdc..6d105037 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
@@ -104,4 +104,7 @@ public class Saleback_item0Entity  {
     @TableField("NOT_AMOUNT")
     private BigDecimal notAmount;
 
+    @TableField("VEHICLE_ID")
+    private String vehicleId;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java
index c77ef6e6..8e50c6e1 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java
@@ -435,8 +435,9 @@ public class SaleorderController {
 		List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
 		List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
 		for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
-//								Map<String,Object> licenseNumMap = new HashMap<>();
+								Map<String,Object> vehicleIdMap = new HashMap<>();
 //                jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap));
+            jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("391151974030035653","vehicle_id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
     }
 		vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
 		List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
index c175c48b..045aedc2 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
@@ -72,8 +72,8 @@ public class Salesorder_item0Entity  {
     @TableField("POUNDLIST_ID")
     private String poundlistId;
 
-    @TableField("LICENSE_NUM")
-    private String licenseNum;
+//    @TableField("LICENSE_NUM")
+//    private String licenseNum;
 
     @TableField("MATERIAL_CODE")
     private String materialCode;
@@ -123,4 +123,7 @@ public class Salesorder_item0Entity  {
     @TableField("VEHICLE_PICTURES")
     private String vehiclePictures;
 
+    @TableField("VEHICLE_ID")
+    private String vehicleId;
+
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java
index 2488ed5c..6cbbe30d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java
@@ -70,5 +70,7 @@ public class Salesorder_item0Model  {
     @JsonProperty("vehiclePictures")
     private String vehiclePictures;
 
-
+    /** id **/
+    @JsonProperty("vehicleId")
+    private String vehicleId;
 }
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index 5b698610..58974352 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -42,7 +42,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="收款类型 " prop="paymentType">
+            <el-form-item label="收款类型" prop="paymentType">
               <el-select v-model="dataForm.paymentType" placeholder="请选择" clearable :style='{"width":"100%"}'>
                 <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
                   :value="item.id" :disabled="item.disabled"></el-option>
@@ -51,7 +51,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="币别 " prop="currency">
+            <el-form-item label="币别" prop="currency">
               <el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
                 <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
                   :disabled="item.disabled"></el-option>
@@ -83,7 +83,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="单据状态 " prop="status">
+            <el-form-item label="单据状态" prop="status">
               <el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
                 <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
                   :disabled="item.disabled"></el-option>
@@ -106,7 +106,7 @@
                     <div class="JNPF-common-title">
                       <h2></h2>
                     </div>
-                    <el-table :data="dataForm.collection_item0List" size='mini' show-summary>
+                    <el-table :data="dataForm.collection_item0List" size='mini' show-summary :summary-method="getSummaries">
                       <el-table-column type="index" width="50" label="序号" align="center" />
                       <el-table-column prop="amount" label="收款金额" align="center" >
                         <template slot-scope="scope">
@@ -114,20 +114,20 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="creatorUserId" label="订单金额" align="center" >
+                      <el-table-column prop="price" label="订单金额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="creatorUserName" label="已收款金额" align="center" >
+                      <el-table-column prop="amountCollected" label="已收款金额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
                             :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="deleteTime" label="销售订单编号" align="center" >
+                      <el-table-column prop="coustomerCode" label="销售订单编号" align="center" >
                         <template slot-scope="scope">
                           <popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
                             :field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
@@ -137,14 +137,14 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="lastModifyUserId" label="合同编号" align="center" >
+                      <el-table-column prop="contractCode" label="合同编号" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
                             :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="lastModifyUserName" label="数量" align="center" >
+                      <el-table-column prop="num" label="数量" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
@@ -158,20 +158,20 @@
                       <!--                </el-select>-->
                       <!--            </template>-->
                       <!--        </el-table-column>-->
-                      <el-table-column prop="lastModifyTime" label="垫资金额" align="center" >
+                      <el-table-column prop="advanceAmount" label="垫资金额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
                             :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="deleteUserId" label="税额" align="center" >
+                      <el-table-column prop="rate" label="税额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="deleteUserName" label="不含税金额" align="center" >
+                      <el-table-column prop="notPrice" label="不含税金额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
@@ -219,6 +219,7 @@
   export default {
     components: {},
     props: [],
+
     data() {
       return {
         visible: false,
@@ -365,10 +366,26 @@
       }
     },
     computed: {},
-    watch: {},
+    watch: {
+      dataForm: {
+        deep: true,
+        handler: function() {
+          this.popupnum()
+        }
+      }
+    },
     created() {},
     mounted() {},
     methods: {
+      popupnum() {
+        let amount = 0
+        for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
+          amount = amount + parseFloat(this.dataForm.collection_item0List[i].amount);
+        }
+        parseFloat(this.dataForm.amountCollected = amount)
+      },
+
+
       popupSelect(e, d) {
         this.dataForm.customerCode = d.id;
       },
@@ -387,6 +404,32 @@
           }
         }
       },
+
+      getSummaries(param) {
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value)) && (index === 1 || index === 2 || index === 3 || index === 6|| index === 7|| index === 8 || index === 9  )) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+      },
       collection_item0Exist() {
         let isOk = true;
         for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index 2a9774b6..37a13440 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -387,6 +387,7 @@
             }
           });
         })
+        }
         if (this.multipleSelection.length > 1) {
           this.$message({
             type: 'error',
@@ -394,7 +395,6 @@
             duration: 1500
           })
         }
-        }
       },
       addOrUpdateHandle(id, isDetail) {
         this.formVisible = true
diff --git a/SC-web/src/views/scm/basicInformation/payment/Form.vue b/SC-web/src/views/scm/basicInformation/payment/Form.vue
index f052a5f5..4068383a 100644
--- a/SC-web/src/views/scm/basicInformation/payment/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/Form.vue
@@ -174,26 +174,26 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="deleteUserId" label="重量" align="center" >
+                      <el-table-column prop="num" label="重量" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="deleteTime" label="垫资金额" align="center" >
+                      <el-table-column prop="advanceAmount" label="垫资金额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
                             :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="orgnizeId" label="税额" align="center" >
+                      <el-table-column prop="rate" label="税额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="departmentId" label="不含税金额" align="center" >
+                      <el-table-column prop="notAmount" label="不含税金额" align="center" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
@@ -341,7 +341,6 @@
       dataForm: {
         deep: true,
         handler: function() {
-
           this.popupSelect()
         }
       }
diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
index 2bf6e5d9..bfb0ebf9 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
@@ -64,17 +64,27 @@
 										</div>
 										<el-table :data="dataForm.saleback_item0List" size='mini'>
 											<el-table-column type="index" width="50" label="序号" align="center" />
-											<el-table-column prop="licenseNum" label="车牌号">
-												<template slot-scope="scope">
-													<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
-														clearable :field="'licenseNum'+scope.$index"
-														interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"
-														:columnOptions="saleback_item0licenseNumcolumnOptions"
-														propsValue="license_num" relationField="license_num"
-														popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
-													</popupSelect>
-												</template>
-											</el-table-column>
+<!--											<el-table-column prop="licenseNum" label="车牌号">-->
+<!--												<template slot-scope="scope">-->
+<!--													<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"-->
+<!--														clearable :field="'licenseNum'+scope.$index"-->
+<!--														interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"-->
+<!--														:columnOptions="saleback_item0licenseNumcolumnOptions"-->
+<!--														propsValue="license_num" relationField="license_num"-->
+<!--														popupType="dialog" popupWidth="800px" @change="popupSelectChange2">-->
+<!--													</popupSelect>-->
+<!--												</template>-->
+<!--											</el-table-column>-->
+                      <el-table-column prop="vehicleId" label="车辆ID">
+                        <template slot-scope="scope">
+                          <popupSelect   v-model="scope.row.vehicleId"
+                           placeholder="请选择"  clearable  :field="'vehicleId'+scope.$index"  interfaceId="383568082196537541"
+                                         :columnOptions="salesback_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
+                                         relationField="ticketno" popupType="dialog"
+                           popupWidth="800px">
+                          </popupSelect>
+                        </template>
+                      </el-table-column>
 											<el-table-column prop="materialName" label="物料名称">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.materialName" placeholder="请输入"
@@ -249,9 +259,9 @@
 					"id": "2"
 				}],
 
-				saleback_item0licenseNumcolumnOptions: [{
+        salesback_item0vehicleIdcolumnOptions: [{
 					"label": "车牌号",
-					"value": "license_num"
+					"value": "ticketno"
 				}, {
 					"label": "物料名称",
 					"value": "material_name"
@@ -323,8 +333,8 @@
 			popupSelectChange2(a, b){
         var excludeFields = [];
 				for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
-          excludeFields.push(this.dataForm.saleback_item0List[i].licenseNo);
-					if(a == this.dataForm.saleback_item0List[i].licenseNum){
+          excludeFields.push(this.dataForm.saleback_item0List[i].vehicleId);
+					if(a == this.dataForm.saleback_item0List[i].vehicleId){
 						this.dataForm.saleback_item0List[i].materialName = b.material_name;
 						this.dataForm.saleback_item0List[i].settlement = b.settlement;
 						this.dataForm.saleback_item0List[i].unit = b.unit;
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index 5db0f470..602fddb2 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
-    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
+             :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
     <el-row :gutter="15" class="">
       <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
         <template v-if="!loading">
@@ -14,9 +14,10 @@
           <el-col :span="8">
             <el-form-item label="合同名称" prop="contractName">
               <popupSelect v-model="dataForm.contractName" placeholder="请选择" clearable field="contractName"
-                interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions" propsValue="contract_name"
-                relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
-                @change="popupSelectChange">
+                           interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions"
+                           propsValue="contract_name"
+                           relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+                           @change="popupSelectChange">
 
               </popupSelect>
             </el-form-item>
@@ -25,7 +26,7 @@
             <el-form-item label="币别" prop="currency">
               <el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
                 <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
-                  :disabled="item.disabled"></el-option>
+                           :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
@@ -104,7 +105,7 @@
             <el-form-item label="来源系统" prop="sourceSystem">
               <el-select v-model="dataForm.sourceSystem" placeholder="请选择" clearable :style='{"width":"100%"}'>
                 <el-option v-for="(item, index) in sourceSystemOptions" :key="index" :label="item.fullName"
-                  :value="item.id" :disabled="item.disabled"></el-option>
+                           :value="item.id" :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
@@ -113,7 +114,7 @@
             <el-form-item label="单据状态 " prop="status">
               <el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
                 <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
-                  :disabled="item.disabled"></el-option>
+                           :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
@@ -134,31 +135,44 @@
                       <h2></h2>
                     </div>
                     <el-table :data="dataForm.salesorder_item0List" size='mini'>
-                      <el-table-column type="index" width="50" label="序号" align="center" />
-                      <el-table-column prop="licenseNum" label="车牌号">
-                        <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.licenseNum" placeholder="请选择" clearable
-                            :field="'licenseNum'+scope.$index" interfaceId="391151974030035653"
-                            :bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"
-                            propsValue="license_no" relationField="license_no" popupType="dialog"
-                            @change="popupSelectChange2" popupWidth="800px">
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+
+<!--                                            <el-table-column prop="licenseNum" label="车牌号">-->
+<!--                                              <template slot-scope="scope">-->
+<!--                                                <popupSelect v-model="scope.row.licenseNum" placeholder="请选择" clearable-->
+<!--                                                  :field="'licenseNum'+scope.$index" interfaceId="391151974030035653"-->
+<!--                                                  :bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"-->
+<!--                                                  propsValue="license_no" relationField="license_no" popupType="dialog"-->
+<!--                                                  @change="popupSelectChange2" popupWidth="800px">-->
+<!--                                             </popupSelect>-->
+<!--                                              </template>-->
+<!--                                            </el-table-column>-->
 
-                       </popupSelect>
+                      <el-table-column prop="vehicleId" label="车辆ID">
+                        <template slot-scope="scope">
+                          <popupSelect v-model="scope.row.vehicleId"
+                                       placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
+                                       interfaceId="391151974030035653"   :bissId="dataForm.contractCode"
+                                       :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"
+                                       relationField="ticketno" popupType="dialog"
+                                       popupWidth="800px" @change="popupSelectChange2">
+                          </popupSelect>
                         </template>
                       </el-table-column>
+
                       <el-table-column prop="materialName" label="物料名称">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.materialName" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="poundType" label="类型">
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.poundType" placeholder="请选择" clearable
-                            :style='{"width":"100%"}'>
+                                     :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
@@ -172,7 +186,7 @@
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
@@ -180,7 +194,7 @@
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
@@ -193,7 +207,7 @@
                       <el-table-column prop="settlement" label="结算重量">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.settlement" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
@@ -201,7 +215,7 @@
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.rate" placeholder="请选择" clearable :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
@@ -230,14 +244,15 @@
                       <el-table-column prop="vehiclePictures" label="车辆图片">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.vehiclePictures" placeholder="请输入" clearable
-                            :style='{"width":"300%"}'>
+                                    :style='{"width":"300%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
                           <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                            @click="delsalesorder_item0List(scope.$index)">删除</el-button>
+                                     @click="delsalesorder_item0List(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -254,18 +269,19 @@
                       <h2></h2>
                     </div>
                     <el-table :data="dataForm.receiptoutsoitemList" size='mini'>
-                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="documentNo" label="出库单号">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.documentNo" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="issueDate" label="出库日期 ">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.issueDate" placeholder="请选择" clearable
-                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
+                                          :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                          value-format="timestamp">
                           </el-date-picker>
                         </template>
                       </el-table-column>
@@ -284,7 +300,8 @@
                       <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
                           <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                            @click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
+                                     @click="delreceiptoutsoitemList(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -301,20 +318,20 @@
                       <h2></h2>
                     </div>
                     <el-table :data="dataForm.collectionsoitemList" size='mini'>
-                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="paymentType" label="收款类型 ">
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.paymentType" placeholder="请选择" clearable
-                            :style='{"width":"100%"}'>
+                                     :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
                       <el-table-column prop="amountCollected" label="收款金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
@@ -327,7 +344,8 @@
                       <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
                           <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                            @click="delcollectionsoitemList(scope.$index)">删除</el-button>
+                                     @click="delcollectionsoitemList(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -344,7 +362,7 @@
                       <h2></h2>
                     </div>
                     <el-table :data="dataForm.arinvoices_item0soitemList" size='mini'>
-                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="invoiceNo" label="发票编号">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.invoiceNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
@@ -354,21 +372,21 @@
                       <el-table-column prop="invoiceCode" label="发票代码">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.invoiceCode" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="involceAmount" label="发票金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.involceAmount" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="invoiceQuantity" label="发票数量">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.invoiceQuantity" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
@@ -376,14 +394,14 @@
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.taxRate" placeholder="请选择" clearable :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
                       <el-table-column prop="amountNotTax" label="不含税金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.amountNotTax" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
@@ -396,37 +414,39 @@
                       <el-table-column prop="invoiceStatus" label="发票状态 ">
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.invoiceStatus" placeholder="请选择" clearable
-                            :style='{"width":"100%"}'>
+                                     :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName"
-                              :value="item.id" :disabled="item.disabled"></el-option>
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
                       <el-table-column prop="creatorUserName" label="开票人">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="invoiceDate" label="开票日期">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.invoiceDate" placeholder="请选择" clearable
-                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
+                                          :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                          value-format="timestamp">
                           </el-date-picker>
                         </template>
                       </el-table-column>
                       <el-table-column prop="attachMent" label="发票附件 ">
                         <template slot-scope="scope">
                           <JNPF-UploadFz v-model="scope.row.attachMent" :fileSize="5" sizeUnit="MB" :limit="9"
-                            buttonText="点击上传">
+                                         buttonText="点击上传">
                           </JNPF-UploadFz>
                         </template>
                       </el-table-column>
                       <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
                           <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                            @click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
+                                     @click="delarinvoices_item0soitemList(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -445,11 +465,11 @@
                       <h2></h2>
                     </div>
                     <el-table :data="dataForm.salesbacksoitemList" size='mini'>
-                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="documentNo" label="退货单号">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.documentNo" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
@@ -462,21 +482,23 @@
                       <el-table-column prop="refundAmount" label="退款金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.refundAmount" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="creatorTime" label="退货日期">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
-                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
+                                          :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                          value-format="timestamp">
                           </el-date-picker>
                         </template>
                       </el-table-column>
                       <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
                           <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                            @click="delsalesbacksoitemList(scope.$index)">删除</el-button>
+                                     @click="delsalesbacksoitemList(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -493,34 +515,35 @@
                       <h2></h2>
                     </div>
                     <el-table :data="dataForm.paymentsoitemList" size='mini'>
-                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="documentno" label="付款单号">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.documentno" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="settlementtype" label="付款方式">
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable
-                            :style='{"width":"100%"}'>
+                                     :style='{"width":"100%"}'>
                             <el-option v-for="(item, index) in settlementtypeOptions" :key="index"
-                              :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+                                       :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
                       <el-table-column prop="duedate" label="付款日期">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.duedate" placeholder="请选择" clearable
-                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
+                                          :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                                          value-format="timestamp">
                           </el-date-picker>
                         </template>
                       </el-table-column>
                       <el-table-column prop="paymentamount" label="付款金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.paymentamount" placeholder="请输入" clearable
-                            :style='{"width":"100%"}'>
+                                    :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
@@ -533,7 +556,8 @@
                       <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
                           <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                            @click="delpaymentsoitemList(scope.$index)">删除</el-button>
+                                     @click="delpaymentsoitemList(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -564,6 +588,7 @@
   import {
     getDictionaryDataSelector
   } from '@/api/systemData/dictionary'
+
   export default {
     components: {},
     props: [],
@@ -574,8 +599,8 @@
         isDetail: false,
         dataForm: {
           documentNo: '',
-          contractName: "",
-          currency: "0",
+          contractName: '',
+          currency: '0',
           contractNo: '',
           advanceAmount: '',
           num: '',
@@ -586,15 +611,15 @@
           amountCollected: '',
           invoiceNum: '',
           invoiceAmount: '',
-          sourceSystem: "0",
-          status: "0",
-          creatorUserName: "",
+          sourceSystem: '0',
+          status: '0',
+          creatorUserName: '',
           salesorder_item0List: [],
           receiptoutsoitemList: [],
           collectionsoitemList: [],
           arinvoices_item0soitemList: [],
           salesbacksoitemList: [],
-          paymentsoitemList: [],
+          paymentsoitemList: []
         },
         activexvlbvm: '0',
         rules: {
@@ -602,287 +627,301 @@
             required: true,
             message: '请选择',
             trigger: 'change'
-          }, ],
+          }]
         },
         contractNamecolumnOptions: [{
-          "label": "合同编码",
-          "value": "contract_code"
+          'label': '合同编码',
+          'value': 'contract_code'
         }, {
-          "label": "合同名称",
-          "value": "contract_name"
+          'label': '合同名称',
+          'value': 'contract_name'
         }, {
-          "label": "合同类型",
-          "value": "contract_type"
+          'label': '合同类型',
+          'value': 'contract_type'
         }, {
-          "label": "供应商/客户名称",
-          "value": "name"
-        }, ],
+          'label': '供应商/客户名称',
+          'value': 'name'
+        }],
         currencyOptions: [{
-          "fullName": "人民币",
-          "id": "0"
+          'fullName': '人民币',
+          'id': '0'
         }, {
-          "fullName": "美元",
-          "id": "1"
+          'fullName': '美元',
+          'id': '1'
         }, {
-          "fullName": "英镑",
-          "id": "2"
+          'fullName': '英镑',
+          'id': '2'
         }],
         sourceSystemOptions: [{
-          "fullName": "人工创建",
-          "id": "0"
+          'fullName': '人工创建',
+          'id': '0'
         }, {
-          "fullName": "商城平台",
-          "id": "1"
+          'fullName': '商城平台',
+          'id': '1'
         }],
         statusOptions: [{
-          "fullName": "已保存",
-          "id": "0"
+          'fullName': '已保存',
+          'id': '0'
         }, {
-          "fullName": "开票中",
-          "id": "1"
+          'fullName': '开票中',
+          'id': '1'
         }, {
-          "fullName": "付款申请",
-          "id": "2"
+          'fullName': '付款申请',
+          'id': '2'
         }, {
-          "fullName": "待回款",
-          "id": "3"
+          'fullName': '待回款',
+          'id': '3'
         }, {
-          "fullName": "回款中",
-          "id": "4"
+          'fullName': '回款中',
+          'id': '4'
         }, {
-          "fullName": "归档",
-          "id": "5"
+          'fullName': '归档',
+          'id': '5'
         }],
-
-        salesorder_item0licenseNumcolumnOptions: [{
-            "label": "车牌号",
-            "value": "license_no"
-          }, {
-            "label": "物料名称",
-            "value": "material_name"
-          }, {
-            "label": "磅单类型",
-            "value": "pound_type"
-          }, {
-            "label": "净重",
-            "value": "net_weight"
-          },
-          {
-            "label": "计量单位",
-            "value": "unit"
-          }, {
-            "label": "是否垫资",
-            "value": "advance"
-          }, {
-            "label": "销售单价",
-            "value": "sales_price"
-          },
-          {
-            "label": "结算重量",
-            "value": "settlement"
-          }, {
-            "label": "税率",
-            "value": "rate"
-          }, {
-            "label": "备注",
-            "value": "remark"
-          },
-          {
-            "label": "磅单图片",
-            "value": "pound_pictures"
-          }, {
-            "label": "车辆图片",
-            "value": "vehicle_pictures"
-          },
-        ],
+        salesorder_item0vehicleIdcolumnOptions: [{ 'label': '车牌号', 'value': 'ticketno' }, {
+          'label': '物料名称',
+          'value': 'materialName'
+        }, { 'label': '结算重量', 'value': 'settlement' }, { 'label': '计量单位', 'value': 'unit' }, {
+          'label': '采购单价',
+          'value': 'sales_price'
+        }, { 'label': '税率', 'value': 'rate' }, { 'label': '应退金额', 'value': 'price' }, {
+          'label': '税额',
+          'value': 'no_price'
+        }, { 'label': '业务员', 'value': 'pound_user' }, { 'label': '磅单类型', 'value': 'pound_type' }],
+        // salesorder_item0licenseNumcolumnOptions: [{
+        //   'label': '车牌号',
+        //   'value': 'license_no'
+        // }, {
+        //   'label': '物料名称',
+        //   'value': 'material_name'
+        // }, {
+        //   'label': '磅单类型',
+        //   'value': 'pound_type'
+        // }, {
+        //   'label': '净重',
+        //   'value': 'net_weight'
+        // },
+        //   {
+        //     'label': '计量单位',
+        //     'value': 'unit'
+        //   }, {
+        //     'label': '是否垫资',
+        //     'value': 'advance'
+        //   }, {
+        //     'label': '销售单价',
+        //     'value': 'sales_price'
+        //   },
+        //   {
+        //     'label': '结算重量',
+        //     'value': 'settlement'
+        //   }, {
+        //     'label': '税率',
+        //     'value': 'rate'
+        //   }, {
+        //     'label': '备注',
+        //     'value': 'remark'
+        //   },
+        //   {
+        //     'label': '磅单图片',
+        //     'value': 'pound_pictures'
+        //   }, {
+        //     'label': '车辆图片',
+        //     'value': 'vehicle_pictures'
+        //   }
+        // ],
         poundTypeOptions: [{
-          "fullName": "贸易",
-          "id": "0"
+          'fullName': '贸易',
+          'id': '0'
         }, {
-          "fullName": "其他",
-          "id": "1"
+          'fullName': '其他',
+          'id': '1'
         }],
         unitOptions: [{
-          "fullName": "吨",
-          "id": "0"
+          'fullName': '吨',
+          'id': '0'
         }, {
-          "fullName": "千克",
-          "id": "1"
+          'fullName': '千克',
+          'id': '1'
         }],
         advanceOptions: [{
-          "fullName": "否",
-          "id": "0"
+          'fullName': '否',
+          'id': '0'
         }, {
-          "fullName": "是",
-          "id": "1"
+          'fullName': '是',
+          'id': '1'
         }],
         rateOptions: [{
-          "fullName": "13",
-          "id": "0"
+          'fullName': '13',
+          'id': '0'
         }, {
-          "fullName": "9",
-          "id": "1"
+          'fullName': '9',
+          'id': '1'
         }, {
-          "fullName": "6",
-          "id": "2"
+          'fullName': '6',
+          'id': '2'
         }, {
-          "fullName": "5",
-          "id": "3"
+          'fullName': '5',
+          'id': '3'
         }, {
-          "fullName": "3",
-          "id": "4"
+          'fullName': '3',
+          'id': '4'
         }, {
-          "fullName": "0",
-          "id": "5"
+          'fullName': '0',
+          'id': '5'
         }],
         paymentTypeOptions: [{
-          "fullName": "贷款",
-          "id": "0"
+          'fullName': '贷款',
+          'id': '0'
         }, {
-          "fullName": "运费",
-          "id": "1"
+          'fullName': '运费',
+          'id': '1'
         }, {
-          "fullName": "仓储",
-          "id": "2"
+          'fullName': '仓储',
+          'id': '2'
         }],
         taxRateOptions: [{
-          "fullName": "13",
-          "id": "0"
+          'fullName': '13',
+          'id': '0'
         }, {
-          "fullName": "9",
-          "id": "1"
+          'fullName': '9',
+          'id': '1'
         }, {
-          "fullName": "6",
-          "id": "2"
+          'fullName': '6',
+          'id': '2'
         }, {
-          "fullName": "5",
-          "id": "3"
+          'fullName': '5',
+          'id': '3'
         }, {
-          "fullName": "3",
-          "id": "4"
+          'fullName': '3',
+          'id': '4'
         }, {
-          "fullName": "0",
-          "id": "5"
+          'fullName': '0',
+          'id': '5'
         }],
         invoiceStatusOptions: [{
-          "fullName": "正常",
-          "id": "0"
+          'fullName': '正常',
+          'id': '0'
         }, {
-          "fullName": "红冲",
-          "id": "1"
+          'fullName': '红冲',
+          'id': '1'
         }, {
-          "fullName": "作废",
-          "id": "2"
+          'fullName': '作废',
+          'id': '2'
         }],
         settlementtypeOptions: [{
-          "fullName": "现金",
-          "id": "0"
+          'fullName': '现金',
+          'id': '0'
         }, {
-          "fullName": "赊购",
-          "id": "1"
+          'fullName': '赊购',
+          'id': '1'
         }, {
-          "fullName": "网银",
-          "id": "2"
+          'fullName': '网银',
+          'id': '2'
         }, {
-          "fullName": "银企直连",
-          "id": "3"
+          'fullName': '银企直连',
+          'id': '3'
         }, {
-          "fullName": "银票",
-          "id": "4"
+          'fullName': '银票',
+          'id': '4'
         }, {
-          "fullName": "商票",
-          "id": "5"
-        }],
+          'fullName': '商票',
+          'id': '5'
+        }]
       }
     },
     computed: {},
     watch: {},
-    created() {},
-    mounted() {},
+    created() {
+    },
+    mounted() {
+    },
     methods: {
       popupSelectChange(e, d) {
-        this.dataForm.costomerName = d.name;
-        this.dataForm.contractCode = d.contract_code;
+        this.dataForm.costomerName = d.name
+        this.dataForm.contractCode = d.contract_code
       },
       popupSelectChange2(a, b) {
-        let settlementSum = 0;
+        var excludeFields = []
+        let settlementSum = 0
         for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
-          if (a == this.dataForm.salesorder_item0List[i].licenseNum) {
-            this.dataForm.salesorder_item0List[i].materialName = b.material_name;
-            this.dataForm.salesorder_item0List[i].settlement = b.settlement;
-            this.dataForm.salesorder_item0List[i].netWeight = b.net_weight;
-            this.dataForm.salesorder_item0List[i].unit = b.unit;
-            this.dataForm.salesorder_item0List[i].advance = b.advance;
-            this.dataForm.salesorder_item0List[i].rate = b.rate;
-            this.dataForm.salesorder_item0List[i].remark = b.remark;
-            this.dataForm.salesorder_item0List[i].poundPictures = b.pound_pictures;
-            this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures;
-            this.dataForm.salesorder_item0List[i].poundType = b.pound_type;
-            this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price;
-            settlementSum = settlementSum + settlement;
+          excludeFields.push(this.dataForm.salesorder_item0List[i].vehicleId)
+          if (a == this.dataForm.salesorder_item0List[i].vehicleId) {
+            this.dataForm.salesorder_item0List[i].materialName = b.materialName
+            this.dataForm.salesorder_item0List[i].settlement = b.settlement
+            this.dataForm.salesorder_item0List[i].netWeight = b.net_weight
+            this.dataForm.salesorder_item0List[i].unit = b.unit
+            this.dataForm.salesorder_item0List[i].advance = b.advance
+            this.dataForm.salesorder_item0List[i].rate = b.rate
+            this.dataForm.salesorder_item0List[i].remark = b.remark
+            this.dataForm.salesorder_item0List[i].poundPictures = b.pound_pictures
+            this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures
+            this.dataForm.salesorder_item0List[i].poundType = b.pound_type
+            this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price
+            settlementSum = settlementSum + settlement
           }
         }
-        this.dataForm.num = settlementSum;
+        this.dataForm.num = settlementSum
+        this.excludeFields = excludeFields
       },
       salesorder_item0Exist() {
-        let isOk = true;
+        let isOk = true
         for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
-          const e = this.dataForm.salesorder_item0List[i];
+          const e = this.dataForm.salesorder_item0List[i]
         }
-        return isOk;
+        return isOk
       },
       receiptoutsoitemExist() {
-        let isOk = true;
+        let isOk = true
         for (let i = 0; i < this.dataForm.receiptoutsoitemList.length; i++) {
-          const e = this.dataForm.receiptoutsoitemList[i];
+          const e = this.dataForm.receiptoutsoitemList[i]
         }
-        return isOk;
+        return isOk
       },
       collectionsoitemExist() {
-        let isOk = true;
+        let isOk = true
         for (let i = 0; i < this.dataForm.collectionsoitemList.length; i++) {
-          const e = this.dataForm.collectionsoitemList[i];
+          const e = this.dataForm.collectionsoitemList[i]
         }
-        return isOk;
+        return isOk
       },
       arinvoices_item0soitemExist() {
-        let isOk = true;
+        let isOk = true
         for (let i = 0; i < this.dataForm.arinvoices_item0soitemList.length; i++) {
-          const e = this.dataForm.arinvoices_item0soitemList[i];
+          const e = this.dataForm.arinvoices_item0soitemList[i]
         }
-        return isOk;
+        return isOk
       },
       salesbacksoitemExist() {
-        let isOk = true;
+        let isOk = true
         for (let i = 0; i < this.dataForm.salesbacksoitemList.length; i++) {
-          const e = this.dataForm.salesbacksoitemList[i];
+          const e = this.dataForm.salesbacksoitemList[i]
         }
-        return isOk;
+        return isOk
       },
       paymentsoitemExist() {
-        let isOk = true;
+        let isOk = true
         for (let i = 0; i < this.dataForm.paymentsoitemList.length; i++) {
-          const e = this.dataForm.paymentsoitemList[i];
+          const e = this.dataForm.paymentsoitemList[i]
         }
-        return isOk;
+        return isOk
       },
       clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
-            data[key] = [];
+            data[key] = []
           } else if (data[key] instanceof Object) {
-            this.clearData(data[key]);
+            this.clearData(data[key])
           } else {
-            data[key] = "";
+            data[key] = ''
           }
         }
       },
       init(id, isDetail) {
-        this.dataForm.id = id || 0;
-        this.visible = true;
-        this.isDetail = isDetail || false;
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.isDetail = isDetail || false
         this.$nextTick(() => {
-          this.$refs['elForm'].resetFields();
+          this.$refs['elForm'].resetFields()
           if (this.dataForm.id) {
             this.loading = true
             request({
@@ -891,11 +930,11 @@
             }).then(res => {
               this.dataInfo(res.data)
               this.loading = false
-            });
+            })
           } else {
             this.clearData(this.dataForm)
           }
-        });
+        })
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       // 表单提交
@@ -950,6 +989,7 @@
       },
       addsalesorder_item0List() {
         let item = {
+          vehicleId: undefined,
           licenseNum: undefined,
           materialName: undefined,
           poundType: undefined,
@@ -962,35 +1002,35 @@
           price: undefined,
           noPrice: undefined,
           poundPictures: undefined,
-          vehiclePictures: undefined,
+          vehiclePictures: undefined
         }
         this.dataForm.salesorder_item0List.push(item)
       },
       delsalesorder_item0List(index) {
-        this.dataForm.salesorder_item0List.splice(index, 1);
+        this.dataForm.salesorder_item0List.splice(index, 1)
       },
       addreceiptoutsoitemList() {
         let item = {
           documentNo: undefined,
           issueDate: undefined,
           num: undefined,
-          amount: undefined,
+          amount: undefined
         }
         this.dataForm.receiptoutsoitemList.push(item)
       },
       delreceiptoutsoitemList(index) {
-        this.dataForm.receiptoutsoitemList.splice(index, 1);
+        this.dataForm.receiptoutsoitemList.splice(index, 1)
       },
       addcollectionsoitemList() {
         let item = {
           paymentType: undefined,
           amountCollected: undefined,
-          remark: undefined,
+          remark: undefined
         }
         this.dataForm.collectionsoitemList.push(item)
       },
       delcollectionsoitemList(index) {
-        this.dataForm.collectionsoitemList.splice(index, 1);
+        this.dataForm.collectionsoitemList.splice(index, 1)
       },
       addarinvoices_item0soitemList() {
         let item = {
@@ -1004,24 +1044,24 @@
           invoiceStatus: undefined,
           creatorUserName: undefined,
           invoiceDate: undefined,
-          attachMent: undefined,
+          attachMent: undefined
         }
         this.dataForm.arinvoices_item0soitemList.push(item)
       },
       delarinvoices_item0soitemList(index) {
-        this.dataForm.arinvoices_item0soitemList.splice(index, 1);
+        this.dataForm.arinvoices_item0soitemList.splice(index, 1)
       },
       addsalesbacksoitemList() {
         let item = {
           documentNo: undefined,
           refundNum: undefined,
           refundAmount: undefined,
-          creatorTime: undefined,
+          creatorTime: undefined
         }
         this.dataForm.salesbacksoitemList.push(item)
       },
       delsalesbacksoitemList(index) {
-        this.dataForm.salesbacksoitemList.splice(index, 1);
+        this.dataForm.salesbacksoitemList.splice(index, 1)
       },
       addpaymentsoitemList() {
         let item = {
@@ -1029,59 +1069,59 @@
           settlementtype: undefined,
           duedate: undefined,
           paymentamount: undefined,
-          remark: undefined,
+          remark: undefined
         }
         this.dataForm.paymentsoitemList.push(item)
       },
       delpaymentsoitemList(index) {
-        this.dataForm.paymentsoitemList.splice(index, 1);
+        this.dataForm.paymentsoitemList.splice(index, 1)
       },
       dataList() {
-        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        var _data = JSON.parse(JSON.stringify(this.dataForm))
         for (let i = 0; i < _data.salesorder_item0List.length; i++) {
-          var _list = _data.salesorder_item0List[i];
+          var _list = _data.salesorder_item0List[i]
         }
         for (let i = 0; i < _data.receiptoutsoitemList.length; i++) {
-          var _list = _data.receiptoutsoitemList[i];
+          var _list = _data.receiptoutsoitemList[i]
         }
         for (let i = 0; i < _data.collectionsoitemList.length; i++) {
-          var _list = _data.collectionsoitemList[i];
+          var _list = _data.collectionsoitemList[i]
         }
         for (let i = 0; i < _data.arinvoices_item0soitemList.length; i++) {
-          var _list = _data.arinvoices_item0soitemList[i];
+          var _list = _data.arinvoices_item0soitemList[i]
           _list.attachMent = JSON.stringify(_list.attachMent)
         }
         for (let i = 0; i < _data.salesbacksoitemList.length; i++) {
-          var _list = _data.salesbacksoitemList[i];
+          var _list = _data.salesbacksoitemList[i]
         }
         for (let i = 0; i < _data.paymentsoitemList.length; i++) {
-          var _list = _data.paymentsoitemList[i];
+          var _list = _data.paymentsoitemList[i]
         }
-        return _data;
+        return _data
       },
       dataInfo(dataAll) {
         let _dataAll = dataAll
         for (let i = 0; i < _dataAll.salesorder_item0List.length; i++) {
-          var _list = _dataAll.salesorder_item0List[i];
+          var _list = _dataAll.salesorder_item0List[i]
         }
         for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
-          var _list = _dataAll.receiptoutsoitemList[i];
+          var _list = _dataAll.receiptoutsoitemList[i]
         }
         for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
-          var _list = _dataAll.collectionsoitemList[i];
+          var _list = _dataAll.collectionsoitemList[i]
         }
         for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
-          var _list = _dataAll.arinvoices_item0soitemList[i];
+          var _list = _dataAll.arinvoices_item0soitemList[i]
           _list.attachMent = JSON.parse(_list.attachMent)
         }
         for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
-          var _list = _dataAll.salesbacksoitemList[i];
+          var _list = _dataAll.salesbacksoitemList[i]
         }
         for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
-          var _list = _dataAll.paymentsoitemList[i];
+          var _list = _dataAll.paymentsoitemList[i]
         }
         this.dataForm = _dataAll
-      },
-    },
+      }
+    }
   }
 </script>