From 6480b739b3aa4221ffc3a2505b78248a562cee15 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 28 七月 2023 11:00:03 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 335 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 267 insertions(+), 68 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 55b44b4..63be185 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -2,16 +2,23 @@
<template>
<el-container>
<!-- 宸︿晶鑿滃崟-->
- <el-aside>
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
+ <el-aside >
+ <basic-container style="overflow:hidden;">
<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="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; flex-direction: column;">
+ <div style="display: flex;">
+ <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="flushed">鍒锋柊</el-button>
+ </div>
+ <div style="display: flex; margin-top: 10px">
+ <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="ImportExcel">瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
+ </div>
</div>
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</div>
@@ -25,6 +32,9 @@
</el-form-item>
<el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" style="display: inline-block" prop="name">
<el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
+ </el-form-item>
+ <el-form-item label="瀛樺偍鐨勪笟鍔＄被鍨嬶細" label-width="150px" v-if="TreeFlagCode==false" prop="btmTypeName">
+ <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.description" autocomplete="off" style="width: 585px"></el-input>
@@ -48,38 +58,40 @@
</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="TreeFlagCode" ::nodeClickList="nodeClickList" @referTreeForm="referTreeForm" @flushed="flushed"></classifyTreeform>
</el-dialog>
<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"
+ style="height: calc(100vh - 230px);"
+ @node-click="nodeClick"
+ class="classifyTree"
>
</avue-tree>
+ </div>
</basic-container>
</el-aside>
<el-main>
- <basic-container style="height: 85vh; max-height: 155vh; ">
+ <basic-container style="height: calc(100vh - 150px);">
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'" ></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"
+ <avue-crud ref="textCrud" v-model="crudForm" v-loading="FormLoing" :data="this.Formlist" :option="this.crudTreeOption"
@row-save="CrudRowSave"
@row-del="CrudRowDel"
@row-update="CrudRowUpdata"
- :before-close="beforeClose"
- @select="selectHandle"
+ @row-click="rowHandle"
>
+ <template slot="radio" slot-scope="{row}">
+ <el-radio v-model="selectRow" :label="row.$index" style="padding-left: 10px !important;">{{''}}</el-radio>
+ </template>
+
<template slot="menuLeft">
<el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
<el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</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>
<!-- 鏌ヨ瀵硅瘽妗�-->
<el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
@@ -114,11 +126,11 @@
<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 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>
@@ -140,6 +152,7 @@
<avue-crud v-model="ClonecrudForm" v-loading="FormLoing" :data="this.CloneFormlist"
:option="this.ClonecrudTreeOption"
@selection-change="selectionChange"
+
></avue-crud>
</div>
</el-main>
@@ -160,7 +173,17 @@
</el-dialog>
</el-dialog>
</template>
- <template #menu="{ size, row }">
+ <template #menu="{ size, row ,index}">
+ <el-button type="text"
+ v-if="row.lcStatus == 'Editing'"
+ icon="el-icon-edit-outline "
+ :size="size"
+ @click="$refs.textCrud.rowEdit(row)">缂栬緫</el-button>
+ <el-button type="text"
+ v-if="row.lcStatus == 'Editing'"
+ icon="el-icon-delete"
+ :size="size"
+ @click="$refs.textCrud.rowDel(row,index)">鍒犻櫎</el-button>
<el-button
v-show="row.lcStatus === 'Released'"
@click="upAndStopAndStart(row, 'upVersion')"
@@ -190,9 +213,8 @@
>
</template>
</avue-crud>
-
</basic-container>
- <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
+ <templatePro :ProData="this.ProData" :rowIndex="this.selectRow" :crudOid="this.crudOid" :crudLCStatus="this.crudLCStatus" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
</span>
<!-- 缂栫爜瑙勫垯-->
<el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
@@ -266,6 +288,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>
@@ -297,16 +343,19 @@
//浣跨敤inject鎺ユ敹鍙傛暟
//Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐� 閰嶇疆椤� crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭
//Treeform鍙充晶琛ㄥ崟閰嶇疆椤�
- inject: [, "crudTreeData"],
+ inject: ["crudTreeData"],
data() {
return {
+ selectRow:'',
+ //鏍戣妭鐐规樉绀洪殣钘�
+ TreeFlagCode:false,
//缂栫爜瑙勫垯
MasterdialogVisible:false,
masterData:[],
masterSelectList:[],
masterName:"",
masterOid:"",
- //鍏抽敭灞炴��
+ //鍏抽敭灞炴�tmTypeId
KeydialogVisible:false,
KeyName:"",
KeyOid:"",
@@ -318,6 +367,12 @@
simData:[],
SimidialogVisible:false,
simSelectList:[],
+ //涓氬姟绫诲瀷
+ btmName:"",
+ btmOid:"",
+ BtmData:[],
+ BtmdialogVisible:false,
+ btmSelectList:[],
masterOption:{
addBtn:false,
index:true,
@@ -352,17 +407,11 @@
],
SelectValue:"",
SelectFInd:"",
- rules: {
- id: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
- ],
- name:[
- { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
- ]
- },
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
+ //褰撳墠閫変腑妯℃澘鐘舵��
+ crudLCStatus:'',
//琛ㄦ牸褰撳墠閫夋嫨鏁扮粍
crudArray:[],
//妯℃澘灞炴�у睍绀哄唴瀹�
@@ -424,6 +473,17 @@
codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
btmTypeName: ""
+ },
+ rules: {
+ id: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
+ ],
+ name:[
+ { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
+ ],
+ btmTypeName:[
+ { required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷', trigger: 'blur' },
+ ]
},
//avue-tree鏁版嵁锛屾殏鏃舵病鏈変綔鐢紝閲岄潰鍔熻兘鐢╡lement鍐欎簡锛屽彧鐢╝vue鐨勪竴涓爲缁勪欢涓嶇敤鍐呯疆琛ㄥ崟浜嗐��
TreeAvueform: {},
@@ -505,11 +565,21 @@
column: [
{
label: "妯℃澘缂栧彿",
- prop: "id"
+ prop: "id",
+ rules: [{
+ required: true,
+ message: "妯℃澘缂栧彿",
+ trigger: "blur"
+ }]
},
{
label: "妯℃澘鍚嶇О",
prop: "name",
+ rules: [{
+ required: true,
+ message: "妯℃澘鍚嶇О",
+ trigger: "blur"
+ }]
},
{
label: "妯℃澘鎻忚堪",
@@ -564,23 +634,34 @@
},
stopLose: {
tip: "妯℃澘鍙湁鍙戝竷鐘舵�佹墠鑳借浣跨敤锛屾槸鍚︾‘瀹氬仠鐢紵",
- typeText: "鍋滅敤/澶辨晥",
+ typeText: "鍋滅敤",
funAPi: stopLose,
load: 'stopLoseLoad'
},
startRelease: {
tip: "鏄惁纭畾鍚敤/鍙戝竷杩欎釜妯℃澘锛屾ā鏉垮彧鏈夊彂甯冪姸鎬佹墠鑳借浣跨敤锛屾槸鍚︾户缁紵",
- typeText: "鍚敤/鍙戝竷",
+ typeText: "鍚敤",
funAPi: startRelease,
load: 'startReleaseLoad'
}
- }
+ },
+ //妯℃澘绠＄悊缂栬緫
+ showEditBtn:false,
}
},
//tab鏍忛粯璁ゆ槸琛ㄦ牸
mounted() {
this.type = this.tabOption.column[0];
this.getAttr();
+ const treeEle = this.$refs.tree.$el
+ treeEle.addEventListener('click', (e) => {
+ if (e.target.nodeName !== 'SPAN') {
+ this.$refs.tree.setCurrentKey(null)
+ this.nodeClickList = {}
+ this.TreeList=[]
+ this.TreeFlagCode=false;
+ }
+ }, true)
},
computed:{
crudTreeOption(){
@@ -588,16 +669,33 @@
index: true,
border: true,
height:180,
- selection:true,
addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
+ editBtn:false,
+ delBtn:false,
column: [
{
- label: "妯℃澘缂栧彿",
- prop: "id"
+ label: '',
+ prop: 'radio',
+ width: 60,
+ hide: false,
},
{
- label:"妯℃澘鍚嶇О",
- prop:"name"
+ label: "妯℃澘缂栧彿",
+ prop: "id",
+ rules: [{
+ required: true,
+ message: "妯℃澘缂栧彿",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "妯℃澘鍚嶇О",
+ prop: "name",
+ rules: [{
+ required: true,
+ message: "妯℃澘鍚嶇О",
+ trigger: "blur"
+ }]
},
{
label: "妯℃澘鎻忚堪",
@@ -618,6 +716,18 @@
}
},
methods: {
+ /** 瀵煎叆 */
+ ImportExcel(){
+
+ },
+ /** 瀵煎嚭 */
+ ExportExcel(){
+
+ },
+ //妯℃澘绠＄悊宸插彂甯冪紪杈�
+ // checkShowEditBtn() {
+ // this.showEditBtn = this.Formlist.some(item => item.lcStatus === 'Released');
+ // },
//缂栫爜瑙勫垯澶辩劍
CodeFoucus(){
this.MasterdialogVisible=true;
@@ -661,7 +771,6 @@
this.$set(this.TreeAddform,'codeRuleOidName',this.masterName)
this.$set(this.TreeAddform,'codeRuleOid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
}
},
//缂栫爜鎺ュ彛
@@ -689,7 +798,6 @@
this.KeySelectLIst=[]
this.$set(this.TreeAddform,'codeKeyAttrRepeatOidName',this.KeyName)
this.$set(this.TreeAddform,'codeKeyAttrRepeatOid',this.KeyOid)
- console.log(this.TreeAddform)
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -699,8 +807,8 @@
'conditionMap[id]':this.SelectFInd
}
this.KeydefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue="";
+ this.SelectFInd="";
}else if(this.SelectValue == 'name'){
const masterParameter={
'conditionMap[name]':this.SelectFInd
@@ -768,7 +876,6 @@
this.simSelectList=row;
this.simName=row[0].name;
this.simOid=row[0].oid;
- console.log('oid',this.oid)
},
//鐩镐技椤归」鎺ュ彛
simdefaultRend(){
@@ -780,16 +887,85 @@
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.TreeAddform,'btmTypeName',this.btmName)
+ this.$set(this.TreeAddform,'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].id;
+ },
+ //涓氬姟绫诲瀷鎺ュ彛
+ btmdefaultRend(masterParameter){
+ referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
+ this.BtmData=res.data.data.records
+ })
+ },
//瀛愪紶鐖�
MasterHandler(val){
- this.TreeList=val
+ this.TreeList=val;
},
- //琛屽崟閫変簨浠�
- selectHandle(selection,row){
+ rowHandle(row, column){
+ this.selectRow=row.$index;
this.crudOid=row.oid;
- this.crudArray=selection;
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ this.crudLCStatus=row.lcStatus;
+ this.crudArray.push(row);
+ console.log(row.$index)
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
this.ProData = res.data.data;
+ //鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
+ this.ProData = res.data.data.map((item) => {
+ //濡傛灉鍒嗙被娉ㄥ叆classifyInvokeAttr涓虹┖璇存槑鏄垵濮嬬姸鎬�
+ if(item.classifyInvokeAttr !== ''){
+ if (!item.hasOwnProperty('classifyInvokeText')) { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
+ item = {
+ ...item,
+ classifyInvokeText: {
+ "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
+ "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
+ "灞傜骇璁剧疆": item.classifyInvokeLevel,
+ "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
+ }
+ };
+ }
+ }
+ return item;
+ });
}).catch(res => {
this.$message.error(res)
})
@@ -833,18 +1009,19 @@
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
const data = this.TreeAddform;
- data.btmTypeName= this.TreeList.btmtypename
+ // data.btmtypename= this.TreeList.btmtypename
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
- // console.log("data", data);
TreeSave(data)
.then(() => {
this.$message({
type: "success",
message: "娣诲姞鎴愬姛!",
});
+ Object.keys(this.TreeAddform).forEach(key => {
+ this.TreeAddform[key] = "";
+ });
this.getAttr();
this.TreeAddFormVisible = false;
- this.TreeAddform = "";
})
.catch((res) => {
this.$message({
@@ -911,14 +1088,13 @@
},
//淇敼鍥炲～
TreeEdit() {
- if (this.nodeClickList == "") {
+ if ( Object.keys(this.nodeClickList).length<1) {
this.$message({
type: 'warning',
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
});
} else {
this.TreeEditFormVisible = true;
- console.log(this.TreeList)
}
},
//鏍戝埛鏂�
@@ -991,6 +1167,9 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
+ if(data.parentId == ""){
+ this.TreeFlagCode=true;
+ }
this.nodeClickList = data
this.ProData=[]
try {
@@ -1011,14 +1190,25 @@
this.$message.error(res)
})
// 鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
- await getObjectByOid(this.nodeClickList.oid).then(res => {
- this.TreeList = res.data.data;
- }).catch(res => {
- this.$message.error(res)
- })
+ await getObjectByOid(this.nodeClickList.oid).then(res => {
+ this.TreeList = res.data.data;
+ }).catch(res => {
+ this.$message.error(res)
+ })
} catch (error) {
this.$message.error(error)
}
+ },
+ treeClick(e) {
+ console.log(e);
+ },
+ //鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
+ referTreeForm(){
+ getObjectByOid(this.nodeClickList.oid).then(res => {
+ this.TreeList = res.data.data;
+ }).catch(res => {
+ this.$message.error(res)
+ })
},
//鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁
async ClonenodeClick(data){
@@ -1073,6 +1263,7 @@
});
} else {
this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
+ console.log(this.nodeClickList)
addSave(row).then(() => {
this.$message({
type: "success",
@@ -1087,7 +1278,6 @@
});
})
}
- console.log('123',this.codeClassifyOid)
},
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
@@ -1241,6 +1431,15 @@
</script>
<style lang="scss" scoped>
+.el-container{
+ height: 100%;
+}
+.el-aside {
+ height: calc(100% - 30px);
+}
+.el-main {
+ height: calc(100% - 30px);
+}
.el-form {
display: flex;
flex-wrap: wrap; /* 璁剧疆鍙崲琛岋紝浠ヤ究鍦ㄥ皬灞忓箷璁惧涓婁娇鐢ㄥ琛屽竷灞� */
--
Gitblit v1.9.3