From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/views/tms/tmsSettlementEntity/index.vue | 267 +++++++++++++++++++++++++++--------------------------
1 files changed, 136 insertions(+), 131 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/tmsSettlementEntity/index.vue b/ui/admin-ui3/src/views/tms/tmsSettlementEntity/index.vue
index d778149..2b5d568 100644
--- a/ui/admin-ui3/src/views/tms/tmsSettlementEntity/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsSettlementEntity/index.vue
@@ -134,12 +134,7 @@
viewDisplay: true,
hide: false,minWidth:150,
search: true,
- rules: [
- {
- required: true,
- message: "杩愯惀涓讳綋绠�绉颁笉鑳戒负绌�", trigger: "blur"
- }
- ],
+
},
customerFullName: {
@@ -149,6 +144,12 @@
viewDisplay: true,
hide: true,
search: false,
+ rules: [
+ {
+ required: true,
+ message: "杩愯惀涓讳綋鍏ㄧО涓嶈兘涓虹┖", trigger: "blur"
+ }
+ ],
},
businessRegistrationNumber: {
label: '缁忚惀鐧昏璇佷欢鍙风爜',
@@ -241,89 +242,89 @@
// },
// }
// },
- {
- label: '淇＄敤淇℃伅',
- prop: 'xyxx',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- column: {
- creditRating: {
- label: '杩愯惀涓讳綋淇＄敤璇勭骇',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_credit_rating',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- hide: false,minWidth:150,
- search: true,
- },
- creditLimitAmount: {
- label: '淇＄敤棰濆害',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- hide: false,minWidth:150,
- search: true,
- },
- creditLimitQuantity: {
- label: '淇＄敤棰濆害',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- hide: false,minWidth:150,
- search: true,
- },
- operatingStatus: {
- label: '缁忚惀鐘舵��',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/business_status',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- hide: false,minWidth:150,
- search: true,
- rules: [
- {
- required: true,
- message: "缁忚惀鐘舵�佷笉鑳戒负绌�", trigger: "change"
- }
- ],
- },
- contractStatus: {
- label: '鍚堝悓鐘舵��',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/contract_status',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- hide: false,minWidth:150,
- search: true,
- rules: [
- {
- required: true,
- message: "鍚堝悓鐘舵�佷笉鑳戒负绌�", trigger: "change"
- }
- ],
- },
- }
- },
+ // {
+ // label: '淇＄敤淇℃伅',
+ // prop: 'xyxx',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // column: {
+ // creditRating: {
+ // label: '杩愯惀涓讳綋淇＄敤璇勭骇',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_credit_rating',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
+ // creditLimitAmount: {
+ // label: '淇＄敤棰濆害',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
+ // creditLimitQuantity: {
+ // label: '淇＄敤棰濆害',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
+ // operatingStatus: {
+ // label: '缁忚惀鐘舵��',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/business_status',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // hide: false,minWidth:150,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "缁忚惀鐘舵�佷笉鑳戒负绌�", trigger: "change"
+ // }
+ // ],
+ // },
+ // contractStatus: {
+ // label: '鍚堝悓鐘舵��',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/contract_status',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // hide: false,minWidth:150,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "鍚堝悓鐘舵�佷笉鑳戒负绌�", trigger: "change"
+ // }
+ // ],
+ // },
+ // }
+ // },
{
label: '鍏朵粬淇℃伅',
prop: 'qtyxx',
column: {
- dataStatus: {
- label: '鏁版嵁鐘舵��',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/data_status',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- hide: false,minWidth:150,
- search: true,
- rules: [
- {
- required: true,
- message: "鏁版嵁鐘舵�佷笉鑳戒负绌�", trigger: "change"
- }
- ],
- },
+ // dataStatus: {
+ // label: '鏁版嵁鐘舵��',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/data_status',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: true,
+ // hide: false,minWidth:150,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "鏁版嵁鐘舵�佷笉鑳戒负绌�", trigger: "change"
+ // }
+ // ],
+ // },
createBy: {
label: '鍒涘缓浜�',
addDisplay: false,
@@ -372,17 +373,21 @@
],
column: {
- customerType: {
- label: '杩愯惀涓讳綋绫诲瀷',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/customer_type',
- display: false,
- hide: false,minWidth:150,
- search: true,
- },
+ // customerType: {
+ // label: '杩愯惀涓讳綋绫诲瀷',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/customer_type',
+ // display: false,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
customerShortName: {
label: '杩愯惀涓讳綋绠�绉�',
display: false,
hide: false,minWidth:150,
+ search: true,
+ },
+ customerFullName: {
+ label: '杩愯惀涓讳綋鍏ㄧО', minWidth: 150, display: false,
search: true,
},
customerCode: {
@@ -409,25 +414,25 @@
// }
// ],
// },
- creditRating: {
- label: '杩愯惀涓讳綋淇＄敤璇勭骇',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_credit_rating',
- display: false,
- hide: false,minWidth:150,
- search: true,
- },
- creditLimitAmount: {
- label: '淇＄敤棰濆害',
- display: false,
- hide: false,minWidth:150,
- search: true,
- },
- creditLimitQuantity: {
- label: '淇＄敤棰濆害',
- display: false,
- hide: false,minWidth:150,
- search: true,
- },
+ // creditRating: {
+ // label: '杩愯惀涓讳綋淇＄敤璇勭骇',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_credit_rating',
+ // display: false,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
+ // creditLimitAmount: {
+ // label: '淇＄敤棰濆害',
+ // display: false,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
+ // creditLimitQuantity: {
+ // label: '淇＄敤棰濆害',
+ // display: false,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
operatingStatus: {
label: '缁忚惀鐘舵��',
type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/business_status',
@@ -435,26 +440,26 @@
hide: false,minWidth:150,
search: true,
},
- contractStatus: {
- label: '鍚堝悓鐘舵��',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/contract_status',
- display: false,
- hide: false,minWidth:150,
- search: true,
- },
- dataStatus: {
- label: '鏁版嵁鐘舵��',
- type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/data_status',
- display: false,
- hide: false,minWidth:150,
- search: true,
- rules: [
- {
- required: true,
- message: "鏁版嵁鐘舵�佷笉鑳戒负绌�", trigger: "change"
- }
- ],
- },
+ // contractStatus: {
+ // label: '鍚堝悓鐘舵��',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/contract_status',
+ // display: false,
+ // hide: false,minWidth:150,
+ // search: true,
+ // },
+ // dataStatus: {
+ // label: '鏁版嵁鐘舵��',
+ // type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/data_status',
+ // display: false,
+ // hide: false,minWidth:150,
+ // search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "鏁版嵁鐘舵�佷笉鑳戒负绌�", trigger: "change"
+ // }
+ // ],
+ // },
updateBy: {
label: '鏇存柊浜�',
display: false,
--
Gitblit v1.8.0