From 2d5c2e2043e49a492ee13e6cf3441f2df684b8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 26 May 2023 10:03:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/order/index.vue  | 67 ++++++++++---------------------
 src/views/system/order/indexjs.js | 13 ++----
 2 files changed, 25 insertions(+), 55 deletions(-)

diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index aeb7c06..6ac3ee3 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -99,7 +99,7 @@
             type="text"
             icon="el-icon-edit"
             v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
-            @click="seeedit(scope.row)"
+            @click="seelookedit(scope.row,false)"
           >编辑</el-button>
           <el-button
             size="mini"
@@ -108,6 +108,13 @@
             v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
             @click="Confirmcompletion(scope.row)"
           >确认完成</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-zoom-in"
+            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'EVALUATED'"
+            @click="seelookedit(scope.row,true)"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -467,61 +474,73 @@
       <el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
         <el-form-item label="订单填写人姓名" prop="orderWriteName">
           <input
+            v-if="!lookedit"
             class="text"
             type="text"
             v-model="query.orderWriteName"
             placeholder="请输入姓名"
             maxlength="5"
           />
+          <div class="text" v-else>{{query.orderWriteName}}</div>
         </el-form-item>
         <el-form-item label="姓名" prop="caregiverName">
           <input
             class="text"
+            v-if="!lookedit"
             type="text"
             v-model="query.caregiverName"
             placeholder="请输入姓名"
             maxlength="5"
           />
+          <div class="text" v-else>{{query.caregiverName}}</div>
         </el-form-item>
         <el-form-item label="电话" prop="caregiverPhone">
           <input
+            v-if="!lookedit"
             class="text"
             type="text"
             v-model="query.caregiverPhone"
             placeholder="请输入电话"
             maxlength="11"
           />
+          <div class="text" v-else>{{query.caregiverPhone}}</div>
         </el-form-item>
         <el-form-item label="医院名称" prop="hospitalName">
           <input
+            v-if="!lookedit"
             class="text"
             type="text"
             v-model="query.hospitalName"
             placeholder="请输入医院名称"
             maxlength="20"
           />
+          <div class="text" v-else>{{query.hospitalName}}</div>
         </el-form-item>
         <el-form-item label="科室名称" prop="departmentName">
           <input
+            v-if="!lookedit"
             class="text"
             type="text"
             v-model="query.departmentName"
             placeholder="请输入科室名称"
             maxlength="20"
           />
+          <div class="text" v-else>{{query.departmentName}}</div>
         </el-form-item>
         <el-form-item label="病床号" prop="hospitalBedNumber">
           <input
+            v-if="!lookedit"
             class="text"
             type="text"
             v-model="query.hospitalBedNumber"
             placeholder="请输入病床号"
             maxlength="20"
           />
+          <div class="text" v-else>{{query.hospitalBedNumber}}</div>
         </el-form-item>
         <el-form-item label="时间" prop="time">
           <el-date-picker
-            v-if="query.companionDays==1"
+            v-if="query.companionDays==1&&!lookedit"
             v-model="timevalue"
             type="daterange"
             range-separator="至"
@@ -531,7 +550,7 @@
             @change="timechange"
           ></el-date-picker>
           <div
-            v-else
+            v-if="query.companionDays!=1||lookedit"
             class="text"
           >{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}</div>
         </el-form-item>
@@ -571,49 +590,7 @@
         >
           <div class="text">{{query.evaluateSatisfaction}}</div>
         </el-form-item>
-        <el-form-item
-          label="服务到岗照片"
-          prop="onDutyPictureUrl"
-          v-if="
-            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
-          "
-        >
-          <img class="img" :src="baseurl + query.onDutyPictureUrl" alt />
-        </el-form-item>
-        <el-form-item
-          label="服务结束照片"
-          prop="serviceEndPictureUrl"
-          v-if="
-            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
-          "
-        >
-          <img class="img" :src="baseurl + query.serviceEndPictureUrl" alt />
-        </el-form-item>
-        <el-form-item
-          label="用户确认签名"
-          prop="userSignaturePictureUrl"
-          v-if="
-            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
-          "
-        >
-          <img class="img" :src="baseurl + query.userSignaturePictureUrl" alt />
-        </el-form-item>
-        <el-form-item
-          label="预约服务位置"
-          v-if="
-            query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
-          "
-        >
-          <el-input v-model="query.serviceLocationName" disabled style="width: 250px" />
-        </el-form-item>
       </el-form>
-      <div
-        id="container"
-        v-if="
-          this.query.orderStatus == 'COMPLETE' ||
-          this.query.orderStatus == 'EVALUATED'
-        "
-      ></div>
       <div slot="footer" class="dialog-footer" style="margin-right: 50px">
         <el-button @click="editinnerVisible = false">取 消</el-button>
         <el-button type="primary" @click="editsubmitForm">确 定</el-button>
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index 8132cb2..bf562a6 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -92,6 +92,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             },
+            lookedit: undefined,
             queryParams: {
                 patientName: null,
                 orderNo: null,
@@ -287,7 +288,8 @@ export default {
                 .catch(() => { });
         },
         //编辑
-        seeedit(row) {
+        seelookedit(row, boolean) {
+            this.lookedit = boolean
             this.loading = true;
             const id = row.orderNo;
             this.map = null;
@@ -318,22 +320,13 @@ export default {
                         }
                         this.loading = false;
                         this.editinnerVisible = true;
-                        setTimeout(() => {
-                            this.init(this.query);
-                        }, 500);
                     } else {
                         this.loading = false;
                         this.editinnerVisible = true;
-                        setTimeout(() => {
-                            this.init(this.query);
-                        }, 500);
                     }
                 } else if (row.orderStatus == "COMPLETE") {
                     this.loading = false;
                     this.editinnerVisible = true;
-                    setTimeout(() => {
-                        this.init(this.query);
-                    }, 500);
                 } else {
                     this.loading = false;
                     this.editinnerVisible = true;