From 5ec150affc0fc777b2a645a888d377f65501e08b Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 05 九月 2025 10:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index b3aa941..1731a7b 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -39,12 +39,36 @@
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator" v-if="isDisplayOperation">
       <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+
+      <a-dropdown :disabled="selectedRowKeys.length===0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="handleBatchPrint(1)">
+            楠屾敹鍗�
+          </a-menu-item>
+          <a-menu-item key="2" @click="handleBatchPrint(2)">
+            瀹屽伐绉讳氦鍗�
+          </a-menu-item>
+          <a-menu-item key="3" @click="handleBatchPrint(3)">
+            浠ヤ笂鍚屾椂灞曠ず
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px" type="primary"> 鎵归噺棰勮
+          <a-icon type="down"/>
+        </a-button>
+      </a-dropdown>
     </div>
 
     <!-- table鍖哄煙-begin -->
     <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
              :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
+             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
              @change="handleTableChange">
+
+      <!--浣跨敤閮ㄩ棬-->
+      <template slot="factoryOrgCode" slot-scope="text,record">
+        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
+      </template>
+
         <span slot="action" slot-scope="text, record">
           <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
             <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
@@ -69,7 +93,7 @@
           <template v-if="record.maintenanceStatus === 'COMPLETE'">
           <a-divider type="vertical"/>
 
-          <a @click="handlePrint(record)">鎵撳嵃</a>
+          <a @click="handlePrint(record)">棰勮</a>
           </template>
         </span>
     </a-table>
@@ -79,10 +103,13 @@
     <eamThirdMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/>
 
     <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"
-                                      :selectShenpiData="selectThirdMaintenanceData"/>
+                                      :selectShenpiData="selectedRowData"/>
 
     <!--宸ュ崟鍙樻洿寮圭獥-->
     <eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
+
+    <!--鎵归噺鎵撳嵃寮圭獥-->
+    <eam-third-maintenance-order-batch-print-modal ref="batchPrintModal"/>
   </a-card>
 </template>
 
@@ -93,13 +120,14 @@
   import { deleteAction, getAction } from '@api/manage'
   import ThirdMaintenanceApprovalModal
     from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
-  import EamThirdMaintenanceChangeModal
-    from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'
+  import EamThirdMaintenanceChangeModal from './modules/EamThirdMaintenanceChangeModal.vue'
+  import EamThirdMaintenanceOrderBatchPrintModal from './modules/EamThirdMaintenanceOrderBatchPrintModal'
 
   export default {
     name: 'EamThirdMaintenanceOrderList',
     mixins: [JeecgListMixin],
     components: {
+      EamThirdMaintenanceOrderBatchPrintModal,
       EamThirdMaintenanceChangeModal,
       LxSearchEquipmentSelect,
       EamThirdMaintenanceOrderModal,
@@ -115,7 +143,7 @@
       return {
         description: '璁惧涓夌骇淇濆吇绠＄悊椤甸潰',
         disableMixinCreated: true,
-        selectThirdMaintenanceData: {},
+        selectedRowData: {},
         // 琛ㄥご
         columns: [
           {
@@ -145,6 +173,12 @@
             title: '璁惧鍨嬪彿',
             align: 'center',
             dataIndex: 'equipmentModel',
+            fixed: 'left'
+          },
+          {
+            title: '浣跨敤閮ㄩ棬',
+            align: 'center',
+            scopedSlots: { customRender: 'factoryOrgCode' },
             fixed: 'left'
           },
           {
@@ -285,6 +319,7 @@
         dataIndex: 'action',
         align: 'center',
         fixed: 'right',
+        width: 200,
         scopedSlots: { customRender: 'action' }
       }
       this.columns = [...this.columns, operationColumn]
@@ -356,11 +391,16 @@
        * @param record
        */
       handleDetail(record) {
-        this.selectThirdMaintenanceData = Object.assign({}, record)
+        this.selectedRowData = Object.assign({}, record)
         this.$refs.thirdMaintenanceApprovalModal.title = '璇︽儏'
         this.$refs.thirdMaintenanceApprovalModal.visible = true
         this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
-        this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
+        this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
+      },
+
+      // 鎵归噺鎵撳嵃
+      handleBatchPrint(type) {
+        this.$refs.batchPrintModal.handlePreview(type,this.selectedRowKeys.join())
       },
 
       onMaintenanceDateChange(dateString) {
@@ -368,6 +408,10 @@
         this.queryParam.maintenanceDateEnd = dateString[1]
       },
 
+      /**
+       * 绉湪鎶ヨ〃棰勮鎵撳嵃
+       * @param record
+       */
       handlePrint(record) {
         let href = `${window._CONFIG['domianURL']}/jmreport/view/1094880052100399104?id=` + record.id
         //  + `&orderId=` + record.id; //缃戠珯閾炬帴

--
Gitblit v1.9.3