From 6b13f9c3f40f6a1b46531005627041c2fe53b7c1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 03 八月 2023 16:24:35 +0800
Subject: [PATCH] 修改主数据流程默认名
---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 14 +++++++++-----
Source/UBCS-WEB/src/views/MasterData/items.vue | 8 ++++++--
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 1 +
Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue | 1 -
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 71634a4..a127460 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -88,6 +88,7 @@
this.codeClassifyOid=firstProperty.oid;
this.coderuleoid=firstProperty.attributes.coderuleoid;
this.$emit("coderuleoid", this.coderuleoid )
+ this.$emit('Treedata',this.Treedata)
}).catch(res=>{
this.$message.error(res)
})
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 7771e5c..fa8e39b 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -174,6 +174,9 @@
tableHeadBtnData: {
type: Array,
},
+ Treedata:{
+ type:Array
+ }
},
data() {
return {
@@ -338,7 +341,7 @@
}
},
deep: true
- }
+ },
},
methods: {
//鐘舵�佹悳绱�
@@ -422,6 +425,7 @@
},
// 鍙戝竷
setHandler() {
+ console.log('Treedata',this.Treedata)
if (this.selectRow.length > 0) {
let hasEditing = this.selectRow.some(item => item.lcstatus !== 'Editing');
let showMessage = true;
@@ -436,7 +440,7 @@
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.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鐢宠[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'PUBLIC';
this.parameter.code = this.templateOid
this.title = '娴佺▼瀹℃壒'
@@ -486,7 +490,7 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍋滅敤[' + this.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鍋滅敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'DISABLE';
this.parameter.code = this.templateOid
this.title = '鍋滅敤锛堝喕缁擄級缂栫爜鏁版嵁'
@@ -537,7 +541,7 @@
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.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鍚敤[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'Released';
this.parameter.code = this.templateOid
this.title = '鍚敤缂栫爜鏁版嵁'
@@ -594,7 +598,7 @@
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
- this.parameter.template = this.userName + '-鍥炴敹[' + this.result + '-' + this.selectRow[0].name + ']';
+ this.parameter.template = this.userName + '-鍥炴敹[' + this.Treedata[0].name + '-' + this.selectRow[0].name + ']';
this.parameter.type = 'TakeBack';
this.parameter.code = this.templateOid
this.title = '鍥炴敹缂栫爜鏁版嵁'
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
index e53c6cc..88da25c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeTemplatePro.vue
@@ -6,7 +6,6 @@
</span>
<span v-else-if="type.prop==='tab2'">
<FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
-
</span>
<span v-else-if="type.prop==='tab3'">
<stage :code="this.crudOid"></stage>
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index e3b674b..1745425 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -6,7 +6,7 @@
<master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize"
:currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas"
@tableHeadBttoms="tableHeadBttoms" @total="totals" @nodeClick="nodeClick"
- @tableHeadFindData="tableHeadFindDatas"></master-tree>
+ @tableHeadFindData="tableHeadFindDatas" @Treedata="TreedataList"></master-tree>
</basic-container>
</el-aside>
<el-main>
@@ -14,7 +14,7 @@
<VciMasterCrud :page="this.page" :codeClassifyOid="this.codeClassifyOid" :coderuleoid="this.coderuleoid"
@pageSize="pageSizes" @currentPage="currentPages" :tableDataArray="tableDataArray" :total="this.total"
:tableHeadDataFateher="this.tableHeadDataFateher" :isLoading="isLoading" :templateOid="templateOid"
- :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList"></VciMasterCrud>
+ :tableHeadFindData="tableHeadFindData" :tableHeadBtnData="masterVrBtnList" :Treedata="Treedata"></VciMasterCrud>
</el-main>
</el-container>
</template>
@@ -35,6 +35,7 @@
currentPage: "1",
codeClassifyOid: "",
coderuleoid: "",
+ Treedata:[],
templateOid: "",
tableDataArray: [],
masterVrBtnList: [],
@@ -53,6 +54,9 @@
coderuleoidList(val) {
this.coderuleoid = val;
},
+ TreedataList(val){
+ this.Treedata=val
+ },
pageSizes(val) {
this.pageSize = val
},
--
Gitblit v1.9.3