From 27cddefb0cb28da699954ba1a1756d6bcabafbbe Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 05 三月 2025 17:41:29 +0800
Subject: [PATCH] 集成申码接口调整：当码值按照约定传表名为空的业务场景下传null校验问题和码值组装问题。
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 392 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 256 insertions(+), 136 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index dd94ab2..d8ea149 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -1,85 +1,91 @@
<template>
<el-dialog
- :visible.sync="dialogVisible"
v-if="dialogVisible"
v-dialogDrag
- top="-5vh"
- class="avue-dialog avue-dialog--top"
:title="title"
+ :visible.sync="dialogVisible"
:width="width"
append-to-body
+ class="avue-dialog avue-dialog--top"
+ top="-5vh"
@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"
+ v-if="dialogVisible" key="masterForm"
ref="FormTemplate"
+ v-bind="$attrs"
+ :TreeValue="TreeValue"
+ :eventList="eventList"
+ :rowOid="rowOid"
+ :selectRow="selectRow"
+ :status="status"
+ :templateOid="templateOid"
+ :type="type"
+ data-key="masterForm"
+ @dataYearCode="dataYearHandler"
@getFormData="getFormData"
+ @isShow="isShowHandler"
></FormTemplate>
<div
- class="tab_box"
v-if="
type !== 'detail' &&
dialogVisible &&
(showCodeApply || showResembleQuery) &&
type !== 'preview'
"
+ class="tab_box"
>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
- <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
+ <el-tab-pane v-if="showCodeApply" label="鐮佸�肩敵璇�" name="codeApply">
<FormTemplate
- key="codeApplyForm" data-key="codeApplyForm"
- secDTOListv-bind="$attrs"
- :type="type"
- :selfColumnType="selfColumnType"
+ key="codeApplyForm" ref="CodeApply"
+ :selectRow="selectRow"
:selfColumnConfig="selfColumnConfig"
- ref="CodeApply"
- @getFormData="getCodeApplyFormData"
+ :selfColumnType="selfColumnType"
+ :status="status"
+ :type="type"
+ data-key="codeApplyForm"
+ secDTOListv-bind="$attrs"
@attrList="attrListForm"
- @isSeriesType="isSeriesTypeString"
+ @getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"
></FormTemplate>
</el-tab-pane>
<el-tab-pane
+ v-if="showResembleQuery"
label="鐩镐技椤规煡璇�"
name="resembleQuery"
- v-if="showResembleQuery"
>
<ResembleQuery
- v-bind="$attrs"
ref="resembleQueryRef"
- :hasResemble="this.hasResemble"
- :column="this.resembleTableColumn"
+ v-bind="$attrs"
:codeClassifyOid="codeClassifyOid"
+ :column="this.resembleTableColumn"
:form="this.form"
+ :hasResemble="this.hasResemble"
:templateOid="templateOid"
></ResembleQuery>
</el-tab-pane>
</el-tabs>
</div>
<template #footer>
- <div class="" v-if="type !== 'detail'">
- <el-button @click="close()" size="small">鍙� 娑�</el-button>
+ <div v-if="type !== 'detail'" class="">
+ <el-button size="small" @click="close()">鍙� 娑�</el-button>
<el-button
- @click="submit()"
- type="primary"
:loading="submitBtnLoading"
size="small"
- >{{ submitText }}</el-button
+ type="primary"
+ @click="submit()"
+ >{{ submitText }}
+ </el-button
>
<el-button
- @click="resembleQuerySubmit"
- type="primary"
- size="small"
v-if="showResembleQuery"
- >鐩镐技鍍忔煡璇�</el-button
+ size="small"
+ type="primary"
+ @click="resembleQuerySubmit"
+ >鐩镐技鍍忔煡璇�
+ </el-button
>
</div>
</template>
@@ -87,14 +93,15 @@
</template>
<script>
-import { getCodeRule, getFormTemplate } from "@/api/formTemplate.js";
+import {getCodeRule, getFormTemplate} from "@/api/formTemplate.js";
import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
+
export default {
name: "FormTemplateDialog",
- components: { ResembleQuery, FormTemplate },
+ components: {ResembleQuery, FormTemplate},
props: {
- status:{
+ status: {
type: String,
default: "",
},
@@ -102,7 +109,7 @@
type: Boolean,
default: false,
},
- TreeValue:{
+ TreeValue: {
type: String,
default: "",
},
@@ -135,14 +142,18 @@
type: Object,
default: () => ({}),
},
+ selectRow: {
+ type: Array,
+ default: []
+ }
},
data() {
return {
- isSeriesType:{},
- attrList:[],
- eventList:[],
+ isSeriesType: {},
+ attrList: [],
+ eventList: [],
//鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
- codeValueApplyStatus:'',
+ codeValueApplyStatus: '',
loading: false,
submitBtnLoading: false,
hasResemble: false,
@@ -222,9 +233,11 @@
"secretgrade",
],
codeRuleOid: "",
+ isShowStatus: ""
};
},
- created() {},
+ created() {
+ },
computed: {
dialogVisible: {
get() {
@@ -235,18 +248,14 @@
},
},
},
- watch:{
- codeApplyForm:{
- handler(newval,oldval){
- // console.log('newval',newval)
- }
- }
- },
+ watch: {},
methods: {
openDialog() {
+ //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
this.getFormTemplate();
if (this.type === "add") {
this.getCodeRule();
+ return;
}
},
close() {
@@ -254,6 +263,7 @@
},
// 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁
getFormTemplate() {
+ //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
getFormTemplate({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -271,11 +281,12 @@
} else {
this.showResembleQuery = false;
}
+ //浼犻�掕〃鍗曚笂鏂瑰尯鍩熸暟鎹� 锛堟柊澧炲拰淇敼锛�
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
);
- this.eventList=res.data.templateVO.attributes
+ 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;
@@ -313,9 +324,10 @@
that.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- if (that.secVOList.length > 0 && that.type === "add") {
+ if (that.secVOList.length > 0 && that.type === "add" || (that.type !== "add" && that.status === "amend")) {
that.showCodeApply = true;
that.activeName = "codeApply";
+
this.$nextTick(() => {
that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue);
});
@@ -326,12 +338,7 @@
});
},
getFormData(form) {
- // if (this.status === "apply"){
- // form.codeStandardEditType = "鍒跺畾";
- // return;
- // }
this.form = form;
- // console.log("form",form)
//灞炴�х爜娈佃祴鍊�
if (this.attrList) {
this.attrList.forEach(item => {
@@ -342,12 +349,38 @@
}
},
- isSeriesTypeString(val){
- this.isSeriesType = val;
+ //绯诲垪鍙疯鍒�
+ isShowHandler(val) {
+ this.isShowStatus = val;
+
+ this.secVOList.forEach(item => {
+ if (item.name === "绯诲垪鍙�") {
+ this.$set(item, "readOnly", val)
+ }
+ })
+ if (this.$refs.CodeApply) { // 娣诲姞涓�涓垽鏂鍙ワ紝妫�鏌ュ璞℃槸鍚︿负undefined
+ this.$refs.CodeApply.changeStatusItem(this.secVOList, this.TreeValue, this.type);
+ }
+ },
+ //骞翠唬鍙�
+ dataYearHandler(val) {
+ const readOnlyValue = val && Object.values(val).every(value => value !== '');
+
+ this.secVOList.forEach(item => {
+ if (item.name === "骞翠唬鍙�") {
+ const year = readOnlyValue ? val.value.slice(0, 4) : item.codeDateValue;
+ this.codeApplyForm[item.oid] = year;
+ this.$set(item, "readOnly", readOnlyValue);
+ }
+ });
+
+ if (this.$refs.CodeApply) {
+ this.$refs.CodeApply.changeStatusItem(this.secVOList, this.TreeValue, this.type);
+ }
},
//灞炴�х爜娈佃祴鍊�
- attrListForm(attrListForm){
- this.attrList=attrListForm;
+ attrListForm(attrListForm) {
+ this.attrList = attrListForm;
},
getCodeApplyFormData(codeApplyForm) {
// console.log("codeApplyForm",codeApplyForm)
@@ -355,21 +388,21 @@
},
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
- const { field } = data;
- let childItems=[];
+ 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.readOnly = false;
+ item.referConfig.extraParams.parentClassifyValueOid = data.value;
item.referConfig.reloadData = true;
childItems.push(item)
}
return item;
});
//this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
- this.$refs.CodeApply.changeChildItem(childItems);
+ this.$refs.CodeApply.changeChildItem(childItems, this.TreeValue, this.type);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -381,78 +414,160 @@
}
},
async submit() {
- // 杩涜琛ㄥ崟鏍￠獙
- const formValidate = await this.$refs.FormTemplate.validate();
- if (!formValidate) return;
- let codeValidate = true;
- // 杩涜鐮佸�肩敵璇锋牎楠�
- // if (this.showCodeApply) {
- // codeValidate = await this.$refs.CodeApply.validate();
- // if (!codeValidate) {
- // this.activeName = "codeApply";
- // return false;
- // }
- // }
- let resembleQueryList = [];
- if (this.showResembleQuery && this.$refs.resembleQueryRef) {
- // 杩涜鐩镐技椤规煡璇�
- resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ if (this.status) {
+ // 杩涜琛ㄥ崟鏍￠獙
+ const formValidate = await this.$refs.FormTemplate.validate();
+ if (!formValidate) return;
+ let resembleQueryList = [];
+ if (this.showResembleQuery && this.$refs.resembleQueryRef) {
+ // 杩涜鐩镐技椤规煡璇�
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ this.form
+ );
+ }
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
+ `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
+ "闇�瑕佹偍纭",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ }
+ // 鎺掗櫎涓�浜涘瓧娈�
+ const noData = [
+ "jiliangdwname",
+ "materialtypeText",
+ "morengongysname",
+ "$caigouwl",
+ "$xiaoshouwl",
+ "$shifoupihaoguanli",
+ "lcstatus_text",
+ "hesuanfenleiname",
+ "$kucunwl",
+ "lastmodifier"
+ ];
+
+ let resForm = {};
+ const {defaultValue, formValue} = this.getDefaultValueAndFormValues(
this.form
);
- }
- if (resembleQueryList.length > 0) {
- await this.$confirm(
- `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
- "闇�瑕佹偍纭",
- {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- }
- );
- }
- // 鎺掗櫎涓�浜涘瓧娈�
- const noData = [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- "oldcode",
- "lastmodifier"
- ];
- let resForm = {};
- const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
- this.form
- );
- noData.forEach((item) => {
- this.$delete(formValue, item);
- });
- const keys = Object.keys(formValue);
- keys.forEach((item, index) => {
- keys.forEach((itm, idx) => {
- if ((item === ('$' + itm)) && idx !== index) {
- this.$delete(formValue, keys[index]);
- }
- })
- });
+ noData.forEach((item) => {
+ this.$delete(formValue, item);
+ });
+ const keys = Object.keys(formValue);
+ keys.forEach((item, index) => {
+ keys.forEach((itm, idx) => {
+ if ((item === ('$' + itm)) && idx !== index) {
+ this.$delete(formValue, keys[index]);
+ }
+ })
+ });
- resForm.data = formValue;
- resForm = Object.assign({}, resForm, defaultValue);
- resForm.secDTOList = this.secVOList.map((item) => {
- return {
- secOid: item.oid,
- secValue: this.codeApplyForm[item.oid],
+ resForm.data = formValue;
+ resForm.data = Object.assign({}, resForm.data, defaultValue);
+ resForm.secDTOList = this.secVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.oid],
+ };
+ });
+ //鏍囧噯鐗瑰畾瀛楁鏄犲皠
+ const mappings = {
+ codeStandardEditType: 'operationType',
+ reviseSeries: 'series',
+ oldcode: 'oldCode',
+ releaseDate: 'releaseTime',
+ isSeries: 'isEditseries'
};
- });
- resForm.codeClassifyOid = this.codeClassifyOid;
- resForm.codeRuleOid = this.codeRuleOid;
- resForm.templateOid = this.templateOid;
- this.$emit("submit", resForm);
+
+ for (const key in mappings) {
+ if (formValue[key]) {
+ resForm[mappings[key]] = formValue[key];
+ }
+ }
+ //
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
+ this.$emit("submit", resForm);
+ } else {
+ // 杩涜琛ㄥ崟鏍￠獙
+ const formValidate = await this.$refs.FormTemplate.validate();
+ if (!formValidate) return;
+ let codeValidate = true;
+ // 杩涜鐮佸�肩敵璇锋牎楠�
+ // if (this.showCodeApply) {
+ // codeValidate = await this.$refs.CodeApply.validate();
+ // if (!codeValidate) {
+ // this.activeName = "codeApply";
+ // return false;
+ // }
+ // }
+ let resembleQueryList = [];
+ if (this.showResembleQuery && this.$refs.resembleQueryRef) {
+ // 杩涜鐩镐技椤规煡璇�
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ this.form
+ );
+ }
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
+ `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
+ "闇�瑕佹偍纭",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ }
+ // 鎺掗櫎涓�浜涘瓧娈�
+ const noData = [
+ "jiliangdwname",
+ "materialtypeText",
+ "morengongysname",
+ "$caigouwl",
+ "$xiaoshouwl",
+ "$shifoupihaoguanli",
+ "lcstatus_text",
+ "hesuanfenleiname",
+ "$kucunwl",
+ "oldcode",
+ "lastmodifier"
+ ];
+
+ let resForm = {};
+ const {defaultValue, formValue} = this.getDefaultValueAndFormValues(
+ this.form
+ );
+ noData.forEach((item) => {
+ this.$delete(formValue, item);
+ });
+ const keys = Object.keys(formValue);
+ keys.forEach((item, index) => {
+ keys.forEach((itm, idx) => {
+ if ((item === ('$' + itm)) && idx !== index) {
+ this.$delete(formValue, keys[index]);
+ }
+ })
+ });
+
+ resForm.data = formValue;
+ resForm = Object.assign({}, resForm, defaultValue);
+ resForm.secDTOList = this.secVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.oid],
+ };
+ });
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
+ this.$emit("submit", resForm);
+ }
},
getDefaultValueAndFormValues(form) {
let defaultValue = {};
@@ -524,7 +639,7 @@
};
} else if (item.secType == "coderefersec") {
//寮曠敤鐮佹
- params = JSON.parse(item.referValueInfo);
+ params = JSON.parse(item.referValueInfo || item.referConfig);
}
return params;
},
@@ -534,9 +649,13 @@
if (!this.codeApplyForm[item.parentClassifySecOid]) {
return true;
} else {
- return false;
+ return item.readOnly || false;
}
+ } else {
+ return item.readOnly || false;
}
+ } else {
+ return item.readOnly || false;
}
},
isRequired(item) {
@@ -577,6 +696,7 @@
top: 2px;
color: red;
}
+
// 瑙ｅ喅swich缁勪欢涓嶅瀭鐩村眳涓殑闂
/deep/ .el-switch {
vertical-align: baseline;
--
Gitblit v1.9.3