From dd2cbe9c6f7360d0f50da4e5f0fc506ad3915d8b Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期一, 10 七月 2023 18:04:43 +0800
Subject: [PATCH] 业务类型修改功能修正
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 285 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 211 insertions(+), 74 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index e9bffc4..106a39c 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -30,18 +30,18 @@
<el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
</el-form-item>
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.coderuleoidName" readonly autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
+ <el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
+ </el-form-item>
+ <el-form-item label="涓氬姟绫诲瀷锛�" label-width="150px" v-if="TreeFlag==false">
+ <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
</el-form-item>
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
- <el-input v-model="TreeAddform.codekeyattrrepeatoidName" readonly autocomplete="off" @focus="Keyfouce"
+ <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" @focus="Keyfouce"
style="width: 585px"></el-input>
</el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.codeResembleRuleOidName"
- autocomplete="off"
- readonly
- @focus="simFouce"
- style="width: 585px"></el-input>
+ <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" @focus="simFouce"
+ style="width: 585px"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -51,7 +51,7 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlag"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -163,6 +163,35 @@
</el-dialog>
</el-dialog>
</template>
+ <template #menu="{ size, row }">
+ <el-button
+ v-show="row.lcStatus === 'Released'"
+ @click="upAndStopAndStart(row, 'upVersion')"
+ :loading="row.upVersionLoad"
+ icon="el-icon-upload2"
+ type="text"
+ :size="size"
+ >鍗囩増</el-button
+ >
+ <el-button
+ v-show="row.lcStatus === 'Released'"
+ @click="upAndStopAndStart(row, 'stopLose')"
+ :loading="row.stopLoseLoad"
+ icon="el-icon-circle-close"
+ type="text"
+ :size="size"
+ >鍋滅敤/澶辨晥</el-button
+ >
+ <el-button
+ v-show="['Disabled', 'Editing'].includes(row.lcStatus)"
+ @click="upAndStopAndStart(row, 'startRelease')"
+ :loading="row.startReleaseLoad"
+ icon="el-icon-circle-check"
+ type="text"
+ :size="size"
+ >鍚敤/鍙戝竷</el-button
+ >
+ </template>
</avue-crud>
</basic-container>
@@ -209,7 +238,7 @@
</template>
<avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud>
<div style="height: 30px">
- <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.codekeyattrrepeatoidName ==''?'鏈缃��':this.TreeAddform.codekeyattrrepeatoidName}}]</div>
+ <div style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.codeKeyAttrRepeatOidName ==''?'鏈缃��':this.TreeAddform.codekeyattrrepeatoidName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
<el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
<el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
@@ -240,6 +269,30 @@
</div>
</div>
</el-dialog>
+<!-- 涓氬姟绫诲瀷-->
+ <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�" append-to-body>
+ <template>
+ <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
+ <el-option
+ v-for="item in SelectOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ style="width: 130px">
+ </el-option>
+ </el-select>
+ <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
+ <el-button size="small" type="primary" plain @click="BtmSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ </template>
+ <avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
+ <div style="height: 30px">
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.btmtypename}}]</div>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
+ <el-button type="primary" size="small" @click="btmHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
+ </div>
+ </div>
+ </el-dialog>
</basic-container>
</el-main>
</el-container>
@@ -260,7 +313,10 @@
addSave,
deleteData,
editSave,
- copy
+ copy,
+ upVersion,
+ stopLose,
+ startRelease
} from "@/api/template/templateAttr";
import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master'
export default {
@@ -271,6 +327,8 @@
inject: [, "crudTreeData"],
data() {
return {
+ //鏍戣妭鐐规樉绀洪殣钘�
+ TreeFlag:false,
//缂栫爜瑙勫垯
MasterdialogVisible:false,
masterData:[],
@@ -289,6 +347,12 @@
simData:[],
SimidialogVisible:false,
simSelectList:[],
+ //涓氬姟绫诲瀷
+ btmName:"",
+ btmOid:"",
+ BtmData:[],
+ BtmdialogVisible:false,
+ btmSelectList:[],
masterOption:{
addBtn:false,
index:true,
@@ -390,11 +454,11 @@
//鐩镐技鏌ヨ瑙勫垯
codeResembleRuleOidName: "",
//鍏抽敭灞炴�ф煡璇㈣鍒�
- codekeyattrrepeatoidName: "",
+ codeKeyAttrRepeatOidName: "",
//缂栫爜瑙勫垯
- coderuleoidName: "",
+ codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
- btmtypename: ""
+ btmTypeName: ""
},
//avue-tree鏁版嵁锛屾殏鏃舵病鏈変綔鐢紝閲岄潰鍔熻兘鐢╡lement鍐欎簡锛屽彧鐢╝vue鐨勪竴涓爲缁勪欢涓嶇敤鍐呯疆琛ㄥ崟浜嗐��
TreeAvueform: {},
@@ -510,9 +574,42 @@
prop: 'tab2',
}]
},
+ //妯℃嫙琛ㄥ崟鍋囨暟鎹�
+ Treeform: [
+ {
+ name: "娴嬭瘯1",
+ sex: "鐢�",
+ value: 0
+ },
+ {
+ name: "娴嬭瘯2",
+ sex: "濂�",
+ value: 1
+ }
+ ],
//浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁
TreeList: {},
- codeClassifyOid: ""
+ codeClassifyOid: "",
+ upAndStopAndStartData: {
+ upVersion: {
+ tip: "鏄惁杩涜鍗囩増锛�",
+ typeText: "鍗囩増",
+ funAPi: upVersion,
+ load: 'upVersionLoad'
+ },
+ stopLose: {
+ tip: "妯℃澘鍙湁鍙戝竷鐘舵�佹墠鑳借浣跨敤锛屾槸鍚︾‘瀹氬仠鐢紵",
+ typeText: "鍋滅敤/澶辨晥",
+ funAPi: stopLose,
+ load: 'stopLoseLoad'
+ },
+ startRelease: {
+ tip: "鏄惁纭畾鍚敤/鍙戝竷杩欎釜妯℃澘锛屾ā鏉垮彧鏈夊彂甯冪姸鎬佹墠鑳借浣跨敤锛屾槸鍚︾户缁紵",
+ typeText: "鍚敤/鍙戝竷",
+ funAPi: startRelease,
+ load: 'startReleaseLoad'
+ }
+ }
}
},
//tab鏍忛粯璁ゆ槸琛ㄦ牸
@@ -596,8 +693,8 @@
}else {
this.MasterdialogVisible=false;
this.masterSelectList=[]
- this.$set(this.TreeAddform,'coderuleoidName',this.masterName)
- this.$set(this.TreeAddform,'coderuleOid',this.masterOid)
+ this.$set(this.TreeAddform,'codeRuleOidName',this.masterName)
+ this.$set(this.TreeAddform,'codeRuleOid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
console.log(this.loneTreeNewForm)
}
@@ -625,9 +722,9 @@
}else {
this.KeydialogVisible=false;
this.KeySelectLIst=[]
- this.$set(this.TreeAddform,'codeResembleRuleOidName',this.simName)
- this.$set(this.TreeAddform,'codeResembleRuleOid',this.simOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
+ this.$set(this.TreeAddform,'codeKeyAttrRepeatOidName',this.KeyName)
+ this.$set(this.TreeAddform,'codeKeyAttrRepeatOid',this.KeyOid)
+ console.log(this.TreeAddform)
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -718,6 +815,56 @@
this.simData=res.data.records;
})
},
+ //涓氬姟绫诲瀷澶辩劍
+ btmFoucus(){
+ this.BtmdialogVisible=true;
+ this.btmdefaultRend()
+ },
+ //涓氬姟绫诲瀷纭畾
+ btmHandlerClick(){
+ if(this.btmSelectList.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
+ }else if(this.btmSelectList.length<=0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ }else {
+ this.BtmdialogVisible=false;
+ this.btmSelectList=[]
+ this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
+ }
+ },
+ //涓氬姟绫诲瀷鏌ヨ
+ BtmSelectFindeHandler(){
+ if(this.SelectValue == 'id'){
+ const masterParameter={
+ 'conditionMap[id]':this.SelectFInd
+ }
+ this.btmdefaultRend(masterParameter);
+ this.SelectValue=""
+ this.SelectFInd=""
+ }else if(this.SelectValue == 'name'){
+ const masterParameter={
+ 'conditionMap[name]':this.SelectFInd
+ }
+ this.btmdefaultRend(masterParameter)
+ this.SelectValue=""
+ this.SelectFInd=""
+ }
+ },
+ //涓氬姟绫诲瀷澶氶��
+ btmSelect(row){
+ this.btmSelectList=row;
+ this.btmName=row[0].name;
+ this.btmOid=row[0].oid;
+ },
+ //涓氬姟绫诲瀷鎺ュ彛
+ btmdefaultRend(masterParameter){
+ referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
+ // console.log(res)
+ this.BtmData=res.data.data.records
+ })
+ },
//瀛愪紶鐖�
MasterHandler(val){
this.TreeList=val
@@ -770,23 +917,26 @@
},
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
- const data = this.TreeAddform
- this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid)
- // console.log('data',data)
- TreeSave(data).then(() => {
- this.$message({
- type: 'success',
- message: '娣诲姞鎴愬姛!'
+ const data = this.TreeAddform;
+ data.btmTypeName= this.TreeList.btmtypename
+ this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
+ // console.log("data", data);
+ TreeSave(data)
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "娣诲姞鎴愬姛!",
+ });
+ this.getAttr();
+ this.TreeAddFormVisible = false;
+ this.TreeAddform = "";
+ })
+ .catch((res) => {
+ this.$message({
+ type: "warning",
+ message: res,
+ });
});
- this.getAttr();
- this.TreeAddFormVisible = false
- this.TreeAddform = ""
- }).catch(res => {
- this.$message({
- type: 'warning',
- message: res
- });
- })
},
//鏍戣妭鐐瑰垹闄ゆ寜閽�
TreeDel() {
@@ -853,6 +1003,7 @@
});
} else {
this.TreeEditFormVisible = true;
+ console.log(this.TreeList)
}
},
//鏍戝埛鏂�
@@ -925,6 +1076,10 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
+ console.log('鏍�',data)
+ if(data.parentId == ""){
+ this.TreeFlag=true;
+ }
this.nodeClickList = data
this.ProData=[]
try {
@@ -970,44 +1125,6 @@
handleChange(column) {
this.type = column;
},
- // //楂樼骇鏌ヨ鎸夐挳
- // handleSelectChange(key) {
- // const selectedValue = this.FindSelect[key];
- // console.log(selectedValue)
- // console.log(this.QueryArray[0])
- // switch (this.FindSelect[key]) {
- // case '0':
- // this.QueryArray[key] = '';
- // this.$set(this.QueryArray, key, '');
- // // 濡傛灉閫変腑鐨勬槸妯℃澘缂栧彿锛岀浉搴旂殑杈撳叆妗嗗弻鍚戠粦瀹氬叧绯讳负 QueryArray.id
- // this.$set(this.QueryArray, 'id', this.QueryArray[key]);
- // break;
- // case '1':
- // this.QueryArray[key] = '';
- // this.$set(this.QueryArray, key, '');
- // // 濡傛灉閫変腑鐨勬槸妯℃澘鍚嶇О锛岀浉搴旂殑杈撳叆妗嗗弻鍚戠粦瀹氬叧绯讳负 QueryArray.name
- // this.$set(this.QueryArray, 'name', this.QueryArray[key]);
- // break;
- // case '2':
- // this.QueryArray[key] = '';
- // this.$set(this.QueryArray, key, '');
- // // 濡傛灉閫変腑鐨勬槸妯℃澘鎻忚堪锛岀浉搴旂殑杈撳叆妗嗗弻鍚戠粦瀹氬叧绯讳负 QueryArray.description
- // this.$set(this.QueryArray, 'description', this.QueryArray[key]);
- // break;
- // case '3':
- // this.QueryArray[key] = '';
- // this.$set(this.QueryArray, key, '');
- // // 濡傛灉閫変腑鐨勬槸鐗堟湰鍙凤紝鐩稿簲鐨勮緭鍏ユ鍙屽悜缁戝畾鍏崇郴涓� QueryArray.revisionValue
- // this.$set(this.QueryArray, 'revisionValue', this.QueryArray[key]);
- // break;
- // case '4':
- // this.QueryArray[key] = '';
- // this.$set(this.QueryArray, key, '');
- // // 濡傛灉閫変腑鐨勬槸鐘舵�侊紝鐩稿簲鐨勮緭鍏ユ鍙屽悜缁戝畾鍏崇郴涓� QueryArray.lcStatus
- // this.$set(this.QueryArray, 'lcStatus', this.QueryArray[key]);
- // break;
- // }
- // },
AdvQueries() {
this.FindFormVisible = false
//濡傛灉鍏ㄩ儴涓虹┖ allEmpty涓簍rue
@@ -1133,7 +1250,6 @@
});
} else {
this.CloneinnerVisible=true;
-
}
},
//鐐瑰嚮浠庡叾瀹冩ā鏉垮厠闅�
@@ -1188,6 +1304,27 @@
this.FormLoing = false
}, 600);
},
+ upAndStopAndStart(row, type) {
+ this.$confirm(this.upAndStopAndStartData[type]["tip"], "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }).then(() => {
+ this.$set(row, this.upAndStopAndStartData[type]["load"], true)
+ const { ts, oid } = row;
+ this.upAndStopAndStartData[type]['funAPi']({ ts, oid }).then((res) => {
+ if (res.data.code === 200) {
+ this.$set(row, this.upAndStopAndStartData[type]["load"], false)
+ this.TemRefresh();
+ this.$message.success(
+ this.upAndStopAndStartData[type]["typeText"] + "鎴愬姛锛�"
+ );
+ }
+ }).catch(() => {
+ this.$set(row, this.upAndStopAndStartData[type]["load"], false)
+ });
+ });
+ },
}
}
</script>
--
Gitblit v1.9.3