From 37ec3ec5aa6f148d517d0a8886d67d0fc465342e Mon Sep 17 00:00:00 2001
From: ysn <2126564605@qq.com>
Date: Wed, 15 Apr 2026 14:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86-=E5=BA=9F?=
 =?UTF-8?q?=E6=B0=B4=E5=A4=84=E7=90=86-=E6=A7=BD=E6=B6=B2=E6=8E=92?=
 =?UTF-8?q?=E6=94=BE=E8=AE=B0=E5=BD=95-=E5=88=A0=E9=99=A4-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD=20=E5=AE=89=E7=8E=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=BA=9F=E6=B0=B4=E5=A4=84=E7=90=86-=E6=A7=BD?=
 =?UTF-8?q?=E6=B6=B2=E6=8E=92=E6=94=BE=E8=AE=B0=E5=BD=95-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E-=E5=89=82=E9=87=8F(kg)-=E5=8F=AA=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addEditDialogDosingRecord.vue  |   2 +-
 .../wastewater/components/dischargeRec.vue    |   2 +-
 .../wastewater/components/dosingRecord.vue    | 176 +++++++++++-------
 3 files changed, 113 insertions(+), 67 deletions(-)

diff --git a/src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue b/src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue
index a8c2bf9..c024127 100644
--- a/src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue
+++ b/src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue
@@ -38,7 +38,7 @@
                         <span><i style="color: red">*</i>剂量(kg)</span>
                     </template>
                     <template #default="scope">
-                        <el-input v-model.number="scope.row.dose" placeholder="请输入" />
+                        <el-input-number controls-position="right" v-model.number="scope.row.dose" placeholder="请输入" />
                     </template>
                 </el-table-column>
                 <!-- 加药人 -->
diff --git a/src/views/safetyManagement/wastewater/components/dischargeRec.vue b/src/views/safetyManagement/wastewater/components/dischargeRec.vue
index ce18cbc..9d78f18 100644
--- a/src/views/safetyManagement/wastewater/components/dischargeRec.vue
+++ b/src/views/safetyManagement/wastewater/components/dischargeRec.vue
@@ -330,7 +330,7 @@ export default {
         this.$message.error('请至少选择一条数据');
         return;
       }
