修改

src/views/system/order/index.vue

@@ -232,74 +232,6 @@
         "
       ></div>
     </el-dialog>
-    <!-- 派单弹框 -->
-    <el-dialog title="派单" :visible.sync="innerdispatch" append-to-body width="900px" height="100px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px" :inline="true">
-        <el-form-item label="护理员姓名">
-          <el-button
-            type
-            v-if="nurseName == '请选择护理员'"
-            style="width: 250px; text-align: left; height: 36px; color: #c0c4cc"
-            @click="clicknursePersonName()"
-          >{{ nurseName }}</el-button>
-          <el-button
-            type
-            @click="clicknursePersonName()"
-            v-else
-            style="
-              width: 250px;
-              text-align: left;
-              height: 36px;
-            "
-          >{{ nurseName }}</el-button>
-        </el-form-item>
-        <el-form-item label="工作状态" v-if="nursePersonlist.workStatus">
-          <div class="text" style="display: inline-block;">
-            {{ nursePersonlist.workStatus=='ONLINE'?"在线":'' }}
-            {{ nursePersonlist.workStatus=='BE_BUSY'?"忙碌":'' }}
-            {{ nursePersonlist.workStatus=='OFFLINE'?"离线":'' }}
-          </div>
-        </el-form-item>
-        <el-form-item label="护理人职称" v-if="nursePersonlist.nursePersonType">
-          <div class="text" style="display: inline-block;">
-            {{ nursePersonlist.nursePersonType=='NURSE'?"护士":'' }}
-            {{ nursePersonlist.nursePersonType=='NURSE_TEACHER'?"护理师":'' }}
-          </div>
-        </el-form-item>
-        <el-form-item label="职称级别" v-if="nursePersonlist.positionalTitleLevel">
-          <div class="text" style="display: inline-block;">
-            {{ nursePersonlist.positionalTitleLevel=='PRIMARY_LEVEL'?'初级':'' }}
-            {{ nursePersonlist.positionalTitleLevel=='MIDDLE_LEVEL'?'中级':'' }}
-            {{ nursePersonlist.positionalTitleLevel=='HIGH_LEVEL'?'高级':'' }}
-          </div>
-        </el-form-item>
-        <el-form-item label="擅长项目" v-if="nursePersonlist.geniusItem">
-          <div
-            class="text"
-            style="width:600px;display: inline-block;height:100px;line-height:25px; overflow: hidden;	display: -webkit-box;-webkit-line-clamp:4;-webkit-box-orient: vertical;"
-          >{{ nursePersonlist.geniusItem }}</div>
-        </el-form-item>
-        <el-form-item label v-else></el-form-item>
-        <el-form-item label="资质证书图片" v-if="nursePersonlist.nurseStationPersonCertificateList">
-          <div style="width:780px;display: flex;flex-wrap: wrap;">
-            <div
-              v-for="(item,index) in nursePersonlist.nurseStationPersonCertificateList"
-              :key="index"
-            >
-              <el-image
-                style="width: 120px; height: 120px;margin-right:10px"
-                :src="baseurl+item.certificateUrl"
-                :preview-src-list="PersonChecksrcList"
-              ></el-image>
-            </div>
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <!-- <el-button @click="cancel">取 消</el-button> -->
-      </div>
-    </el-dialog>
     <!-- 取消预约弹框 -->
     <el-dialog title="取消预约" :visible.sync="innerrefund" append-to-body width="500px">
       <el-form :inline="true" :rules="rules" label-width="120px">
@@ -330,7 +262,7 @@
       </div>
     </el-dialog>
     <!-- 派单护理员弹框 -->
-    <el-dialog :visible.sync="nursePersonNameinfo" width="1000px" append-to-body>
+    <el-dialog :visible.sync="nursePersonNameinfo" width="1000px" append-to-body title="派单">
       <el-form
         ref="queryForm"
         :model="querynursePersonname"
