1.增加客户库存品列表

2.修改客户订单列表

src/api/distribution/distributionReservation.js

@@ -12,6 +12,7 @@ export const getList = (current, size, params) => {
   })
 }
 
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/reservation/detail',

src/api/distribution/distributionStockList.js

@@ -23,6 +23,19 @@ export const getStockListOwn = (current, size, params) => {
     }
   })
 }
+
+export const getStockListClient = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/listClient',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getListStockList = (current, size, params) => {
   return request({
     url: '/api/logpm-distribution/distributionStockList/list',

src/option/distribution/distributionStockArticle.js

@@ -403,7 +403,7 @@ export default {
     },
     {
       label: '物料名称',
-      prop: 'material'
+      prop: 'materialName'
     },
     {
       label: '数量',

src/option/distribution/distributionStockArticleFrom.js

@@ -99,7 +99,7 @@ export default {
     },
     {
       label: "包条码",
-      prop: "packetBarCode",
+      prop: "orderPackageCode",
     },
     {
       label: "货位信息",
@@ -123,7 +123,7 @@ export default {
     },
     {
       label: "物料",
-      prop: "material",
+      prop: "materialName",
     },
     {
       label: "数量",

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -693,7 +693,7 @@ export default {
         }, {
           prop: 'createTime',
           label: '创建时间',
-          type: 1,
+          type: 4,
           values: '',
           width: '150',
           checkarr: [],
@@ -1137,17 +1137,6 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-     /*   this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });*/
-
-        // this.columnList[26].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('order_package_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
@@ -1156,11 +1145,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[24].checkarr =res.data.data.map(item=>{
+
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('basic_grounding').then(res => {
         this.checkcColumnList("groundingStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1168,11 +1153,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[19].checkarr =res.data.data.map(item=>{
+ 
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('freeze_status').then(res => {
         this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1180,11 +1161,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[19].checkarr =res.data.data.map(item=>{
+
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('stockup_status').then(res => {
         this.checkcColumnList("stockupStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1192,11 +1169,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[36].checkarr =res.data.data.map(item=>{
+    
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
       getDictionaryBiz('order_reservation_status').then(res => {
         this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1204,18 +1177,13 @@ export default {
           item.label=item.dictValue
           return item
         });
-        // this.columnList[35].checkarr =res.data.data.map(item=>{
+   
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
       });
 
     },
     checkcColumnList(prop,columnList){
       for(var a = 0; a < columnList.length; a++){
         if(columnList[a].prop===prop){
-          console.log("1111111111111",columnList[a]);
           return columnList[a];
         }
       }