From 43b449343715b398b9e1222b93d83f50f8e8e19e Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 10:18:52 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/const/code/codebutton.js | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/const/code/codebutton.js b/Source/UBCS-WEB/src/const/code/codebutton.js
index 6b43ddb..8ab2dc4 100644
--- a/Source/UBCS-WEB/src/const/code/codebutton.js
+++ b/Source/UBCS-WEB/src/const/code/codebutton.js
@@ -12,6 +12,7 @@
selection: true,
dialogClickModal: false,
highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
+ rowKey: "oid", //琛屾暟鎹殑 Key锛岀敤鏉ヤ紭鍖� Table 鐨勬覆鏌�
column: [
{
label: "",
@@ -237,23 +238,23 @@
// },
{
label: "鐘舵��",
- prop: "lcstatusName",
+ prop: "lcStatusText",
slot: true,
display: false
},
{
label: "鐘舵��",
type: "select",
- dicUrl: "/api/ubcs-omd/dict/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: "鐘舵��",
@@ -271,13 +272,13 @@
},
{
label: "鎸夐挳鐨勫浘鏍囨牱寮�",
- prop: "iconcls",
+ prop: "iconCls",
type: "input",
search: true,
},
{
label: "鎵ц鐨刯s璺緞",
- prop: "executejs",
+ prop: "executeJs",
type: "input",
search: true,
},
@@ -289,7 +290,7 @@
// },
{
label: "鎸夐挳鐨勪綅缃�",
- prop: "usedpositiontypeName",
+ prop: "usedPositionTypeText",
slot: true,
display: false
},
@@ -297,16 +298,16 @@
label: "鎸夐挳鐨勪綅缃�",
type: "select",
weight :'140px',
- dicUrl: "/api/ubcs-omd/dict/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