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

src/utils/tools.js

   // console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
-
-
-export function formatDate (date, format) {
-  if (/(y+)/.test(format)) {
-      format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
-  }
-  let o = {
-      'M+': date.getMonth() + 1,
-      'd+': date.getDate(),
-      'h+': date.getHours(),
-      'm+': date.getMinutes(),
-      's+': date.getSeconds()
-  };
-  for (let k in o) {
-      if (new RegExp(`(${k})`).test(format)) {
-          let str = o[k] + '';
-          format= format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
-      }
-  }
-  return format;
-};
-
-function padLeftZero (str) {
-  return ('00' + str).substr(str.length);
-};

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

           }
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
+              this.$emit("change")
               this.$message.success('保存成功')
             }
           })

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

 
       </el-tab-pane>
       <el-tab-pane label="病历详情" name="second">
-        <div class="detailMain">
-          <span style="width:240px;">处方号：{{order.prescription_number}}</span>
-          <span style="width:200px;">医生：{{order.doctor}}</span>
-          <span style="width:200px;">科室：{{getDepartMent(order.departments)}}</span>
-          <span style="width:200px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
-        </div>
         <div class="commonCell">
-          <p>基本信息</p>
+          <p style="color:#409EFF;">基本信息</p>
           <div class="detailMain">
-            <span style="width:240px;">疾病名称：{{case_history.diagnostic}}</span>
-            <span style="width:200px;">症状：{{case_history.diagnostic}}</span>
-            <span style="width:200px;">发病日期：{{getTimes(case_history.sick_date,"{y}-{m}-{d}")}}</span>
-            <span style="width:200px;" v-if="case_history.is_infect== 1">是否传染：是</span>
-          <span style="width:200px;" v-if="case_history.is_infect != 1">是否传染：否</span>
+            <span style="width:260px;">处方号：{{order.prescription_number}}</span>
+            <span style="width:180px;">姓名：{{order.patient.name}}</span>
+            <span style="width:240px;">证件号：{{order.patient.id_card_no}}</span>
+            <span style="width:180px;">联系电话：{{order.patient.phone}}</span>
+            <span style="width:260px;">医生：{{order.doctor}}</span>
+            <span style="width:180px;">科室：{{order.departments}}</span>
+            <span style="width:240px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
+            <!-- <span style="width:180px;">疾病名称：{{case_history.diagnostic}}</span>
+            <span style="width:180px;">症状：{{case_history.diagnostic}}</span> -->
+            
 
           </div>
         </div>
         <div class="commonCell">
-          <p>体格信息</p>
+          <p style="color:#409EFF;">体格信息</p>
           <div class="detailMain">
             <span style="width:140px;">体温：{{case_history.temperature}}℃</span>
             <span style="width:140px;">呼吸：{{case_history.breathing}} 次/分</span>
             <span style="width:200px;">血压：{{case_history.sbp}}~{{case_history.dbp}} mmHg</span>
           </div>
         </div>
+        <div class="commonCell">
+          <p style="color:#409EFF;">病历信息</p>
+          <div class="detailMain">
+            <span style="width:260px;" v-if="case_history.is_infect== 1">是否传染：是</span>
+            <span style="width:260px;" v-if="case_history.is_infect != 1">是否传染：否</span>
+            <span style="width:180px;">发病日期：{{getTimes(case_history.sick_date,"{y}-{m}-{d}")}}</span>
+          </div>
+        </div>
         <div class="commonCell">
           <p>主诉</p>
           <div>{{case_history.chief_conplaint}}</div>
             this.case_history = response.data.data.order.case_history
             console.log("历史详情",this.case_history)
             this.order = response.data.data.order
+            console.log('this.order',this.order)
 
 
             this.prescriptions = []
   }
 
   .detailMain {
+    flex: 1;
   span {
     display: inline-block;
   }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

           </el-button>
         </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" @row-click='choosePatient' border style="width: 100%;"
+          <el-table :data="patientTableData" :height="tableHeight" @row-click='choosePatient' @current-change='currentChange' border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row
         <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
-                          v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                          v-if="titleType == '电子处方'" style="flex:1;" v-on:change="changeTab"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                     :hisPatientInfo="hisPatientInfo"   v-if="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
         }
 
 
+      },changeTab(){
+        this.radio = 2
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio
+        }
+        this.patientTableData = []
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+            this.cal_one = response.data.data.total_one
+            this.cal_two =  response.data.data.total_two
+            this.admin_info =  response.data.data.info
+           for (let i = 0; i< this.patientTableData.length; i++){
+             if(this.patientTableData[i].patients.id == this.patientid){
+               this.$refs.tab.setCurrentRow(this.patientTableData[i])
+             }
+           }
+
+          }
+        })
+
       },
       change(val) {
         this.getList()
-
-
       },
       getList() {
         let params = {
 
             if(this.patientTableData.length > 0) {
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
+              this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
             }
 
 
 
       },
+
       choosePatient(val) {
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++){
           }
         }
         if(isShowDailog){
+
+          this.patientTableData.map((item,index) => {
+            if(item.patient_id == this.oldCurrentRow.patient_id){
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
+            }
+          })
           this.$message.error('需要保存当前处方才能切换')
           return
         }
             this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
+      },
+      currentChange(currentRow, oldCurrentRow){
+        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.oldCurrentRow = currentRow
+          return
+        }
+
+
       },
       open(index) {
         console.log("index0999999",this.prescriptions)