From d5b955494f6d658959e50b9e87ea7ebafb86c6d4 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 05 三月 2025 17:13:09 +0800 Subject: [PATCH] art: 中心项 改为 必填 --- src/views/eam/EquipmentCalibrationOrder.vue | 74 ++++++++++++++++++++++++++++--------- 1 files changed, 56 insertions(+), 18 deletions(-) diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue index bdec41f..613fc4a 100644 --- a/src/views/eam/EquipmentCalibrationOrder.vue +++ b/src/views/eam/EquipmentCalibrationOrder.vue @@ -1,7 +1,7 @@ <template> <a-card :bordered='false' - title='鎶�鏈姸鎬侀壌瀹氱鐞�' + title='' > <!-- 鏌ヨ鍖哄煙 --> <div class='table-page-search-wrapper'> @@ -15,10 +15,10 @@ :sm='8' > <a-form-item label='宸ュ崟缂栫爜'> - <a-input + <j-input placeholder='璇疯緭鍏ュ伐鍗曠紪鐮�' v-model='queryParam.num' - ></a-input> + ></j-input> </a-form-item> </a-col> <!-- <a-col @@ -46,7 +46,7 @@ icon='search' >鏌ヨ</a-button> <a-button - type='primary' + type='info' @click='searchReset' icon='reload' style='margin-left: 8px' @@ -113,13 +113,23 @@ type='vertical' /> <a - v-show="record.status === '2'" + v-show="record.status === '2' && record.equipmentImportance != 'D'" @click='handleTechnologyStatus(record)' v-has="'calibrationOrder:audit'" >缁撴灉瀹℃牳</a> <a-divider - v-show="record.status === '2'" + v-show="record.status === '2' && record.equipmentImportance != 'D'" + type='vertical' + /> + <a + v-show="record.status === '2' && record.equipmentImportance == 'D'" + @click='handleTechnologyStatusAuthenticate(record)' + v-has="'calibrationOrder:authenticate'" + >D绫绘妧鏈姸鎬侀壌瀹�</a> + + <a-divider + v-show="record.status === '2' && record.equipmentImportance == 'D'" type='vertical' /> <a @click='handleDetail(record)'>璇︽儏</a> @@ -229,7 +239,7 @@ <a-tab-pane key='2' - tab='妫�瀹氭姤鍛�' + tab='閴村畾鎶ュ憡' > <equipment-calibration-order-report-list ref='EquipmentCalibrationOrderReportList' @@ -263,6 +273,11 @@ ref="EquipmentTechnologyStatusModal" @ok="modalFormOk" ></equipment-technology-status-modal> + + <technology-status-authenticate-modal + ref="TechnologyStatusAuthenticateModal" + @ok="modalFormOk" + ></technology-status-authenticate-modal> </a-card> </template> @@ -280,6 +295,8 @@ import EquipmentCalibrationOrderReportModal from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal' import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal' +import TechnologyStatusAuthenticateModal from './modules/equipmentCalibrationOrder/TechnologyStatusAuthenticateModal' +import { interceptorFunc } from 'vxe-table' export default { name: 'EquipmentCalibrationOrder', @@ -291,15 +308,17 @@ EquipmentCalibrationOrderReportList, EquipmentCalibrationOrderReportModal, FinalModal, - EquipmentTechnologyStatusModal + EquipmentTechnologyStatusModal, + TechnologyStatusAuthenticateModal }, data() { return { description: '鎶�鏈姸鎬侀壌瀹氱鐞�', + disableMixinCreated: true, ipagination: { current: 1, - pageSize: 5, - pageSizeOptions: ['5', '10', '50'], + pageSize: 20, + pageSizeOptions: ['5', '10', '20', '50'], showTotal: (total, range) => { return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�' }, @@ -374,11 +393,11 @@ // align: 'center', // dataIndex: 'createBy' // }, - // { - // title: '鍒涘缓鏃ユ湡', - // align: 'center', - // dataIndex: 'createTime' - // }, + { + title: '鍒涘缓鏃ユ湡', + align: 'center', + dataIndex: 'createTime' + }, // { // title: '妫�瀹氫汉', // align: 'center', @@ -422,6 +441,17 @@ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` } }, + created() { + //浠庤矾鐢变腑鑾峰彇鏌ヨ鏉′欢 + if (this.$route.query) { + this.queryParam.equipmentId = this.$route.query.equipmentId; + //鏌ヨ鏉′欢鎸夋椂闂村�掑簭 + this.queryParam.sort = 'createTime'; + this.queryParam.order = 'desc'; + } + this.loadData() + this.initDictConfig(); + }, methods: { @@ -441,9 +471,16 @@ this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false; }, + handleTechnologyStatusAuthenticate: function (record) { + this.$refs.TechnologyStatusAuthenticateModal.edit(record); + this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�"; + this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false; + + }, + handleOrderExe(record) { this.$refs.EquipmentCalibrationOrderExeDrawer.visible = true - this.$refs.EquipmentCalibrationOrderExeDrawer.title = '妫�瀹氬伐鍗曟墽琛�' + this.$refs.EquipmentCalibrationOrderExeDrawer.title = '閴村畾宸ュ崟鎵ц' this.$refs.EquipmentCalibrationOrderExeDrawer.handleShow(record) if (record.status === '4') { this.$refs.EquipmentCalibrationOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸� @@ -497,12 +534,13 @@ // 鐩存帴涓婁紶閴村畾鎶ュ憡 handleAddOrderReport: function (record) { this.$refs.equipmentCalibrationOrderReportModal.add(record.id) - this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶妫�瀹氭姤鍛�' + this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶閴村畾鎶ュ憡' this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false }, handleFinal(record) { this.$refs.finalModal.edit(record) - } + }, + } } </script> -- Gitblit v1.9.3