Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
       },
       choosePatient(val) {
+        let isShowDailog = false
+        for (let i = 0; i < this.prescriptions.length; i++){
+          if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
+            isShowDailog = true
+          }
+        }
+        if(isShowDailog){
+          this.$message.error('需要保存当前处方才能切换')
+          return
+        }
+
 
         this.patientid = val.patients.id
         let params = {

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

           <template slot-scope="scope">{{scope.row.info?scope.row.info.doctor:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{ scope.row.info ? scope.row.info.diagnosis :''}}</template>
+          <template slot-scope="scope">{{ scope.row.info?scope.row.info.diagnosis :''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
-            <div v-if=" scope.row.info.id == 0">未就诊</div>
-            <div v-if=" scope.row.info.id > 0">已就诊</div>
+            <div v-if=" scope.row.info && scope.row.info.id > 0">已就诊</div>
+            <div v-else>未就诊</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="100">