From d3239b6a098724db5a29b4f48ddad5f8a0402cea Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 05 七月 2023 15:35:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/const/code/mdmrule.js |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/const/code/mdmrule.js b/Source/UBCS-WEB/src/const/code/mdmrule.js
index b18b03c..72b707a 100644
--- a/Source/UBCS-WEB/src/const/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/const/code/mdmrule.js
@@ -1,5 +1,5 @@
 export default {
-  height:"200px",
+  height:"220px",
   calcHeight: 30,
   tip: false,
   editBtn:false,
@@ -10,6 +10,10 @@
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
+  columnBtn: false,
+  searchShowBtn: false,
+  highlightCurrentRow: true,
+  rowKey: "oid", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
   column: [
     {
       label: "缂栧彿",
@@ -17,6 +21,7 @@
       search: true,
       searchLabelWidth: 45,
       searchSpan: 4,
+      sortable: true,
       rules: [{
         required: true,
         message: "璇疯緭鍏ョ紪鍙�",
@@ -29,6 +34,7 @@
       search: true,
       searchLabelWidth: 45,
       searchSpan: 4,
+      sortable: true,
       rules: [{
         required: true,
         message: "璇疯緭鍏ュ悕绉�",
@@ -52,11 +58,26 @@
     },
     {
       label: "鐘舵��",
-      prop: "lcStatusText",
+      prop: "lcStatus",
       search: true,
       searchLabelWidth: 45,
       searchSpan: 5,
       display: false,
+      hide: true,
+      type: 'select',
+      dicUrl: "/api/ubcs-omd/enum/dictionary?code=codeSearchLCStatus",
+      props: {
+        label: "itemName",
+        value: "itemValue"
+      },
+    },
+    {
+      label: "鐘舵��",
+      prop: "lcStatusText",
+      // search: false,
+      // searchLabelWidth: 45,
+      // searchSpan: 5,
+      display: false,
     },
   ]
 }
\ No newline at end of file

--
Gitblit v1.9.3