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

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -3,6 +3,7 @@
     <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
               :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"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
       </el-table-column>
@@ -55,7 +56,7 @@
     <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
               :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="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
@@ -189,7 +190,7 @@
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
-          width:60px;
+          width:80px;
           display: inline-block;
           font-size: 14px;
         }

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -1,16 +1,16 @@
 <template>
   <el-dialog
     title="附加收费"
-    width="300px"
+    width="600px"
     :visible.sync="visible"
     :before-close="_close"
   >
-    <el-table :data="chargeTable" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }"
+    <el-table :data="chargeTable" border style="width: 100%;" height="350" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
               @select-all="handleSelectionChange"
               @select='selectDrugs'>
-      <el-table-column align="center" type="selection" width="40"></el-table-column>
-      <el-table-column align="center" prop="name" label="名称" width="100">
+      <el-table-column align="center" type="selection" width="60"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称" width="160">
         <template slot-scope="scope">{{ scope.row.item_name }}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额(元)">

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -11,31 +11,31 @@
     <div class="mainTitle">基本信息：</div>
     <el-form class="basicForm" :model="patientInfo" ref="form" label-width="120px">
       <el-form-item label="姓名:" prop="name">
-        <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.name" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="性别: " prop="name">
-        <el-input v-model="patientInfo.gender" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.gender" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="年龄: " prop="name">
-        <el-input v-model="patientInfo.age" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.age" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="证件号:" prop="name">
-        <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.id_card_no" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="出生日期: " prop="name">
         <el-date-picker
           style="width:100%;"
           v-model="patientInfo.birth"
           type="date"
-          readonly
+          :disabled="true"
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="联系电话: " prop="name">
-        <el-input v-model="patientInfo.phone" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.phone" placeholder="" :disabled="true"></el-input>
       </el-form-item>
       <el-form-item label="医保类型: " prop="name">
-        <el-select v-model="delivery_way" placeholder="请选择">
+        <el-select v-model="delivery_way" style="width:100%;" placeholder="请选择">
          <el-option
             v-for="item in wayOptions"
            :key="item.id"
@@ -45,10 +45,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.health_care_no" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="" :disabled="true"></el-input>
       </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.home_address" placeholder="" :disabled="true"></el-input>
       </el-form-item>
     </el-form>
     <div class="mainTitle">体格信息：</div>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -129,7 +129,7 @@
 
     <div class="additionalBox">
       <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span>{{item.item_name}}</span>
+        <span :title="item.item_name">{{item.item_name}}</span>
         <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
         共
         <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
@@ -371,7 +371,7 @@
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
-          width:60px;
+          width:80px;
           display: inline-block;
           font-size: 14px;
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -92,19 +92,19 @@
 
       @selection-change="handleSelectionChange">
       <el-table-column
+        align='center'
         type="selection"
         width="50">
       </el-table-column>
       <el-table-column
+        align='center'
         label="处方编号"
         width="120">
         <template  slot-scope="scope">
           <span>处方编号</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="处方号"
-        width="200">
+      <el-table-column label="处方号">
         <template slot-scope="scope">
           <span>
            <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
@@ -112,6 +112,15 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-dialog
+      class="centerDialog"
+      width="560px"
+      title="打印"
+      :visible.sync="innerVisible"
+      append-to-body>
+      
+      <print :paramsObj='paramsObj'></print>
+    </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="savePrint">确 定</el-button>
@@ -131,13 +140,15 @@
   import saveRecordTemplate from './components/saveRecordTemplate'
   import { uParseTime } from '@/utils/tools'
   import { getPrescriptionList } from "@/api/project/project"
+  import print from './print'
   export default {
     components: {
       BreadCrumb,
       deskPrescription,
       deskRecord,
       medicalRecord,
-      saveRecordTemplate
+      saveRecordTemplate,
+      print
     },
     data() {
       return {
@@ -184,6 +195,8 @@
         index:0,
         admin_info:{},
         saveLoading:false,
+        innerVisible:false,
+        paramsObj:{}
 
       }
     },
@@ -688,7 +701,16 @@
          var ids = arr.join(",")
          console.log("ids",ids)
          if(this.index == 2){
-           this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
+           let obj = {
+             record:this.record_date,
+             prescription_id:this.prescription_id,
+             ids:ids,
+             patient_id:this.patientid
+           }
+           this.paramsObj = obj
+           this.innerVisible = true
+           
+          //  this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
          }
          if(this.index == 6){
             this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
@@ -978,4 +1000,9 @@
   }
 
   }
