From 54c22f2f0e98c35e48cdad6c4d0299d08beea630 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 28 七月 2025 10:15:13 +0800
Subject: [PATCH] update

---
 src/views/eam/maintenance/EamInspectionOrderList.vue |   88 +++++++++++++++++++-------------------------
 1 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index 3bf317a..8ca2c71 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -37,14 +37,14 @@
 
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator" v-if="isDisplayOperation">
-      <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-if="isShowAuth('eam:inspection:add')">鏂板</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchZf('ABOLISH')">
+          <a-menu-item key="1" v-if="isShowAuth('eam:inspection:abolish')" @click="batchZf('ABOLISH')">
             <a-icon type="snippets"/>
             浣滃簾
           </a-menu-item>
-          <a-menu-item key="2" @click="batchLq('UNDER_INSPECTION')">
+          <a-menu-item key="2" v-if="isShowAuth('eam:inspection:collect')" @click="batchLq('UNDER_INSPECTION')">
             <a-icon type="form"/>
             棰嗗彇
           </a-menu-item>
@@ -77,39 +77,17 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            涓嬭浇
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
-          <template v-if="record.inspectionStatus === 'WAIT_INSPECTION'">
-            <a @click="handleEdit(record)">缂栬緫</a>
+            <a @click="handleEdit(record)" v-if="isShowAuth('eam:inspection:edit') && record.inspectionStatus === 'WAIT_INSPECTION'" >缂栬緫</a>
 
-          <a-divider type="vertical"/>
+          <a-divider type="vertical" v-if="isShowAuth('eam:inspection:edit') && record.inspectionStatus === 'WAIT_INSPECTION'" />
 
-          <a-popconfirm title="纭畾棰嗗彇鍚�?"
+          <a-popconfirm title="纭畾棰嗗彇鍚�?" v-if="isShowAuth('eam:inspection:collect') && record.inspectionStatus === 'WAIT_INSPECTION'"
                         @confirm="() => handleInspection(record.id)">
                   <a>棰嗗彇</a>
           </a-popconfirm>
 
-          <a-divider type="vertical"/>
+          <a-divider type="vertical" v-if="isShowAuth('eam:inspection:collect') && record.inspectionStatus === 'WAIT_INSPECTION'" />
 
           <a-dropdown>
             <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
@@ -117,24 +95,20 @@
               <a-menu-item>
                 <a @click="handleDetail(record)">璇︽儏</a>
               </a-menu-item>
-              <a-menu-item>
+              <a-menu-item v-if="isShowAuth('eam:inspection:abolish') && record.inspectionStatus === 'WAIT_INSPECTION'">
                 <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleOrReceive(record.id)">
                   <a>浣滃簾</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
           </a-dropdown>
-          </template>
-
-          <template v-else>
-            <a @click="handleDetail(record)">璇︽儏</a>
-          </template>
         </span>
       </a-table>
     </div>
 
     <eam-inspection-order-modal ref="modalForm" @ok="modalFormOk"></eam-inspection-order-modal>
-    <EamInspectionOrderModalXq ref="modalFormXq" @ok="modalFormOk"></EamInspectionOrderModalXq>
+
+    <inspection-order-handle ref="modalFormXq" :selectShenpiData="selectInspectionOrderXqData"/>
   </a-card>
 </template>
 
@@ -144,17 +118,17 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import EamInspectionOrderModal from './modules/EamInspectionOrderModal'
-  import EamInspectionOrderModalXq from './modules/EamInspectionOrderModalXq.vue'
   import { deleteAction, getAction } from '@api/manage'
+  import InspectionOrderHandle from '../../flowable/workflow/InspectionOrder/InspectionOrderHandle'
   import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
 
   export default {
     name: 'EamInspectionOrderList',
     mixins: [JeecgListMixin, mixinDevice],
     components: {
-      LxSearchEquipmentSelect,
+      InspectionOrderHandle,
       EamInspectionOrderModal,
-      EamInspectionOrderModalXq
+      LxSearchEquipmentSelect,
     },
     props: {
       isDisplayOperation: {
@@ -192,6 +166,11 @@
             title: '璁惧鍚嶇О',
             align: 'center',
             dataIndex: 'equipmentName'
+          },
+          {
+            title: '瀹夎浣嶇疆',
+            align: 'center',
+            dataIndex: 'installationPosition'
           },
           {
             title: '鏍囧噯鍚嶇О',
@@ -243,11 +222,16 @@
             title: '纭鏃堕棿',
             align: 'center',
             dataIndex: 'confirmTime',
+          },
+          {
+            title: '纭鎰忚',
+            align: 'center',
+            dataIndex: 'confirmComment',
           }
         ],
         url: {
           list: '/eam/eamInspectionOrder/list',
-          cancelInspectionOrder: "/eam/eamInspectionOrder/cancelInspectionOrder",
+          cancelInspectionOrder: '/eam/eamInspectionOrder/cancelInspectionOrder',
           deleteBatch: '/eam/eamInspectionOrder/deleteBatch',
           exportXlsUrl: '/eam/eamInspectionOrder/exportXls',
           importExcelUrl: 'eam/eamInspectionOrder/importExcel',
@@ -255,7 +239,8 @@
           cancelOrReceive: 'eam/eamInspectionOrder/cancelOrReceive'
         },
         dictOptions: {},
-        superFieldList: []
+        superFieldList: [],
+        selectInspectionOrderXqData: {}
       }
     },
     created() {
@@ -267,7 +252,7 @@
         dataIndex: 'action',
         align: 'center',
         fixed: 'right',
-        width: 147,
+        width: 200,
         scopedSlots: { customRender: 'action' }
       }
       this.columns = [...this.columns, operationColumn]
@@ -283,9 +268,12 @@
       },
       //璇︽儏
       handleDetail: function(record) {
-        this.$refs.modalFormXq.edit(record)
+        this.selectInspectionOrderXqData = Object.assign({}, record)
+        this.$refs.modalFormXq.visible = true
         this.$refs.modalFormXq.title = '璇︽儏'
         this.$refs.modalFormXq.disableSubmit = true
+        this.$refs.modalFormXq.getAllApproveData(record)
+        this.$refs.modalFormXq.getBasicInformation({ ...record, dataId: record.id })
       },
       handleInspection(id) {
         if (!this.url.receiveInspectionOrder) {
@@ -309,27 +297,27 @@
           }
         })
       },
-      handleOrReceive(id){
+      handleOrReceive(id) {
         if (!this.url.cancelInspectionOrder) {
-          this.$message.error("璇疯缃畊rl.cancelInspectionOrder!")
+          this.$message.error('璇疯缃畊rl.cancelInspectionOrder!')
           return
         }
-        var that = this;
+        var that = this
         getAction(that.url.cancelInspectionOrder, { id: id }).then((res) => {
           if (res.success) {
             that.$notification.success({
               message: '娑堟伅',
               description: res.message
-            });
-            that.loadData();
+            })
+            that.loadData()
           } else {
             // that.$message.warning(res.message);
             that.$notification.warning({
               message: '娑堟伅',
               description: res.message
-            });
+            })
           }
-        });
+        })
       },
       batchZf(type) {
         if (this.selectedRowKeys.length <= 0) {

--
Gitblit v1.9.3