From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 09:46:44 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop --- src/views/eam/EquipmentCalibrationOrder.vue | 617 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 359 insertions(+), 258 deletions(-) diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue index 2ed65ff..5b7d464 100644 --- a/src/views/eam/EquipmentCalibrationOrder.vue +++ b/src/views/eam/EquipmentCalibrationOrder.vue @@ -1,24 +1,24 @@ <template> <a-card - :bordered="false" - title="璁惧妫�瀹氬伐鍗�" + :bordered='false' + title='鎶�鏈姸鎬侀壌瀹氱鐞�' > <!-- 鏌ヨ鍖哄煙 --> - <div class="table-page-search-wrapper"> + <div class='table-page-search-wrapper'> <a-form - layout="inline" - @keyup.enter.native="searchQuery" + layout='inline' + @keyup.enter.native='searchQuery' > - <a-row :gutter="24"> + <a-row :gutter='24'> <a-col - :md="6" - :sm="8" + :md='6' + :sm='8' > - <a-form-item label="宸ュ崟缂栫爜"> - <a-input - placeholder="璇疯緭鍏ュ伐鍗曠紪鐮�" - v-model="queryParam.num" - ></a-input> + <a-form-item label='宸ュ崟缂栫爜'> + <j-input + placeholder='璇疯緭鍏ュ伐鍗曠紪鐮�' + v-model='queryParam.num' + ></j-input> </a-form-item> </a-col> <!-- <a-col @@ -33,23 +33,23 @@ </a-form-item> </a-col> --> <a-col - :md="6" - :sm="8" + :md='6' + :sm='8' > <span - style="float: left;overflow: hidden;" - class="table-page-search-submitButtons" + style='float: left;overflow: hidden;' + class='table-page-search-submitButtons' > <a-button - type="primary" - @click="searchQuery" - icon="search" + type='primary' + @click='searchQuery' + icon='search' >鏌ヨ</a-button> <a-button - type="primary" - @click="searchReset" - icon="reload" - style="margin-left: 8px" + type='primary' + @click='searchReset' + icon='reload' + style='margin-left: 8px' >閲嶇疆</a-button> </span> </a-col> @@ -59,170 +59,225 @@ <!-- 鏌ヨ鍖哄煙-END --> <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> - <div class="table-operator"> + <div class='table-operator'> <a-button - @click="handleAdd" - type="primary" - icon="plus" - >鏂板</a-button> + @click='handleAdd' + type='primary' + icon='plus' + v-has="'calibrationOrder:add'" + >鏂板 + </a-button> </div> <!-- table鍖哄煙-begin --> <div> <div - class="ant-alert ant-alert-info" - style="margin-bottom: 16px;" + class='ant-alert ant-alert-info' + style='margin-bottom: 16px;' > - <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤� + <i class='anticon anticon-info-circle ant-alert-icon'></i> 宸查�夋嫨 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>椤� <a - style="margin-left: 24px" - @click="onClearSelected" + style='margin-left: 24px' + @click='onClearSelected' >娓呯┖</a> </div> <a-table - ref="table" - size="middle" - :scroll="{ x: 'calc(2000px + 50%)', y: 900 }" + ref='table' + size='middle' + :scroll="{ x: 'calc(1000px + 50%)', y: 900 }" bordered - rowKey="id" - :columns="columns" - :dataSource="dataSource" - :pagination="ipagination" - :loading="loading" - class="j-table-force-nowrap" - @change="handleTableChange" - :customRow="clickThenSelect" + rowKey='id' + :columns='columns' + :dataSource='dataSource' + :pagination='ipagination' + :loading='loading' + class='j-table-force-nowrap' + @change='handleTableChange' + :customRow='clickThenSelect' :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}" > - - <span - slot="action" - slot-scope="text, record" - > - <a-popconfirm - title="纭畾涓嬪彂宸ュ崟鍚�?" - @confirm="() => handleOrderIssue(record)" - > - <a v-if="record.status === '1'">涓嬪彂</a> - </a-popconfirm> - <a-divider - v-if="record.status === '1'" - type="vertical" - /> - <a - v-if="record.status === '1'" - @click="handleEdit(record)" - >缂栬緫</a> - <a-divider - v-if="record.status === '1'" - type="vertical" - /> - <a - v-if="record.status === '2' " - @click="handleOrderExe(record)" - >鎵ц</a> - <a-divider - v-if="record.status === '2'" - type="vertical" - /> - <a - v-if="record.status === '4'" - @click="handleOrderExe(record)" - >鏌ョ湅</a> - <a-divider - v-if="record.status === '4'" - type="vertical" - /> - <a-popconfirm - title="纭畾鎾ゅ洖宸ュ崟鍚�?" - @confirm="() => handleOrderReset(record,'1')" - > - <a v-if="record.status === '2'">鎾ゅ洖</a> - </a-popconfirm> - <a-divider - v-if="record.status === '2'" - type="vertical" - /> - <a-popconfirm - title="纭畾鎾ゅ洖宸ュ崟鍚�?" - @confirm="() => handleOrderReset(record,'2')" - > - <a v-if="record.status === '4'">鎾ゅ洖</a> - </a-popconfirm> - <a-divider - v-if="record.status === '4'" - type="vertical" - /> - <a - - @click="handleFinal(record)" - >褰曞叆缁撴灉</a> - <!-- v-if="record.status === '5'" --> - <a-divider - type="vertical" - /> - <a-dropdown> - <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a> - <a-menu slot="overlay"> - <a-menu-item> - <a @click="handleDetail(record)">璇︽儏</a> - </a-menu-item> - <a-menu-item> - <a-popconfirm - title="纭畾鍒犻櫎鍚�?" - @confirm="() => handleDelete(record.id)" - > - <a v-if="record.status === '1'">鍒犻櫎</a> - </a-popconfirm> - </a-menu-item> - </a-menu> - </a-dropdown> - </span> <span - slot="num" - slot-scope="text, record" + slot='action' + slot-scope='text, record' + > + <a + v-show="record.status === '1' || record.status === '3'" + @click='handleAddOrderReport(record)' + v-has="'calibrationOrder:write'" + >缁撴灉褰曞叆</a> + + <a-divider + v-show="record.status === '1' || record.status === '3'" + type='vertical' + /> + <a + v-show="record.status === '2' && record.equipmentImportance != 'D'" + @click='handleTechnologyStatus(record)' + v-has="'calibrationOrder:audit'" + >缁撴灉瀹℃牳</a> + + <a-divider + 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> + <!-- <a-popconfirm--> + <!-- title='纭畾涓嬪彂宸ュ崟鍚�?'--> + <!-- @confirm='() => handleOrderIssue(record)'--> + <!-- >--> + <!-- <a v-if="record.status === '1'">涓嬪彂</a>--> + <!-- </a-popconfirm>--> + <!-- <a-divider--> + <!-- v-if="record.status === '1'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- <a--> + <!-- v-if="record.status === '1'"--> + <!-- @click='handleEdit(record)'--> + <!-- >缂栬緫</a>--> + <!-- <a-divider--> + <!-- v-if="record.status === '1'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- <a--> + <!-- v-if="record.status === '2' "--> + <!-- @click='handleOrderExe(record)'--> + <!-- >鎵ц</a>--> + <!-- <a-divider--> + <!-- v-if="record.status === '2'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- <a--> + <!-- v-if="record.status === '4'"--> + <!-- @click='handleOrderExe(record)'--> + <!-- >鏌ョ湅</a>--> + <!-- <a-divider--> + <!-- v-if="record.status === '4'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- <a-popconfirm--> + <!-- title='纭畾鎾ゅ洖宸ュ崟鍚�?'--> + <!-- @confirm="() => handleOrderReset(record,'1')"--> + <!-- >--> + <!-- <a v-if="record.status === '2'">鎾ゅ洖</a>--> + <!-- </a-popconfirm>--> + <!-- <a-divider--> + <!-- v-if="record.status === '2'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- <a-popconfirm--> + <!-- title='纭畾鎾ゅ洖宸ュ崟鍚�?'--> + <!-- @confirm="() => handleOrderReset(record,'2')"--> + <!-- >--> + <!-- <a v-if="record.status === '4'">鎾ゅ洖</a>--> + <!-- </a-popconfirm>--> + <!-- <a-divider--> + <!-- v-if="record.status === '4'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- <a--> + <!-- v-if="record.status === '4'"--> + <!-- @click='handleFinal(record)'--> + <!-- >褰曞叆缁撴灉</a>--> + <!-- <!– v-if="record.status === '5'" –>--> + <!-- <a-divider--> + <!-- v-if="record.status === '4'"--> + <!-- type='vertical'--> + <!-- />--> + <!-- --> + <!-- <a-dropdown>--> + <!-- <a @click='handleDetail(record)'>璇︽儏</a>--> + <!-- <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>--> + <!-- <a-menu slot='overlay'>--> + <!-- <a-menu-item>--> + <!-- <a @click='handleDetail(record)'>璇︽儏</a>--> + <!-- </a-menu-item>--> + <!-- <a-menu-item>--> + <!-- <a-popconfirm--> + <!-- title='纭畾鍒犻櫎鍚�?'--> + <!-- @confirm='() => handleDelete(record.id)'--> + <!-- >--> + <!-- <a v-if="record.status === '1'">鍒犻櫎</a>--> + <!-- </a-popconfirm>--> + <!-- </a-menu-item>--> + <!-- </a-menu>--> + <!-- </a-dropdown>--> + </span> + + <!-- <span + slot='num' + slot-scope='text, record' > <a v-if="record.status === '3' || record.status === '2' " - class="lot" - @click="handleOrderExe(record)" - >{{record.num}}</a> + class='lot' + @click='handleOrderExe(record)' + >{{ record.num }}</a> - <span v-else>{{record.num}}</span> - </span> + <span v-else>{{ record.num }}</span> + </span> --> </a-table> - <a-tabs - defaultActiveKey="1" - > - <a-tab-pane - key="1" - tab="妫�楠岄」" - > - <equipment-precision-parameters-list ref="PrecisionParametersList" :calibrationOrderId="mainId"></equipment-precision-parameters-list> - </a-tab-pane> + <a-tabs defaultActiveKey='2'> + <!-- <a-tab-pane --> + <!-- key="1"--> + <!-- tab="妫�楠岄」"--> + <!-- >--> + <!-- <equipment-precision-parameters-list ref="PrecisionParametersList" :calibrationOrderId="mainId"></equipment-precision-parameters-list>--> + <!-- </a-tab-pane>--> <a-tab-pane - key="2" - tab="妫�瀹氭姤鍛�" + key='2' + tab='妫�瀹氭姤鍛�' > - <equipment-calibration-order-report-list ref="EquipmentCalibrationOrderReportList" :calibrationOrderId="mainId"></equipment-calibration-order-report-list> + <equipment-calibration-order-report-list + ref='EquipmentCalibrationOrderReportList' + :calibrationOrderId='mainId' + ></equipment-calibration-order-report-list> </a-tab-pane> </a-tabs> </div> <equipment-calibration-order-modal - ref="modalForm" - @ok="modalFormOk" + ref='modalForm' + @ok='modalFormOk' ></equipment-calibration-order-modal> <equipment-calibration-order-exe-drawer - ref="EquipmentCalibrationOrderExeDrawer" - @ok="modalFormOk" + ref='EquipmentCalibrationOrderExeDrawer' + @ok='modalFormOk' ></equipment-calibration-order-exe-drawer> - <final-modal ref="finalModal" @ok="modalFormOk"></final-modal> + <final-modal + ref='finalModal' + @ok='modalFormOk' + ></final-modal> + + <equipment-calibration-order-report-modal + ref='equipmentCalibrationOrderReportModal' + @ok='modalFormOk' + ></equipment-calibration-order-report-modal> + + <equipment-technology-status-modal + ref="EquipmentTechnologyStatusModal" + @ok="modalFormOk" + ></equipment-technology-status-modal> + + <technology-status-authenticate-modal + ref="TechnologyStatusAuthenticateModal" + @ok="modalFormOk" + ></technology-status-authenticate-modal> </a-card> </template> @@ -234,9 +289,14 @@ import EquipmentCalibrationOrderExeDrawer from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer' import { getAction, postAction, requestPut } from '@/api/manage' import EquipmentPrecisionParametersList from './modules/equipmentCalibrationOrder/EquipmentPrecisionParametersList' -import EquipmentCalibrationOrderReportList from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList' +import EquipmentCalibrationOrderReportList + from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList' import FinalModal from './modules/equipmentCalibrationOrder/FinalModal.vue' - +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', @@ -246,24 +306,27 @@ EquipmentCalibrationOrderExeDrawer, EquipmentPrecisionParametersList, EquipmentCalibrationOrderReportList, - FinalModal + EquipmentCalibrationOrderReportModal, + FinalModal, + EquipmentTechnologyStatusModal, + TechnologyStatusAuthenticateModal }, data() { return { - description: '璁惧妫�瀹氬伐鍗�', - ipagination:{ - current: 1, - pageSize: 5, - pageSizeOptions: ['5', '10', '50'], - showTotal: (total, range) => { - return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�" - }, - showQuickJumper: true, - showSizeChanger: true, - total: 0 + description: '鎶�鏈姸鎬侀壌瀹氱鐞�', + disableMixinCreated: true, + ipagination: { + current: 1, + pageSize: 20, + pageSizeOptions: ['5', '10', '20', '50'], + showTotal: (total, range) => { + return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�' + }, + showQuickJumper: true, + showSizeChanger: true, + total: 0 }, - dictOptions:{ - }, + dictOptions: {}, /* 鍒嗛〉鍙傛暟 */ // 琛ㄥご columns: [ @@ -272,116 +335,147 @@ dataIndex: '', key: 'rowIndex', width: 60, - align: "center", + align: 'center', customRender: function (t, r, index) { - return parseInt(index) + 1; + return parseInt(index) + 1 } - }, - { - title: '鐘舵��', - align: "center", - dataIndex: 'status_dictText' - }, - { - title: '宸ュ崟鍙�', - align: "center", - dataIndex: 'num', - // scopedSlots: { customRender: 'num' } - }, - { - title: '妫�瀹氭柟寮�', - align: "center", - dataIndex: 'calibrationType_dictText', - }, - { - title: '璁惧缂栫爜', - align: "center", - dataIndex: 'equipmentNum', - }, - { - title: '璁惧鍚嶇О', - align: "center", - dataIndex: 'equipmentName', - }, - { - title: '鍨嬪彿', - align: "center", - dataIndex: 'equipmentModel', - }, - { - title: '瑙勬牸', - align: "center", - dataIndex: 'equipmentSpecification', - }, - { - title: '鍒ゅ畾渚濇嵁', - align: "center", - dataIndex: 'managementMode_dictText', }, { - title: '鍒ゅ畾缁撴灉', - align: "center", - dataIndex: 'calibrationOrderUda6_dictText' + title: '宸ュ崟鍙�', + align: 'center', + dataIndex: 'num' + // scopedSlots: { customRender: 'num' } }, { - title: '鍒涘缓浜�', - align: "center", - dataIndex: 'createBy' + title: '鐘舵��', + align: 'center', + dataIndex: 'status_dictText' }, + { + title: '鍒ゅ畾缁撴灉', + align: 'center', + dataIndex: 'calibrationResult_dictText' + }, + // { + // title: '妫�瀹氭柟寮�', + // align: 'center', + // dataIndex: 'calibrationType_dictText' + // }, + { + title: '缁熶竴缂栫爜', + align: 'center', + dataIndex: 'equipmentNum' + }, + { + title: '璁惧鍚嶇О', + align: 'center', + dataIndex: 'equipmentName' + }, + { + title: '鍨嬪彿', + align: 'center', + dataIndex: 'equipmentModel' + }, + { + title: '瑙勬牸', + align: 'center', + dataIndex: 'equipmentSpecification' + }, + // { + // title: '鍒ゅ畾渚濇嵁', + // align: 'center', + // dataIndex: 'managementMode_dictText' + // }, + + // { + // title: '鍒涘缓浜�', + // align: 'center', + // dataIndex: 'createBy' + // }, { title: '鍒涘缓鏃ユ湡', - align: "center", + align: 'center', dataIndex: 'createTime' }, - { - title: '妫�瀹氫汉', - align: "center", - dataIndex: 'calibrationUserId_dictText' - }, + // { + // title: '妫�瀹氫汉', + // align: 'center', + // dataIndex: 'calibrationUserId_dictText' + // }, { title: '瀹屾垚鏃堕棿', - align: "center", + align: 'center', dataIndex: 'calibrationTime' }, { - title: '涓嬪彂鏃堕棿', - align: "center", - dataIndex: 'issueTime' + title: '瀹℃牳鎰忚', + align: 'center', + dataIndex: 'remark' }, + // { + // title: '涓嬪彂鏃堕棿', + // align: 'center', + // dataIndex: 'issueTime' + // }, { title: '鎿嶄綔', dataIndex: 'action', - align: "center", - fixed: "right", - width: 300, + align: 'center', + width: 200, + fixed: 'right', scopedSlots: { customRender: 'action' } } ], url: { - list: "/eam/calibrationOrder/listNew", - delete: "/eam/calibrationOrder/delete", - edit: "/eam/calibrationOrder/editStatus", + list: '/eam/calibrationOrder/listNew', + delete: '/eam/calibrationOrder/delete', + edit: '/eam/calibrationOrder/editStatus' }, - mainId:'', + mainId: '' } }, computed: { importExcelUrl: function () { - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; - }, + 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: { + onSelectChange(selectedRowKeys, selectionRows) { if (selectedRowKeys.length == 1) { - this.mainId = selectedRowKeys[0]; + this.mainId = selectedRowKeys[0] } else { - this.mainId = '-1'; + this.mainId = '-1' } - this.selectedRowKeys = selectedRowKeys; - this.selectionRows = selectionRows; + this.selectedRowKeys = selectedRowKeys + this.selectionRows = selectionRows + }, + + handleTechnologyStatus(record) { + this.$refs.EquipmentTechnologyStatusModal.edit(record); + this.$refs.EquipmentTechnologyStatusModal.title = "瀹℃牳"; + this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false; + }, + + handleTechnologyStatusAuthenticate: function (record) { + this.$refs.TechnologyStatusAuthenticateModal.edit(record); + this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�"; + this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false; + }, handleOrderExe(record) { @@ -401,45 +495,52 @@ }, handleOrderIssue(record) { - const that = this; + const that = this requestPut(that.url.edit, { id: record.id, status: '2' }).then((res) => { if (res.success) { - that.$message.success("宸ュ崟涓嬪彂鎴愬姛锛�") + that.$message.success('宸ュ崟涓嬪彂鎴愬姛锛�') that.loadData() } else { - that.$message.warning("宸ュ崟涓嬪彂澶辫触锛�") + that.$message.warning('宸ュ崟涓嬪彂澶辫触锛�') } }) }, //鎾ゅ洖 handleOrderReset(record, status) { - const that = this; + const that = this requestPut(that.url.edit, { id: record.id, status: status }).then((res) => { if (res.success) { - that.$message.success("宸ュ崟鎾ゅ洖鎴愬姛锛�") + that.$message.success('宸ュ崟鎾ゅ洖鎴愬姛锛�') that.loadData() } else { - that.$message.warning("宸ュ崟鎾ゅ洖澶辫触锛�") + that.$message.warning('宸ュ崟鎾ゅ洖澶辫触锛�') } }) }, onClearSelected() { - this.selectedRowKeys = []; - this.selectionRows = []; - this.mainId='' + this.selectedRowKeys = [] + this.selectionRows = [] + this.mainId = '' }, clickThenSelect(record) { - return { - on: { - click: () => { - this.onSelectChange(record.id.split(","), [record]); - } + return { + on: { + click: () => { + this.onSelectChange(record.id.split(','), [record]) } } + } }, - handleFinal(record){ - this.$refs.finalModal.edit(record); - } + // 鐩存帴涓婁紶閴村畾鎶ュ憡 + handleAddOrderReport: function (record) { + this.$refs.equipmentCalibrationOrderReportModal.add(record.id) + this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶妫�瀹氭姤鍛�' + this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false + }, + handleFinal(record) { + this.$refs.finalModal.edit(record) + }, + } } </script> -- Gitblit v1.9.3