From 421ee711aa469f00eaff610cfa85ad1d4b755688 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 08:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/const/code/mdmrule.js b/Source/UBCS-WEB/src/const/code/mdmrule.js
index bb871c9..7992a0a 100644
--- a/Source/UBCS-WEB/src/const/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/const/code/mdmrule.js
@@ -1,6 +1,5 @@
 export default {
-  height:"220px",
-  calcHeight: 30,
+  height:"270",
   tip: false,
   editBtn:false,
   searchShow: true,
@@ -10,7 +9,9 @@
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
+  columnBtn: false,
   highlightCurrentRow: true,
+  rowKey: "oid", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
   column: [
     {
       label: "缂栧彿",
@@ -18,6 +19,7 @@
       search: true,
       searchLabelWidth: 45,
       searchSpan: 4,
+      sortable: true,
       rules: [{
         required: true,
         message: "璇疯緭鍏ョ紪鍙�",
@@ -30,9 +32,22 @@
       search: true,
       searchLabelWidth: 45,
       searchSpan: 4,
+      sortable: true,
       rules: [{
         required: true,
         message: "璇疯緭鍏ュ悕绉�",
+        trigger: "blur"
+      }]
+    },
+    {
+      label: "渚濇嵁",
+      prop: "accordingTo",
+      search: false,
+      span: 24,
+      type: "input",
+      rules: [{
+        required: true,
+        message: "璇疯緭鍏ヤ緷鎹�",
         trigger: "blur"
       }]
     },
@@ -74,5 +89,10 @@
       // searchSpan: 5,
       display: false,
     },
+    {
+      label: "鎵�鏈夎��",
+      prop: "ownerText",
+      display: false,
+    },
   ]
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3