From 145aca4ce40cbdb14f940975da44db63eb5c497f Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 26 七月 2023 17:38:38 +0800
Subject: [PATCH] fjl
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 84 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index b57d4e4..50f38a3 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -3,7 +3,7 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside >
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
+ <basic-container style="overflow:hidden;">
<div>
<div>
<div style="display: flex; flex-direction: column;">
@@ -33,14 +33,14 @@
<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>
</el-form-item>
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
<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="TreeFlagCode==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" autocomplete="off" @focus="Keyfouce"
@@ -62,7 +62,7 @@
</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"
+ style="height: calc(100vh - 230px);"
@node-click="nodeClick"
class="classifyTree"
>
@@ -71,7 +71,7 @@
</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'">
@@ -124,10 +124,10 @@
<div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div>
<!-- 鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁-->
<avue-tree v-model="TreeAvueform" v-loading="loading" :data="Treedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- style="height: 50.5vh;margin-right: 10px"
- @node-click="ClonenodeClick"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ style="height: 50.5vh;margin-right: 10px"
+ @node-click="ClonenodeClick"
>
</avue-tree>
</el-aside>
@@ -172,11 +172,12 @@
</template>
<template #menu="{ size, row ,index}">
<el-button type="text"
- v-if="row.lcStatus != 'Released'"
+ v-if="row.lcStatus == 'Editing'"
icon="el-icon-edit-outline "
- :size="size"
- @click="$refs.textCrud.rowEdit(row)">缂栬緫</el-button>
+ :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>
@@ -211,7 +212,7 @@
</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" :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>
@@ -351,7 +352,7 @@
masterSelectList:[],
masterName:"",
masterOid:"",
- //鍏抽敭灞炴��
+ //鍏抽敭灞炴�tmTypeId
KeydialogVisible:false,
KeyName:"",
KeyOid:"",
@@ -403,17 +404,11 @@
],
SelectValue:"",
SelectFInd:"",
- rules: {
- id: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
- ],
- name:[
- { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
- ]
- },
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
+ //褰撳墠閫変腑妯℃澘鐘舵��
+ crudLCStatus:'',
//琛ㄦ牸褰撳墠閫夋嫨鏁扮粍
crudArray:[],
//妯℃澘灞炴�у睍绀哄唴瀹�
@@ -475,6 +470,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: {},
@@ -625,13 +631,13 @@
},
stopLose: {
tip: "妯℃澘鍙湁鍙戝竷鐘舵�佹墠鑳借浣跨敤锛屾槸鍚︾‘瀹氬仠鐢紵",
- typeText: "鍋滅敤/澶辨晥",
+ typeText: "鍋滅敤",
funAPi: stopLose,
load: 'stopLoseLoad'
},
startRelease: {
tip: "鏄惁纭畾鍚敤/鍙戝竷杩欎釜妯℃澘锛屾ā鏉垮彧鏈夊彂甯冪姸鎬佹墠鑳借浣跨敤锛屾槸鍚︾户缁紵",
- typeText: "鍚敤/鍙戝竷",
+ typeText: "鍚敤",
funAPi: startRelease,
load: 'startReleaseLoad'
}
@@ -785,8 +791,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
@@ -897,33 +903,33 @@
const masterParameter={
'conditionMap[name]':this.SelectFInd
}
- this.btmdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.btmdefaultRend(masterParameter);
+ this.SelectValue="";
+ this.SelectFInd="";
}
},
//涓氬姟绫诲瀷澶氶��
btmSelect(row){
this.btmSelectList=row;
this.btmName=row[0].name;
- this.btmOid=row[0].oid;
+ this.btmOid=row[0].id;
},
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- // console.log(res)
this.BtmData=res.data.data.records
})
},
//瀛愪紶鐖�
MasterHandler(val){
- this.TreeList=val
+ this.TreeList=val;
},
//琛屽崟閫変簨浠�
selectHandle(selection,row){
this.crudOid=row.oid;
+ this.crudLCStatus=row.lcStatus;
this.crudArray=selection;
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
this.ProData = res.data.data;
}).catch(res => {
this.$message.error(res)
@@ -1222,6 +1228,7 @@
});
} else {
this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
+ console.log(this.nodeClickList)
addSave(row).then(() => {
this.$message({
type: "success",
@@ -1389,6 +1396,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