From d1a430e88df40d76558a14f890ac0dbd3181f3a0 Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期二, 06 九月 2022 14:30:14 +0800 Subject: [PATCH] 对接 --- src/views/goalManagement/targetDecompositionYear/index.vue | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/views/goalManagement/targetDecompositionYear/index.vue b/src/views/goalManagement/targetDecompositionYear/index.vue index bddd610..e840ca6 100644 --- a/src/views/goalManagement/targetDecompositionYear/index.vue +++ b/src/views/goalManagement/targetDecompositionYear/index.vue @@ -23,8 +23,9 @@ <div class="minCenter"> <div class="btns"> <div> - <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button> - <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button> + <!--<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>--> + <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain + @click="openD('修改', deletAll[0])">修改</el-button> <el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button> </div> </div> @@ -32,16 +33,16 @@ <el-table-column label="序号" align="center" type="index" width="70" /> <el-table-column type="selection" align="center" width="55" /> <el-table-column type="expand"> - <template #default> + <template #default="scope"> <div class="tableC"> <el-tabs v-model="activeNames"> <el-tab-pane label="目标指标分解" name="1"> - <el-table :data="targetDivideDetailList" style="width: 100%"> - <el-table-column align="center" prop="dutyDepartmentId" label="责任部门" /> + <el-table :data="scope.row.targetDivideDetailList" style="width: 100%"> + <el-table-column align="center" prop="dutyDepartmentName" label="责任部门" /> <el-table-column align="center" prop="value" label="考核指标" /> - <el-table-column align="center" prop="makerDepartmentId" label="制定人部门" /> - <el-table-column align="center" prop="makeDate" label="制定日期" /> - <el-table-column align="center" prop="commitPersonId" label="上报人" /> + <el-table-column align="center" prop="makerDepartmentName" label="制定人部门" /> + <el-table-column align="center" prop="makeDate" :formatter="timeDate" label="制定日期" /> + <el-table-column align="center" prop="commitPersonName" label="上报人" /> </el-table> </el-tab-pane> </el-tabs> @@ -66,16 +67,17 @@ v-model:page-size="pageSize4" :page-sizes="[10, 20, 30, 40]" layout="total, sizes, prev, pager, next, jumper" - :total="400" + :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" /> </div> </div> - <Dailog ref="Show"></Dailog> + <Dailog ref="Show" @addList="add"></Dailog> </div> </template> <script lang="ts"> +import { timeDate } from '/@/assets/index.ts'; import Dailog from './component/Dailog.vue'; import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue'; import { ElMessageBox, ElMessage, ElButton, ElInput, TabsPaneContext, FormInstance } from 'element-plus'; @@ -103,6 +105,7 @@ const resetForm = () => { ruleForm.searchParams.qName = ''; ruleForm.searchParams.indexNum = ''; + listApi() }; const listApi = () => { goalManagementApi() @@ -140,6 +143,8 @@ }; // 删除 const onDelete = (id: number) => { + let arr=[] + arr.push(id) ElMessageBox.confirm('确定删除所选项吗?', 'Warning', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -147,7 +152,7 @@ }) .then(() => { goalManagementApi() - .getTargetMngDelete(id) + .getTargetMngDelete(arr) .then((res) => { if (res.data.code == 200) { ElMessage({ @@ -177,7 +182,7 @@ for (let i = 0; i < valId.length; i++) { arr.push(valId[i].id); } - deletAll.value = arr.toString(); + deletAll.value = arr if (val.length == 1) { warning.value = false; danger.value = false; @@ -217,8 +222,13 @@ }); }); }; + const add=()=>{ + listApi() + } return { + timeDate, listApi, + add, resetForm, tableData, currentPage4, -- Gitblit v1.9.2