@@ -338,37 +270,48 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="姓名" prop="nursePersonName" label-width="120">
+        <el-form-item label="护理人员姓名" prop="nursePersonName" label-width="120">
-          <el-input v-model="querynursePersonname.nursePersonName" placeholder="请输入姓名" clearable />
+          <el-input
+            v-model="querynursePersonname.nursePersonName"
+            placeholder="请输入护理人员姓名"
+            clearable
+          />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table :data="dispatchlist" @cell-dblclick="nursePersonclick">
+      <el-table :data="dispatchlist" @cell-dblclick="submitForm">
         <el-table-column label="请选择" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
               style="width: 15px; height: 15px; overflow: hidden"
-              v-if="nursePersonid == scope.row.nurseStationPersonId"
+              v-if="nursePersonlist.nurseStationPersonId == scope.row.nurseStationPersonId"
               circle
-              @click="nursePersonclick(scope.row)"
+              @click="submitForm(scope.row)"
             ></el-button>
             <el-button
               v-else
               style="width: 15px; height: 15px; overflow: hidden"
               circle
-              @click="nursePersonclick(scope.row)"
+              @click="submitForm(scope.row)"
             ></el-button>
           </template>
         </el-table-column>
         <el-table-column property="nurseStationName" label="所属护理站" align="center"></el-table-column>
-        <!-- <el-table-column property="nursePersonCode" label="护理员编号" align="center"></el-table-column> -->
+        <!-- <el-table-column property="nursePersonCode" label="护理员编号"  align="center"></el-table-column> -->
-        <el-table-column property="nursePersonName" label="护理站人员姓名" align="center"></el-table-column>
+        <el-table-column property="nursePersonName" label="护理人员姓名" align="center"></el-table-column>
-        <el-table-column property="nursePersonType" label="护理站人员类型" align="center">
+        <el-table-column property="workStatus" label="在线状态" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.workStatus == 'ONLINE'" type="success">在线</el-button>
+            <el-button v-if="scope.row.workStatus == 'BE_BUSY'" type="warning">忙碌</el-button>
+            <el-button v-if="scope.row.workStatus == 'OFFLINE'" type="info">离线</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column property="nursePersonName" label="星级评价" align="center"></el-table-column>
+        <el-table-column property="nursePersonType" label="护理人员类型" align="center">
           <template slot-scope="scope">
             {{ scope.row.nursePersonType == "NURSE" ? "护士" : "" }}
             {{ scope.row.nursePersonType == "NURSE_TEACHER" ? "护理师" : "" }}
@@ -381,7 +324,22 @@
             {{ scope.row.sex == "FEMALE" ? "女" : "" }}
           </template>
         </el-table-column>
+        <el-table-column property="nursePersonName" label="查看证书" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-zoom-in"
+              @click="nursePersonclick(scope.row)"
+              v-hasPermi="['system:appointmentOrder:query']"
+            >查看</el-button>
+          </template>
+        </el-table-column>
       </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="nursePersonNameinfocancel">关 闭</el-button>
+        <el-button type="primary" @click="submitFormclick">确 定</el-button>
+      </div>
       <pagination
         v-show="total2 > 0"
         :total="total2"
@@ -390,6 +348,20 @@
         @pagination="handleQuery2"
       />
     </el-dialog>
+    <!-- 查看证书 -->
+    <el-dialog :visible.sync="certificateshow" width="1000px" append-to-body title="查看证书">
+      <el-table :data="PersonChecksrcList">
+        <el-table-column property="certificateUrl" label="证书图片" align="center">
+          <template slot-scope="scope">
+            <img :src="baseurl+scope.row.certificateUrl" alt style="width:100px;height:100px" />
+          </template>
+        </el-table-column>
+        <el-table-column property="certificateName" label="证书名称" align="center"></el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="certificateshow=false">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -459,6 +431,7 @@ export default {
       innerdispatch: false,
       // 护理员姓名弹框
       nursePersonNameinfo: false,
+      certificateshow: false,
       //护理员list
       nursePersonlist: {},
       PersonChecksrcList: [],
@@ -662,49 +635,94 @@ export default {
         }
       });
     },
