From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/workorder/components/detail.vue |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue
index 0743cfa..039bad0 100644
--- a/admin/src/views/workorder/components/detail.vue
+++ b/admin/src/views/workorder/components/detail.vue
@@ -1,6 +1,6 @@
 <template>
-  <GlobalWindow width="100%" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
-    @confirm="confirm">
+  <GlobalWindow width="100%" title="宸ュ崟璇︽儏" :withFooter="withFooter" :visible.sync="visible" :confirm-working="isWorking"
+    @confirm="confirm" @close="closeView">
     <div class="main">
       <div class="title">
         <div class="title_left">
@@ -11,7 +11,7 @@
             <div class="status gray" v-if="info.dealStatus == 2">宸插鐞�</div>
           </div>
         </div>
-        <el-button v-if="info.origin === 1" @click="openWT">鏌ョ湅闂涓婃姤</el-button>
+        <el-button v-if="info.origin === 1 && isShow" @click="openWT">鏌ョ湅闂涓婃姤</el-button>
       </div>
       <div class="main_content">
         <div class="list">
@@ -171,31 +171,33 @@
           </div>
         </template>
       </el-form>
+      <!--  闂涓婃姤璇︽儏  -->
+      <ProblemReportingDetails ref="problem_Reporting_Details" @close="closeDetails" />
     </div>
-    <!--  闂涓婃姤璇︽儏  -->
-    <problemReportingDetails ref="problemReportingDetails" />
   </GlobalWindow>
 </template>
 
 <script>
 import GlobalWindow from '@/components/common/GlobalWindow'
 import BaseOpera from '@/components/base/BaseOpera'
-import problemReportingDetails from './problemReportingDetails'
+// import ProblemReportingDetails from './problemReportingDetails'
+// import ProblemReportingDetails from '@/views/workorder/components/problemReportingDetails'
 import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
 import { getByWorkorderId } from '@/api/ywProblem'
 import { getUserList } from '@/api/system/user'
 import { Message, Loading } from 'element-ui'
+import { mapState } from 'vuex'
 import dayjs from 'dayjs'
 export default {
+  name: 'detail',
   components: {
     GlobalWindow,
-    problemReportingDetails
+    ProblemReportingDetails: () => import('./problemReportingDetails')
   },
   extends: BaseOpera,
   data() {
     return {
       id: '',
-      visible: false,
       param: {
         dealType: 0
       },
@@ -211,22 +213,47 @@
       uploadData: {
         folder: 'YW_WORKORDER_FILE'
       },
+      isShow: true,
+      test: false
     }
   },
   computed: {
     userInfo() {
       return this.$store.state.userInfo
+    },
+    withFooter() {
+      if (this.info) {
+        return this.info.dealStatus === 0 || (this.info.dealStatus === 1 && (this.userInfo.id === this.info.dealUserId));
+      } else {
+        return false;
+      }
     }
   },
   created() {
     this.getStaff()
   },
   methods: {
+    closeDetails() {
+      console.log('1')
+      this.test = false
+    },
+    closeView() {
+      this.$emit('close')
+      this.visible = false
+    },
+    open (title, target, show) {
+      this.title = title
+      this.isShow = show
+      this.id = target.workorderId
+      this.getDetail()
+    },
     openWT() {
       getByWorkorderId(this.id)
         .then(res => {
-          console.log(res)
-          this.$refs.problemReportingDetails.open('闂涓婃姤璇︽儏', res)
+          this.test = true
+          this.$nextTick(() => {
+            this.$refs.problem_Reporting_Details.open('闂涓婃姤璇︽儏', res, false)
+          })
         })
     },
     confirm() {
@@ -258,6 +285,7 @@
         if (this.info.dealStatus == 1) {
           this.$set(this.param, 'getDate', dayjs().format('YYYY-MM-DD HH:mm:ss'))
         }
+        this.visible = true
       })
     },
     getStaff() {

--
Gitblit v1.9.3