From c0a65879010e96ae25113ba638e8a85601d6a605 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 13 十一月 2023 14:53:52 +0800 Subject: [PATCH] 整合代码 --- Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 2 +- Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 14 +++++++++++++- Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 2 +- Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 3 +++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue index f16ba65..7fd964d 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue @@ -160,6 +160,7 @@ immediate: true, handler(newV) { this.$emit("getFormData", newV); + // console.log("getFormData", newV) }, }, TreeValue:{ @@ -189,6 +190,7 @@ let dictKeys = []; let slotColumnList = []; formItemList.forEach((formItem) => { + console.log('formItem',formItem) formItem = this.resetFormConfig(formItem); if (formItem.type === "line") { group.push({ @@ -328,6 +330,7 @@ let that=this; items.forEach((item) => { let formItem = this.resetFormConfig(item); + if (formItem.field == "lcstatus") { formItem.field = formItem.field + "_text"; formItem.readOnly = true; diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue index 0d72866..6baddfc 100644 --- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue +++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue @@ -497,7 +497,19 @@ if (uniqueFlag === 'receiveEditApply') return this.receiveEditApply() // 鐩镐技椤规煡璇� // if(uniqueFlag === 'CODEEDIT') return this.similarHandler() + // 鏍囧噯鐢宠 + if (uniqueFlag === 'CODEAPPLY') return this.codeApplyHandler() + // 鏍囧噯淇 + if (uniqueFlag === 'CODEAMEND') return this.codeAMENDHandler() }); + }, + //鏍囧噯鐢宠 + codeApplyHandler(){ + console.log('1') + }, + //鏍囧噯淇 + codeAMENDHandler(){ + console.log('2') }, addSaveHandler(){ @@ -865,7 +877,7 @@ }, //澧炲姞淇濆瓨 AddSumbit(val) { - //console.log(val) + console.log('val',val) if(func.notEmpty(val.ts)) { val.ts = func.formattedDateTime(val.ts); //console.log(val.ts); diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue index 28fad1b..19776b2 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue @@ -29,7 +29,7 @@ </div> </el-dialog> - <avue-input v-model="text" :disabled="disabled" :placeholder="title" @click="!disabled && (visible=true)"></avue-input> + <avue-input v-model="text" :disabled="disabled" :readonly="true" :placeholder="title" @click="!disabled && (visible=true)" ></avue-input> </div> </template> diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue index 9474f0d..7f49775 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue @@ -32,7 +32,7 @@ </div> </el-dialog> - <avue-input v-model="text" :disabled="disabled" :placeholder="title" @click="!disabled && (visible=true)"></avue-input> + <avue-input v-model="text" :disabled="disabled" :readonly="true" :placeholder="title" @click="!disabled && (visible=true)"></avue-input> </div> </template> -- Gitblit v1.9.3