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/deskPrescription.vue

                           <el-table-column prop="name" label="名称">
                             <template slot-scope="scope">{{}}</template>
                           </el-table-column>
-                          <el-table-column label="规格" width="60">
-                            <template slot-scope="scope">33</template>
-                          </el-table-column>
-                          <el-table-column label="库存" width="60">
-                            <template slot-scope="scope">22</template>
-                          </el-table-column>
-                          <el-table-column label="单价" width="40">
-                            <template slot-scope="scope">12</template>
-                          </el-table-column>
+                          <!--<el-table-column label="规格" width="60">-->
+                            <!--<template slot-scope="scope">33</template>-->
+                          <!--</el-table-column>-->
+                          <!--<el-table-column label="库存" width="60">-->
+                            <!--<template slot-scope="scope">22</template>-->
+                          <!--</el-table-column>-->
+                          <!--<el-table-column label="单价" width="40">-->
+                            <!--<template slot-scope="scope">12</template>-->
+                          <!--</el-table-column>-->
                         </el-table>
                       </div>
                     </el-tab-pane>
 
         }
 
-      }, 
+      },
       getTotalOne() {
         var total = 0
         console.log(this.prescriptions)
         }
         return total
 
-      }, 
+      },
       getCurTotal() {
         var total = 0
 
                   execution_frequency: temp[b].execution_frequency,
                   retail_price: temp[b].retail_price.toString(),
                   remark: '',
-                  day:'',
+                  day:1,
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
       this.$nextTick(() => {
         this.multipleTableHeight = parseInt(this.$refs.rightTable.offsetHeight)
       })
-      
+
     },
     watch: {
       fullHeight (val) {

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
         <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{ scope.row.patient   .name }}</template>
+          <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="200">
-          <template slot-scope="scope"> {{getTimes(scope.row.info.ctime)}}</template>
+          <template slot-scope="scope"> {{scope.row.info?getTimes(scope.row.info.ctime):''}}</template>
 
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
           <!--<template slot-scope="scope">{{}}</template>-->
         <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="处方号">
-          <template slot-scope="scope">{{scope.row.info.prescription_number}}</template>
+          <template slot-scope="scope">{{scope.row.info?scope.row.info.prescription_number:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{scope.row.info.doctor}}</template>
+          <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.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">