From 6b9c331b4499f463717c0ec64a8090d9a96ca7d7 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 28 十一月 2023 10:26:40 +0800 Subject: [PATCH] 主数据申请-修订 主题库测试按钮 --- Source/UBCS-WEB/src/components/FormTemplate/index.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 93 insertions(+), 19 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue index e41a812..dd94ab2 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue @@ -11,9 +11,13 @@ @opened="openDialog" > <FormTemplate + key="masterForm" data-key="masterForm" + :status="status" v-bind="$attrs" :type="type" + :TreeValue="TreeValue" :rowOid="rowOid" + :eventList="eventList" :templateOid="templateOid" v-if="dialogVisible" ref="FormTemplate" @@ -31,12 +35,15 @@ <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply"> <FormTemplate - v-bind="$attrs" + key="codeApplyForm" data-key="codeApplyForm" + secDTOListv-bind="$attrs" :type="type" :selfColumnType="selfColumnType" :selfColumnConfig="selfColumnConfig" ref="CodeApply" @getFormData="getCodeApplyFormData" + @attrList="attrListForm" + @isSeriesType="isSeriesTypeString" @referConfigDataUpdate="referConfigDataUpdate" ></FormTemplate> </el-tab-pane> @@ -87,9 +94,17 @@ name: "FormTemplateDialog", components: { ResembleQuery, FormTemplate }, props: { + status:{ + type: String, + default: "", + }, visible: { type: Boolean, default: false, + }, + TreeValue:{ + type: String, + default: "", }, type: { type: String, @@ -123,6 +138,11 @@ }, data() { return { + isSeriesType:{}, + attrList:[], + eventList:[], + //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐� + codeValueApplyStatus:'', loading: false, submitBtnLoading: false, hasResemble: false, @@ -134,10 +154,13 @@ showCodeApply: false, showResembleQuery: false, selfColumnType: { - codefixedsec: "combox", - codeclassifysec: "refer", - codevariablesec: "text", - coderefersec: "refer", + codefixedsec: "combox",//鍥哄畾鐮佹 + codeclassifysec: "refer",//鍒嗙被鐮佹 + codevariablesec: "text",//鍙彉鐮佹 + coderefersec: "refer",//寮曠敤鐮佹 + codeattrsec: "text", + codelevelsec: "text", + codedatesec: "date" }, selfColumnConfig: { function: { @@ -156,6 +179,7 @@ label: "name", maxlength: "codeSecLength", data: "fixedValueVOList", + dateFormate: "codeDateFormatStr" }, directVoluation: { search: true, @@ -211,6 +235,13 @@ }, }, }, + watch:{ + codeApplyForm:{ + handler(newval,oldval){ + // console.log('newval',newval) + } + } + }, methods: { openDialog() { this.getFormTemplate(); @@ -240,11 +271,12 @@ } else { this.showResembleQuery = false; } - console.log(this.hasResemble, "this.hasResemblethis.hasResemble"); this.$nextTick(() => { this.$refs.FormTemplate.templateRender( res.data.formDefineVO.items ); + this.eventList=res.data.templateVO.attributes + // this.$refs.FormTemplate.$emit('eventList', res.data.templateVO.attributes); if (Object.keys(this.setForm).length > 0) { this.$refs.FormTemplate.form = this.setForm; } @@ -257,47 +289,87 @@ }, // 鑾峰彇鐮佸�肩敵璇锋暟鎹� getCodeRule() { - getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => { + let that = this; + getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => { if (res.data && res.data.code === 200) { - this.codeRuleOid = res.data.data.oid; + that.codeRuleOid = res.data.data.oid; const typeList = [ - "codefixedsec", - "codeclassifysec", + //灞炴�х爜娈� 鍙 + "codeattrsec", + //鍙彉鐮佹 "codevariablesec", + //鍥哄畾鐮佹 + "codefixedsec", + //鍒嗙被鐮佹 + "codeclassifysec", + //鏃ユ湡鐮佹 鍙 + "codedatesec", + //寮曠敤鐮佹 "coderefersec", + //灞傜骇鐮佹 鍙 + "codelevelsec", + //娴佹按鐮佹 闅愯棌 ]; - this.secVOList = (res.data.data.secVOList || []).filter((item) => + that.secVOList = (res.data.data.secVOList || []).filter((item) => typeList.includes(item.secType) ); - if (this.secVOList.length > 0 && this.type === "add") { - this.showCodeApply = true; - this.activeName = "codeApply"; + if (that.secVOList.length > 0 && that.type === "add") { + that.showCodeApply = true; + that.activeName = "codeApply"; this.$nextTick(() => { - this.$refs.CodeApply.templateRender(this.secVOList); + that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue); }); } else { - this.showCodeApply = false; + that.showCodeApply = false; } } }); }, getFormData(form) { + // if (this.status === "apply"){ + // form.codeStandardEditType = "鍒跺畾"; + // return; + // } this.form = form; + // console.log("form",form) + //灞炴�х爜娈佃祴鍊� + if (this.attrList) { + this.attrList.forEach(item => { + if (this.form.hasOwnProperty(item.referAttributeId)) { + this.codeApplyForm[item.oid] = this.form[item.referAttributeId]; + } + }) + } + + }, + isSeriesTypeString(val){ + this.isSeriesType = val; + }, + //灞炴�х爜娈佃祴鍊� + attrListForm(attrListForm){ + this.attrList=attrListForm; }, getCodeApplyFormData(codeApplyForm) { + // console.log("codeApplyForm",codeApplyForm) this.codeApplyForm = codeApplyForm; }, // 鍙傜収缁勪欢鏁版嵁鍙樻洿 referConfigDataUpdate(data) { const { field } = data; + let childItems=[]; this.secVOList = this.secVOList.map((item) => { if (item.parentClassifySecOid === field) { this.$refs.CodeApply.form[item.oid] = undefined; this.$refs.CodeApply.form[item.name] = undefined; + item.readOnly=false; + item.referConfig.extraParams.parentClassifyValueOid=data.value; + item.referConfig.reloadData = true; + childItems.push(item) } return item; }); - this.$refs.CodeApply.templateRender(this.secVOList); + //this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue); + this.$refs.CodeApply.changeChildItem(childItems); }, resembleQuerySubmit() { this.activeName = "resembleQuery"; @@ -322,7 +394,7 @@ // } // } let resembleQueryList = []; - if (this.$refs.resembleQueryRef) { + if (this.showResembleQuery && this.$refs.resembleQueryRef) { // 杩涜鐩镐技椤规煡璇� resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery( this.form @@ -361,7 +433,6 @@ this.$delete(formValue, item); }); const keys = Object.keys(formValue); - debugger keys.forEach((item, index) => { keys.forEach((itm, idx) => { if ((item === ('$' + itm)) && idx !== index) { @@ -407,6 +478,7 @@ getReferConfig(item) { let params = {}; if (item.secType == "codeclassifysec") { + //鍒嗙被鐮佹 params = { isMuti: false, type: "grid", @@ -451,6 +523,7 @@ }, }; } else if (item.secType == "coderefersec") { + //寮曠敤鐮佹 params = JSON.parse(item.referValueInfo); } return params; @@ -469,6 +542,7 @@ isRequired(item) { return item.nullableFlag != "true"; }, + //榛樿鍊� getOptionList(item) { if ( Array.isArray(item.fixedValueVOList) && -- Gitblit v1.9.3