-      this.$confirm('确定删除数据吗?', {
+      this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
diff --git a/src/views/safetyManagement/wastewater/components/dosingRecord.vue b/src/views/safetyManagement/wastewater/components/dosingRecord.vue
index 0e0ab64..bf89b27 100644
--- a/src/views/safetyManagement/wastewater/components/dosingRecord.vue
+++ b/src/views/safetyManagement/wastewater/components/dosingRecord.vue
@@ -1,40 +1,68 @@
 <template>
   <div>
-    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
-     @row-update="rowUpdate"
-      @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-del="handleDelete"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template #menu-left>
-        <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
-            </el-button> -->
-        <el-button type="primary" @click="moldAddFn(null, true)">新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="moldAddFn(null, true)"
+          >新增</el-button
+        >
+        <el-button type="danger" icon="el-icon-delete" @click="handleBatchDelete">删 除 </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary"  @click="handleImport">导入 </el-button>
+        <el-button type="primary" @click="handleImport">导入 </el-button>
       </template>
     </avue-crud>
     <!-- 新增弹窗 -->
-    <addEditDialogDosingRecord ref="addEditDialogDosingRecord"  
-    @closeDialog="closeDialog"
-    @submitData="handleSubmitData"
-    :dosingManList ="dosingManList"
-    :moldAddMore="moldAddMore" >
+    <addEditDialogDosingRecord
+      ref="addEditDialogDosingRecord"
+      @closeDialog="closeDialog"
+      @submitData="handleSubmitData"
+      :dosingManList="dosingManList"
+      :moldAddMore="moldAddMore"
+    >
     </addEditDialogDosingRecord>
     <!-- 导入 -->
-    <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
-      templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateName="废水加药记录导入模板.xls"
-      importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeImportDialog"></basic-import>
+    <basic-import
+      v-if="isShowImport"
+      title="导入"
+      :isShow="isShowImport"
+      templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate"
+      templateName="废水加药记录导入模板.xls"
+      importUrl="/blade-desk/bsDosingRec/importExcel"
+      @closeDialog="closeImportDialog"
+    ></basic-import>
   </div>
 </template>
 <script>
-import { getList, update , getDosingManList,add } from '@/api/safetyManagement/dosingRecord.js';
+import {
+  getList,
+  update,
+  getDosingManList,
+  add,
+  remove,
+} from '@/api/safetyManagement/dosingRecord.js';
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue';
 
 export default {
   components: {
     basicImport,
-    addEditDialogDosingRecord
+    addEditDialogDosingRecord,
   },
   data() {
     return {
@@ -42,7 +70,7 @@ export default {
       isShowImport: false,
       loading: false,
       selectionList: [],
-      dosingManList:[],
+      dosingManList: [],
       option: {
         addBtn: false,
         height: 'auto',
@@ -58,15 +86,15 @@ export default {
         index: true,
         selection: true,
         viewBtn: false,
-        delBtn: false,
+        delBtn: true,
         editBtnText: '修改',
-        addBtnIcon: ' ',
-        viewBtnIcon: ' ',
-        delBtnIcon: ' ',
-        editBtnIcon: ' ',
+        addBtnIcon: 'el-icon-plus',
+        viewBtnIcon: 'el-icon-view',
+        delBtnIcon: 'el-icon-delete',
+        editBtnIcon: 'el-icon-edit',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 80,
+        menuWidth: 200,
         dialogWidth: 1040,
         dialogClickModal: false,
         searchEnter: true,
@@ -127,6 +155,7 @@ export default {
             filter: true,
             span: 12,
             searchLabelWidth: 70,
+            type: 'number',
             rules: [
               {
                 required: true,
@@ -142,8 +171,8 @@ export default {
             sortable: true,
             filter: true,
             display: false,
-            editDisplay:false,
-            hide:true,
+            editDisplay: false,
+            hide: true,
             span: 12,
             type: 'datetime',
             rules: [
@@ -154,8 +183,8 @@ export default {
               },
             ],
             searchRange: true,
-            startPlaceholder: "开始时间",
-            endPlaceholder: "结束时间",
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
           },
@@ -173,7 +202,8 @@ export default {
                 trigger: 'blur',
               },
             ],
-            
+            format: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
           },
           {
             label: '加药人',
@@ -183,7 +213,7 @@ export default {
             sortable: true,
             filter: true,
             span: 12,
-            type: "select",
+            type: 'select',
             dicData: [],
             rules: [
               {
@@ -193,8 +223,8 @@ export default {
               },
             ],
             props: {
-              label: 'name', 
-              value: 'id'   
+              label: 'name',
+              value: 'id',
             },
           },
           {
@@ -216,44 +246,44 @@ export default {
     };
   },
   mounted() {
-    this.fetchDosingManList()
+    this.fetchDosingManList();
   },
   methods: {
-     // 新增
-        moldAddFn(row, flag) {
-          this.$refs.addEditDialogDosingRecord.show()
-            this.moldAddMore = flag
-        },
-        //关闭弹窗
-        closeDialog() {
-          this.addOpen = false
-          this.onLoad(this.page);
+    // 新增
+    moldAddFn(row, flag) {
+      this.$refs.addEditDialogDosingRecord.show();
+      this.moldAddMore = flag;
     },
-        //关闭弹窗
-        closeImportDialog() {
-          this.isShowImport = false; // 关闭导入弹窗
-          this.onLoad(this.page);
+    //关闭弹窗
+    closeDialog() {
+      this.addOpen = false;
+      this.onLoad(this.page);
+    },
+    //关闭弹窗
+    closeImportDialog() {
+      this.isShowImport = false; // 关闭导入弹窗
+      this.onLoad(this.page);
     },
-        // 加药人
+    // 加药人
     fetchDosingManList() {
       getDosingManList({
         current: 1,
         size: 10000000,
-        roleId: '2008474700619563009'
+        roleId: '2008474700619563009',
       }).then(res => {
-        const result = res.data.data.records
-        this.dosingManList = result
-        console.log("加药人result", result)
+        const result = res.data.data.records;
+        this.dosingManList = result;
+        console.log('加药人result', result);
         this.option.column.forEach(col => {
           if (col.prop === 'dosingMan') {
             col.dicData = this.dosingManList;
           }
         });
-      })
+      });
     },
     // 点击导入按钮
     handleImport() {
-      this.isShowImport = true
+      this.isShowImport = true;
     },
     // 处理子组件提交的数据
     handleSubmitData(data) {
@@ -272,18 +302,35 @@ export default {
           loading();
         }
       );
-
     },
-    handleDelete() {
+    // 批量删除
+    handleBatchDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
+        this.$message.error('请至少选择一条数据');
         return;
       }
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => { });
+      }).then(() => {
+        remove(this.selectionList.map(item => item.id).join(',')).then(res => {
+          this.$message.success('删除成功');
+          this.refreshChange();
+        });
+      });
+    },
+    handleDelete(row) {
+      this.$confirm('确定删除数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        remove(row.id).then(res => {
+          this.$message.success('删除成功');
+          this.refreshChange();
+        });
+      });
     },
     // 多选
     selectionChange(list) {
@@ -312,24 +359,23 @@ export default {
     },
     // 搜索重置
     searchReset() {
-      this.query = {}
-      this.onLoad(this.page)
+      this.query = {};
+      this.onLoad(this.page);
     },
     //搜索
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params)
-      done()
+      this.onLoad(this.page, params);
+      done();
     },
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      this.query = { ...this.query, dorType: 2 }  //类型：1、废气加药；2、废水加药
+      this.query = { ...this.query, dorType: 2 }; //类型：1、废气加药；2、废水加药
       const requestParams = Object.assign({}, params, this.query);
       // 后端要字符串类型
       if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) {
-
         requestParams.queryDosingTime = requestParams.queryDosingTime.join(',');
       }
       getList(page.currentPage, page.pageSize, Object.assign(params, requestParams))
@@ -342,7 +388,7 @@ export default {
         .catch(() => {
           this.loading = false;
         });
-    }
+    },
   },
 };
 </script>