From 3d828ba07224d1935f47cb0c20dcb959281361d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 14:06:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 561cb91..6270458 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -17,6 +17,7 @@
:TreeValue="TreeValue"
:eventList="eventList"
:rowOid="rowOid"
+ :selectRow="selectRow"
:status="status"
:templateOid="templateOid"
:type="type"
@@ -38,8 +39,10 @@
<el-tab-pane v-if="showCodeApply" label="鐮佸�肩敵璇�" name="codeApply">
<FormTemplate
key="codeApplyForm" ref="CodeApply"
+ :selectRow="selectRow"
:selfColumnConfig="selfColumnConfig"
:selfColumnType="selfColumnType"
+ :status="status"
:type="type"
data-key="codeApplyForm"
secDTOListv-bind="$attrs"
@@ -139,6 +142,10 @@
type: Object,
default: () => ({}),
},
+ selectRow: {
+ type: Array,
+ default: []
+ }
},
data() {
return {
@@ -241,16 +248,10 @@
},
},
},
- watch: {
- codeApplyForm: {
- handler(newval, oldval) {
- // console.log('newval',newval)
- }
- }
- },
+ watch: {},
methods: {
openDialog() {
- //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
+ //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
this.getFormTemplate();
if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
this.getCodeRule();
@@ -323,7 +324,7 @@
that.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
);
- if (that.secVOList.length > 0 && that.type === "add" ||(that.type !== "add" && that.status === "amend")) {
+ if (that.secVOList.length > 0 && that.type === "add" || (that.type !== "add" && that.status === "amend")) {
that.showCodeApply = true;
that.activeName = "codeApply";
@@ -413,7 +414,7 @@
}
},
async submit() {
- if(this.status){
+ if (this.status) {
// 杩涜琛ㄥ崟鏍￠獙
const formValidate = await this.$refs.FormTemplate.validate();
if (!formValidate) return;
@@ -473,7 +474,7 @@
secValue: this.codeApplyForm[item.oid],
};
});
- //鏍囧噯鐗瑰畾
+ //鏍囧噯鐗瑰畾瀛楁鏄犲皠
const mappings = {
codeStandardEditType: 'operationType',
reviseSeries: 'series',
@@ -492,7 +493,7 @@
resForm.codeRuleOid = this.codeRuleOid;
resForm.templateOid = this.templateOid;
this.$emit("submit", resForm);
- }else {
+ } else {
// 杩涜琛ㄥ崟鏍￠獙
const formValidate = await this.$refs.FormTemplate.validate();
if (!formValidate) return;
--
Gitblit v1.9.3