修改订单值回显

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

@@ -1137,6 +1137,17 @@ 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;
@@ -1153,7 +1164,7 @@ export default {
           item.label=item.dictValue
           return item
         });
- 
+
       });
       getDictionaryBiz('freeze_status').then(res => {
         this.checkcColumnList("freezeStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1169,7 +1180,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-    
+
       });
       getDictionaryBiz('order_reservation_status').then(res => {
         this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{
@@ -1177,7 +1188,7 @@ export default {
           item.label=item.dictValue
           return item
         });
-   
+
       });
 
     },

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

@@ -944,7 +944,7 @@ export default {
       }
       let st = false;
       this.selectionList.some( i =>{
-        if(i.stateName === "已预约"){
+        if(i.reservationStatusName === "已预约"){
           st = true;
           this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
         }

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

@@ -1177,7 +1177,7 @@ export default {
       let consigneePerson = '';
       let consigneeMobile = '';
       this.selectionList.some( i =>{
-        if(i.stateName === "已预约"){
+        if(i.reservationStatusName === "已预约"){
           st = true;
           this.$message.warning(i.orderCode+"已预约，请勿重复预约！！！");
         }

src/views/distribution/inventory/distributionStockListDetails.vue

@@ -496,6 +496,9 @@ export default {
         if(i.outboundType == '3'){
           i.outboundTypeName = "自提"
         }
+        if(i.deliveryListCode == '-1'){
+            i.deliveryListCode = null
+        }
       })
       this.page1.total = b.data.data.total;
       this.loading = false;

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -315,7 +315,8 @@ import { getDept } from '@/api/system/dept';
 import { getListMaterial } from '@/api/basic/basicMaterial';
 import { getListCopy } from '@/api/basicdata/basicdataWarehouse';
 import { getListIdsName} from '@/api/basicdata/basicdataStoreBrand';
-import dayjs from 'dayjs';
+import { getListName} from '@/api/basicdata/basicdataStoreBusiness';
+
 
 
 export default {
@@ -352,7 +353,7 @@ export default {
       },
       // 表单数据
       form: {
-        serviceType: "1"
+        serviceType: null,
       },
       formDetail: {},
       // 选择行
@@ -630,12 +631,20 @@ export default {
       //门店查询
     async getMenDian(row){
       // console.log("值阿德飒飒的",row);
-
+      let aa = '';
       this.options.some(i =>{
+        // console.log(">><><><<>",i);
         if(i.value == row){
           this.form.customerName = i.label;
+          //查询客户服务类型
+          aa=  i.value;
         }
       })
+      let bu = await getListName(this.page.currentPage, this.page.pageSize,{ clientId: aa ,typeService: '3'});
+      // console.log("bububu",bu.data.data.records);
+      if(bu.data.data?.records.length > 0){
+        this.form.serviceType = bu.data.data.records[0].mold;
+      }
       let cl = await getListClient(this.page.currentPage, this.page.pageSize,{pid:row});
       // console.log(">>>>",cl.data.data.records);
       cl.data.data.records.forEach(i =>{
@@ -676,11 +685,11 @@ export default {
       if (query) {
         // this.loading = true;
         let cl = await getListClient(this.page.currentPage, this.page.pageSize,{clientName:query});
-        // console.log(">>>>",cl.data.data.records);
+        console.log("客户信息1234>>>>",cl.data.data.records);
         cl.data.data.records.forEach(i =>{
           let st= {
             label: i.clientName,
-            value: i.id
+            value: i.id,
           }
           this.options.push(st);
         });