From de42c8e66e2303b46741fa66dc72f4b4183f8084 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 12:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 50f38a3..63be185 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -83,9 +83,12 @@
@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>
@@ -210,9 +213,8 @@
>
</template>
</avue-crud>
-
</basic-container>
- <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudLCStatus="this.crudLCStatus" :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>
@@ -344,6 +346,7 @@
inject: ["crudTreeData"],
data() {
return {
+ selectRow:'',
//鏍戣妭鐐规樉绀洪殣钘�
TreeFlagCode:false,
//缂栫爜瑙勫垯
@@ -666,11 +669,16 @@
index: true,
border: true,
height:180,
- selection:true,
addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
editBtn:false,
delBtn:false,
column: [
+ {
+ label: '',
+ prop: 'radio',
+ width: 60,
+ hide: false,
+ },
{
label: "妯℃澘缂栧彿",
prop: "id",
@@ -708,6 +716,14 @@
}
},
methods: {
+ /** 瀵煎叆 */
+ ImportExcel(){
+
+ },
+ /** 瀵煎嚭 */
+ ExportExcel(){
+
+ },
//妯℃澘绠＄悊宸插彂甯冪紪杈�
// checkShowEditBtn() {
// this.showEditBtn = this.Formlist.some(item => item.lcStatus === 'Released');
@@ -924,13 +940,32 @@
MasterHandler(val){
this.TreeList=val;
},
- //琛屽崟閫変簨浠�
- selectHandle(selection,row){
+ rowHandle(row, column){
+ this.selectRow=row.$index;
this.crudOid=row.oid;
this.crudLCStatus=row.lcStatus;
- this.crudArray=selection;
+ 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)
})
--
Gitblit v1.9.3