+  .centerDialog{
+    .el-dialog__body{
+      max-height: calc(100vh - 100px) !important;
+    }
+  }
 </style>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+  <div>
        <template>
         <el-button
           :loading="loading"
@@ -12,29 +10,9 @@
           >打印</el-button
         >
       </template>
-    </div>
-    <div class="app-container" style="min-height:0;">
-        <el-container class="newContainer">
-            <!-- <div style="width:270px;margin-right:20px;">
-                <div class="cell clearfix" style="margin-bottom:10px;">
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
-                    <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                </div>
-                <el-table ref="tab"   @current-change="changePatient" highlight-current-row :data="patientTableData" 
-                 height="480" border style="width: 100%">
-                    <el-table-column prop="date"  label="患者">   
-                      <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template> 
-                    </el-table-column>
-                    <el-table-column prop="name" label="就诊号">
-                        <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
-                    </el-table-column>
-                </el-table>
-            </div> -->
             
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px;margin：0 auto；width：960px;">
-              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-            </div>
-        </el-container>
+    <div class='dialysisPage'>
+      <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
     </div>
   </div>
 </template>
@@ -57,6 +35,9 @@ export default {
     BreadCrumb,
     printOne
   },
+  props:{
+    paramsObj:Object
+  },
   data() {
     return {
       crumbs: [
@@ -72,7 +53,9 @@ export default {
        search_input:"",
        loading:false,
        patient_id:"",
-       prescription_id:""
+       prescription_id:"",
+       ids:'',
+       paramsObj:{}
     };
   },
   methods:{
@@ -127,9 +110,9 @@ export default {
                 cal_two = cal_two + 1
               }
             }
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            console.log(this.patientTableData[0])
-            this.choosePatient(this.patientTableData[0])
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // console.log(this.patientTableData[0])
+            // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one
             this.cal_two = cal_two   
          }
@@ -171,13 +154,35 @@ export default {
 
   created() {
     this.getAllDoctorList()
-    var record_date = this.$route.query.record
+    var record_date = this.paramsObj.record
     this.record_date = record_date
     console.log("record_date",record_date)
-    var prescription_id = this.$route.query.prescription_id
+    var prescription_id = this.paramsObj.prescription_id
     this.prescription_id = prescription_id
+    this.patient_id = this.paramsObj.patient_id
+    this.ids = this.paramsObj.ids
+    // var record_date = this.$route.query.record
+    // this.record_date = record_date
+    // console.log("record_date",record_date)
+    // var prescription_id = this.$route.query.prescription_id
+    // this.prescription_id = prescription_id
     this.getAllHisPatientList(record_date)
   },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val
+        this.patient_id = this.paramsObj.patient_id
+        var record_date = this.paramsObj.record
+        this.record_date = record_date
+        console.log("record_date",record_date)
+        var prescription_id = this.paramsObj.prescription_id
+        this.prescription_id = prescription_id
+        this.ids = this.paramsObj.ids
+      },
+      deep:true
+    }
+  }
 
 };
 </script>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -57,7 +57,8 @@ export default {
     props:{
       patient_id:Number,
       record_date:String,
-      prescription_id:Number
+      prescription_id:Number,
+      ids:String
     }, 
     data(){
       return {
@@ -104,10 +105,10 @@ export default {
           // patient_id:this.patient_id,
           // record_date:this.record_date,
           // prescription_id:this.prescription_id,
-          patient_id:this.$route.query.patient_id,
-          record_date:this.$route.query.record,
-          prescription_id:this.$route.query.prescription_id,
-          ids:this.$route.query.ids
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids
         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
@@ -193,6 +194,13 @@ export default {
 
 
 <style lang="scss" scoped>
+.prescription-print{
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 0px;
+}
 .printTitle{
     font-size: 22px;
     text-align: center;

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -97,12 +97,13 @@
                 <el-table-column align="center" prop="name" label="操作人" width="70">
                     <template slot-scope="scope">{{creator}}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="操作" width="80">
+                <el-table-column align="center" prop="name" label="操作" width="180">
                     <template slot-scope="scope">
-                        <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>  
+                      <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>  
+                      <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -118,6 +119,98 @@
                 :total="total"
             >
             </el-pagination>
+            <el-dialog
+              title="挂号历史详情"
+              :visible.sync="dialogVisible"
+              width="1100px"
+              :before-close="handleClose">
+              <div>
+                <div class="formMain">
+                  <el-form class="basicForm" :model="form"  ref="form"  label-width="130px">
+                    <el-form-item label="患者姓名："  prop="name">
+                       <div>{{ form.name }}</div>
+                    </el-form-item>
+
+                    <el-form-item label="性别：" prop="gender">
+                      <div v-if="form.gender == 1">男</div>
+                      <div v-if="form.gender == 2">女</div>
+                    </el-form-item>
+
+                    <el-form-item label="年龄：" prop="age">
+                      <div>{{ form.age }}</div>
+                    </el-form-item>
+
+
+                    <el-form-item label="出生日期：" prop="birthday">
+                      <div>{{ getTime(form.birthday,"{y}-{m}-{d}") }}</div>
+                    </el-form-item>
+
+                    <el-form-item label="手机号码：" prop="phone">
+                      <div>{{ form.phone }}</div>
+                    </el-form-item>
+
+
+                    <el-form-item label="医疗类别：">
+                      <div>{{ getDictionaryDataConfig(form.medical_treatment_type) }}</div>
+                    </el-form-item>
+
+
+                    <el-form-item label="证件类型：">
+                      <div>{{ getCertificates(form.id_type) }}</div>
+                    </el-form-item>
+
+                    <el-form-item label="证件号码：" prop="idCard">
+                      {{ form.id_card_no }}
+                    </el-form-item>
+
+
+                      <el-form-item label="结算类型：">
+                        {{ getSettlement(form.balance_accounts_type) }}
+                      </el-form-item>
+
+
+                    <el-form-item label="社保类型：">
+                      <div>{{ getMedicalCare(form.social_type) }}</div>
+                    </el-form-item>
+                    <el-form-item class="specialFormItem" style="width:66.5%;" label="医保卡号：">
+                      <div>{{ form.medical_insurance_number }}</div>
+                    </el-form-item>
+                    <el-form-item label="挂号类型："  prop="register"  :validate-event="is_Name">
+                      <div>{{ getRegister(form.register_type) }}</div>
+                    </el-form-item>
+                    <el-form-item label="医生："  prop="doctor" :validate-event="is_Name" >
+                      <div>{{ getDoctor(form.admin_user_id) }}</div>
+                    </el-form-item>
+                    <el-form-item label="科室："  prop="department" :validate-event="is_Name">
+                      <div>{{ getDepartMent(form.departments) }}</div>
+                    </el-form-item>
+                    <el-form-item label="是否需要工本费："> 
+                      <div v-if="form.is_need_cost_of_production == 1">是</div>
+                      <div v-else>否</div>
+                    </el-form-item>
+                    <el-form-item label="挂号费：">
+                      <div>{{ form.register_cost }}</div>
+                    </el-form-item>
+                    <el-form-item label="诊疗费：">
+                      <div>{{ form.treatment_cost }}</div>
+                    </el-form-item>
+                    <el-form-item label="工本费：">
+                      <div>{{ form.cost_of_production }}</div>
+                    </el-form-item>
+                    <el-form-item label="合计：">
+                      <div>{{ form.total }}</div>
+                    </el-form-item>
+                    <el-form-item>
+                        <!-- <el-input v-model="form.name"></el-input> -->
+                    </el-form-item>
+                  </el-form>
+                </div>
+              </div>
+              <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+              </span>
+            </el-dialog>
         </div>
     </div>
 </template>
@@ -127,6 +220,7 @@ const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisPatientHistory,changePatient,getHisPatient } from "@/api/project/project"
 import { uParseTime } from "@/utils/tools";
+import { getDictionaryDataConfig } from '@/utils/data'
 
 export default {
     components:{
@@ -180,10 +274,81 @@ export default {
                 id: 7,
                 name: "生育保险"
             }],
+            certificates: [{
+              value: 1,
+              label: '内地身份证'
+              }, {
+              value: 2,
+              label: "社保卡"
+              },{
+              value: 3,
+              label: "护照"
+              },{
+              value: 4,
+              label: "军官证"
+              },{
+              value: 5,
+              label: "台胞证"
+              },{
+              value: 6,
+              label: "港澳地区身份证"
+            }],
+            settlement: 
+            [
+              {value: 1,label: '医保'},
+              {value: 2,label: '自费'},
+              {value: 3,label:'公费'},
+              {value: 4,label:'农保'},
+              {value: 5,label:'会员'},
+              {value: 6,label:'职工'},
+              {value: 7,label:'合同'}
+            ],
+            medicalCare: [{
+              value: 1,
+              label: '职工基本医疗保险'
+              }, {
+              value: 2,
+              label: "公务员医疗补助"
+              },{
+              value: 3,
+              label: "大额医疗费用补助"
+              },{
+              value: 4,
+              label: "离休人员医疗"
+              },{
+              value: 5,
+              label: "城乡居民基本医疗保险"
+              },{
+              value: 6,
+              label: "城乡居民大病医疗保险"
+              },
+              {
+              value: 7,
+              label: "生育保险"
+            }],
+            newRegister: [{
+              value: 1,
+              label: '普通'
+              }, {
+              value: 2,
+              label: "主治"
+              },{
+              value: 3,
+              label: "主任"
+              },{
+              value: 4,
+              label: "免收诊金"
+              },{
+              value: 5,
+              label: "专家"
+            }],
             
             tablePatient:[],
             creator:"",
-            startUnix:''
+            startUnix:'',
+
+            dialogVisible:false,
+            form:{}
         }
     },
     created(){
@@ -205,6 +370,7 @@ export default {
        this.startUnix = todayUnix - 28800
       
        this.getlist()
+       this.getDictionaryDataConfig()
     },
     methods:{
         searchAction(){
@@ -349,13 +515,83 @@ export default {
       },
 
       handleSelect(val){   
-          this.search_input = val.name
-          this.getlist()
-       },
+        this.search_input = val.name
+        this.getlist()
+      },
+      handleClose(done){
+        done()
+      },
+      open(obj){
+        this.dialogVisible = true
+        this.form = obj
+        console.log(obj)
+      },
+      getDictionaryDataConfig(type){
+        let arr = getDictionaryDataConfig('system','social_type')
+        let str = ''
+        arr.map(item => {
+          if(item.id == type)
+          str = item.name
+        })
+        return str
+      },
+      getCertificates(type){
+        let arr = this.certificates
+        let str = ''
+        arr.map(item => {
+          if(item.value == type)
+          str = item.label
+        })
+        return str
+      },
+      getSettlement(type){
+        let arr = this.settlement
+        let str = ''
+        arr.map(item => {
+          if(item.value == type)
+          str = item.label
+        })
+        return str
+      },
+      getMedicalCare(type){
+        let arr = this.medicalCare
+        let str = ''
+        arr.map(item => {
+          if(item.value == type)
+          str = item.label
+        })
+        return str
+      },
+      getRegister(type){
+        let arr = this.newRegister
+        let str = ''
+        arr.map(item => {
+          if(item.value == type)
+          str = item.label
+        })
+        return str
+      },
+      getDepartMent(type){
+        let arr = this.departMent
+        let str = ''
+        arr.map(item => {
+          if(item.id == type)
+          str = item.name
+        })
+        return str
+      },
 
     }
 }
 </script>
 
 <style lang="scss" scoped>
+.basicForm{
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  .el-form-item{
+    width: 33%;
+  }
+}
 </style>