From 3ed6dac0e18dab7ad794a7081bd6579c94eb65ba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 43 +++++++++++++++++----
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue | 17 ++++++++
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 25 ++++++++++++
3 files changed, 75 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 77ae0da..0277de9 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -75,6 +75,18 @@
</el-table>
</div>
</el-row>
+ <!-- 鐢宠-->
+ <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
+ :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
+ :visible.sync="applyvisible"
+ type="add"
+ @submit="applySumbit">
+ </FormTemplateDialog>
+ <!-- 淇-->
+ <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :visible.sync="amendvisible"
+ type="edit" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
:codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
@@ -273,6 +285,8 @@
label: "name",
},
tableHeadFindDatas: [],
+ applyvisible:false,
+ amendvisible:false,
addvisible: false,
editvisible: false,
findvisible: false,
@@ -505,11 +519,26 @@
},
//鏍囧噯鐢宠
codeApplyHandler(){
- console.log('1')
+ this.$nextTick(() => {
+ this.applyvisible = true;
+ });
+ },
+ applySumbit(){
+
+ },
+ amendSumbit(){
+
},
//鏍囧噯淇
codeAMENDHandler(){
- console.log('2')
+ if (this.selectRow.length !== 1) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else if (this.selectRow[0].lcstatus !== "Editing") {
+ this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
+ } else {
+ this.amendvisible = true;
+ this.rowOid = this.selectRow[0].oid;
+ }
},
addSaveHandler(){
this.$nextTick(() => {
@@ -825,15 +854,13 @@
},
//缂栬緫
editHandler() {
- if (this.selectRow.length <= 0) {
+ if (this.selectRow.length !== 1) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow.length > 1) {
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
- } else if (this.selectRow[0].lcstatus != "Editing") {
- this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥�,涓嶅彲缂栬緫");
+ } else if (this.selectRow[0].lcstatus !== "Editing") {
+ this.$message.warning("缂栫爜鐘舵�佷笉鏄�滅紪杈戜腑鈥濓紝涓嶅彲缂栬緫");
} else {
this.editvisible = true;
- this.rowOid = this.selectRow[0]['oid']
+ this.rowOid = this.selectRow[0].oid;
}
},
//楂樼骇鏌ヨ鎸夐挳
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index 4ea4530..f21526d 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -392,7 +392,22 @@
focus: this.simFouce,
readonly: true,
},
-
+ {
+ label: '鏄惁鍙備笌鍏抽敭灞炴�ф牎楠�',
+ prop: 'isParticipateCheck',
+ type: 'switch',
+ activeColor: "#13ce66",
+ inactiveColor: "#ff4949",
+ labelWidth:160,
+ dicData: [{
+ label: '鍚�',
+ value: 0
+ }, {
+ label: '鏄�',
+ value: 1
+ }
+ ]
+ }
]
}
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index ae3a1ef..88d4b0b 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -63,6 +63,16 @@
<el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
@focus="Keyfouce"></el-input>
</el-form-item>
+ <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="150px">
+ <el-switch
+ v-model="TreeAddform.codeKeyAttrValue"
+ active-text="鏄�"
+ inactive-text="鍚�"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ @change="switchChange">
+ </el-switch>
+ </el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
@focus="simFouce"></el-input>
@@ -586,7 +596,9 @@
//缂栫爜瑙勫垯
codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
- btmTypeName: ""
+ btmTypeName: "",
+ codeKeyAttrValue:false,
+ isParticipateCheck:0
},
rules: {
id: [
@@ -853,6 +865,11 @@
created() {
},
methods: {
+ // switch
+ switchChange(){
+ this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue ? 1 : 0;
+ console.log(this.TreeAddform.isParticipateCheck)
+ },
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
this.SelectFInd = '';
@@ -1157,6 +1174,8 @@
});
Object.keys(this.TreeAddform).forEach(key => {
this.TreeAddform[key] = "";
+ this.TreeAddform.codeKeyAttrValue = false;
+ this.TreeAddform.isParticipateCheck = 0;
});
this.getAttr();
this.TreeAddFormVisible = false;
@@ -1350,6 +1369,10 @@
this.crudOid = ''
}
this.TreeList = res3.data.data;
+ if(!this.TreeList.isParticipateCheck){
+ this.$set(this.TreeList,"isParticipateCheck",0)
+ return
+ }
} catch (error) {
this.$message.error(error);
}
--
Gitblit v1.9.3