From 41f11d5fd764a2bc7e8463a70bb340467d99a3ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 14 七月 2023 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/Stage.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 31ee7b5..8fe6216 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -8,7 +8,7 @@
@click="handleMaintenance(row, index)">缁存姢</el-button>
</template>
</avue-crud>
- <el-dialog title="妯℃澘闃舵" width="50%" append-to-body="true" :visible.sync="dialogNode">
+ <el-dialog title="妯℃澘闃舵" width="50%" append-to-body="true" :visible.sync="dialogNode">
<avue-crud ref="crud" :table-loading="loading" :data="stageData" :option="stageOption" @on-load="getStagelist"
@row-click="handleRowStageClick">
<template slot-scope="{type,size,row,index}" slot="menu">
@@ -106,6 +106,7 @@
},
stageOption: {
...options,
+ height:620,
column: [
{ label: '闃舵缂栧彿', prop: 'taskId' },
{ label: '闃舵鍚嶇О', prop: 'taskName' },
@@ -161,9 +162,10 @@
item = { oid, id, name, attributeGroup, ...{ checked: false } }
if (dataRight.length !== 0) {
dataRight.forEach(element => { if (item.id === element.attrId) item.checked = true });
- return item
}
+ return item
})
+ console.log(datas)
let dataValue = datas.map(item => item.checked ? item.oid : undefined)
this.attributeValue = dataValue.filter(item => item)
this.attributeData = datas
@@ -186,8 +188,11 @@
handleMaintenance(row) {
console.log(row)
this.dialogNode = true
+ this.modelKey = row.modelKey
this.saveParam.modelKey = row.modelKey
+ this.getStagelist()
},
+ // 缁存姢
handleMaintenanceTransfer(row) {
this.saveParam.taskId = row.taskId
this.saveParam.taskName = row.taskName
--
Gitblit v1.9.3