Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/financialManagement/collectionManagementList.vue

@@ -54,7 +54,7 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
+      <el-table-column class="table_td" prop="contractNo" label="合同编号" width="120"></el-table-column>
       <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="buyer" label="买方"></el-table-column>
       <el-table-column class="table_td" prop="seller" label="卖方"></el-table-column>

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -101,11 +101,13 @@
         <el-table-column
           class="table_td"
           prop="contractNo"
+          width="120"
           label="合同编号"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="closePositionDate"
+          width="100"
           label="平仓日期"
         ></el-table-column>
         <el-table-column

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -132,6 +132,7 @@
         <el-table-column
           class="table_td"
           prop="contractNo"
+          width="120"
           label="合同编号"
         ></el-table-column>
         <el-table-column
@@ -144,7 +145,7 @@
           prop="positionNumber"
           label="仓位号"
         ></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号"
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"
           ><template slot-scope="scope">
             {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
           </template></el-table-column
@@ -152,6 +153,7 @@
         <el-table-column
           class="table_td"
           prop="warehousingDate"
+          width="100"
           label="入库日期"
         ></el-table-column>
         <el-table-column
@@ -1054,6 +1056,7 @@ export default {
           contractNo: this.modification[0].contractNo,
           carryOverWeight: this.carryoverlist.carryOverWeight,
           purchaseReceiptReport: {
+            id: this.carryoverlist.id,
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
           },
@@ -1067,6 +1070,7 @@ export default {
           contractNo: this.carryoverlist.contractNo,
           carryOverWeight: this.carryoverlist.carryOverWeight,
           purchaseReceiptReport: {
+            id: this.carryoverlist.id,
             contractNo: this.carryoverlist.contractNo,
             carryOverWeight: this.carryoverlist.carryOverWeight,
           },
@@ -1134,7 +1138,9 @@ export default {
       for (let i = 0; i < this.carryovercontractnolist.length; i++) {
         if (this.carryovercontractnolist[i].contractNo == e) {
           this.carryoverlist.netWeight =
-            this.carryovercontractnolist[i].netWeight
+            this.carryovercontractnolist[i].netWeight,
+            this.carryoverlist.id =
+            this.carryovercontractnolist[i].id
         }
       }
     },

src/views/statisticalReport/salesClosingCashierList.vue

@@ -101,6 +101,7 @@
       <el-table-column
         class="table_td"
         prop="contractNo"
+        width="120"
         label="合同编号"
       ></el-table-column>
       <el-table-column

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -126,6 +126,7 @@
         <el-table-column
           class="table_td"
           prop="contractNo"
+          width="120"
           label="合同编号"
         ></el-table-column>
         <el-table-column
@@ -138,7 +139,7 @@
           prop="positionNumber"
           label="仓位号"
         ></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号">
+        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140">
           <template slot-scope="scope">
             {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
           </template>
@@ -146,6 +147,7 @@
         <el-table-column
           class="table_td"
           prop="retrievalDate"
+          width="100"
           label="出库日期"
         ></el-table-column>
         <el-table-column