+    // 查看
+    seeLook(row) {
+      this.loading = true;
+      const id = row.orderNo;
+      this.map = null;
+      appointmentOrderDetails(id).then(res => {
+        res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
+        this.query = res.data;
+        res.data.disablingCondition == "DISABLED"
+          ? (res.data.disablingCondition = "是")
+          : "";
+        res.data.disablingCondition == "NOT_DISABLED"
+          ? (res.data.disablingCondition = "否")
+          : "";
+        if (row.orderStatus == "EVALUATED") {
+          if (res.data) {
+            if (res.data.evaluateSatisfaction == "COMMONLY") {
+              this.query.evaluateSatisfaction = "一般";
+            } else if (res.data.evaluateSatisfaction == "SATISFIED") {
+              this.query.evaluateSatisfaction = "满意";
+            } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
+              this.query.evaluateSatisfaction = "不满意";
+            } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
+              this.query.evaluateSatisfaction = "非常满意";
+            } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
+              this.query.evaluateSatisfaction = "非常不满意";
+            }
+            this.loading = false;
+            this.innerVisible4 = true;
+            setTimeout(() => {
+              this.init(this.query);
+            }, 500);
+          } else {
+            this.loading = false;
+            this.innerVisible4 = true;
+            setTimeout(() => {
+              this.init(this.query);
+            }, 500);
+          }
+        } else if (row.orderStatus == "COMPLETE") {
+          this.loading = false;
+          this.innerVisible4 = true;
+          setTimeout(() => {
+            this.init(this.query);
+          }, 500);
+        } else {
+          this.loading = false;
+          this.innerVisible4 = true;
+        }
+      });
+    },
     // 派单
     dispatch(row) {
-      this.nursePersonlist = {};
-      this.PersonChecksrcList = [];
       this.querynursePersonname.orderNo = row.orderNo;
-      this.nurseName = "请选择护理员";
-      this.innerdispatch = true;
-      this.nursePersonid = "";
-      this.querynursePersonname.pageNum = 1;
-    },
-    // 姓名弹框
-    clicknursePersonName() {
       getPerson(this.querynursePersonname).then(res => {
         this.dispatchlist = res.rows;
         this.total2 = res.total;
         this.nursePersonNameinfo = true;
       });
     },
-    // 姓名弹框确定按钮
+    //派单护理员
-    submitForm() {
+    nursePersonNameinfocancel() {
+      this.nursePersonNameinfo = false;
+      this.nursePersonlist = {};
+    },
+    // 护理员姓名弹框确定按钮
+    submitFormclick() {
       let params = {
-        nurseStationPersonId: this.nursePersonid,
+        nurseStationPersonId: this.nursePersonlist.nurseStationPersonId,
         orderNo: this.querynursePersonname.orderNo
       };
       dispatchsubmit(params).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("派单成功");
         }
-        this.innerdispatch = false;
+        this.nursePersonNameinfo = false;
         this.getList();
-        this.nurseName = "请选择护理员";
       });
     },
-    // 选择姓名按钮
+    submitForm(row) {
+      this.nursePersonlist = row;
+    },
+    // 查看护理员证书按钮
     nursePersonclick(row) {
-      this.nursePersonid = row.nurseStationPersonId;
+      this.PersonChecksrcList = [];
       getPersonInfo(row.nurseStationPersonId).then(res => {
-        this.nurseName = res.data.nursePersonName;
+        this.PersonChecksrcList = res.data;
-        this.nursePersonNameinfo = false;
+        this.certificateshow = true;
-        this.nursePersonlist = res.data;
-        res.data.nurseStationPersonCertificateList.forEach(e => {
-          this.PersonChecksrcList.push(this.baseurl + e.certificateUrl);
-        });
       });
     },
     // 确认取消预约