From 9936c22620744e351a8c8050c65da8a0ca927e51 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 九月 2023 13:58:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 15 ++++++++-------
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 2 +-
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 13 +++----------
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 1f4e6a3..092ab2d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -138,12 +138,8 @@
let value=''
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
- if( formItem.type === "combox" && formItem.dicData){
- value=formItem.dicData[0].key
- }
// console.log('formItem',formItem)
- // console.log('formItem.dicData[0].value',formItem.dicData[0].key)
- // console.log('formItem.dicData[0].value',formItem.dicData[0].id)
+ // console.log('formItem.dicData.value',formItem.dicData)
if (formItem.type === "line") {
group.push({
label: formItem.text,
@@ -199,11 +195,11 @@
valueFormat:formItem.dateFormate,
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
- value: value,
+ value: formItem.dicData && formItem.dicData.length > 0 && formItem.type == 'combox' ? formItem.dicData[0].id : null,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
- readonly:true,
+ // readonly:true,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
@@ -241,9 +237,6 @@
value: "key",
},
};
- // if(columnItem.type == "select"){
- // columnItem.value=value
- // }
// console.log('columnItem',columnItem)
slotColumnList.push(columnItem);
if (group.length === 0) {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 8597543..9d00f58 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -265,20 +265,21 @@
if (res.data && res.data.code === 200) {
this.codeRuleOid = res.data.data.oid;
const typeList = [
+ //灞炴�х爜娈� 鍙
+ "codeattrsec",
+ //鍙彉鐮佹
+ "codevariablesec",
//鍥哄畾鐮佹
"codefixedsec",
//鍒嗙被鐮佹
"codeclassifysec",
- //鍙彉鐮佹
- "codevariablesec",
+ //鏃ユ湡鐮佹 鍙
+ "codedatesec",
//寮曠敤鐮佹
"coderefersec",
- //灞炴�х爜娈�
- "codeattrsec",
- //鏃ユ湡鐮佹
- "codedatesec",
- //灞傜骇鐮佹
+ //灞傜骇鐮佹 鍙
"codelevelsec",
+ //娴佹按鐮佹 闅愯棌
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index bce1993..1505e83 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,7 +47,7 @@
:prop="item.prop" :show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
- v-if="item.tableDisplayFlag == 'true'"
+ v-if="!item.hidden"
align="center">
</el-table-column>
</el-table>
--
Gitblit v1.9.3