From 9faf49aeaf26cb22dda40c43ad98d91ef41eee0a Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期五, 07 十一月 2025 17:32:41 +0800
Subject: [PATCH] 修改bug

---
 ui/admin-ui3/src/views/tms/tmsConsignor/index.vue |  689 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 348 insertions(+), 341 deletions(-)

diff --git a/ui/admin-ui3/src/views/tms/tmsConsignor/index.vue b/ui/admin-ui3/src/views/tms/tmsConsignor/index.vue
index 6ed4a74..760f8d5 100644
--- a/ui/admin-ui3/src/views/tms/tmsConsignor/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsConsignor/index.vue
@@ -95,35 +95,358 @@
   rowKey: 'id',
   labelWidth: 150,
   searchLabelWidth: 120,
+  group: [
+    {
+      label: '鍩虹淇℃伅',
+      prop: 'jcxx',
+      column:{
+        consignorCode: {
+          label: '鏀跺彂璐т汉缂栫爜',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鏀跺彂璐т汉缂栫爜涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+        },
+        consignorName: {
+          label: '鏀跺彂璐т汉鍚嶇О',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鏀跺彂璐т汉鍚嶇О涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+        },
+        customerName:{
+          label: '鎵�灞炲鎴�',minWidth: 150,
+          display: false,
+          hide: false,
+          search: false,
+        },
+        customerId: {
+          label: '鎵�灞炲鎴�',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,suffixIcon:'search',
+          viewDisplay: true,
+          hide: true,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鎵�灞炲鎴蜂笉鑳戒负绌�", trigger: "change"
+            }
+          ],
+          type: 'table',
+          children:{
+            border: true,
+            searchMenuSpan: 5,
+            column:{
+              customerType: {
+                label: '瀹㈡埛绫诲瀷', minWidth: 120,
+                type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/customer_type',
+                search: true,
+              },
+              customerShortName: {
+                label: '瀹㈡埛绠�绉�', minWidth: 130,
+                search: true,
+              },
+              customerCode: {
+                label: '瀹㈡埛缂栧彿',minWidth: 120,
+                search: true,
+              },
+              contactName: {
+                label: '鑱旂郴浜哄鍚�',minWidth: 120,
+              },
+              signCompany: {
+                label: '绛剧害鍏徃', minWidth: 150,
+              },
+            },
+
+          },
+          props:{
+            label: 'customerShortName',
+            value: 'id'
+          },
+          onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback:any) => {
+            if (value){
+              let id = value;
+              if (Array.isArray(value)){
+                id = value[0]
+              }
+              getTmsCustomerInfo(id).then(res=>{
+                return callback(res.data||{})
+              })
+            }else{
+              listTmsCustomerInfo({pageSize:page.pageSize,pageNum:page.currentPage,...data}).then(res=>{
+                return callback({
+                  total: res.total,
+                  data: res.rows||[],
+                })
+              })
+            }
+
+          }
+        },
+        customerSysCode: {
+          label: '瀹㈡埛缂栫爜',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          disabled: true,
+          rules: [
+            {
+              required: true,
+              message: "瀹㈡埛缂栫爜涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+        },
+        consignorType: {
+          label: '鏀跺彂璐т汉绫诲瀷',minWidth: 150,
+          type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鏀跺彂璐т汉绫诲瀷涓嶈兘涓虹┖", trigger: "change"
+            }
+          ],
+        },
+      }
+    },
+    {
+      label: '鑱旂郴浜轰俊鎭�',
+      prop: 'lxrxx',
+      column:{
+        contactName: {
+          label: '鑱旂郴浜哄鍚�',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鑱旂郴浜哄鍚嶄笉鑳戒负绌�", trigger: "blur"
+            }
+          ],
+        },
+        contactPhone: {
+          label: '鑱旂郴浜虹數璇�',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: true,
+          search: false,
+        },
+        contactEmail: {
+          label: '鑱旂郴浜洪偖绠�',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: true,
+          search: false,
+        },
+      }
+    },
+    {
+      label: '鍦板潃淇℃伅',
+      prop: 'dzxx',
+      column:{
+        region: {
+          label: '琛屾斂鍖哄煙',minWidth: 150,type:'cascader',
+          addDisplay: true,
+          editDisplay: true,
+          viewDisplay: true,span: 24,
+          hide: true,
+          search: false,
+          lazy: true,
+          props: {
+            label: 'name',
+            value: 'code'
+          },
+          rules: [
+            {
+              required: true,
+              message: "鐪佷唤涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+          change:({value=[]}:{value:any})=>{
+            if (value && value.length>0){
+              form.value.provinceId = value[0];
+              form.value.cityId = value[1];
+              form.value.districtId = value[2];
+              form.value.streetId = value[3];
+            }
+          },
+          lazyLoad (node:any, resolve:any) {
+            const stopLevel = 3;
+            const level = node.level;
+            const data = node.data || {};
+            const code = data.code;
+            let list:any = [];
+            const callback = () => {
+              resolve((list || []).map((ele:any) => ({
+                ...ele,
+                leaf: level >= stopLevel
+              })));
+            };
+
+            if (level === 0) {
+              getProvince().then(res => {
+                list = res.data || [];
+                callback();
+              });
+            } else if (level === 1) {
+              getCity(code).then(res => {
+                list = res.data ||[];
+                callback();
+              });
+            } else if (level === 2) {
+              getArea(code).then(res => {
+                list = res.data ||  [];
+                callback();
+              });
+            }else if (level === 3) {
+              getStreet(code).then(res => {
+                list = res.data || [];
+                callback();
+              });
+            } else {
+              callback();
+            }
+          }
+        },
+        mapLocationDetail: {
+          label: '鍦板浘浣嶇疆',minWidth: 150,
+          addDisplay: true,
+          editDisplay: true,span:24,
+          viewDisplay: true,
+          hide: true,
+          search: false,
+          type: 'map',
+        },
+        dispatchTransportArea: {
+          label: '璋冨害鍗曡繍杈撳湴',
+          addDisplay: true,minWidth: 150,
+          editDisplay: true,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "璋冨害鍗曡繍杈撳湴涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+        },
+      }
+    },
+    {
+      label: '鍏朵粬淇℃伅',
+      prop: 'qtyxx',
+      column:{
+        status: {
+          label: '鐘舵��',
+          type: 'radio', dicUrl: '/system/dict/data/type/sys_normal_disable',dataType: 'string',
+          addDisplay: false,
+          editDisplay: false,
+          viewDisplay: true,minWidth: 150,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur"
+            }
+          ],
+        },
+        createBy: {
+          label: '鍒涘缓浜�',
+          addDisplay: false,
+          editDisplay: false,minWidth: 150,
+          viewDisplay: true,
+          hide: true,
+          search: false,
+        },
+        createTime: {
+          label: '鍒涘缓鏃堕棿',
+          addDisplay: false,
+          editDisplay: false,minWidth: 150,
+          viewDisplay: true,
+          hide: true,
+          search: false,
+          rules: [
+            {
+              required: true,
+              message: "鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+        },
+        updateBy: {
+          label: '鏇存柊浜�',
+          addDisplay: false,
+          editDisplay: false,
+          viewDisplay: true,minWidth: 150,
+          hide: false,
+          search: true,
+        },
+        updateTime: {
+          label: '鏇存柊鏃堕棿',
+          addDisplay: false,
+          editDisplay: false,minWidth: 180,
+          viewDisplay: true,
+          hide: false,
+          search: true,
+          rules: [
+            {
+              required: true,
+              message: "鏇存柊鏃堕棿涓嶈兘涓虹┖", trigger: "blur"
+            }
+          ],
+        },
+        remark: {
+          label: '澶囨敞',minWidth: 150,
+          type: 'textarea', minRows: 3, maxRows: 5,
+          addDisplay: true,
+          editDisplay: true,span:24,
+          viewDisplay: true,
+          hide: true,
+          search: false,
+        },
+      }
+    }
+  ],
   column: {
 
     consignorCode: {
       label: '鏀跺彂璐т汉缂栫爜',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
+      display: false,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "鏀跺彂璐т汉缂栫爜涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
     },
     consignorName: {
       label: '鏀跺彂璐т汉鍚嶇О',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
+      display: false,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "鏀跺彂璐т汉鍚嶇О涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
     },
     customerName:{
       label: '鎵�灞炲鎴�',minWidth: 150,
@@ -131,364 +454,48 @@
       hide: false,
       search: false,
     },
-    customerId: {
-      label: '鎵�灞炲鎴�',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,suffixIcon:'search',
-      viewDisplay: true,
-      hide: true,
-      search: true,
-      rules: [
-        {
-          required: true,
-          message: "鎵�灞炲鎴蜂笉鑳戒负绌�", trigger: "change"
-        }
-      ],
-      type: 'table',
-      children:{
-        border: true,
-        searchMenuSpan: 5,
-        column:{
-          customerType: {
-            label: '瀹㈡埛绫诲瀷', minWidth: 120,
-            type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/customer_type',
-            search: true,
-          },
-          customerShortName: {
-            label: '瀹㈡埛绠�绉�', minWidth: 130,
-            search: true,
-          },
-          customerCode: {
-            label: '瀹㈡埛缂栧彿',minWidth: 120,
-            search: true,
-          },
-          contactName: {
-            label: '鑱旂郴浜哄鍚�',minWidth: 120,
-          },
-          signCompany: {
-            label: '绛剧害鍏徃', minWidth: 150,
-          },
-        },
-
-      },
-      props:{
-        label: 'customerShortName',
-        value: 'id'
-      },
-      onLoad: ({ page, value, data }: { page: any, value: any, data: any }, callback:any) => {
-        if (value){
-          let id = value;
-          if (Array.isArray(value)){
-            id = value[0]
-          }
-          getTmsCustomerInfo(id).then(res=>{
-            return callback(res.data||{})
-          })
-        }else{
-          listTmsCustomerInfo({pageSize:page.pageSize,pageNum:page.currentPage,...data}).then(res=>{
-            return callback({
-              total: res.total,
-              data: res.rows||[],
-            })
-          })
-        }
-
-      }
-    },
     customerSysCode: {
       label: '瀹㈡埛缂栫爜',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
+      display: false,
       hide: false,
       search: true,
       disabled: true,
-      rules: [
-        {
-          required: true,
-          message: "瀹㈡埛缂栫爜涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
     },
     consignorType: {
       label: '鏀跺彂璐т汉绫诲瀷',minWidth: 150,
       type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/consignor_type',
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
+      display: false,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "鏀跺彂璐т汉绫诲瀷涓嶈兘涓虹┖", trigger: "change"
-        }
-      ],
     },
     contactName: {
       label: '鑱旂郴浜哄鍚�',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
+      display: false,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "鑱旂郴浜哄鍚嶄笉鑳戒负绌�", trigger: "blur"
-        }
-      ],
-    },
-    contactPhone: {
-      label: '鑱旂郴浜虹數璇�',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
-      hide: true,
-      search: false,
-    },
-    contactEmail: {
-      label: '鑱旂郴浜洪偖绠�',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
-      hide: true,
-      search: false,
-    },
-    // countryId: {
-    //   label: '鍥藉',minWidth: 150,type:'select',
-    //   addDisplay: true,
-    //   editDisplay: true,
-    //   viewDisplay: false,
-    //   hide: true,
-    //   search: false,
-    //   rules: [
-    //     {
-    //       required: true,
-    //       message: "鍥藉涓嶈兘涓虹┖", trigger: "blur"
-    //     }
-    //   ],
-    // },
-    region: {
-      label: '琛屾斂鍖哄煙',minWidth: 150,type:'cascader',
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,span: 24,
-      hide: true,
-      search: false,
-      lazy: true,
-      props: {
-        label: 'name',
-        value: 'code'
-      },
-      rules: [
-        {
-          required: true,
-          message: "鐪佷唤涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
-      change:({value=[]}:{value:any})=>{
-        if (value && value.length>0){
-          form.value.provinceId = value[0];
-          form.value.cityId = value[1];
-          form.value.districtId = value[2];
-          form.value.streetId = value[3];
-        }
-      },
-      lazyLoad (node:any, resolve:any) {
-        const stopLevel = 3;
-        const level = node.level;
-        const data = node.data || {};
-        const code = data.code;
-        let list:any = [];
-        const callback = () => {
-          resolve((list || []).map((ele:any) => ({
-            ...ele,
-            leaf: level >= stopLevel
-          })));
-        };
-
-        if (level === 0) {
-          getProvince().then(res => {
-            list = res.data || [];
-            callback();
-          });
-        } else if (level === 1) {
-          getCity(code).then(res => {
-            list = res.data ||[];
-            callback();
-          });
-        } else if (level === 2) {
-          getArea(code).then(res => {
-            list = res.data ||  [];
-            callback();
-          });
-        }else if (level === 3) {
-          getStreet(code).then(res => {
-            list = res.data || [];
-            callback();
-          });
-        } else {
-          callback();
-        }
-      }
-    },
-    // provinceId: {
-    //   label: '鐪佷唤',minWidth: 150,type:'select',
-    //   addDisplay: true,
-    //   editDisplay: true,
-    //   viewDisplay: false,
-    //   hide: true,
-    //   search: false,
-    //   rules: [
-    //     {
-    //       required: true,
-    //       message: "鐪佷唤涓嶈兘涓虹┖", trigger: "blur"
-    //     }
-    //   ],
-    // },
-    // cityId: {
-    //   label: '甯�',minWidth: 150,type:'select',
-    //   addDisplay: true,
-    //   editDisplay: true,
-    //   viewDisplay: false,
-    //   hide: true,
-    //   search: false,
-    //   rules: [
-    //     {
-    //       required: true,
-    //       message: "甯備笉鑳戒负绌�", trigger: "blur"
-    //     }
-    //   ],
-    // },
-    // districtId: {
-    //   label: '鍖�',minWidth: 150,type:'select',
-    //   addDisplay: true,
-    //   editDisplay: true,
-    //   viewDisplay: false,
-    //   hide: true,
-    //   search: false,
-    //   rules: [
-    //     {
-    //       required: true,
-    //       message: "鍖轰笉鑳戒负绌�", trigger: "blur"
-    //     }
-    //   ],
-    // },
-    // streetId: {
-    //   label: '琛楅亾',minWidth: 150,type:'select',
-    //   addDisplay: true,
-    //   editDisplay: true,
-    //   viewDisplay: false,
-    //   hide: true,
-    //   search: false,
-    //   rules: [
-    //     {
-    //       required: true,
-    //       message: "琛楅亾涓嶈兘涓虹┖", trigger: "blur"
-    //     }
-    //   ],
-    // },
-    // addressDetail: {
-    //   label: '璇︾粏鍦板潃',minWidth: 150,
-    //   type: 'textarea', minRows: 3, maxRows: 5,
-    //   addDisplay: true,span:24,
-    //   editDisplay: true,
-    //   viewDisplay: false,
-    //   hide: true,
-    //   search: false,
-    // },
-
-    mapLocationDetail: {
-      label: '鍦板浘浣嶇疆',minWidth: 150,
-      addDisplay: true,
-      editDisplay: true,span:24,
-      viewDisplay: true,
-      hide: true,
-      search: false,
-      type: 'map',
     },
     dispatchTransportArea: {
-      label: '璋冨害鍗曡繍杈撳湴',
-      addDisplay: true,minWidth: 150,
-      editDisplay: true,
-      viewDisplay: true,
+      label: '璋冨害鍗曡繍杈撳湴',   display: false,minWidth: 150,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "璋冨害鍗曡繍杈撳湴涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
     },
     status: {
       label: '鐘舵��',
       type: 'radio', dicUrl: '/system/dict/data/type/sys_normal_disable',dataType: 'string',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: true,minWidth: 150,
+      display: false,minWidth: 150,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "鐘舵�佷笉鑳戒负绌�", trigger: "blur"
-        }
-      ],
-    },
-    createBy: {
-      label: '鍒涘缓浜�',
-      addDisplay: false,
-      editDisplay: false,minWidth: 150,
-      viewDisplay: true,
-      hide: true,
-      search: false,
-    },
-    createTime: {
-      label: '鍒涘缓鏃堕棿',
-      addDisplay: false,
-      editDisplay: false,minWidth: 150,
-      viewDisplay: true,
-      hide: true,
-      search: false,
-      rules: [
-        {
-          required: true,
-          message: "鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
     },
     updateBy: {
-      label: '鏇存柊浜�',
-      addDisplay: false,
-      editDisplay: false,
-      viewDisplay: true,minWidth: 150,
+      label: '鏇存柊浜�', display: false,minWidth: 150,
       hide: false,
       search: true,
     },
     updateTime: {
       label: '鏇存柊鏃堕棿',
-      addDisplay: false,
-      editDisplay: false,minWidth: 180,
-      viewDisplay: true,
+      display: false,minWidth: 180,
       hide: false,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: "鏇存柊鏃堕棿涓嶈兘涓虹┖", trigger: "blur"
-        }
-      ],
-    },
-    remark: {
-      label: '澶囨敞',minWidth: 150,
-      type: 'textarea', minRows: 3, maxRows: 5,
-      addDisplay: true,
-      editDisplay: true,span:24,
-      viewDisplay: true,
-      hide: true,
-      search: false,
     },
   }
 })

--
Gitblit v1.8.0