From f7f0a26ba95de85e537b0c18e02f06416b01312f Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 04 八月 2025 21:33:28 +0800 Subject: [PATCH] 保养流程添加流程节点 --- src/views/eam/repair/EamRepairOrderList.vue | 86 ++++++++++++++++++++++++++++++++---------- 1 files changed, 65 insertions(+), 21 deletions(-) diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue index 34f03c0..3ba12e2 100644 --- a/src/views/eam/repair/EamRepairOrderList.vue +++ b/src/views/eam/repair/EamRepairOrderList.vue @@ -5,24 +5,24 @@ <div class="table-page-search-wrapper" v-if="isDisplayOperation"> <a-form layout="inline" @keyup.enter.native="searchQuery"> <a-row :gutter="24"> - <a-col :xl="6" :lg="7" :md="8" :sm="24"> + <a-col :xl="6" :lg="7" :md="8" :sm="12"> <a-form-item label="缁熶竴缂栫爜"> <lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/> </a-form-item> </a-col> - <a-col :xl="6" :lg="7" :md="8" :sm="24"> + <a-col :xl="6" :lg="7" :md="8" :sm="12"> <a-form-item label="宸ュ崟鍙�"> <a-input placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.repairCode"></a-input> </a-form-item> </a-col> - <a-col :xl="6" :lg="7" :md="8" :sm="24"> + <a-col :xl="6" :lg="7" :md="8" :sm="12"> <a-form-item label="缁翠慨鐘舵��"> <j-dict-select-tag placeholder="璇烽�夋嫨缁翠慨鐘舵��" v-model="queryParam.repairStatus" dict-code="repair_status"/> </a-form-item> </a-col> - <a-col :xl="6" :lg="7" :md="8" :sm="24"> + <a-col :xl="6" :lg="7" :md="8" :sm="12"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button> <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button> @@ -35,11 +35,11 @@ <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> <div class="table-operator" v-if="isDisplayOperation"> - <a-dropdown v-if="selectedRowKeys.length > 0"> + <a-dropdown :disabled="selectedRowKeys.length == 0"> <a-menu slot="overlay"> - <a-menu-item key="1" @click="batchDel"> - <a-icon type="delete"/> - 鍒犻櫎 + <a-menu-item key="1" @click="handleBatchSubmit"> + <a-icon type="form"/> + 鎻愪氦 </a-menu-item> </a-menu> <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 @@ -61,13 +61,32 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange" :scroll="{x:'max-content'}"> <span slot="action" slot-scope="text, record"> - <a v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" @click="handleFillIn(record)">濉姤</a> - <a-divider v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" type="vertical"/> - <a-popconfirm v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)"> - <a>鎻愪氦</a> - </a-popconfirm> - <a-divider v-if="record.repairStatus === 'PENDING_REPAIR' || record.repairStatus === 'UNDER_MAINTENANCE'" type="vertical"/> - <a @click="handleDetail(record)">璇︽儏</a> + <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE' ||record.repairStatus=='REJECTED'"> + <a @click="handleFillIn(record)">濉姤</a> + <a-divider type="vertical"/> + <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)"> + <a>鎻愪氦</a> + </a-popconfirm> + </template> + + <a v-else @click="handleDetail(record)">璇︽儏</a> + </span> + + <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず--> + <span slot="faultPhenomenon" slot-scope="text"> + <j-ellipsis :value="text" :length="8"/> + </span> + <span slot="faultReason" slot-scope="text"> + <j-ellipsis :value="text" :length="8"/> + </span> + <span slot="faultAnalysis" slot-scope="text"> + <j-ellipsis :value="text" :length="8"/> + </span> + <span slot="faultProcess" slot-scope="text"> + <j-ellipsis :value="text" :length="8"/> + </span> + <span slot="faultPrevent" slot-scope="text"> + <j-ellipsis :value="text" :length="8"/> </span> </a-table> </div> @@ -146,7 +165,17 @@ { title: '宸ュ崟鍙�', align: 'center', - dataIndex: 'repairCode' + dataIndex: 'repairCode', + }, + { + title: '鏁呴殰绫诲瀷', + align: 'center', + dataIndex: 'faultType_dictText', + }, + { + title: '鎶ヤ慨浜�', + align: 'center', + dataIndex: 'reportPerson_dictText', }, { title: '缁翠慨寮�濮嬫椂闂�', @@ -172,24 +201,34 @@ width: 200 }, { + title: '鏁呴殰鐜拌薄', + align: 'center', + dataIndex: 'faultPhenomenon', + scopedSlots: {customRender: 'faultPhenomenon'}, + }, + { title: '鏁呴殰鍘熷洜', align: 'center', - dataIndex: 'faultReason' + dataIndex: 'faultReason', + scopedSlots: {customRender: 'faultReason'}, }, { title: '鏁呴殰鍒嗘瀽', align: 'center', - dataIndex: 'faultAnalysis' + dataIndex: 'faultAnalysis', + scopedSlots: {customRender: 'faultAnalysis'}, }, { title: '鎺掓晠杩囩▼', align: 'center', - dataIndex: 'faultProcess' + dataIndex: 'faultProcess', + scopedSlots: {customRender: 'faultProcess'}, }, { title: '棰勯槻鎺柦', align: 'center', - dataIndex: 'faultPrevent' + dataIndex: 'faultPrevent', + scopedSlots: {customRender: 'faultPrevent'}, }, { title: '鎿嶄綔宸�', @@ -261,6 +300,11 @@ }) }, + // 鎵归噺鎻愪氦鏃惰Е鍙� + handleBatchSubmit() { + + }, + /** * 鐐瑰嚮璇︽儏瑙﹀彂 * @param record 琛ㄦ牸琛屼俊鎭� @@ -270,7 +314,7 @@ this.$refs.repairOrderApprovalModal.visible = true this.$refs.repairOrderApprovalModal.title = '璇︽儏' this.$refs.repairOrderApprovalModal.disableSubmit = true - this.$refs.repairOrderApprovalModal.recordDetail(record) + this.$refs.repairOrderApprovalModal.handleDetail(record) } } } -- Gitblit v1.9.3