From c852aa9f6ecec2953ca3a5c11ce7d9f79f8fc5bc Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 14 七月 2025 14:15:32 +0800
Subject: [PATCH] 鉴定工单审批弹窗维修工填写检查结果

---
 src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue |   67 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
index 26efcce..2232cf7 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="5" :lg="6" :md="8" :sm="12">
             <a-form-item label="缁熶竴缂栫爜">
-              <technical-status-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
+              <lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
             </a-form-item>
           </a-col>
           <a-col :xl="5" :lg="6" :md="8" :sm="12">
@@ -17,6 +17,12 @@
           <a-col :xl="5" :lg="6" :md="8" :sm="12">
             <a-form-item label="璁″垝閴村畾鏃ユ湡">
               <a-date-picker v-model="queryParam.evaluationDate" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="5" :lg="6" :md="8" :sm="12">
+            <a-form-item label="閴村畾鐘舵��">
+              <j-dict-select-tag placeholder="璇烽�夋嫨閴村畾鐘舵��" dict-code="technical_status_evaluation_order_status"
+                                 v-model="queryParam.evaluationStatus"/>
             </a-form-item>
           </a-col>
           <a-col :xl="4" :lg="6" :md="8" :sm="12">
@@ -39,35 +45,48 @@
              :scroll="{ x: 'max-content' }" :loading="loading" @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <a-popconfirm v-if="record.evaluationStatus=='WAIT_EVALUATION'" title="纭畾棰嗗彇鍚楋紵"
-                        @confirm="handleReceive(record.id)">
+          <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'">
+            <a-popconfirm title="纭畾棰嗗彇鍚楋紵"
+                          @confirm="handleReceive(record.id)">
             <a>棰嗗彇</a>
           </a-popconfirm>
+
+           <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"/>
   </a-card>
 </template>
 
 <script>
   import EamTechnicalStatusEvaluationOrderModal from './modules/EamTechnicalStatusEvaluationOrderModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TechnicalStatusEquipmentSelect from '../equipment/modules/TechnicalStatusEquipmentSelect'
   import { getAction } from '@/api/manage'
+  import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+  import TechnicalStatusEvaluationApprovalModal
+    from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
 
   export default {
     name: 'EamTechnicalStatusEvaluationOrderList',
     mixins: [JeecgListMixin],
     components: {
-      TechnicalStatusEquipmentSelect,
+      TechnicalStatusEvaluationApprovalModal,
+      LxSearchEquipmentSelect,
       EamTechnicalStatusEvaluationOrderModal
     },
     data() {
       return {
         description: '鎶�鏈姸鎬侀壌瀹氬伐鍗曠鐞嗛〉闈�',
+        selectedOrderData: {},
         // 琛ㄥご
         columns: [
           {
@@ -102,14 +121,12 @@
           {
             title: '宸ュ崟鍙�',
             align: 'center',
-            dataIndex: 'orderNum',
-            fixed: 'left'
+            dataIndex: 'orderNum'
           },
           {
             title: '璁″垝閴村畾鏃ユ湡',
             align: 'center',
-            dataIndex: 'evaluationDate',
-            fixed: 'left'
+            dataIndex: 'evaluationDate'
           },
           {
             title: '閿佸畾宸ュ崟鏃ユ湡',
@@ -132,9 +149,9 @@
             dataIndex: 'actualEndTime'
           },
           {
-            title: '閴村畾浜�',
+            title: '棰嗗彇浜�',
             align: 'center',
-            dataIndex: 'evaluator'
+            dataIndex: 'evaluator_dictText'
           },
           {
             title: '閴村畾鐘舵��',
@@ -241,35 +258,37 @@
         ],
         url: {
           list: '/eam/eamTechnicalStatusEvaluationOrder/list',
-          receive: '/eam/eamTechnicalStatusEvaluationOrder/collect',
-          delete: '/eam/eamTechnicalStatusEvaluationOrder/delete',
-          deleteBatch: '/eam/eamTechnicalStatusEvaluationOrder/deleteBatch',
-          exportXlsUrl: 'eam/eamTechnicalStatusEvaluationOrder/exportXls',
-          importExcelUrl: 'eam/eamTechnicalStatusEvaluationOrder/importExcel'
+          receive: '/eam/eamTechnicalStatusEvaluationOrder/collect'
         }
-      }
-    },
-    computed: {
-      importExcelUrl: function() {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
       }
     },
     methods: {
       handleReceive(id) {
-        getAction(this.url.receive, { id })
+        let that = this
+        this.loading = true
+        getAction(that.url.receive, { id })
           .then(res => {
             if (res.success) {
-              this.$notification.success({
+              that.$notification.success({
                 message: '娑堟伅',
                 description: res.message
               })
+              that.loadData()
             } else {
-              this.$notification.warning({
+              that.$notification.warning({
                 message: '娑堟伅',
                 description: res.message
               })
+              that.loading = false
             }
           })
+      },
+
+      handleDetail(record) {
+        this.selectedOrderData = Object.assign({}, record)
+        this.$refs.technicalStatusEvaluationApprovalModal.recordDetail(record)
+        this.$refs.technicalStatusEvaluationApprovalModal.title = '璇︽儏'
+        this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true
       }
     }
   }

--
Gitblit v1.9.3