配送详情、签收详情字段调整

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -951,17 +951,17 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'goodsAllocation',
-          label: '货位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'goodsAllocation',
+        //   label: '货位信息',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           prop: 'consigneeUnit',
           label: '收货单位',
@@ -1003,7 +1003,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneePerson',
+          prop: 'customerName',
           label: '终端收货人',
           type: 1,
           values: '',
@@ -1013,7 +1013,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneeAddress',
+          prop: 'customerAddress',
           label: '终端收货地址',
           type: 1,
           values: '',
@@ -1023,7 +1023,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneeMobile',
+          prop: 'customerTelephone',
           label: '终端收货电话',
           type: 1,
           values: '',
@@ -2257,7 +2257,7 @@ export default {
             },
             {
               label: '终端收货人',
-              prop: 'consigneePerson',
+              prop: 'customerName',
               search: true,
               width: '100px'
             },

src/views/distribution/reservation/reservationSubmitFrom.vue

@@ -486,7 +486,13 @@
 
 
 <script>
-  import { add, update, remove, getReservationInfo } from '@/api/distribution/distributionReservation';
+  import {
+    add,
+    update,
+    remove,
+    getReservationInfo,
+    autonomouslySave
+  } from '@/api/distribution/distributionReservation';
   import {
     getStockArticleList,
     selectStockArticleList,
@@ -1140,7 +1146,8 @@
         //     });
         //   });
         // } else {
-          add(this.form).then(() => {
+        this.form.reservationStatus = '20';
+        autonomouslySave(this.form).then(() => {
             this.$router.go(-1);
             this.$message({
               type: 'success',
@@ -1183,6 +1190,7 @@
           this.form = res.data.data;
         });
       },
+
       rowDel(row) {
         this.$confirm('确定将选择数据删除?', {
           confirmButtonText: '确定',

src/views/distribution/signfor/distributionSignforedt.vue

@@ -441,24 +441,24 @@ export default {
             search: true,
             width: '130px'
           },
-          // {
-          //   label: '终端收货人',
-          //   prop: 'consigneePerson',
-          //   search: true,
-          //   width: '120px'
-          // },
-          // {
-          //   label: '终端收货地址',
-          //   prop: 'consigneeAddress',
-          //   search: true,
-          //   width: '120px'
-          // },
-          // {
-          //   label: '终端收货电话',
-          //   prop: 'consigneeMobile',
-          //   search: true,
-          //   width: '120px'
-          // }
+          {
+            label: '终端收货人',
+            prop: 'customerName',
+            search: true,
+            width: '120px'
+          },
+          {
+            label: '终端收货地址',
+            prop: 'customerTelephone',
+            search: true,
+            width: '120px'
+          },
+          {
+            label: '终端收货电话',
+            prop: 'customerAddress',
+            search: true,
+            width: '120px'
+          }
 
         ]
       },

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -1335,7 +1335,7 @@
             console.log('------------->', res);
             const data = res.data.data;
             this.page.total = data.total;
-            this. reservationData= data.records;
+            this. reservationData= data;
             console.log('>>>>>>>>>>>', this.data);
             this.loading = false;
           });