From 9be2e2f91332ed341406acf9739d8912dddbf6fe Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期二, 22 七月 2025 20:43:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/eam/repair/EamRepairOrderList.vue | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue index 4bdd93d..f4f9e4f 100644 --- a/src/views/eam/repair/EamRepairOrderList.vue +++ b/src/views/eam/repair/EamRepairOrderList.vue @@ -28,18 +28,17 @@ <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button> </span> </a-col> - </a-row> </a-form> </div> <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> <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 +60,15 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange" :scroll="{x:'max-content'}"> <span slot="action" slot-scope="text, record"> - <a @click="handleFillIn(record)">濉姤</a> - <a-divider type="vertical"/> - <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)"> - <a>鎻愪氦</a> - </a-popconfirm> - <a-divider type="vertical"/> - <a @click="handleDetail(record)">璇︽儏</a> + <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE'"> + <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> </a-table> </div> @@ -261,6 +262,11 @@ }) }, + // 鎵归噺鎻愪氦鏃惰Е鍙� + handleBatchSubmit() { + + }, + /** * 鐐瑰嚮璇︽儏瑙﹀彂 * @param record 琛ㄦ牸琛屼俊鎭� -- Gitblit v1.9.3