From ffffd305fff42756d2c57e1e11046117a2cabce6 Mon Sep 17 00:00:00 2001 From: "471615499@qq.com" Date: Mon, 2 Sep 2024 20:07:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=88=A0=E9=99=A4=E6=8F=90?= =?UTF-8?q?=E9=86=92=EF=BC=9B=20=E5=B7=A5=E5=8D=95=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/repair.js | 4 +- src/views/admin/RepairList.vue | 24 ++-- .../admin/repair/RepairAddressFloorList.vue | 31 ++++- src/views/admin/repair/RepairAddressList.vue | 31 ++++- src/views/admin/repair/RepairDeviceList.vue | 32 ++++- .../admin/repair/RepairDeviceTypeList.vue | 121 ++++++++++-------- .../admin/repair/RepairFailureTypeList.vue | 31 ++++- .../modules/RepairAddressFloorModalList.vue | 30 ++++- 8 files changed, 207 insertions(+), 97 deletions(-) diff --git a/src/api/admin/repair.js b/src/api/admin/repair.js index e5560f1..62427a4 100644 --- a/src/api/admin/repair.js +++ b/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 }) } diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue index 5901af1..63b341a 100644 --- a/src/views/admin/RepairList.vue +++ b/src/views/admin/RepairList.vue @@ -95,6 +95,9 @@
新建 + + 删除 +
详情 - - + + 删除 - + @@ -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() { diff --git a/src/views/admin/repair/RepairAddressFloorList.vue b/src/views/admin/repair/RepairAddressFloorList.vue index dd2c307..a912b08 100644 --- a/src/views/admin/repair/RepairAddressFloorList.vue +++ b/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 = [] }) } }, diff --git a/src/views/admin/repair/RepairAddressList.vue b/src/views/admin/repair/RepairAddressList.vue index 2b70b50..1b2266a 100644 --- a/src/views/admin/repair/RepairAddressList.vue +++ b/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 = [] }) } }, diff --git a/src/views/admin/repair/RepairDeviceList.vue b/src/views/admin/repair/RepairDeviceList.vue index d868552..eb51409 100644 --- a/src/views/admin/repair/RepairDeviceList.vue +++ b/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 = [] }) } }, diff --git a/src/views/admin/repair/RepairDeviceTypeList.vue b/src/views/admin/repair/RepairDeviceTypeList.vue index b268a16..676d6f0 100644 --- a/src/views/admin/repair/RepairDeviceTypeList.vue +++ b/src/views/admin/repair/RepairDeviceTypeList.vue @@ -1,49 +1,49 @@ @@ -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 = [] }) } }, diff --git a/src/views/admin/repair/RepairFailureTypeList.vue b/src/views/admin/repair/RepairFailureTypeList.vue index ad8bc92..c462ac0 100644 --- a/src/views/admin/repair/RepairFailureTypeList.vue +++ b/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 = [] }) } }, diff --git a/src/views/admin/repair/modules/RepairAddressFloorModalList.vue b/src/views/admin/repair/modules/RepairAddressFloorModalList.vue index 3289aba..6d54284 100644 --- a/src/views/admin/repair/modules/RepairAddressFloorModalList.vue +++ b/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 = [] }) } },