修改客户详情数据回显

src/views/basicdata/brand/basicClient.vue

@@ -132,7 +132,7 @@
           </template>
         </tablecmt>
         <!-- 列表模块 -->
-       
+
       </el-row>
       <el-row>
         <div class="avue-crud__pagination" style="width:100%">
@@ -387,7 +387,7 @@ export default {
           head: false,
         },
         {
-          prop: 'clientType',
+          prop: 'clientTypeName',
           label: '客户类型',
           type: 2,
           values: '',
@@ -398,8 +398,8 @@ export default {
           head: false,
         },
         {
-          prop: 'typeService',
-          label: '客户类型',
+          prop: 'typeServiceName',
+          label: '服务类型',
           type: 2,
           values: '',
           width: '180',
@@ -803,7 +803,7 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     async init() {
-      //字典
+      //客户字典
       getDictionaryBiz('client_type').then(res => {
         // console.log("字典》》》",res);
         this.clientType = res.data.data;
@@ -1239,16 +1239,35 @@ export default {
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         console.log(data);
-        this.clientType.forEach(it => {
-          data.records.forEach(i => {
-            if (parseInt(it.dictKey) == parseInt(i.clientType)) {
-              i.typeService = it.dictValue;
-              console.log('==-=-=', i.typeService, it.dictKey, it.dictValue);
-            }
-            if (i.clientType == '-1') {
-              i.typeService = '无';
-            }
-          });
+
+
+        data.records.forEach(i => {
+
+         let ke =  this.clientType.find( kh=>parseInt(kh.dictKey) == parseInt(i.clientType));
+          // console.log("客户类型<><><>",ke);
+          if (!!ke) {
+            i.clientTypeName = ke.dictValue;
+            console.log('==-=-=', i.clientType, ke.dictKey, ke.dictValue);
+          }
+          if (!i.clientType) {
+            i.clientTypeName = '无';
+          }
+          let typeServiceName = [];
+
+          if (!i.typeServiceBusiness) {
+            i.typeServiceName = '无';
+          }else{
+            i.typeServiceBusiness.forEach( ty =>{
+              let fuw =  this.freightType.find( fw => parseInt(fw.dictKey) == parseInt(ty.typeService) );
+              if(!!fuw){
+                console.log("fuw",fuw);
+                typeServiceName.push( fuw.dictValue);
+                // console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue);
+              }
+            });
+            i.typeServiceName = typeServiceName.join(",");
+          }
+
         });
         let dz = '';
         data.records.forEach(it => {

src/views/basicdata/brand/basicClientDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      
+
     <el-descriptions
     title="客户信息详情"
     :column="2"
@@ -42,7 +42,7 @@
           客户类型
         </div>
       </template>
-      {{ detail.clientType }}
+      {{ detail.clientTypeName }}
     </el-descriptions-item>
     <el-descriptions-item>
       <template #label>
@@ -53,7 +53,7 @@
           服务类型
         </div>
       </template>
-      {{ detail.typeServiceList }}
+      {{ detail.typeServiceName }}
     </el-descriptions-item>
     <el-descriptions-item>
       <template #label>
@@ -99,18 +99,7 @@
       </template>
       {{ detail.detailedly }}
     </el-descriptions-item>
-    <el-descriptions-item>
-      <template #label>
-        <div class="cell-item">
-          <el-icon :style="iconStyle">
-            <!-- <office-building /> -->
-          </el-icon>
-          合同附件
-        </div>
-      </template>
-      <el-image style="width: 100px; height: 100px;border-radius: 5px;" :src="detail.leaseAccessories" :fit="fit" />
-      <!-- 图片 leaseAccessories -->
-    </el-descriptions-item>
+
     <el-descriptions-item>
       <template #label>
         <div class="cell-item">
@@ -133,6 +122,18 @@
       </template>
       {{ detail.contractEntTime }}
     </el-descriptions-item>
+      <el-descriptions-item>
+        <template #label>
+          <div class="cell-item">
+            <el-icon :style="iconStyle">
+              <!-- <office-building /> -->
+            </el-icon>
+            合同附件
+          </div>
+        </template>
+        <el-image style="width: 100px; height: 100px;border-radius: 5px;" :src="detail.leaseAccessories" :fit="fit" />
+        <!-- 图片 leaseAccessories -->
+      </el-descriptions-item>
     <el-descriptions-item>
       <template #label>
         <div class="cell-item">
@@ -153,6 +154,8 @@
 import { getDetail } from '@/api/basicdata/basicClient';
 import { useRoute, useRouter } from 'vue-router';
 import { reactive,onMounted } from 'vue';
+import { getDictionaryBiz } from '@/api/system/dict';
+import { getLazyTreeAll } from '@/api/base/region';
 const route = useRoute();
 const router=useRouter()
 const details = reactive({
@@ -169,9 +172,67 @@ watchEffect(()=>{
   init()
 })
 async function init() {
+  //字典
+  let a =await getDictionaryBiz('client_type');
+
+  let b = await getLazyTreeAll();
+   let fw = await getDictionaryBiz('basic_freight_type');
+
   if(!!details.id){
-    let res=await getDetail(details.id)
-    details.detail=res.data.data
+    let res=await getDetail(details.id);
+    const dat = res.data.data;
+    if(!!dat){
+      console.log("客户类型》》》》》",a.data.data);
+      console.log("地址类型》》》",b);
+      console.log("什么鬼",dat);
+      let keh = a.data.data.find( kh => parseInt(kh.dictKey) == parseInt(dat.clientType)  );
+
+      //客户类型
+      if(!!keh){
+        if (parseInt(keh.dictKey) == parseInt(dat.clientType)) {
+          dat.clientTypeName = keh.dictValue;
+          console.log('==-=-=', dat.typeService, keh.dictKey, keh.dictValue);
+        }
+      }
+      if (!dat.clientType ) {
+        dat.clientTypeName = '无';
+      }
+      if (!dat.typeServiceBusiness ) {
+        dat.typeServiceName = '无';
+      }else{
+        let  tyName = [];
+          dat.typeServiceBusiness.forEach( ls =>{
+            let fuw = fw.data.data.find( fwu => parseInt(fwu.dictKey) == parseInt(ls.typeService)  );
+            //服务类型
+            if(!!fuw){
+                tyName.push( fuw.dictValue);
+                console.log('==-=-=', dat.typeService, fuw.dictKey, fuw.dictValue);
+            }
+          })
+          dat.typeServiceName = tyName.join(",");
+
+      }
+      //地址
+      let dz = '';
+      let arrsheng = b.data.data.filter((i) => {
+        return dat.bladeRegionProvinceId == i.value;
+      });
+      if(arrsheng.length == 0) return
+      // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+      let arrshi = arrsheng[0].children.filter((i) => {
+        return dat.bladeRegionCityId == i.value;
+      });
+      // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+      let arrqu = arrshi[0].children.filter((i) => {
+        return dat.bladeRegionAreaId == i.value;
+      });
+      // console.log("========",JSON.parse(JSON.stringify(arrsheng)) );
+      dz = arrsheng[0].label + (arrshi[0].label?`/${arrshi[0].label}`:``) + (arrqu[0]?.label?`/${arrqu[0]?.label}`:'');
+      dat.bladeRegionProvinceId = dz;
+
+    }
+    details.detail=dat;
+    console.log("数据类型》》》》》",details.detail);
   }
 
 }

src/views/distribution/inventory/distributionStockList.vue

@@ -466,16 +466,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        // {
-        //   prop: 'shoppingMall',
-        //   label: '所属商场',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
+        {
+          prop: 'shoppingMall',
+          label: '所在托盘',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'warehouseName',
           label: '仓库名称',

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -957,6 +957,10 @@ export default {
       //   this.form = res.data.data;
       // });
       console.log("row<<<<<",row);
+      if(row.row.assignStatus == "10"){
+        this.$message.warning("当前任务未指派！请指派后在修改！！！");
+        return ;
+      }
       this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != "-1" ? row.row.forkliftId : null ;
       this.form.loaderId = !!row.row.loaderId && row.row.loaderId != "-1" ? row.row.loaderId : null;
       this.form.goodsAreaId = !!row.row.goodsAreaId && row.row.goodsAreaId != "-1" ? row.row.goodsAreaId : null;