From 42c17fe468ceea7e5eed7fec520b9858bed02e85 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 04 八月 2023 17:52:30 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS-WEB/src/components/template/Stage.vue | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue index 3959152..a4bd748 100644 --- a/Source/UBCS-WEB/src/components/template/Stage.vue +++ b/Source/UBCS-WEB/src/components/template/Stage.vue @@ -1,5 +1,5 @@ <template> - <div> + <div v-if="Formlist.length>0"> <avue-crud ref="crud" :table-loading="loading" :data="data" :option="option" :page.sync="page" @on-load="getDataList" @size-change="handleSizePage" @current-change="handleCurrentPage" @row-click="handleRowClick"> @@ -35,10 +35,18 @@ typeof: String, required: true, default: "" - } + }, + Formlist:{ + type:Array, + default:[] + } }, watch: { - + code: { + handler(newval, oldval) { + this.getDataList() + } + } }, data() { const options = { @@ -98,6 +106,7 @@ ], option: { ...options, + height: 383, column: [ { label: '妯℃澘缂栧彿', prop: 'modelKey' }, { label: '妯℃澘鍚嶇О', prop: 'modelName' }, @@ -127,17 +136,21 @@ }, // 鑾峰彇鍒楄〃 async getDataList() { - this.loading = false - const { pageSize, currentPage } = this.page - let param = { size: pageSize, current: currentPage } - const response = await getFlowpathList({ ...param, ...{ templateId: this.code } }) + this.loading = false + if (this.code) { + const {pageSize, currentPage} = this.page + 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 - this.page.total = data.total + console.log(response) + this.loading = false + const data = response.data.data + this.data = data.records + this.page.total = data.total } else this.loading = false + }else { + this.data=[] + } }, // 鑾峰彇闃舵鍒楄〃 async getStagelist() { @@ -162,9 +175,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 @@ -187,8 +201,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