From 5ca05f604876cacca45e3bdfa9f54a997653da90 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 一月 2024 16:25:45 +0800
Subject: [PATCH] bug修改:290相似项查询sql拼接报错修改，291码值回收报错下标越界
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 582 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 488 insertions(+), 94 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index a5e99a0..d8ea149 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -1,87 +1,117 @@
<template>
<el-dialog
- :visible.sync="dialogVisible"
v-if="dialogVisible"
v-dialogDrag
- top="0vh"
:title="title"
- class="avue-dialog avue-dialog--top"
+ :visible.sync="dialogVisible"
:width="width"
append-to-body
+ class="avue-dialog avue-dialog--top"
+ top="-5vh"
@opened="openDialog"
>
- <FormTempalte
+ <FormTemplate
+ v-if="dialogVisible" key="masterForm"
+ ref="FormTemplate"
v-bind="$attrs"
- :visible="visible"
- :type="type"
+ :TreeValue="TreeValue"
+ :eventList="eventList"
:rowOid="rowOid"
+ :selectRow="selectRow"
+ :status="status"
:templateOid="templateOid"
- ref="FormTempalte"
+ :type="type"
+ data-key="masterForm"
+ @dataYearCode="dataYearHandler"
@getFormData="getFormData"
- ></FormTempalte>
-
+ @isShow="isShowHandler"
+ ></FormTemplate>
<div
- class="tab_box"
v-if="
type !== 'detail' &&
dialogVisible &&
- (showCodeApply || showResembleQuery)
+ (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">
- <FormTempalte
- v-bind="$attrs"
- :type="type"
- :selfColumnType="selfColumnType"
+ <el-tab-pane v-if="showCodeApply" label="鐮佸�肩敵璇�" name="codeApply">
+ <FormTemplate
+ key="codeApplyForm" ref="CodeApply"
+ :selectRow="selectRow"
:selfColumnConfig="selfColumnConfig"
- ref="CodeApply"
- @getFormData="getFormData"
- ></FormTempalte>
+ :selfColumnType="selfColumnType"
+ :status="status"
+ :type="type"
+ data-key="codeApplyForm"
+ secDTOListv-bind="$attrs"
+ @attrList="attrListForm"
+ @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>
- <div class="avue-dialog__footer" v-if="type !== 'detail'">
- <el-button @click="close()">鍙� 娑�</el-button>
- <el-button @click="submit()" type="primary" :loading="submitBtnLoading"
- >纭� 瀹�</el-button
- >
- <el-button
- @click="resembleQuerySubmit"
- type="primary"
- v-if="showResembleQuery"
- >鐩镐技鍍忔煡璇�</el-button
- >
- </div>
+ <template #footer>
+ <div v-if="type !== 'detail'" class="">
+ <el-button size="small" @click="close()">鍙� 娑�</el-button>
+ <el-button
+ :loading="submitBtnLoading"
+ size="small"
+ type="primary"
+ @click="submit()"
+ >{{ submitText }}
+ </el-button
+ >
+ <el-button
+ v-if="showResembleQuery"
+ size="small"
+ type="primary"
+ @click="resembleQuerySubmit"
+ >鐩镐技鍍忔煡璇�
+ </el-button
+ >
+ </div>
+ </template>
</el-dialog>
</template>
<script>
-import { getCodeRule, getFormTemplate } from "@/api/formTemplate.js";
-import FormTempalte from "./FormTempalte";
+import {getCodeRule, getFormTemplate} from "@/api/formTemplate.js";
+import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
+
export default {
name: "FormTemplateDialog",
- components: { ResembleQuery, FormTempalte },
+ components: {ResembleQuery, FormTemplate},
props: {
+ status: {
+ type: String,
+ default: "",
+ },
visible: {
type: Boolean,
default: false,
+ },
+ TreeValue: {
+ type: String,
+ default: "",
},
type: {
type: String,
@@ -104,29 +134,52 @@
type: String,
default: "",
},
+ submitText: {
+ type: String,
+ default: "纭� 瀹�",
+ },
+ setForm: {
+ type: Object,
+ default: () => ({}),
+ },
+ selectRow: {
+ type: Array,
+ default: []
+ }
},
data() {
return {
+ isSeriesType: {},
+ attrList: [],
+ eventList: [],
+ //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+ codeValueApplyStatus: '',
loading: false,
submitBtnLoading: false,
hasResemble: false,
resembleTableColumn: [],
secVOList: [],
form: {},
+ codeApplyForm: {},
activeName: "codeApply",
- showCodeApply: true,
- showResembleQuery: true,
+ 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: {
required: this.isRequired,
dicData: this.getOptionList,
type: this.getType,
+ referConfig: this.getReferConfig,
+ readOnly: this.getDisabled,
},
exchange: {
text: "name",
@@ -137,6 +190,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -146,9 +200,44 @@
},
},
},
+ defaultKeys: [
+ "oid",
+ "id",
+ "name",
+ "description",
+ "revisionoid",
+ "nameoid",
+ "btmname",
+ "lastr",
+ "firstr",
+ "lastv",
+ "firstv",
+ "creator",
+ "createtime",
+ "lastModifier",
+ "lastmodifytime",
+ "revisionrule",
+ "revisionseq",
+ "revisionvalue",
+ "versionrule",
+ "versionseq",
+ "versionvalue",
+ "lcstatus",
+ "ts",
+ "owner",
+ "checkinby",
+ "checkintime",
+ "checkoutby",
+ "checkouttime",
+ "copyfromversion",
+ "secretgrade",
+ ],
+ codeRuleOid: "",
+ isShowStatus: ""
};
},
- created() {},
+ created() {
+ },
computed: {
dialogVisible: {
get() {
@@ -159,11 +248,14 @@
},
},
},
+ watch: {},
methods: {
openDialog() {
+ //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
this.getFormTemplate();
- if (this.type === 'add') {
+ if (this.type === "add") {
this.getCodeRule();
+ return;
}
},
close() {
@@ -171,6 +263,7 @@
},
// 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁
getFormTemplate() {
+ //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
getFormTemplate({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -183,44 +276,133 @@
res.data.resembleTableVO.cols.length > 0;
this.resembleTableColumn = res.data.resembleTableVO.cols || [];
if (this.hasResemble) {
- this.activeName = 'resembleQuery'
- this.showResembleQuery = true
+ this.activeName = "resembleQuery";
+ this.showResembleQuery = true;
+ } else {
+ this.showResembleQuery = false;
}
- this.$refs.FormTempalte.templateRender(res.data.formDefineVO.items);
+ //浼犻�掕〃鍗曚笂鏂瑰尯鍩熸暟鎹� 锛堟柊澧炲拰淇敼锛�
+ 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;
+ }
+ });
}
})
- .catch((err) => {
+ .catch(() => {
this.loading = false;
- console.log(err);
});
},
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
getCodeRule() {
- getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
+ let that = this;
+ getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => {
if (res.data && res.data.code === 200) {
+ 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) =>
- typeList.includes(item)
+ that.secVOList = (res.data.data.secVOList || []).filter((item) =>
+ typeList.includes(item.secType)
);
- this.$nextTick(() => {
- if (this.secVOList.length > 0 && this.type === 'add') {
- this.showCodeApply = true
- this.activeName = 'codeApply'
- this.$refs.CodeApply.templateRender(this.secVOList);
- } else {
- this.showCodeApply = false
- }
- });
+ 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);
+ });
+ } else {
+ that.showCodeApply = false;
+ }
}
});
},
getFormData(form) {
this.form = form;
+ //灞炴�х爜娈佃祴鍊�
+ if (this.attrList) {
+ this.attrList.forEach(item => {
+ if (this.form.hasOwnProperty(item.referAttributeId)) {
+ this.codeApplyForm[item.oid] = this.form[item.referAttributeId];
+ }
+ })
+ }
+
+ },
+ //绯诲垪鍙疯鍒�
+ 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;
+ },
+ 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.TreeValue);
+ this.$refs.CodeApply.changeChildItem(childItems, this.TreeValue, this.type);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -232,43 +414,254 @@
}
},
async submit() {
- // 杩涜琛ㄥ崟鏍￠獙
- const formValidate = await this.$refs.FormTempalte.validate();
- if (!formValidate) return;
- let codeValidate = true;
- // 杩涜鐮佸�肩敵璇锋牎楠�
- if (this.showCodeApply) {
- codeValidate = await this.$refs.codeApply.validate();
- if (!codeValidate) return;
- }
- // 杩涜鐩镐技椤规煡璇�
- const resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
- this.form
- );
- if (resembleQueryList.length === 0) {
- this.$emit("submit", this.form);
- } else {
- this.$confirm(
- `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
- "闇�瑕佹偍纭",
- {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- }
- )
- .then(() => {
- this.$emit("submit", this.form);
+ 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
+ );
+ 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]);
+ }
})
- .catch(() => {});
+ });
+
+ 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'
+ };
+
+ 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 = {};
+ let formValue = {};
+ for (const key in form) {
+ if (Object.hasOwnProperty.call(form, key)) {
+ const element = form[key];
+ if (this.defaultKeys.includes(key)) {
+ defaultValue[key] = element;
+ } else {
+ formValue[key] = element;
+ }
+ }
+ }
+ return {
+ defaultValue,
+ formValue,
+ };
+ },
getType(item) {
- return this.selfColumnType[item.sectype];
+ return this.selfColumnType[item.secType];
+ },
+ getReferConfig(item) {
+ let params = {};
+ if (item.secType == "codeclassifysec") {
+ //鍒嗙被鐮佹
+ params = {
+ isMuti: false,
+ type: "grid",
+ tableConfig: {
+ limit: -1,
+ cols: [
+ {
+ field: "id",
+ title: "鑻辨枃鍚嶇О",
+ sort: true,
+ width: 150,
+ },
+ {
+ field: "name",
+ title: "涓枃鍚嶇О",
+ sort: true,
+ width: 150,
+ },
+ {
+ field: "description",
+ title: "鎻忚堪",
+ width: 250,
+ },
+ ],
+ queryColumns: [
+ {
+ field: "id",
+ title: "鑻辨枃鍚嶇О",
+ },
+ {
+ field: "name",
+ title: "涓枃鍚嶇О",
+ },
+ ],
+ },
+ url: "api/ubcs-code/ubcs-code/mdmEngineController/listCodeClassifyValueBySecOid",
+ extraParams: {
+ classifySecOid: item.oid,
+ parentClassifyValueOid: item.parentClassifySecOid
+ ? this.codeApplyForm[item.parentClassifySecOid]
+ : "",
+ },
+ };
+ } else if (item.secType == "coderefersec") {
+ //寮曠敤鐮佹
+ params = JSON.parse(item.referValueInfo || item.referConfig);
+ }
+ return params;
+ },
+ getDisabled(item) {
+ if (item.secType === "codeclassifysec") {
+ if (item.parentClassifySecOid) {
+ if (!this.codeApplyForm[item.parentClassifySecOid]) {
+ return true;
+ } else {
+ return item.readOnly || false;
+ }
+ } else {
+ return item.readOnly || false;
+ }
+ } else {
+ return item.readOnly || false;
+ }
},
isRequired(item) {
return item.nullableFlag != "true";
},
+ //榛樿鍊�
getOptionList(item) {
if (
Array.isArray(item.fixedValueVOList) &&
@@ -303,6 +696,7 @@
top: 2px;
color: red;
}
+
// 瑙ｅ喅swich缁勪欢涓嶅瀭鐩村眳涓殑闂
/deep/ .el-switch {
vertical-align: baseline;
--
Gitblit v1.9.3