加入删除提醒；

工单加入删除和批量删除

src/api/admin/repair.js

@@ -58,9 +58,9 @@ export function complete(parameter) {
 
 export function delRepair(parameter) {
   return axios({
-    url: api.repair + '/delete',
+    url: api.repair + '/batchRemove', // 原单独删除为delete，改为允许批量的
     method: 'post',
-    params: parameter
+    data: parameter
   })
 }
 

src/views/admin/RepairList.vue

@@ -95,6 +95,9 @@
     </div>
     <div class='table-operator' v-if='!isShowModel'>
       <a-button v-if='addEnable' type='primary' icon='plus' @click='$refs.modal.add()'>新建</a-button>
+      <a-dropdown v-if='removeEnable&&selectedRowKeys.length > 0'>
+        <a-button type='danger' icon='delete' @click='delByIds(selectedRowKeys)'>删除</a-button>
+      </a-dropdown>
     </div>
     <s-table
       size='default'
@@ -119,10 +122,10 @@
         <a v-if='editEnabel' @click='handleView(record.id)'>详情</a>
         <!--        <a-divider v-if='!isShowModel' type='vertical' />-->
         <!--        <a v-if='editEnabel && !isShowModel' @click='handleEdit(record)'>编辑</a>-->
-<!--        <a-divider v-if='!isShowModel' type='vertical' />-->
-<!--        <a type='danger' v-if='!isShowModel' @click='delByIds(record.id)'>删除</a>-->
+        <a-divider v-if='!isShowModel' type='vertical' />
+        <a type='danger' v-if='!isShowModel' @click='delByIds(record.id)'>删除</a>
         <!--        <a-divider v-if='!isShowModel' type='vertical' />-->
-<!--        <a type='danger' v-if='!isShowModel' @click='delByIds(selectedRowKeys)'>批量删除</a>-->
+        <!--        <a type='danger' v-if='!isShowModel' @click='delByIds(selectedRowKeys)'>批量删除</a>-->
       </span>
     </s-table>
     <repair-modal ref='modal' @success='handleOk' />
@@ -154,6 +157,7 @@ import { exportRepair, exportTemplate, importData } from '@/api/admin/repair/rep
 import storage from 'store'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { message } from 'ant-design-vue'
+import { delRepairRoom } from '@/api/admin/repair/repairAddressFloor'
 
 export default {
   name: 'TableList',
@@ -517,21 +521,25 @@ export default {
     },
     delByIds(ids) {
       const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
       this.$confirm({
         title: '警告',
-        content: '确认要删除工单吗?',
+        content: '删除后不可恢复，是否确认删除?',
         okText: '是',
         okType: 'warning',
         cancelText: '否',
         onOk() {
-          delRepair({ id: ids }).then(res => {
+          delRepair({ ids: ids.join(',') }).then(res => {
             if (res.code === 0) {
-              message.success('删除成功')
+              _this.message.success('删除成功')
               _this.handleOk()
-              // _this.selectRepairList()
             } else {
-              message.error(res.msg)
+              _this.$message.error(res.msg)
             }
+            _this.selectedRowKeys = []
           })
         },
         onCancel() {

src/views/admin/repair/RepairAddressFloorList.vue

@@ -47,6 +47,7 @@
     import {delRepairRoom,getRepairRoomList} from '@/api/admin/repair/repairAddressFloor'
     import RepairRoomModal from './modules/RepairAddressFloorModalList.vue'
     import {checkPermission} from '@/utils/permissions'
+    import { delRepairAddress } from '@/api/admin/repair/repairAddress'
 
     export default {
   name: 'TableList',
@@ -119,14 +120,30 @@
       console.log('handleSaveOk')
     },
     delByIds (ids) {
-      delRepairRoom({ ids: ids.join(',') }).then(res => {
-        if (res.code === 0) {
-          this.$message.success('删除成功')
-          this.handleOk()
-        } else {
-          this.$message.error(res.msg)
+      const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delRepairRoom({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            _this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
         }
-        this.selectedRowKeys = []
       })
     }
   },

src/views/admin/repair/RepairAddressList.vue

@@ -45,6 +45,7 @@
     import {delRepairAddress,getRepairAddressList} from '@/api/admin/repair/repairAddress'
     import RepairAddressModal from './modules/RepairAddressModal.vue'
     import {checkPermission} from '@/utils/permissions'
+    import { delRepairType } from '@/api/admin/repair/repairDeviceType'
 
     export default {
   name: 'TableList',
@@ -121,14 +122,30 @@
     },
 
     delByIds (ids) {
-      delRepairAddress({ ids: ids.join(',') }).then(res => {
-        if (res.code === 0) {
-          this.$message.success('删除成功')
-          this.handleOk()
-        } else {
-          this.$message.error(res.msg)
+      const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delRepairAddress({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            _this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
         }
-        this.selectedRowKeys = []
       })
     }
   },

src/views/admin/repair/RepairDeviceList.vue

@@ -48,6 +48,8 @@ import { delRepairDevice, getRepairDeviceList } from '@/api/admin/repair/repairD
 
 import RepairDeviceModal from './modules/RepairDeviceModal.vue'
 import { checkPermission } from '@/utils/permissions'
+import { delRepair } from '@/api/admin/repair'
+import { message } from 'ant-design-vue'
 
 export default {
   name: 'TableList',
@@ -118,14 +120,30 @@ export default {
       this.$refs.table.refresh(true)
     },
     delByIds(ids) {
-      delRepairDevice({ ids: ids.join(',') }).then(res => {
-        if (res.code === 0) {
-          this.$message.success('删除成功')
-          this.handleOk()
-        } else {
-          this.$message.error(res.msg)
+      const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delRepairDevice({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            _this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
         }
-        this.selectedRowKeys = []
       })
     }
   },

src/views/admin/repair/RepairDeviceTypeList.vue

@@ -1,49 +1,49 @@
 <template>
-  <a-card :bordered="false">
-<!--    <div class="table-page-search-wrapper">-->
-<!--      <a-form layout="inline">-->
-<!--        <a-row :gutter="48">-->
-<!--          <a-col :md="5" :sm="15">-->
-<!--            <a-form-item label="故障类型">-->
-<!--              <a-input placeholder="请输入名称" v-model="queryParam.name" />-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
+  <a-card :bordered='false'>
+    <!--    <div class="table-page-search-wrapper">-->
+    <!--      <a-form layout="inline">-->
+    <!--        <a-row :gutter="48">-->
+    <!--          <a-col :md="5" :sm="15">-->
+    <!--            <a-form-item label="故障类型">-->
+    <!--              <a-input placeholder="请输入名称" v-model="queryParam.name" />-->
+    <!--            </a-form-item>-->
+    <!--          </a-col>-->
 
-<!--          <a-col :md="8" :sm="24">-->
-<!--            <span class="table-page-search-submitButtons">-->
-<!--              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>-->
-<!--              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>-->
-<!--            </span>-->
-<!--          </a-col>-->
-<!--        </a-row>-->
-<!--      </a-form>-->
-<!--    </div>-->
-    <div class="table-operator">
-      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
-      <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
-        <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
+    <!--          <a-col :md="8" :sm="24">-->
+    <!--            <span class="table-page-search-submitButtons">-->
+    <!--              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>-->
+    <!--              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>-->
+    <!--            </span>-->
+    <!--          </a-col>-->
+    <!--        </a-row>-->
+    <!--      </a-form>-->
+    <!--    </div>-->
+    <div class='table-operator'>
+      <a-button v-if='addEnable' type='primary' icon='plus' @click='$refs.modal.add()'>新建</a-button>
+      <a-dropdown v-if='removeEnable&&selectedRowKeys.length > 0'>
+        <a-button type='danger' icon='delete' @click='delByIds(selectedRowKeys)'>删除</a-button>
       </a-dropdown>
     </div>
     <s-table
-      size="default"
-      ref="table"
-      rowKey="id"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-      :columns="columns"
-      :data="loadData"
+      size='default'
+      ref='table'
+      rowKey='id'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+      :columns='columns'
+      :data='loadData'
     >
-     <span slot="workers" slot-scope="text, record">
-       <a @click="seeWorKerList(record.id,record.workerName)">{{ record.worker }}</a>
+     <span slot='workers' slot-scope='text, record'>
+       <a @click='seeWorKerList(record.id,record.workerName)'>{{ record.worker }}</a>
       </span>
-      <span slot="action" slot-scope="text, record">
-        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
-        <a-divider type="vertical" />
-        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      <span slot='action' slot-scope='text, record'>
+        <a v-if='editEnabel' @click='handleEdit(record)'>编辑</a>
+        <a-divider type='vertical' />
+        <a v-if='removeEnable' @click='delByIds([record.id])'>删除</a>
       </span>
     </s-table>
-    <repairType-modal ref="modal" @ok="handleOk" />
-    <a-modal v-model="workerVisible" title="维修人员" width="700px">
-      <a-table :row-selection="rowSelection" :columns="workerColumns" :data-source="data" />
+    <repairType-modal ref='modal' @ok='handleOk' />
+    <a-modal v-model='workerVisible' title='维修人员' width='700px'>
+      <a-table :row-selection='rowSelection' :columns='workerColumns' :data-source='data' />
     </a-modal>
   </a-card>
 </template>
@@ -54,6 +54,7 @@ import { STable } from '@/components'
 import { delRepairType, getRepairTypeList } from '@/api/admin/repair/repairDeviceType'
 import RepairTypeModal from './modules/RepairDeviceTypeModal.vue'
 import { checkPermission } from '@/utils/permissions'
+import { delRepairDevice } from '@/api/admin/repair/repairDevice'
 
 export default {
   name: 'TableList',
@@ -61,7 +62,7 @@ export default {
     STable,
     RepairTypeModal
   },
-  data () {
+  data() {
     return {
       labelCol: {
         xs: { span: 24 },
@@ -126,10 +127,10 @@ export default {
     }
   },
   filters: {},
-  created () {
+  created() {
   },
   methods: {
-    seeWorKerList (id, list) {
+    seeWorKerList(id, list) {
       this.workerVisible = true
       console.log(list)
       this.data = list.map(item => {
@@ -139,29 +140,45 @@ export default {
       })
     },
 
-    onSelectChange (selectedRowKeys, selectedRows) {
+    onSelectChange(selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
-    handleAdd () {
+    handleAdd() {
       this.$refs.modal.add()
     },
-    handleEdit (record) {
+    handleEdit(record) {
       this.$refs.modal.edit(record)
     },
-    handleOk () {
+    handleOk() {
       this.$refs.table.refresh(true)
       console.log('handleSaveOk')
     },
-    delByIds (ids) {
-      delRepairType({ ids: ids.join(',') }).then(res => {
-        if (res.code === 0) {
-          this.$message.success('删除成功')
-          this.handleOk()
-        } else {
-          this.$message.error(res.msg)
+    delByIds(ids) {
+      const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delRepairType({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            _this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
         }
-        this.selectedRowKeys = []
       })
     }
   },

src/views/admin/repair/RepairFailureTypeList.vue

@@ -47,6 +47,7 @@
     import {delRepairFailureType,getRepairFailureTypeList} from '@/api/admin/repair/repairFailureType'
     import RepairFailureTypeModal from './modules/RepairFailureTypeModal.vue'
     import {checkPermission} from '@/utils/permissions'
+    import { delRepairRoom } from '@/api/admin/repair/repairAddressFloor'
 
     export default {
   name: 'TableList',
@@ -118,14 +119,30 @@
       console.log('handleSaveOk')
     },
     delByIds (ids) {
-      delRepairFailureType({ ids: ids.join(',') }).then(res => {
-        if (res.code === 0) {
-          this.$message.success('删除成功')
-          this.handleOk()
-        } else {
-          this.$message.error(res.msg)
+      const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delRepairFailureType({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
         }
-        this.selectedRowKeys = []
       })
     }
   },

src/views/admin/repair/modules/RepairAddressFloorModalList.vue

@@ -128,14 +128,30 @@ import RepairAddressModal from '@/views/admin/repair/modules/RepairAddressModal'
       console.log('handleSaveOk')
     },
     delByIds (ids) {
-      delRepairRoom({ ids: ids.join(',') }).then(res => {
-        if (res.code === 0) {
-          this.$message.success('删除成功')
-          this.handleOk()
-        } else {
-          this.$message.error(res.msg)
+      const _this = this
+      if (ids === '') {
+        this.$message.success('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delRepairRoom({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            _this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
         }
-        this.selectedRowKeys = []
       })
     }
   },