From 2771237a6ea07eb1b7be389034b4dc2981b0cffd Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 11 七月 2025 21:10:14 +0800 Subject: [PATCH] 1、设备台账新增和编辑增加技术状态字段 2、二保编辑功能 3、二保以及点检自动带入保养周期默认值而不是从设备处带出 --- src/views/eam/maintenance/EamInspectionOrderList.vue | 145 +++++++++++++++++++----------------------------- 1 files changed, 58 insertions(+), 87 deletions(-) diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue index 39c7c2b..be8ef7d 100644 --- a/src/views/eam/maintenance/EamInspectionOrderList.vue +++ b/src/views/eam/maintenance/EamInspectionOrderList.vue @@ -1,26 +1,17 @@ <template> <a-card :bordered="false"> <!-- 鏌ヨ鍖哄煙 --> - <div - class="table-page-search-wrapper" - v-if="isDisplayOperation" - > - <a-form - layout="inline" - @keyup.enter.native="searchQuery" - > + <div class="table-page-search-wrapper" v-if="isDisplayOperation"> + <a-form layout="inline" @keyup.enter.native="searchQuery"> <a-row :gutter="24"> - <a-col :xl="4" :lg="7" :md="8" :sm="24"> - <a-form-item label="宸ュ崟鍙�"> - <a-input - placeholder="璇疯緭鍏ュ伐鍗曞彿" - v-model="queryParam.orderNum" - ></a-input> - </a-form-item> - </a-col> <a-col :xl="5" :lg="7" :md="8" :sm="24"> <a-form-item label="缁熶竴缂栫爜"> <lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/> + </a-form-item> + </a-col> + <a-col :xl="4" :lg="7" :md="8" :sm="24"> + <a-form-item label="宸ュ崟鍙�"> + <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.orderNum"/> </a-form-item> </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> @@ -118,22 +109,19 @@ </template> <script> - - import '@/assets/less/TableExpand.less' - import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import EamInspectionOrderModal from './modules/EamInspectionOrderModal' import { deleteAction, getAction } from '@api/manage' import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle' - import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue' + import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect' export default { name: 'EamInspectionOrderList', - mixins: [JeecgListMixin, mixinDevice], + mixins: [JeecgListMixin], components: { + LxSearchEquipmentSelect, InspectionOrderHandle, - EamInspectionOrderModal, - LxSearchEquipmentSelect + EamInspectionOrderModal }, props: { isDisplayOperation: { @@ -143,7 +131,7 @@ }, data() { return { - description: 'eam_inspection_order绠$悊椤甸潰', + description: '鐐规宸ュ崟椤甸潰', disableMixinCreated: true, // 琛ㄥご columns: [ @@ -291,7 +279,6 @@ }) that.loadData() } else { - // that.$message.warning(res.message); that.$notification.warning({ message: '娑堟伅', description: res.message @@ -311,7 +298,6 @@ }) that.loadData() } else { - // that.$message.warning(res.message); that.$notification.warning({ message: '娑堟伅', description: res.message @@ -320,62 +306,50 @@ }) }, batchZf(type) { - if (this.selectedRowKeys.length <= 0) { - this.$notification.warning({ - message: '娑堟伅', - description: '璇烽�夋嫨涓�鏉¤褰�' - }) - } else { - var ids = '' - for (var a = 0; a < this.selectedRowKeys.length; a++) { - ids += this.selectedRowKeys[a] + ',' - } - var that = this - this.$confirm({ - title: '纭浣滃簾', - content: '鏄惁浣滃簾閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲浣滃簾鎴愬姛?', - onOk: function() { - that.loading = true - getAction(that.url.cancelOrReceive, { ids: ids, type: type }).then((res) => { - if (res.success) { - that.$notification.success({ - message: '娑堟伅', - description: res.message - }) - that.loadData() - that.onClearSelected() - } else { - // that.$message.warning(res.message); - that.$notification.warning({ - message: '娑堟伅', - description: res.message - }) - } - }).finally(() => { - that.loading = false - }) - } - }) + var ids = '' + for (var a = 0; a < this.selectedRowKeys.length; a++) { + ids += this.selectedRowKeys[a] + ',' } + var that = this + this.$confirm({ + title: '纭浣滃簾', + content: '鏄惁浣滃簾閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲浣滃簾鎴愬姛?', + onOk: function() { + that.loading = true + getAction(that.url.cancelOrReceive, { ids, type }).then((res) => { + if (res.success) { + that.$notification.success({ + message: '娑堟伅', + description: res.message + }) + that.loadData() + that.onClearSelected() + } else { + // that.$message.warning(res.message); + that.$notification.warning({ + message: '娑堟伅', + description: res.message + }) + } + }).finally(() => { + that.loading = false + }) + } + }) }, batchLq(type) { - if (this.selectedRowKeys.length <= 0) { - this.$notification.warning({ - message: '娑堟伅', - description: '璇烽�夋嫨涓�鏉¤褰�' - }) - } else { - var ids = '' - for (var a = 0; a < this.selectedRowKeys.length; a++) { - ids += this.selectedRowKeys[a] + ',' - } - var that = this - this.$confirm({ - title: '纭棰嗗彇', - content: '鏄惁棰嗗彇閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲棰嗗彇鎴愬姛?', - onOk: function() { - that.loading = true - getAction(that.url.cancelOrReceive, { ids: ids, type: type }).then((res) => { + var ids = '' + for (var a = 0; a < this.selectedRowKeys.length; a++) { + ids += this.selectedRowKeys[a] + ',' + } + var that = this + this.$confirm({ + title: '纭棰嗗彇', + content: '鏄惁棰嗗彇閫変腑鏁版嵁锛屽彧鏈夊緟鐐规鐘舵�佺殑鏁版嵁鎵嶅彲棰嗗彇鎴愬姛?', + onOk: function() { + that.loading = true + getAction(that.url.cancelOrReceive, { ids, type }) + .then((res) => { if (res.success) { that.$notification.success({ message: '娑堟伅', @@ -389,12 +363,12 @@ description: res.message }) } - }).finally(() => { + }) + .finally(() => { that.loading = false }) - } - }) - } + } + }) }, onInspectionDateChange: function(value, dateString) { this.queryParam.inspectionDateBegin = dateString[0] @@ -402,7 +376,4 @@ } } } -</script> -<style scoped> - @import '~@assets/less/common.less'; -</style> \ No newline at end of file +</script> \ No newline at end of file -- Gitblit v1.9.3