From 9520029a84be8df133a539968f05f20bf8041750 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 24 七月 2025 11:31:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue |   54 ++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index 2232cf7..4eb05c3 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -46,29 +46,38 @@
 
         <span slot="action" slot-scope="text, record">
           <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'">
-            <a-popconfirm title="纭畾棰嗗彇鍚楋紵"
-                          @confirm="handleReceive(record.id)">
+            <a-popconfirm title="纭畾棰嗗彇鍚楋紵" @confirm="handleReceive(record.id)">
             <a>棰嗗彇</a>
           </a-popconfirm>
 
            <a-divider type="vertical"/>
           </template>
 
-            <a @click="handleDetail(record)">璇︽儏</a>
+          <template v-if="record.evaluationStatus == 'WAIT_EVALUATION'||record.evaluationStatus=='LOCKED'">
+             <a @click="handleOrderChange(record)">鍙樻洿</a>
+
+             <a-divider type="vertical"/>
+          </template>
+
+          <a @click="handleDetail(record)">璇︽儏</a>
         </span>
     </a-table>
     <!-- table鍖哄煙-end -->
 
-    <!-- 琛ㄥ崟鍖哄煙 -->
+    <!--宸ュ崟寮圭獥-->
     <eamTechnicalStatusEvaluationOrder-modal ref="modalForm" @ok="modalFormOk"/>
 
     <technical-status-evaluation-approval-modal ref="technicalStatusEvaluationApprovalModal"
                                                 :selectShenpiData="selectedOrderData"/>
+
+    <!--宸ュ崟鍙樻洿寮圭獥-->
+    <eamTechnicalStatusEvaluationOrderChange-modal ref="orderChangeModal" @ok="modalFormOk"/>
   </a-card>
 </template>
 
 <script>
   import EamTechnicalStatusEvaluationOrderModal from './modules/EamTechnicalStatusEvaluationOrderModal'
+  import EamTechnicalStatusEvaluationOrderChangeModal from './modules/EamTechnicalStatusEvaluationOrderChangeModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction } from '@/api/manage'
   import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
@@ -81,7 +90,8 @@
     components: {
       TechnicalStatusEvaluationApprovalModal,
       LxSearchEquipmentSelect,
-      EamTechnicalStatusEvaluationOrderModal
+      EamTechnicalStatusEvaluationOrderModal,
+      EamTechnicalStatusEvaluationOrderChangeModal
     },
     data() {
       return {
@@ -119,6 +129,12 @@
             fixed: 'left'
           },
           {
+            title: '閴村畾鐘舵��',
+            align: 'center',
+            dataIndex: 'evaluationStatus_dictText',
+            fixed: 'left'
+          },
+          {
             title: '宸ュ崟鍙�',
             align: 'center',
             dataIndex: 'orderNum'
@@ -152,11 +168,6 @@
             title: '棰嗗彇浜�',
             align: 'center',
             dataIndex: 'evaluator_dictText'
-          },
-          {
-            title: '閴村畾鐘舵��',
-            align: 'center',
-            dataIndex: 'evaluationStatus_dictText'
           },
           {
             title: '鍒涘缓鏂瑰紡',
@@ -253,7 +264,8 @@
             dataIndex: 'action',
             align: 'center',
             scopedSlots: { customRender: 'action' },
-            fixed: 'right'
+            fixed: 'right',
+            width: 200
           }
         ],
         url: {
@@ -263,6 +275,10 @@
       }
     },
     methods: {
+      /**
+       * 鐐瑰嚮棰嗗彇鏃惰Е鍙�
+       * @param id
+       */
       handleReceive(id) {
         let that = this
         this.loading = true
@@ -284,11 +300,25 @@
           })
       },
 
+      /**
+       * 鐐瑰嚮鍙樻洿鏃惰Е鍙�
+       * @param record
+       */
+      handleOrderChange(record) {
+        this.$refs.orderChangeModal.title = '鍙樻洿'
+        this.$refs.orderChangeModal.add(record)
+      },
+
+      /**
+       * 鐐瑰嚮璇︽儏鏃惰Е鍙�
+       * @param record
+       */
       handleDetail(record) {
         this.selectedOrderData = Object.assign({}, record)
-        this.$refs.technicalStatusEvaluationApprovalModal.recordDetail(record)
         this.$refs.technicalStatusEvaluationApprovalModal.title = '璇︽儏'
+        this.$refs.technicalStatusEvaluationApprovalModal.visible = true
         this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true
+        this.$refs.technicalStatusEvaluationApprovalModal.handleDetail(record)
       }
     }
   }

--
Gitblit v1.9.3