From f03855c731766bb74479bf2126ab385961e12345 Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期五, 15 八月 2025 17:15:20 +0800 Subject: [PATCH] 齐套性检查页面 --- src/views/mes/MesProductionWorkOrderListView.vue | 69 ++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/views/mes/MesProductionWorkOrderListView.vue b/src/views/mes/MesProductionWorkOrderListView.vue index e7fd391..6b524e3 100644 --- a/src/views/mes/MesProductionWorkOrderListView.vue +++ b/src/views/mes/MesProductionWorkOrderListView.vue @@ -82,41 +82,54 @@ </template> <span slot="action" slot-scope="text, record"> - <a @click="handleDetail(record)">璇︽儏</a> - <span v-if="record.workOrderStatus === 'PUBLISHED' || record.workOrderStatus === 'EXECUTING'"> - <a-divider type="vertical" /> - <a @click="handleRePublish(record)">閲嶅彂甯�</a> - </span> - <span v-if="record.workOrderStatus === 'PUBLISHED'"> - <a-divider type="vertical" /> - <a-popconfirm title="纭畾寮�濮嬫墽琛屽悧?" @confirm="() => handleExecute(record.id)"> - <a>鎵ц</a> - </a-popconfirm> - </span> - <span v-if="record.workOrderStatus === 'EXECUTING'"> - <a-divider type="vertical" /> - <a @click="handleWorkReport(record)">鎶ュ伐</a> - </span> - <span v-if="record.workOrderStatus === 'NEW'"> - <a-divider type="vertical" /> - <a-popconfirm title="纭畾鍙戝竷鍚�?" @confirm="() => handlePublish(record.id)"> - <a>鍙戝竷</a> - </a-popconfirm> - <a-divider type="vertical" /> + <span v-if="record.workOrderStatus === 'NEW'"> + <a-popconfirm title="纭畾鍙戝竷鍚�?" @confirm="() => handlePublish(record.id)"> + <a>鍙戝竷</a> + </a-popconfirm> + </span> + <span v-if="record.workOrderStatus === 'PUBLISHED' || record.workOrderStatus === 'EXECUTING'"> + <a-divider type="vertical" /> + <a @click="handleRePublish(record)">閲嶅彂甯�</a> + </span> + <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '0'"> + <a-divider type="vertical" /> + <a @click="handleCompletenessCheck(record)">榻愬鎬ф鏌�</a> + </span> + <span v-if="record.workOrderStatus === 'PUBLISHED' && record.equipmentInspectionFlag === '0'"> + <a-divider type="vertical" /> + <a @click="handleCompletenessCheck(record)">璁惧鐐规</a> + </span> + <span v-if="record.workOrderStatus === 'PUBLISHED' && record.processInspectionFlag === '0'"> + <a-divider type="vertical" /> + <a @click="handleCompletenessCheck(record)">宸ヨ壓鐐规</a> + </span> + <span v-if="record.workOrderStatus === 'PUBLISHED' && record.completenessCheckFlag === '1' && record.equipmentInspectionFlag === '1' && record.processInspectionFlag === '1'"> + <a-divider type="vertical" /> + <a-popconfirm title="纭畾寮�濮嬫墽琛屽悧?" @confirm="() => handleExecute(record.id)"> + <a>鎵ц</a> + </a-popconfirm> + </span> + <span v-if="record.workOrderStatus === 'EXECUTING'"> + <a-divider type="vertical" /> + <a @click="handleWorkReport(record)">鎶ュ伐</a> + </span> + <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 v-if="record.workOrderStatus === 'NEW'"> <a @click="handleEdit(record)">缂栬緫</a> </a-menu-item> - <a-menu-item> + <a-menu-item v-if="record.workOrderStatus === 'NEW'"> <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)"> - <a>鍒犻櫎</a> + <a>鍒犻櫎</a> </a-popconfirm> </a-menu-item> </a-menu> </a-dropdown> - </span> </span> </a-table> @@ -203,9 +216,10 @@ <mes-production-order-modal ref="MesProductionOrderModal"></mes-production-order-modal> <MesMaterialUnloadingList ref="MesMaterialUnloadingList"></MesMaterialUnloadingList> <MesMaterialTransferDetailList ref="MesMaterialTransferDetailList"></MesMaterialTransferDetailList> - <MesProductionWorkOrderScheduleModal ref="MesProductionWorkOrderScheduleModal"></MesProductionWorkOrderScheduleModal> + <MesProductionWorkOrderScheduleModal ref="MesProductionWorkOrderScheduleModal" @ok="modalFormOk"></MesProductionWorkOrderScheduleModal> <MesProductionWorkOrderRepublishModal ref="MesProductionWorkOrderRepublishModal" @ok="modalFormOk"></MesProductionWorkOrderRepublishModal> <MesProductionWorkOrderReportModal ref="MesProductionWorkOrderReportModal" @ok="modalFormOk"></MesProductionWorkOrderReportModal> + <MesProductionWorkOrderCompletenessCheckModal ref="MesProductionWorkOrderCompletenessCheckModal" @ok="modalFormOk"></MesProductionWorkOrderCompletenessCheckModal> </a-card> </template> @@ -225,6 +239,7 @@ import MesProductionWorkOrderScheduleModal from '@views/mes/modules/MesProductionWorkOrderScheduleModal.vue' import MesProductionWorkOrderRepublishModal from '@views/mes/modules/MesProductionWorkOrderRepublishModal.vue' import MesProductionWorkOrderReportModal from '@views/mes/modules/MesProductionWorkOrderReportModal.vue' +import MesProductionWorkOrderCompletenessCheckModal from '@views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue' export default { name: 'MesProductionWorkOrderList', @@ -237,6 +252,7 @@ MesProductionWorkOrderScheduleModal, MesProductionWorkOrderRepublishModal, MesProductionWorkOrderReportModal, + MesProductionWorkOrderCompletenessCheckModal }, data() { return { @@ -732,6 +748,9 @@ handleWorkReport(record) { this.$refs.MesProductionWorkOrderReportModal.add(record) }, + handleCompletenessCheck(record) { + this.$refs.MesProductionWorkOrderCompletenessCheckModal.check(record) + }, async handleTransferDetail(row){ console.log('row---->',row) const transferDetailResult = await getAction(this.url.queryTransferDetailBy,{'requestId':row.id}) -- Gitblit v1.9.3