From 02d6ac5bc723b3001d559a87eb8959f6e0e2abba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 10:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/template/Stage.vue | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index de40033..508d8fb 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -1,14 +1,16 @@
<template>
<div v-if="Formlist.length>0">
- <avue-crud ref="crud" :data="data" :option="option" :page.sync="page" :table-loading="loading"
- @on-load="getDataList" @size-change="handleSizePage" @current-change="handleCurrentPage"
- @row-click="handleRowClick">
- <template slot="menu" slot-scope="{type,size,row,index}">
- <el-button :size="size" :type="type" icon="el-icon-check"
- @click="handleMaintenance(row, index)">缁存姢
- </el-button>
- </template>
- </avue-crud>
+ <div style="height: calc(100vh - 553px)">
+ <avue-crud ref="crud" :data="data" :option="option" :page.sync="page" :table-loading="loading"
+ @on-load="getDataList" @size-change="handleSizePage" @current-change="handleCurrentPage"
+ @row-click="handleRowClick">
+ <template slot="menu" slot-scope="{type,size,row,index}">
+ <el-button :size="size" :type="type" icon="el-icon-check"
+ @click="handleMaintenance(row, index)">缁存姢
+ </el-button>
+ </template>
+ </avue-crud>
+ </div>
<el-dialog :visible.sync="dialogNode" append-to-body="true" title="妯℃澘闃舵" width="50%">
<avue-crud ref="crud" :data="stageData" :option="stageOption" :table-loading="loading" @on-load="getStagelist"
@row-click="handleRowStageClick">
@@ -109,7 +111,7 @@
],
option: {
...options,
- height: 383,
+ height: 'auto',
column: [
{label: '妯℃澘缂栧彿', prop: 'modelKey'},
{label: '妯℃澘鍚嶇О', prop: 'modelName'},
@@ -145,7 +147,6 @@
let param = {size: pageSize, current: currentPage}
const response = await getFlowpathList({...param, ...{templateId: this.code}})
if (response.status === 200) {
- console.log(response)
this.loading = false
const data = response.data.data
this.data = data.records
@@ -158,11 +159,9 @@
// 鑾峰彇闃舵鍒楄〃
async getStagelist() {
this.loading = false
- console.log(this.modelKey)
const response = await stagelist({modelKey: this.modelKey})
if (response.status === 200) {
this.loading = false
- console.log(response.data)
this.stageData = response.data.data
} else this.loading = false
},
@@ -187,7 +186,6 @@
}
return item
})
- console.log(datas)
let dataValue = datas.map(item => item.checked ? item.oid : undefined)
this.attributeValue = dataValue.filter(item => item)
this.attributeData = datas
@@ -212,7 +210,6 @@
},
// 缁存姢
handleMaintenance(row) {
- console.log(row)
this.dialogNode = true
this.modelKey = row.modelKey
this.saveParam.modelKey = row.modelKey
@@ -228,7 +225,6 @@
})
},
handleRowClick(row) {
- console.log(row)
this.modelKey = row.modelKey
this.saveParam.modelKey = row.modelKey
this.dialogNode = true
@@ -242,7 +238,6 @@
})
},
async handleSave(event) {
- console.log(event)
const data = event.map(item => {
const {id, name, attributeGroup} = item
return {attrId: id, attrName: name, attrGroup: attributeGroup}
@@ -252,12 +247,9 @@
processStageAttr: data,
...this.saveParam
}
- console.log(this.saveParam)
- console.log(data)
const response = await attributeSave(param)
if (response.status === 200) {
// loading()
- console.log(response)
this.$message({
type: 'success',
message: '鏂板鏁版嵁鎴愬姛锛�'
--
Gitblit v1.9.3