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/components/inquiriesDetail.vue

@@ -6,7 +6,12 @@
     :before-close="_close"
     class="detailDialog"
   >
+    <div style="position: absolute;right:20px;">
+      <el-button v-if="activeName == 'first'" @click="open(1)" type="primary">打印</el-button>
+      <el-button v-if="activeName == 'second'" @click="open(2)" type="primary">打印</el-button>
+    </div>
     <el-tabs v-model="activeName">
+      
       <el-tab-pane label="处方详情" name="first">
         <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
           <el-tab-pane
@@ -111,7 +116,7 @@
         curPrescriptions: {},
         prescriptions: [],
         record_date: '',
-        editableTabsValue: '1',
+        editableTabsValue: '处方1',
         loadingone: false,
         editableTabs: [{
           title: '处方1',
@@ -136,6 +141,13 @@
       }
     },
     methods: {
+      open(index){
+        if(index == 1){
+
+        }else if(index == 2){
+
+        }
+      },
       getTimes(time,temp) {
         return uParseTime(time, temp);
       },
@@ -257,7 +269,7 @@
       hide() {
         // this.clear()
         this.visible = false
-      }
+      },
     }
   }
 </script>
@@ -267,6 +279,7 @@
 
   .el-dialog__body {
     padding: 0 20px 30px;
+    position: relative;
   }
 
   .detailMain {

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -3,6 +3,7 @@
     <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 100%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
       <el-table-column align="center" prop="name" label="名称">
         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
@@ -27,6 +28,11 @@
 
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="day" width="50" label="天数">
+        <template slot-scope="scope">
+          <div>{{ scope.row.day }}</div>
+        </template>
+      </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -387,6 +387,17 @@
 
       },
       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

@@ -35,12 +35,12 @@
           <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">