From c14fedd8903487457ad0911e8afab47670be754e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 22:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/const/code/codebutton.js |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/const/code/codebutton.js b/Source/UBCS-WEB/src/const/code/codebutton.js
index df3fc5b..8ab2dc4 100644
--- a/Source/UBCS-WEB/src/const/code/codebutton.js
+++ b/Source/UBCS-WEB/src/const/code/codebutton.js
@@ -2,13 +2,17 @@
   height:'auto',
   calcHeight: 30,
   tip: false,
+  searchLabelWidth:120,
   searchShow: true,
   searchMenuSpan: 6,
+  // searchSpan:8,
   border: true,
   index: true,
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
+  highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
+  rowKey: "oid", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
   column: [
     {
       label: "",
@@ -234,23 +238,23 @@
     // },
     {
       label: "鐘舵��",
-      prop: "lcstatusName",
+      prop: "lcStatusText",
       slot: true,
       display: false
     },
     {
       label: "鐘舵��",
       type: "select",
-      dicUrl: "/api/ubcs-omd/dict-biz/dictionary?code=codeLcstatus",
+      dicUrl: "/api/ubcs-omd/enum/dictionary?code=codeLcstatus",
       props: {
-        label: "dictValue",
-        value: "dictKey"
+        label: "itemName",
+        value: "itemValue"
       },
       dataType: "String",
       search: true,
       hide: true,
       display: true,
-      prop: "lcstatus",
+      prop: "lcStatus",
       rules: [{
         required: true,
         message: "鐘舵��",
@@ -268,13 +272,13 @@
     },
     {
       label: "鎸夐挳鐨勫浘鏍囨牱寮�",
-      prop: "iconcls",
+      prop: "iconCls",
       type: "input",
       search: true,
     },
     {
       label: "鎵ц鐨刯s璺緞",
-      prop: "executejs",
+      prop: "executeJs",
       type: "input",
       search: true,
     },
@@ -286,7 +290,7 @@
     // },
     {
       label: "鎸夐挳鐨勪綅缃�",
-      prop: "usedpositiontypeName",
+      prop: "usedPositionTypeText",
       slot: true,
       display: false
     },
@@ -294,16 +298,16 @@
       label: "鎸夐挳鐨勪綅缃�",
       type: "select",
       weight :'140px',
-      dicUrl: "/api/ubcs-omd/dict-biz/dictionary?code=codeButtonPosition",
+      dicUrl: "/api/ubcs-omd/enum/dictionary?code=codeButtonPosition",
       props: {
-        label: "dictValue",
-        value: "dictKey"
+        label: "itemName",
+        value: "itemValue"
       },
       dataType: "String",
       search: true,
       hide: true,
       display: true,
-      prop: "usedpositiontype",
+      prop: "usedPositionType",
       rules: [{
         required: true,
         message: "璇烽�夋嫨鎸夐挳鐨勪綅缃�",

--
Gitblit v1.9.3