From 4b8d14958e5a5ccb6f64abef72a4ec7086de0f1d Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 18 七月 2023 09:53:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 94 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 26286f1..a3c4375 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -67,15 +67,20 @@
:type="edit"
:visible.sync="DataVisible"></FormTemplateDialog>
<!-- 鍙戝竷-->
- <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow" :title="title"></set-personnel>
+<!-- 鍋滅敤-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleDeactivate" :title="title"></set-personnel>
+<!-- 鍚敤-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleEnable" :title="title"></set-personnel>
+<!-- 鍥炴敹-->
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleRecovery" :title="title"></set-personnel>
<!-- 楂樼骇鏌ヨ-->
<advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
-
- <integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
- @save="handelTransferSave"></integration-transfer>
+<!-- 瀵煎嚭-->
+ <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData"></MasterTransfer>
+<!-- 鐩镐技椤�-->
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
:templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
-
<div class="block" style="display: flex; justify-content: flex-end">
<el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
:total="page.total" layout="total, sizes, prev, pager, next, jumper"
@@ -166,7 +171,8 @@
parameter: {
ids: [],
code: "",
- type: "PUBLIC",
+ type: '',
+ // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
template: "",
vars: {
codeClassifyOid: "",
@@ -174,7 +180,15 @@
}
},
visibleNames:[],
+ //鍙戝竷
visibleFlow: false,
+ //鍋滅敤
+ visibleDeactivate:false,
+ //鍚敤
+ visibleEnable:false,
+ //鍥炴敹
+ visibleRecovery:false,
+ title:'',
transferData: [],
transferProps: {
key: "oid",
@@ -308,16 +322,6 @@
this.$refs.dataTable.doLayout()
}
},
- // 鍙戝竷
- setHandler() {
- if (this.selectRow.length <= 0) {
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
- } else {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
- this.visibleFlow = true;
- }
- },
openVis(visible) {
console.log(visible)
this[visible] = true
@@ -334,9 +338,14 @@
// if(uniqueFlag === 'CODEEDIT') return this.openBatchImport('batchApplyCode')
if (uniqueFlag === 'CODESTARTPROCESS') return this.setHandler()
if (uniqueFlag === 'CODEUPREVISION') return this.DataChange()
- if (uniqueFlag === 'CODERECYCLE') return this.huishouHandler()
if (uniqueFlag === 'CODEEXPORT') return this.openD()
if (uniqueFlag === 'CODEQUERY') return this.findHandler()
+ //鍋滅敤
+ if (uniqueFlag === 'CODEDISABLE') return this.Deactivate()
+ //鍚敤
+ if (uniqueFlag === 'CODEENABLE') return this.Enable()
+ //鍥炴敹
+ if (uniqueFlag === 'CODERECYCLE') return this.Recovery()
// 鐩镐技椤规煡璇�
// if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
});
@@ -361,6 +370,74 @@
rend() {
this.tableData = this.tableHeadData;
},
+ // 鍙戝竷
+ setHandler() {
+ // let EditFlag1=false
+ // let EditFlag2=false
+ // if(EditFlag1){
+ // this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�')
+ // }else if(EditFlag2){
+ // this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼')
+ // }
+ this.selectRow.forEach(item=>{
+ if(this.selectRow.length === 1 && item.lcstatus !== "Editing"){
+ this.$message.warning('鍙湁鐘舵�佹槸銆愮紪杈戜腑銆戠殑鏁版嵁鎵嶅彲浠ュ彂璧锋祦绋�')
+ }else if(item.lcstatus !== 'Editing'){
+ this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愮紪杈戜腑銆戞墠鍙互鍙戣捣娴佺▼')
+ }else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='PUBLIC'
+ this.title='娴佺▼瀹℃壒'
+ this.visibleFlow = true;
+ }
+ })
+ // if (this.selectRow.length <= 0) {
+ // this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ // } else {
+ // this.userName = localStorage.getItem("username");
+ // this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ // this.parameter.type='PUBLIC'
+ // this.title='娴佺▼瀹℃壒'
+ // this.visibleFlow = true;
+ // }
+ },
+ //鍋滅敤
+ Deactivate(){
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='DISABLE'
+ this.title='鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
+ this.visibleDeactivate=true;
+ }
+ },
+ //鍚敤
+ Enable(){
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='ENABLE'
+ this.title='鍚敤锛堣В鍐伙級缂栫爜鏁版嵁'
+ this.visibleEnable=true;
+ }
+ },
+ //鍥炴敹
+ Recovery(){
+ if (this.selectRow.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.userName = localStorage.getItem("username");
+ this.parameter.template = this.userName + "-鍙戝竷" + "[鐗╁搧]";
+ this.parameter.type='ROLLBACK'
+ this.title='鍥炴敹缂栫爜鏁版嵁'
+ this.visibleRecovery=true;
+ }
+ },
handleSizeChange(val) {
this.isLoading = true;
setTimeout(() => {
--
Gitblit v1.9.3