From 101e8e9738e4bfe0ef7a5170d117b47bf901b8f6 Mon Sep 17 00:00:00 2001 From: ludc <pUXmgxCf6A> Date: 星期一, 29 五月 2023 11:29:48 +0800 Subject: [PATCH] 集团主模型发布接口方法移植开发 --- Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 335 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 281 insertions(+), 54 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue index a867a7d..f3d1fd1 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue @@ -7,15 +7,11 @@ <div> <div style="display: flex;justify-content: space-around"> <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button> - <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button> - <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button> - <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button> - </div> - <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px"> - <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button> <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button> <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button> <el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button> + </div> + <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px"> </div> </div> <!-- 鏍戣妭鐐规坊鍔犲璇濇--> @@ -53,16 +49,15 @@ </el-dialog> <!-- 淇敼瀵硅瘽妗�--> <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被"> - <classifyTreeform ref="childForm" :TreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform> + <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform> </el-dialog> - <avue-tree ref="tree" v-model="TreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" + <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false" :option="Treeoption" style="height: 80.5vh;padding-top: 5px;padding-bottom: 30px" @node-click=" nodeClick" @check-change="checkChange" > </avue-tree> - </basic-container> </el-aside> <el-main> @@ -70,19 +65,28 @@ <!-- 鍙充晶琛ㄦ牸--> <avue-tabs :option="tabOption" @change="handleChange"></avue-tabs> <span v-if="type.prop==='tab1'"> - <basic-container> + <classifyTreeform ref="childForm" :TreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform> + </span> + <span v-else-if="type.prop==='tab2'"> + <basic-container> <avue-crud v-model="crudForm" v-loading="FormLoing" :data="this.Formlist" :option="this.crudTreeOption" @row-save="CrudRowSave" @row-del="CrudRowDel" @row-update="CrudRowUpdata" + :before-close="beforeClose" > <template slot="menuLeft"> <el-button plain size="small" type="primary" @click="FindFormVisible = true;">鏌ヨ</el-button> <el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button> - <el-button plain size="small" type="primary">浠庡叾瀹冩ā鏉垮厠闅�</el-button> + <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button> + <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button> + <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button> + <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button> + <el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button> <div style="display: inline-block"> <el-input v-model="FindText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small" @keyup.enter.native="EnterFind"></el-input></div> + <!-- 鏌ヨ瀵硅瘽妗�--> <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ"> <div> <el-button size="small" type="primary" @click="AdvQueries">鏌ヨ</el-button> @@ -91,7 +95,8 @@ <div style="padding-left: 80px;margin-top: 15px;"> <template v-for="(value, key) in FindSelect"> <div style="display: flex;justify-content: space-around;width: 85%;margin-bottom: 15px"> - <el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%" @change="handleSelectChange(key)"> + <el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%" + @change="handleSelectChange(key)"> <el-option label="妯℃澘缂栧彿" value="0"></el-option> <el-option label="妯℃澘鍚嶇О" value="1"></el-option> <el-option label="妯℃澘鎻忚堪" value="2"></el-option> @@ -104,17 +109,66 @@ </el-select> <el-input v-model="QueryArray[key]" style="width: 49%"></el-input> <span> <i class="el-icon-delete" style="font-size: 22px;margin-top:8px;margin-left: 10px"/></span> - </div> - </template> -</div> + </div> + </template> + </div> </el-dialog> + <!-- 妯℃澘鍏嬮殕 --> + <el-dialog :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘"> + <el-container> + <el-aside width="300px"> + <div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div> + <!-- 鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁--> + <avue-tree ref="tree" v-model="TreeAvueform" v-loading="loading" :data="Treedata" + :defaultExpandAll="false" + :option="Treeoption" + style="height: 50.5vh;margin-right: 10px" + @node-click="ClonenodeClick" + > + </avue-tree> + </el-aside> + <el-container> + <el-main> + <div style="padding-left: 10px;height: 50.5vh"> + <div style="margin: 8px 0;display: flex"> + <el-select v-model="Clonevalue" size="small" style="width: 130px;"> + <el-option + v-for="item in this.CloneSelectOptions" + :key="item.value" + :label="item.label" + :value="item.value"> + </el-option> + </el-select> + <el-input v-model="CloneFind" size="small" style="width: 40%;margin-left: 15px" placeholder="杈撳叆鍊煎悗鎸夊洖杞﹁繘琛屾ā绯婃煡璇�"></el-input> + <el-button size="small" type="primary" plain style="margin-left: 10px" @click="CloneEnterFind" @keyup.enter.native="CloneEnterFind">鏌ヨ</el-button> + </div> + <avue-crud v-model="ClonecrudForm" v-loading="FormLoing" :data="this.CloneFormlist" + :option="this.ClonecrudTreeOption" + @selection-change="selectionChange" + ></avue-crud> + </div> + </el-main> + </el-container> + </el-container > + <div style="display: flex; justify-content: flex-end; align-items: center;margin-top: 10px" > + <el-button size="small " type="primary" @click="Clonehandler">纭畾</el-button> + <el-button size="small" @click="CloneVisible=false" >鍙栨秷</el-button> + </div> + <el-dialog + width="30%" + title="鍏嬮殕妯℃澘" + :visible.sync="CloneinnerVisible" + append-to-body> + <div> + <avue-form :option="CloneOption" @submit="Clonesubmit" v-model="CloneModel"></avue-form> + </div> + </el-dialog> + </el-dialog> </template> </avue-crud> + </basic-container> - <templatePro :ProData="this.ProData"></templatePro> - </span> - <span v-else-if="type.prop==='tab2'"> - <classifyTreeform ref="childForm" :TreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform> + <templatePro :ProData="this.ProData"></templatePro> </span> </basic-container> </el-main> @@ -140,8 +194,10 @@ gridCodeClassifyFindTemplate, addSave, deleteData, - editSave + editSave, + copy } from "@/api/template/templateAttr"; +import done from "@/views/work/done"; export default { name: "classifyTrees.vue", @@ -157,6 +213,9 @@ FindText: "", //楂樼骇鏌ヨ瀵硅瘽妗� FindFormVisible: false, + //鍏嬮殕妯℃澘瀵硅瘽妗� + CloneVisible: false, + CloneinnerVisible:false, //楂樼骇鏌ヨ涓嬫媺妗� FindSelect: { id: "0", @@ -185,6 +244,7 @@ TreeAddFormVisible: false, //褰撳墠鐐瑰嚮椤� nodeClickList: "", + ClonenodeClickList:"", //鍒嗙被鍜屼富棰樺簱鐘舵�� TreeFlag: false, //鏍戝姞杞� @@ -205,7 +265,10 @@ }, //avue-tree鏁版嵁锛屾殏鏃舵病鏈変綔鐢紝閲岄潰鍔熻兘鐢╡lement鍐欎簡锛屽彧鐢╝vue鐨勪竴涓爲缁勪欢涓嶇敤鍐呯疆琛ㄥ崟浜嗐�� TreeAvueform: {}, + //鍏嬮殕鏍� + CloneTreeAvueform:{}, Treedata: [], + CloneTreedata:[], Treeoption: { addBtn: false, editBtn: false, @@ -215,19 +278,101 @@ // //杩欎釜鏄閫� // multiple: true, }, + //妯℃澘绠$悊form crudForm: "", - //鍔ㄦ�佸垏鎹㈠鐞嗚繃鐨勮〃鏍兼暟鎹� + //鍏嬮殕妯℃澘form + ClonecrudForm: "", + //鍔ㄦ�佸垏鎹㈠鐞嗚繃鐨勬ā鏉胯〃鏍兼暟鎹� Formlist: [], + //鍏嬮殕妯℃澘鏁版嵁 + CloneFormlist: [], + //鍏嬮殕妯℃澘涓嬫媺妗唙alue + Clonevalue: "0", + //鍏嬮殕妯℃澘鎼滅储杈撳叆妗� + CloneFind:"", + //鍏嬮殕妯℃澘涓嬫媺妗嗘暟鎹� + CloneSelectOptions: [{ + value: '0', + label: '妯℃澘缂栧彿' + }, + { + value: '1', + label: '妯℃澘鍚嶇О' + }, + ], + //鍏嬮殕妯℃澘纭琛ㄥ崟鏁版嵁 + CloneOption:{ + column:[ + { + label:'妯℃澘缂栧彿', + prop:'id', + rules: [{ + required: true, + message: "璇疯緭鍏ユā鏉跨紪鍙�", + trigger: "blur" + }] + }, { + label:'妯℃澘鍚嶇О', + prop:'name', + rules: [{ + required: true, + message: "璇疯緭鍏ユā鏉垮悕绉�", + trigger: "blur" + }] + }, + { + label:'鎻忚堪', + prop:'desc', + type:'textarea', + span:24 + } + ] + }, + //鍏嬮殕妯℃澘鍙屽悜缁戝畾鏁版嵁 + CloneModel:[], + CloneSelect:[], + //鍏嬮殕妯℃澘option + ClonecrudTreeOption: { + index: true, + border: true, + menu: false, + addBtn: false, + selection: true, + header: false, + height: 430, + column: [ + { + label: "妯℃澘缂栧彿", + prop: "id" + }, + { + label: "妯℃澘鍚嶇О", + prop: "name", + }, + { + label: "妯℃澘鎻忚堪", + prop: "description" + }, + { + label: "鐗堟湰鍙�", + prop: "revisionSeq", + display: false + }, + { + label: "鐘舵��", + prop: "lcStatusText", + display: false + } + ] + }, //tab鐘舵�� type: {}, //Tab閰嶇疆椤� tabOption: { column: [{ - icon: 'el-icon-info', label: '鍩烘湰淇℃伅', prop: 'tab1', }, { - icon: 'el-icon-warning', label: '妯℃澘绠$悊', prop: 'tab2', }] @@ -247,7 +392,7 @@ ], //浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁 TreeList: {}, - codeClassifyOid:"" + codeClassifyOid: "" } }, //tab鏍忛粯璁ゆ槸琛ㄦ牸 @@ -260,18 +405,20 @@ getAttr() { getAtrrList().then(res => { this.Treedata = res.data; - this.Treedata.forEach(() => { + this.CloneTreedata = res.data; + this.Treedata.forEach((item) => { for (let i = 0; i < this.Treedata.length; i++) { this.Treedata[i].value = i; } }) //璋冪敤淇敼灞炴�у悕鏂规硶 this.ModifyProperties(this.Treedata, 'text', 'label'); + this.ModifyProperties(this.CloneTreedata, 'text', 'label'); }).catch(res => { this.$message.error(res) }) }, - //瀹氫箟涓�涓慨鏀瑰璞″睘鎬у悕鐨勬柟娉� 杩欓噷鍒敼锛侊紒锛佸ソ鍍忔槸鍚庡彴鎺ュ彛鏁版嵁瀛楁涓嶄竴鑷达紝娣诲姞鐨勬柟娉曘�傚叿浣撲粈涔堝師鍥犳垜涔熷繕璁颁簡 + //瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉� ModifyProperties(obj, oldName, newName) { for (let key in obj) { if (key === oldName) { @@ -448,7 +595,7 @@ async nodeClick(data) { //瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠$悊琛ㄦ牸閲岄潰鐨刼id this.nodeClickList = data - //console.log(data.oid) + console.log(data.oid) try { await TreeObjcet(data.oid).then(res => { this.FlagObj = res.data.data @@ -456,14 +603,13 @@ this.$message.error(res) }) //妯℃澘绠$悊琛ㄦ牸鏁版嵁 - await gridCodeClassifyTemplate({'conditionMap[codeClassifyOid]':data.oid }).then(res => { + await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res => { this.Formlist = res.data.data.filter(item => { if (item.codeclassifyoid != "") { - this.codeClassifyOid=item.codeclassifyoid + this.codeClassifyOid = item.codeclassifyoid return item.codeclassifyoid == this.nodeClickList.oid } }) - console.log("formlist", this.Formlist) gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => { this.ProData = res.data.data console.log(this.ProData) @@ -484,9 +630,22 @@ console.log(error) } }, + //鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁 + async ClonenodeClick(data){ + this.ClonenodeClickList=data; + console.log("aaa",this.ClonenodeClickList.oid) + await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res=>{ + this.CloneFormlist = res.data.data.filter(item => { + if (item.codeclassifyoid != "") { + this.codeClassifyOid = item.codeclassifyoid + return item.codeclassifyoid == this.ClonenodeClickList.oid + } + }) + }) + }, //tab鏍忓垏鎹� handleChange(column) { - this.type = column + this.type = column; }, // //楂樼骇鏌ヨ鎸夐挳 // handleSelectChange(key) { @@ -548,25 +707,30 @@ } }, //妯℃澘绠$悊娓叉煋 - CrudRend(){ - gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]':this.nodeClickList.oid }).then(res=>{ + CrudRend() { + gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => { this.Formlist = res.data.data }) }, + //妯℃澘绠$悊琛ㄦ牸娣诲姞 - CrudRowSave(row){ - if(this.nodeClickList.length <= 0){ + CrudRowSave(row,done) { + if (this.nodeClickList.length <= 0) { this.$message({ type: 'warning', message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!' }); - }else { - console.log(this.nodeClickList) - let codeClassifyOid=this.codeClassifyOid - this.$set(row,"codeclassifyoid",codeClassifyOid) - addSave(row).then(res=>{ + } else { + let codeClassifyOid = this.codeClassifyOid + this.$set(row, "codeclassifyoid", codeClassifyOid) + addSave(row).then(res => { + this.$message({ + type: "success", + message: "娣诲姞鎴愬姛!" + }); + done(row) this.CrudRend() - }).catch(res=>{ + }).catch(res => { this.$message({ type: 'info', message: res @@ -575,21 +739,23 @@ } }, //妯℃澘绠$悊淇敼 - CrudRowUpdata(row){ - editSave(row).then(()=>{ + CrudRowUpdata(row,index,done) { + editSave(row).then((res) => { this.CrudRend() - }).catch(res=>{ this.$message({ - type: 'info', - message: res + type: "success", + message: "鎿嶄綔鎴愬姛!" }); + done() + }).catch(res => { + console.log(res) }) }, //妯℃澘绠$悊鍒犻櫎 - CrudRowDel(row){ - deleteData(row).then(res=>{ + CrudRowDel(row) { + deleteData(row).then(res => { this.CrudRend() - }).catch(res=>{ + }).catch(res => { this.$message({ type: 'info', message: res @@ -611,11 +777,76 @@ }) } }, + //鍏嬮殕妯℃澘鏌ヨ + CloneEnterFind(){ + gridCodeClassifyTemplate().then(res => { + this.CloneFormlist = res.data.data.filter(item => { + if(this.Clonevalue == 0){ + return item.id.includes(this.CloneFind) + }else if(this.Clonevalue == 1){ + return item.name.includes(this.CloneFind) + } + }) + }) + }, + //鍏嬮殕妯℃澘閫夋嫨纭畾 + Clonehandler(){ + if(this.CloneSelect.length <= 0){ + this.$message({ + type: 'warning', + message: '璇烽�夋嫨瑕佸厠闅嗙殑妯℃澘!' + }); + }else if(this.CloneSelect.length >1){ + this.$message({ + type: 'warning', + message: '鍙兘閫夋嫨涓�鏉℃暟鎹�!' + }); + } else { + this.CloneinnerVisible=true; + + } + }, + //鐐瑰嚮浠庡叾瀹冩ā鏉垮厠闅� + CloneBtn(){ + if(this.nodeClickList.length <= 0){ + this.$message({ + type: 'warning', + message: '璇峰厛浠嶽涓婚搴撳垎绫汇�戞爲涓婇�夋嫨涓�鏉℃暟鎹�!' + }); + }else { + this.CloneVisible=true; + } + }, + //鍏嬮殕妯℃澘鍗曢�夋鏀瑰彉 + selectionChange(row){ + this.CloneSelect=row; + //鍙屽悜缁戝畾锛屾彁浜よ〃鍗曡緭鍏ユ鍥炲~涓婂綋鍓嶉�夋嫨鐨勬暟鎹� + this.CloneModel.id=row[0].id; + this.CloneModel.name=row[0].name; + //杩欓噷鏈夌偣缁曪紝CloneSelect鏄垜閫夋嫨妗嗛�夋嫨鐨勬暟鎹�傜瓑浜巘his.nodeClickList.oid鏄洜涓猴紝鍏嬮殕妯℃澘浼犻�掓暟鎹鎶婂綋鍓嶉�夋嫨鏍戠殑oid浼犻�掔粰鍚庣銆傝�屼笉鏄綋鍓嶈鍏嬮殕妯℃澘鐨刼id + this.CloneSelect[0].codeclassifyoid=this.nodeClickList.oid + }, + //鍏嬮殕琛ㄥ崟鎻愪氦 + Clonesubmit(row,done){ + //閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹� + this.CloneSelect[0].id=this.CloneModel.id; + this.CloneSelect[0].name=this.CloneModel.name; + copy(this.CloneSelect[0]).then(res=>{ + //鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆� + this.CloneinnerVisible=false + this.CloneVisible=false + this.$message.success("澶嶅埗鎴愬姛") + this.CrudRend() + done(row) + }).catch(res=>{ + done(res) + }) + }, //鍒锋柊 TemRefresh() { this.FormLoing = true if (this.nodeClickList.oid != "") { - gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]':this.nodeClickList.oid}).then(res => { + gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => { this.Formlist = res.data.data.filter(item => { return item.codeclassifyoid == this.nodeClickList.oid }) @@ -626,10 +857,6 @@ setTimeout(() => { this.FormLoing = false }, 600); - }, - // 宸︽爲澶氶�� - checkChange(val) { - console.log(val) }, } } -- Gitblit v1.9.3