Merge remote-tracking branch 'origin/jihan_0920new_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920new_护理服务、商城、积分兑换、在线问诊功能分支

# Conflicts:
#	src/views/system/hospitalPerson/index.vue

src/api/system/goodsOrder.js

@@ -19,7 +19,7 @@ export function getGoodsOrder(id) {
 // 查看商品详细信息
 export function getGoodsOrderlist(id) {
     return request({
-        url: `/system/goodsOrder/goodsOrderByOrder` + `?orderNo=${id}`,
+        url: `/nurseApplet/nursingOrder/getConsultationOrder` + `?orderNo=${id}`,
         method: 'get'
     })
 }

src/views/system/healthorder/index.vue

@@ -169,11 +169,52 @@
       />
       <!-- 查看商品订单弹框 -->
       <el-dialog title="订单详情" :visible.sync="innerorder" append-to-body width="1200px">
-        <el-form :inline="true" ref="orderList" :model="orderList" :rules="rules" label-width="120px">
+        <el-form :inline="true" ref="orderList" :model="orderList" :rules="rules" label-width="130px">
           <el-form-item label="订单编号" prop="orderNo">
             <el-input v-model="orderList.orderNo" disabled style="width: 240px" />
           </el-form-item>
-          <el-form-item label="商品名称" prop="goodsName">
+          <el-form-item label="订单类型" prop="orderType">
+            <el-select
+              v-model="orderList.orderType"
+              placeholder="请选择订单类型"
+              disabled
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in orderTypelist"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="订单原始总金额" prop="totalPrice">
+            <el-input v-model="orderList.totalPrice" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="预约日期" prop="appointmentDate">
+            <el-input v-model="orderList.appointmentDate" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="预约开始时间点" prop="appointmentStartTime">
+            <el-input v-model="orderList.appointmentStartTime" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="预约结束时间点" prop="appointmentEndTime">
+            <el-input v-model="orderList.appointmentEndTime" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="问题简述" prop="problemDescription">
+            <el-input v-model="orderList.problemDescription" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="患者个体情况说明" prop="situationDescription">
+            <el-input v-model="orderList.situationDescription" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="问题描述" prop="problemStatement">
+            <el-input v-model="orderList.problemStatement" disabled style="width: 240px" />
+          </el-form-item>
+          <el-form-item label="病例" prop="medicalRecord">
+            <el-input v-model="orderList.medicalRecord" disabled style="width: 240px" />
+          </el-form-item>
+
+
+          <!-- <el-form-item label="订单名称" prop="goodsName">
             <el-input v-model="orderList.goodsName" disabled style="width: 240px" />
           </el-form-item>
           <el-form-item label="订单类型" prop="orderType">
@@ -228,7 +269,7 @@
           </el-form-item>
           <el-form-item label="手机号" prop="phone">
             <el-input v-model="orderList.phone" disabled style="width: 240px" />
-          </el-form-item>
+          </el-form-item> -->
           <!-- <el-form-item label="商品属性" prop="goodsAttributeName">
             <el-input
               v-model="orderList.goodsAttributeName"
@@ -256,7 +297,7 @@
               style="width: 240px"
             />
           </el-form-item>-->
-          <el-form-item label="订单状态" prop="orderStatus">
+          <!-- <el-form-item label="订单状态" prop="orderStatus">
             <el-input :value="orderStatusinfo(orderList.orderStatus)" disabled style="width: 240px" />
           </el-form-item>
           <el-form-item label="下单方式" prop="buySource">
@@ -305,7 +346,7 @@
                 :key="index"
               />
             </div>
-          </el-form-item>
+          </el-form-item> -->
           <!-- <el-table
           :data="orderList"
           align="center"
@@ -421,7 +462,7 @@
           v-show="showSearch"
           label-width="110px"
         >
-          <el-form-item label="商品名称" prop="goodsName">
+          <el-form-item label="订单名称" prop="goodsName">
             <el-input v-model="refundlist.goodsName" placeholder clearable disabled />
           </el-form-item>
           <el-form-item label="退款类型" prop="refundType">

src/views/system/hospitalPerson/index.vue

@@ -41,6 +41,7 @@
           placeholder="请选择用户类型"
           clearable
           style="width: 200px"
+
         >
           <el-option
             v-for="item in statuslist"
@@ -234,10 +235,7 @@
             >{{ form.hospitalName }}</el-button
           >
         </el-form-item>
-        <el-form-item
-          label="所属科室"
-          prop="departmentId"
-        >
+        <el-form-item label="所属科室" :prop="departmentIdtype ?'departmentId' : 'empty'">
           <el-button
             type
             v-if="form.departmentName == '请选择所属科室'"
@@ -265,7 +263,7 @@
             >{{ form.departmentName }}</el-button
           >
         </el-form-item>
-     
+
         <el-form-item label="人员名称" prop="personName">
           <el-input
             v-model="form.personName"
@@ -344,8 +342,8 @@
             v-model="form.status"
             style="width: 210px"
             placeholder="请选择用户类型"
-            @change="changeitem"
             clearable
+            @change="changetype"
           >
             <el-option
               v-for="item in statuslist"
@@ -668,6 +666,7 @@ export default {
     };
     return {
       single:false,
+      departmentIdtype:false,
       statuslist: [
         {
           value: "1",
@@ -923,6 +922,19 @@ export default {
         this.form.certificateUrl = items.certificateUrl;
       }
     },
+    changetype(e){
+      if(e==2){
+      this.departmentIdtype=true
+
+
+      }else{
+      this.departmentIdtype=false
+
+
+      }
+      console.log(e)
+
+    },
     imgUrl(imgUrl) {
       this.form.certificateUrl = imgUrl;
       this.deletupdata.push(imgUrl);
@@ -933,6 +945,7 @@ export default {
     },
 
     nurseclick(row) {
+      this.form.departmentId='';
       if (this.homenumber) {
         this.queryParams.hospitalName = row.hospitalName;
         this.queryParams.hospitalId = row.id;
@@ -1158,6 +1171,7 @@ export default {
         ],
       };
       this.departmentId = "";
+      this.departmentIdtype=null;
       this.reset();
       this.addopen = true;
       this.title = "添加科室人员信息";
@@ -1170,6 +1184,15 @@ export default {
         this.form = response.data;
         this.departmentId = response.data.departmentId;
         this.hospitalId = response.data.hospitalId;
+        if(response.data.status==2){
+        this.departmentIdtype=true
+        }else{
+        this.departmentIdtype=false
+        }
+
+        if(response.data.departmentId==null){
+          this.form.departmentName = '请选择所属科室'
+        }
         this.imgone = this.form.certificateUrl;
         this.addopen = true;
         this.title = "修改科室人员信息";
@@ -1201,6 +1224,9 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            if(this.form.departmentName == '请选择所属科室'){
+              this.form.departmentName=''
+            }
             updateHospitalPerson(this.form).then((response) => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("修改成功");
@@ -1209,6 +1235,9 @@ export default {
               }
             });
           } else {
+            if(this.form.departmentName == '请选择所属科室'){
+              this.form.departmentName=''
+            }
             addHospitalPerson(this.form).then((response) => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("新增成功");