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/base/EamMaintenanceStandardList.vue | 111 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 79 insertions(+), 32 deletions(-) diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue index 440ec2e..a41ed60 100644 --- a/src/views/eam/base/EamMaintenanceStandardList.vue +++ b/src/views/eam/base/EamMaintenanceStandardList.vue @@ -90,19 +90,10 @@ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a> </div> - <a-table - ref="table" - size="middle" - bordered - rowKey="id" - :columns="columns" - :dataSource="dataSource" - :pagination="ipagination" - :loading="loading" - class="j-table-force-nowrap" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" - :customRow='clickThenSelect' - @change="handleTableChange"> + <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource" + :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect' + @change="handleTableChange"> <span slot="action" slot-scope="text, record"> <a v-if="record.standardStatus === 'START'" @click.stop="handleUpgrade(record)">鍗囩増</a> @@ -122,23 +113,50 @@ <a @click.stop="event=>event.stopPropagation()">鍒犻櫎</a> </a-popconfirm> </template> + + <template v-if="record.standardStatus != 'WAIT_SUBMIT'"> + <a-divider type="vertical" v-if="record.standardStatus=='START'"/> + + <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)"> + <a @click.stop="event=>event.stopPropagation()">鍒犻櫎</a> + </a-popconfirm> + </template> </span> </a-table> - <a-tabs defaultActiveKey="1"> - <a-tab-pane tab='淇濆吇鏍囧噯鏄庣粏椤�' key="1"> - <div class="table-operator" style="margin:-16px"> - <eam-maintenance-standard-detail-list ref="standardDetailRef" :standardId="standardId" - :selectionRows="selectionRows"/> - </div> - </a-tab-pane> + <a-tabs defaultActiveKey="1" v-if="selectionRows.length===1"> + <template v-if="selectionRows[0]&&selectionRows[0].maintenanceCategory=='POINT_INSPECTION'"> + <a-tab-pane tab="鏃ョ偣妫�" key="1"> + <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]" + filterKey="DAY_INSPECTION"/> + </a-tab-pane> + <a-tab-pane tab="鍛ㄧ偣妫�" key="2" forceRender> + <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]" + filterKey="WEEK_INSPECTION"/> + </a-tab-pane> + </template> + <template v-if="selectionRows[0]&&selectionRows[0].maintenanceCategory=='SECOND_MAINTENANCE'"> + <a-tab-pane tab="鎿嶄綔宸�" key="1"> + <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]" + filterKey="OPERATOR_MAINTENANCE"/> + </a-tab-pane> + <a-tab-pane tab="缁翠慨宸�" key="2" forceRender> + <eam-maintenance-standard-detail-list :standardId="standardId" :pageSelectionRow="selectionRows[0]" + filterKey="REPAIRER_MAINTENANCE"/> + </a-tab-pane> + </template> + + <a-tab-pane tab="涓変繚" key="1" v-if="selectionRows[0]&&selectionRows[0].maintenanceCategory=='THIRD_MAINTENANCE'"> + <eam-maintenance-standard-detail-list :standardId="standardId" + :pageSelectionRow="selectionRows[0]"/> + </a-tab-pane> </a-tabs> </div> <!-- table鍖哄煙-end --> <!-- 琛ㄥ崟鍖哄煙 --> - <eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"></eamMaintenanceStandard-modal> + <eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"/> </a-card> </template> @@ -239,14 +257,12 @@ deleteBatch: '/eam/maintenanceStandard/deleteBatch', startProcess: '/eam/maintenanceStandard/saveEamMaintenanceStandardProcess', exportXlsUrl: 'eam/maintenanceStandard/exportXls', - inspectionImportExcel: 'eam/maintenanceStandard/inspectionImportExcel', - weekMaintenanceImportExcel: 'eam/maintenanceStandard/weekMaintenanceImportExcel', - secondMaintenanceImportExcel: 'eam/maintenanceStandard/secondMaintenanceImportExcel', - thirdMaintenanceImportExcel: 'eam/maintenanceStandard/thirdMaintenanceImportExcel', - inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/鐐规鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx', - weekMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鍛ㄤ繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx', - secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/浜屼繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx', - thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/涓変繚鏍囧噯瀵煎叆妯℃澘_v1.0.xlsx' + inspectionImportExcel: '/eam/maintenanceStandard/importPointInspection', + secondMaintenanceImportExcel: '/eam/maintenanceStandard/importSecondMaintenanceStandard', + thirdMaintenanceImportExcel: '/eam/maintenanceStandard/importThirdMaintenanceStandard', + inspectionXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鐐规鏍囧噯瀵煎叆妯℃澘.xlsx', + secondMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鐢熶骇璁惧浜岀骇淇濆吇瑙勮寖.docx', + thirdMaintenanceXlsDownloadUrl: '瀵煎叆妯℃澘/鐢熶骇璁惧涓夌骇淇濆吇瑙勮寖.docx' }, standardId: '-1' } @@ -254,9 +270,6 @@ computed: { inspectionImportExcel: function() { return `${window._CONFIG['domianURL']}/${this.url.inspectionImportExcel}` - }, - weekMaintenanceImportExcel: function() { - return `${window._CONFIG['domianURL']}/${this.url.weekMaintenanceImportExcel}` }, secondMaintenanceImportExcel: function() { return `${window._CONFIG['domianURL']}/${this.url.secondMaintenanceImportExcel}` @@ -346,6 +359,40 @@ this.$refs.modalForm.disableSubmit = false }, + batchDel() { + 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 + deleteAction(that.url.deleteBatch, { ids }) + .then((res) => { + if (res.success) { + that.$notification.success({ + message: '娑堟伅', + description: res.message + }) + that.loadData() + that.onClearSelected() + } else { + that.$notification.warning({ + message: '娑堟伅', + description: res.message + }) + } + }) + .finally(() => { + that.loading = false + }) + } + }) + }, + searchReset() { this.standardId = '-1' this.queryParam = {} -- Gitblit v1.9.3