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/technical/modules/EamTechnicalStatusChangeEquipmentDetail.vue |  170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 170 insertions(+), 0 deletions(-)

diff --git a/src/views/eam/technical/modules/EamTechnicalStatusChangeEquipmentDetail.vue b/src/views/eam/technical/modules/EamTechnicalStatusChangeEquipmentDetail.vue
new file mode 100644
index 0000000..3a58564
--- /dev/null
+++ b/src/views/eam/technical/modules/EamTechnicalStatusChangeEquipmentDetail.vue
@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+             :pagination="false" :loading="loading" :scroll="{x:'max-content'}">
+    <span slot="action" slot-scope="text, record">
+      <!--闈炴惉杩�-->
+      <a v-if="record.changeCategory!='EQUIPMENT_RELOCATION'"
+         :disabled="selectedRow.changeStatus!='COMPLETED'||(selectedRow.changeStatus=='COMPLETED'&&record.acceptanceChecker)"
+         @click="handleAcceptance(record)">楠屾敹</a>
+
+      <!--鎼縼-->
+      <a-popconfirm v-else title="鏄惁鐢熸垚鎶�鏈姸鎬侀壌瀹氬伐鍗曪紵" @confirm="handleAcceptance(record)">
+        <a
+          :disabled="selectedRow.changeStatus!='COMPLETED'||(selectedRow.changeStatus=='COMPLETED'&&record.acceptanceChecker)">楠屾敹</a>
+      </a-popconfirm>
+    </span>
+    </a-table>
+
+    <!--璁惧楠屾敹寮圭獥-->
+    <eam-technical-status-equipment-acceptance-modal ref="modalForm" @ok="modalFormOk"/>
+  </div>
+</template>
+
+<script>
+  import { getAction, postAction } from '@/api/manage'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EamTechnicalStatusEquipmentAcceptanceModal from './EamTechnicalStatusEquipmentAcceptanceModal'
+
+  export default {
+    name: 'EamTechnicalStatusChangeEquipmentDetail',
+    components: { EamTechnicalStatusEquipmentAcceptanceModal },
+    mixins: [JeecgListMixin],
+    props: {
+      selectedRow: {
+        type: Object
+      }
+    },
+    watch: {
+      selectedRow: {
+        handler(val) {
+          if (val) {
+            this.loadData()
+          }
+        },
+        immediate: true
+      }
+    },
+    data() {
+      return {
+        disableMixinCreated: true,
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
+          },
+          {
+            title: '缁熶竴缂栫爜',
+            dataIndex: 'equipmentCode',
+            align: 'center'
+          },
+          {
+            title: '璁惧鍚嶇О',
+            dataIndex: 'equipmentName',
+            align: 'center'
+          },
+          {
+            title: '璁惧鍨嬪彿',
+            dataIndex: 'equipmentModel',
+            align: 'center'
+          },
+          {
+            title: '浣跨敤鍗曚綅',
+            dataIndex: 'factoryName',
+            align: 'center'
+          },
+          {
+            title: '鍙樻洿鍘熷洜',
+            dataIndex: 'changeCategory_dictText',
+            align: 'center'
+          },
+          {
+            title: '鍙樻洿鏃ユ湡',
+            dataIndex: 'changeDate',
+            align: 'center'
+          },
+          {
+            title: '鍙樻洿鍚庢妧鏈姸鎬�',
+            dataIndex: 'changeTechnicalStatus_dictText',
+            align: 'center'
+          },
+          {
+            title: '楠屾敹浜�',
+            dataIndex: 'acceptanceChecker_dictText',
+            align: 'center'
+          },
+          {
+            title: '楠屾敹鏃堕棿',
+            dataIndex: 'acceptanceCheckTime',
+            align: 'center'
+          },
+          {
+            title: '楠屾敹妫�鏌ョ粨鏋�',
+            dataIndex: 'acceptanceCheckResult_dictText',
+            align: 'center'
+          },
+          {
+            title: '楠屾敹鎰忚',
+            dataIndex: 'acceptanceCheckComment',
+            align: 'center'
+          },
+          {
+            title: '鎿嶄綔',
+            dataIndex: 'action',
+            align: 'center',
+            width: 200,
+            fixed: 'right',
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: '/eam/eamTechnicalStatusChangeDetail/queryList',
+          acceptance: '/eam/eamTechnicalStatusChange/acceptance'
+        }
+      }
+    },
+    methods: {
+      loadData() {
+        this.loading = true
+        getAction(this.url.list, { orderId: this.selectedRow.id })
+          .then((res) => {
+            if (res.success) this.dataSource = res.result
+          })
+          .finally(() => {
+            this.loading = false
+          })
+      },
+
+      handleAcceptance(record) {
+        if (record.changeCategory != 'EQUIPMENT_RELOCATION') {
+          this.$refs.modalForm.handleAcceptance(record)
+          this.$refs.modalForm.title = '楠屾敹'
+        } else {
+          this.loading = true
+          postAction(this.url.acceptance, record)
+            .then(res => {
+              if (res.success) {
+                this.$notification.success({
+                  message: '娑堟伅',
+                  description: res.message
+                })
+                this.loadData()
+              } else {
+                this.$notification.warning({
+                  message: '娑堟伅',
+                  description: res.message
+                })
+                this.loading = false
+              }
+            })
+        }
+      }
+    }
+  }
+</script>
\ No newline at end of file

--
Gitblit v1.9.3