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

@@ -45,7 +45,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="" readonly></el-input>
       </el-form-item>
       <el-form-item label="家庭住址: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" readonly></el-input>
@@ -138,7 +138,7 @@
           type="textarea"
           :rows="2"
           placeholder="请输入内容"
-          v-model="doctor_advice">
+          v-model="case_history.doctor_advice">
         </el-input>
       </el-form-item>
        <el-form-item label="备注:" prop="name" style="width:100%;">
@@ -146,7 +146,7 @@
           type="textarea"
           :rows="2"
           placeholder="请输入内容"
-          v-model="remark">
+          v-model="case_history.remark">
         </el-input>
       </el-form-item>
     </el-form>
@@ -254,8 +254,8 @@
             "record_date":this.record_date,
             "diagnostic":this.case_history.diagnostic,
             "breathing":this.case_history.breathing,
-            "doctor_advice":this.doctor_advice,
-            "remark":this.remark
+            "doctor_advice":this.case_history.doctor_advice,
+            "remark":this.case_history.remark
           }
 
           createCaseHistory(params).then(response => {

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

@@ -87,7 +87,7 @@
                             <template slot-scope="scope">{{ scope.row.user_name }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="创建日期">
-                            <template slot-scope="scope">{{ scope.row.record_date }}</template>
+                            <template slot-scope="scope">{{getTimes(scope.row.record_date) }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="模板说明">
                             <template slot-scope="scope">{{ scope.row.template_remark }}</template>
@@ -115,6 +115,7 @@
 import recordHistoryDetail from './recordHistoryDetail'
 import recordTemplateDetail from './recordTemplateDetail'
 import { getHistoryTemplate } from "@/api/project/project"
+import { uParseTime } from '@/utils/tools'
 export default {
     components:{
         recordHistoryDetail,
@@ -192,7 +193,10 @@ export default {
         },
         changeEndTime(){
           this.getlist()
-        }
+        },
+        getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      },
     },
     created(){
        console.log("99999999999999999")

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/recordTemplate/printOne.vue

@@ -98,7 +98,7 @@ export default {
     props:{
       patient:Object,
       hispatient:Object,
-      history:Object,
+    //   history:Object,
     },
     data(){
         return{

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -31,12 +31,12 @@
 
           </div>
           <div class="doctorBox">
-              <p>医师：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
+              <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
           <div class="actionBar">
                  <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>配对：{{getDoctor(item.advices[0].advice_doctor)?getDoctor(item.advices[0].advice_doctor):""}}</p>
+                 <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
@@ -149,7 +149,7 @@ export default {
        return name
      },
      getTotalOne(id) {
-        
+        console.log("处方数据",this.prescriptions)
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -167,6 +167,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
+        
         return total + addtotal
        }
       }, 

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="actionBar">
             <p>审核：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
-            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>配对:</p>
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
             <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>

src/xt_pages/outpatientRegistration/index.vue

@@ -529,6 +529,8 @@ export default {
                      this.form.total= "" ,
                      this.form.phone = "",
                      this.form.social_type = ""
+                   }else{
+                       this.$message.error("今日患者已挂号!")
                    }
                 })
              }
@@ -561,6 +563,11 @@ export default {
          }
       },
       changeName(id){
+            this.form.sex = ""
+            this.form.age = ""
+            this.form.birthday = ""
+            this.form.phone = ""
+            this.form.idCard = ""
         getPatientDetail(id).then(response=>{
            if(response.data.state == 1){
              var patient =  response.data.data.patient

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -99,7 +99,8 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</el-button>  
                     </template>
@@ -181,7 +182,8 @@ export default {
             }],
             
             tablePatient:[],
-            creator:""
+            creator:"",
+            startUnix:''
         }
     },
     created(){
@@ -198,7 +200,10 @@ export default {
        //获取所有挂号号的患者
 
        this.creator = this.$store.getters.xt_user.user.user_name
-    
+       var today = moment().startOf('day').format('YYYY-MM-DD')
+       var todayUnix = Date.parse(today)/1000 
+       this.startUnix = todayUnix - 28800
+      
        this.getlist()
     },
     methods:{
@@ -254,6 +259,7 @@ export default {
           getHisPatientHistory(params).then(response=>{
              if(response.data.state == 1){
                 var history = response.data.data.history
+
                 console.log("history",history)
                 this.tableData = history
                 var total =  response.data.data.total
@@ -345,7 +351,7 @@ export default {
       handleSelect(val){   
           this.search_input = val.name
           this.getlist()
-        },
+       },
 
     }
 }