From 27c1f989d25d1e7c5fccc9cb62f202295fbf9441 Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期二, 19 三月 2024 13:17:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue b/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue index c082ea4..b3634e6 100644 --- a/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue +++ b/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue @@ -25,12 +25,21 @@ </el-row> <MachinerySelect ref="machinerySelect" @onSelected="onMachineryAdd" ></MachinerySelect> <el-table v-loading="loading" :data="checkmachineryList" @selection-change="handleSelectionChange"> - <el-table-column type="selection" width="55" align="center" /> <el-table-column label="璁惧缂栫爜" align="center" prop="equipmentCode" /> <el-table-column label="璁惧鍚嶇О" align="center" prop="equipmentName" /> <el-table-column label="鍝佺墝" align="center" prop="equipmentBrand" /> <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="equipmentSpec" /> <el-table-column label="澶囨敞" align="center" prop="remark" /> + <el-table-column label="鎿嶄綔" align="center" > + <template slot-scope="scope"> + <el-button + size="mini" + type="danger" + icon="el-icon-delete" + @click="handleDelete(scope.row)" + >鍒犻櫎</el-button> + </template> + </el-table-column> </el-table> <pagination @@ -97,7 +106,7 @@ getList() { this.loading = true; listInspectionPlanArchives(this.queryParams).then(response => { - this.checkmachineryList = response.rows; + // this.checkmachineryList = response.rows; this.total = response.total; this.loading = false; }); @@ -126,10 +135,10 @@ // }, onMachineryAdd(selectedRows){ if(selectedRows !=null && selectedRows.length >0){ - this.checkmachineryList.spareField1 = this.planCode this.checkmachineryList = selectedRows - console.log(this.checkmachineryList) } + this.$emit('inSelected',this.checkmachineryList); + console.log(this.checkmachineryList) }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { -- Gitblit v1.9.3