From 27cf04fbbc844b3c0fb758d165d030c4929e466d Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 06 九月 2023 10:35:03 +0800 Subject: [PATCH] 主数据固定码段 默认值 --- Source/UBCS-WEB/src/views/docking/loge.vue | 9 +++++---- Source/UBCS-WEB/src/views/code/code.vue | 6 +++--- Source/UBCS-WEB/src/components/FormTemplate/index.vue | 8 +++++--- Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 1 + Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 18 +++++++++++++++--- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue index ce67db7..1f4e6a3 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue @@ -135,8 +135,15 @@ let group = []; let dictKeys = []; let slotColumnList = []; + 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) if (formItem.type === "line") { group.push({ label: formItem.text, @@ -189,13 +196,14 @@ append: this.preOrSufFixShow("text", formItem.suffix), prefixIcon: this.preOrSufFixShow("icon", formItem.prefix), suffixIcon: this.preOrSufFixShow("icon", formItem.suffix), - valueFormat: formItem.dateFormate, + valueFormat:formItem.dateFormate, format: formItem.dateFormate, keyAttr: formItem.keyAttr, - value: formItem.defaultValue, + value: value, placeholder: formItem.inputTip, comboxKey: formItem.comboxKey, tip: formItem.tooltips, + readonly:true, display: !formItem.hidden, maxlength: formItem.maxlength, filterable: true, @@ -206,7 +214,6 @@ showField: formItem.showField || formItem.field, field: formItem.field, fieldMap:formItem.fieldMap || {fieldMapKey:'id'}, - placeholder: formItem.inputTip, options: formItem.referConfig } @@ -234,6 +241,10 @@ value: "key", }, }; + // if(columnItem.type == "select"){ + // columnItem.value=value + // } + // console.log('columnItem',columnItem) slotColumnList.push(columnItem); if (group.length === 0) { column.push(columnItem); @@ -251,6 +262,7 @@ this.geDictData(dictKeys); this.getFormDetail(); + }, // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃� resetFormConfig(formItem) { diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue index 9f31ce4..8597543 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue @@ -244,7 +244,7 @@ } else { this.showResembleQuery = false; } - console.log(this.hasResemble, "this.hasResemblethis.hasResemble"); + // console.log(this.hasResemble, "this.hasResemblethis.hasResemble"); this.$nextTick(() => { this.$refs.FormTemplate.templateRender( res.data.formDefineVO.items @@ -277,6 +277,8 @@ "codeattrsec", //鏃ユ湡鐮佹 "codedatesec", + //灞傜骇鐮佹 + "codelevelsec", ]; this.secVOList = (res.data.data.secVOList || []).filter((item) => typeList.includes(item.secType) @@ -291,8 +293,8 @@ this.showCodeApply = false; } } - console.log(' this.secVOList',this.secVOList) - console.log(' res.data.data.secVOList',res.data.data.secVOList) + // console.log(' this.secVOList',this.secVOList) + // console.log(' res.data.data.secVOList',res.data.data.secVOList) }); }, getFormData(form) { diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue index dc1b16f..bce1993 100644 --- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue @@ -47,6 +47,7 @@ :prop="item.prop" :show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width" + v-if="item.tableDisplayFlag == 'true'" align="center"> </el-table-column> </el-table> diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue index 697ae5e..a3de81c 100644 --- a/Source/UBCS-WEB/src/views/code/code.vue +++ b/Source/UBCS-WEB/src/views/code/code.vue @@ -1402,7 +1402,7 @@ </el-dialog> </basic-container> </template> - + <script> import { gridCodeRule, @@ -3660,7 +3660,7 @@ }, }; </script> - + <style> [class^="icon-"] { font-size: 12px !important; @@ -3803,4 +3803,4 @@ /* .code-total > .basic-container__card { height: 100%; } */ -</style> \ No newline at end of file +</style> diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue index b672067..4653329 100644 --- a/Source/UBCS-WEB/src/views/docking/loge.vue +++ b/Source/UBCS-WEB/src/views/docking/loge.vue @@ -54,7 +54,7 @@ prop: "id", search: true, sortable:true, - width:150 + width:130 }, { label: "鍥惧彿", @@ -69,7 +69,8 @@ prop: 'classifyId', search: true, sortable:true, - width: 230 + overHidden:true, + width: 150 }, { label: '鍒嗙被鍚嶇О', @@ -77,14 +78,14 @@ search: true, sortable:true, overHidden: true, - width: 150 + width: 140 }, { label: '闆嗘垚绯荤粺缂栧彿', prop: 'systemCode', search: true, sortable:true, - width: 150 + width: 130 }, { label: '闆嗘垚绯荤粺鍚嶇О', -- Gitblit v1.9.3