From 571ce3c50b834b0c26fc90a74c0590c823421353 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 04 八月 2023 15:15:24 +0800
Subject: [PATCH] 1、修改模板流程新建重复数据报错问题。
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 0d1b640..ca11dce 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -125,6 +125,7 @@
import BatchImport from '@/components/BatchImport'
import {validatenull} from "@/util/validate";
import fileInHtml from "@/components/file/inHtml.vue";
+import {getUserInfo} from "@/api/system/user";
export default {
components: {
@@ -269,8 +270,12 @@
},
computed: {},
created() {
- const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
- this.result = this.$route.query.id.substring(index);
+ // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
+ // this.result = this.$route.query.id.substring(index);
+ getUserInfo().then(res=>{
+ console.log(res.data.data)
+ this.result=res.data.data.realName
+ })
},
mounted() {
},
@@ -440,8 +445,7 @@
} else if (showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
this.parameter.code = this.templateOid;
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -489,10 +493,9 @@
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼');
showMessage = false;
} else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
- processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
+ processTS({templateId: this.templateOid, buttonTypeKey: 'DISABLE'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code = this.templateOid
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -540,11 +543,10 @@
this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
showMessage = false;
} else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
- processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
+ processTS({templateId: this.templateOid, buttonTypeKey: 'ENABLE'}).then(res => {
if (res.data.data.records && res.data.data.records.length != 0) {
this.parameter = res.data.data.records[0]
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code = this.templateOid
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
@@ -599,10 +601,9 @@
showMessage = false;
} else if (this.selectRow.length >= 1 && (disabledCount === this.selectRow.length || releasedCount === this.selectRow.length) || (disabledCount > 0 && releasedCount > 0) && showMessage) {
//disabledCount 鍜� releasedCount 涓换鎰忎竴涓瓑浜� this.selectRow 鏁扮粍鐨勯暱搴﹀垯琛ㄧず鍏ㄩ儴鏄悓涓�绉嶇姸鎬侊紝杩斿洖 true 濡傛灉disabledCount 鍜� releasedCount 閮藉ぇ浜�0锛屽垯琛ㄧず鏃㈡湁Disabled涔熸湁Released杩斿洖 true
- processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
+ processTS({templateId: this.templateOid, buttonTypeKey: 'ROLLBACK'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
- this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍥炴敹[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
+ this.parameter.processName = this.result + '-鍥炴敹[' + this.selectRow[0].btmname + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code = this.templateOid
this.parameter.btmtype=this.selectRow[0].btmname || this.selectRow[0].btmtype;
--
Gitblit v1.10.0