From 5f03300404c8e4f32c17a7216ea8c99818112eba Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 17:47:45 +0800
Subject: [PATCH] 标准-源标准号非参照回填输入框
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 11 ++++++-----
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 28 +++++++++++++++++++++-------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 18 +++++++++++++++++-
3 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index e75483c..d4e40cc 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -103,9 +103,14 @@
type: String,
default: "",
},
+ selectRow:{
+ type:Array,
+ default:[]
+ }
},
data() {
return {
+ selectValue:"",
//骞翠唬鍙�
dataYearCode: {
type: "",
@@ -206,6 +211,15 @@
handler(newV) {
this.$emit("dataYearCode", newV)
}
+ },
+ selectRow:{
+ handler(newval){
+ console.log(newval);
+ let ids = newval.map(item => item.id);
+ this.selectValue= ids.join(",");
+ },
+ deep:true,
+ immediate:true
}
},
methods: {
@@ -320,7 +334,9 @@
value:formItem.defaultValue || (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
(formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
(formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
- (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null),
+ (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null) ||
+ //鐖剁粍浠跺鏋滄槸鍙傜収鏁版嵁浼氬皢selectRow缃┖,selectRow涓嶄负绌哄氨璇存槑涓嶆槸鍙傜収瑕佸洖濉簮鏍囧噯鍙锋暟鎹�
+ (this.status === "amend" && this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 65b2559..fc64b18 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -14,6 +14,7 @@
v-if="dialogVisible" key="masterForm"
ref="FormTemplate"
v-bind="$attrs"
+ :selectRow="selectRow"
:TreeValue="TreeValue"
:eventList="eventList"
:rowOid="rowOid"
@@ -139,6 +140,10 @@
type: Object,
default: () => ({}),
},
+ selectRow:{
+ type:Array,
+ default:[]
+ }
},
data() {
return {
@@ -242,11 +247,7 @@
},
},
watch: {
- codeApplyForm: {
- handler(newval, oldval) {
- // console.log('newval',newval)
- }
- }
+
},
methods: {
openDialog() {
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index fa46eca..ef999e2 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -100,7 +100,7 @@
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'"
- :visible.sync="amendvisible" status="amend"
+ :visible.sync="amendvisible" status="amend" :selectRow="selectRow"
type="add" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -485,8 +485,7 @@
this.LinkObject = row;
this.LinkVisible = true;
this.LinkList = Object.keys(row).map(property => property)
- // console.log(result);
- // console.log(this.LinkObject)
+
},
//鐘舵�佹悳绱�
cellSelectHandler(row) {
@@ -589,20 +588,35 @@
//鏍囧噯淇
codeAMENDHandler() {
let foundItem = false;
-
this.tableHeadFindData.forEach(item => {
if (item.field === "oldcode" && Object.keys(item.referConfig).length >= 1) {
foundItem = true;
}
});
-
if (foundItem) {
- this.amendvisible = true;
+ if(this.selectRow.length >= 1){
+ this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.selectRow = [];
+ //鍙栨秷鍕鹃�夌姸鎬�
+ this.$refs.dataTable.clearSelection();
+ this.amendvisible = true;
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝綋鍓嶆搷浣�'
+ });
+ });
+ }else {
+ this.amendvisible = true;
+ }
} else {
if (this.selectRow.length <= 0) {
this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
} else {
- console.log(this.selectRow)
this.amendvisible = true;
}
--
Gitblit v1.9.3