diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue index e7cf21db..0da17657 100644 --- a/src/views/specialEquipment/basic/FireFighthing.vue +++ b/src/views/specialEquipment/basic/FireFighthing.vue @@ -117,12 +117,12 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import EquipmentDrawer from '../components/firefightingDrawer'; +import BaseDialogWrapper from '../components/BaseDialogWrapper.vue'; import { createEquipment, updateEquipment, deleteEquipment, - getEquipment, getEquipmentPage, exportEquipmentExcel, } from '@/api/base/equipment'; @@ -134,6 +134,7 @@ export default { components: { Editor, EquipmentDrawer, + BaseDialog: BaseDialogWrapper }, mixins: [basicPageMixin], data() { diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue index e8788d09..b8329090 100644 --- a/src/views/specialEquipment/basic/Manage.vue +++ b/src/views/specialEquipment/basic/Manage.vue @@ -116,12 +116,12 @@ import moment from 'moment'; import basicPageMixin from '@/mixins/lb/basicPageMixin'; import EquipmentDrawer from '../components/manageDrawer'; +import BaseDialogWrapper from '../components/BaseDialogWrapper.vue'; import { createEquipment, updateEquipment, deleteEquipment, - getEquipment, getEquipmentPage, exportEquipmentExcel, } from '@/api/base/equipment'; @@ -133,6 +133,7 @@ export default { components: { Editor, EquipmentDrawer, + BaseDialog: BaseDialogWrapper }, mixins: [basicPageMixin], data() { diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue index cfcdb0f5..01a23622 100644 --- a/src/views/specialEquipment/basic/Safety.vue +++ b/src/views/specialEquipment/basic/Safety.vue @@ -126,12 +126,14 @@ import { } from '@/api/base/equipment'; import Editor from '@/components/Editor'; import AssetsUpload from '../components/AssetsUpload.vue'; +import BaseDialogWrapper from '../components/BaseDialogWrapper.vue'; export default { name: 'SpecialEquipmentForSafety', components: { Editor, EquipmentDrawer, + BaseDialog: BaseDialogWrapper, }, mixins: [basicPageMixin], data() { diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue index 8a9c28f8..088ab28a 100644 --- a/src/views/specialEquipment/check/Config.vue +++ b/src/views/specialEquipment/check/Config.vue @@ -51,7 +51,8 @@ + @refreshDataList="getList" + @destroy="addOrUpdateVisible = false" /> @@ -60,10 +61,11 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin'; import addOrUpdata from './add-or-updata.vue'; import add from './add.vue'; import { parseTime } from '../../core/mixins/code-filter'; +import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue'; export default { name: 'SpecialEquipmentCheckConfig', - components: { addOrUpdata, add }, + components: { addOrUpdata, add, BaseDialog: BaseDialogWrapperVue }, mixins: [basicPageMixin], data() { return { @@ -188,6 +190,7 @@ export default { pageSize: 10, name: null, status: 0, + special: true, }, // 表单参数 form: {}, diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue index 86ba9027..073ae25d 100644 --- a/src/views/specialEquipment/check/Content-edit.vue +++ b/src/views/specialEquipment/check/Content-edit.vue @@ -9,7 +9,9 @@
- + {{ disableEdit ? '返回' : '取消' }} import DialogForm from '../../../components/DialogForm/index.vue'; import { groupConnectWorkshop } from '@/utils/equipment-module'; - -const SmallTitle = { - name: 'SmallTitle', - props: ['size'], - components: {}, - data() { - return {}; - }, - methods: {}, - render: function (h) { - return h( - 'span', - { - class: 'small-title', - style: { - fontSize: '18px', - lineHeight: - this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px', - fontWeight: 500, - fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif', - }, - }, - this.$slots.default - ); - }, -}; +import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue'; +import SmallTitle from '../components/SmallTitle.js'; export default { - components: { SmallTitle, DialogForm }, + components: { SmallTitle, DialogForm, BaseDialog: BaseDialogWrapperVue }, props: ['dataId'], // dataId 作为一个通用的存放id的字段 data() { return { @@ -411,6 +389,35 @@ export default { this.getList('inspector'); }, methods: { + /** 确认是否关闭 */ + async handleConfirmClose() { + if (this.disableEdit) return this.handleCancel(); + + try { + if ( + await this.$confirm( +
+

+ 确认要关闭页面吗? +

+

+ 确定关闭将不保留编辑内容 +

+
, + { + confirmButtonText: '确 定', + cancelButtonText: '取 消', + type: 'warning', + } + ) + ) { + this.handleCancel(); + } + } catch (err) { + return false; + } + }, + handleSearchBarBtnClick(btn) { switch (btn.btnName) { case 'search': diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue index 682f2ca9..fd2c8afd 100644 --- a/src/views/specialEquipment/check/Content.vue +++ b/src/views/specialEquipment/check/Content.vue @@ -64,10 +64,18 @@ import { parseTime } from '../../core/mixins/code-filter'; import CheckOrderListTable from './CheckOrderListTable.vue'; import edit from './Content-edit.vue'; import AddCheckDet from './Content-add_detail.vue'; +import BaseDialogWrapperVue from '../components/BaseDialogWrapper.vue'; export default { name: 'SpecialEquipmentCheckConfig', - components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable }, + components: { + addOrUpdata, + add, + edit, + AddCheckDet, + BaseDialog: BaseDialogWrapperVue, + CheckOrderListTable, + }, mixins: [basicPageMixin], data() { return { @@ -86,7 +94,7 @@ export default { ? { type: 'edit', btnName: '修改', - } + } : undefined, { type: 'detail', @@ -96,7 +104,7 @@ export default { ? { type: 'delete', btnName: '删除', - } + } : undefined, ].filter((v) => v), tableProps: [ @@ -334,9 +342,8 @@ export default { } return this.$axios({ - url: - `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, - // + checkPersonParam, + url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, + // + checkPersonParam, // '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''), method: 'put', data: [id], diff --git a/src/views/specialEquipment/check/Record-detail.vue b/src/views/specialEquipment/check/Record-detail.vue index 5ebee49f..6396e241 100644 --- a/src/views/specialEquipment/check/Record-detail.vue +++ b/src/views/specialEquipment/check/Record-detail.vue @@ -7,9 +7,10 @@