From 995a733a26dd1856c0dd7286f2dcde5ca1434bca Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 21 三月 2024 08:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue |   51 ++++++++++++++++++++-------------------------------
 1 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue b/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
index b3634e6..ca066eb 100644
--- a/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
+++ b/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
@@ -11,20 +11,9 @@
           v-hasPermi="['mes:dv:checkplan:add']"
         >鏂板</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mes:dv:checkplan:remove']"
-        >鍒犻櫎</el-button>
-      </el-col>
     </el-row>
     <MachinerySelect ref="machinerySelect" @onSelected="onMachineryAdd" ></MachinerySelect>
-    <el-table v-loading="loading" :data="checkmachineryList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="checkmachineryList" >
       <el-table-column label="璁惧缂栫爜" align="center" prop="equipmentCode" />
       <el-table-column label="璁惧鍚嶇О" align="center" prop="equipmentName" />
       <el-table-column label="鍝佺墝" align="center" prop="equipmentBrand" />
@@ -36,7 +25,7 @@
             size="mini"
             type="danger"
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            @click="deleteSelectedColumns(scope.row)"
           >鍒犻櫎</el-button>
         </template>
       </el-table-column>
@@ -79,7 +68,7 @@
       total: 0,
       // 鐐规璁惧琛ㄦ牸鏁版嵁
       checkmachineryList: [],
-      // 寮瑰嚭灞傛爣棰�
+        // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
@@ -102,7 +91,21 @@
     this.getList();
   },
   methods: {
-    /** 鏌ヨ鐐规璁惧鍒楄〃 */
+
+    deleteSelectedColumns(row) {
+      const index = this.checkmachineryList.findIndex(item => item.id === row.id);
+      if (index !== -1) {
+        this.checkmachineryList.splice(index, 1);
+      } else {
+        this.$message({
+          message: '鏈壘鍒板叿鏈夎ID鐨勯」鐩�',
+          type: 'warning'
+        });
+      }
+      this.$emit('inSelected',this.checkmachineryList);
+
+    },
+  /** 鏌ヨ鐐规璁惧鍒楄〃 */
     getList() {
       this.loading = true;
       listInspectionPlanArchives(this.queryParams).then(response => {
@@ -112,12 +115,7 @@
       });
     },
 
-    // 澶氶�夋閫変腑鏁版嵁
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.recordId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
+
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.$refs.machinerySelect.showFlag = true;
@@ -140,16 +138,7 @@
       this.$emit('inSelected',this.checkmachineryList);
       console.log(this.checkmachineryList)
     },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      const recordIds = row.recordId || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鐐规璁惧缂栧彿涓�"' + recordIds + '"鐨勬暟鎹」锛�').then(function() {
-        return delInspectionPlanArchives(recordIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
-    }
+
   }
 };
 </script>

--
Gitblit v1.9.3