批量打印

src/api/consumable.js

@@ -14,7 +14,7 @@ export function GetAllZone(params){
 //获取透析参数
 
 export function getDialysisParameters(params){
-   console.log("params============heyuan",params)
+   
   return request({
      url:"/api/dialysis/getdialysisparameters",
      method:"Get",

src/api/project/project.js

@@ -461,4 +461,13 @@ export function changePatient(id,params){
       method:"Get",
       params:params
     })
+  }
+
+  export function getPatientDetail(id,params){
+    
+     return request({
+       url:"/api/histpatient/getpatientdetail?id="+id,
+       method:"Get",
+       params:params
+     })
   }

src/api/schedule.js

@@ -113,3 +113,12 @@ export function exportScheduleTemplate(params) {
   })
 }
 
+
+export function getNextScheduleWeekDay(params){
+  
+  return request({
+    url:"/api/schedule/getnextscheduleweekday",
+    method:"get",
+    params:params
+  })
+}

src/router/modules/workforce.js

@@ -70,6 +70,18 @@ export default {
         title: 'remind_print',
         noCache: true
       }
+    },
+
+    {
+      path:'/schedule/remind/print/next',
+      component:()=>import('@/xt_pages/workforce/next_remind_print'),
+      name:'next_remind_print',
+      hidden:true,
+      is_menu:false,
+      meta:{
+        title:'next_reminde_print',
+        noCache:true
+      }
     }
   ]
 }

src/xt_pages/dialysis/components/consumables.vue

@@ -42,7 +42,7 @@
         </div>
       </div>
       <div>
-        <!--<el-button size="small" icon="el-icon-printer" type="primary">打印</el-button>-->
+        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
@@ -219,13 +219,14 @@
             var res = response.data
             this.total = res.data.total
             this.good_types.push("姓名")
-
+           
             for (let a = 0; a <  res.data.good_type.length; a++){
               this.good_types.push(res.data.good_type[a].type_name)
+              
             }
-            console.log("res====",res.data.good_type)
+            console.log("姓名",this.good_types)
             this.allGoodInfo = res.data.dialysis_goods
-            console.log("dis===",res.data.dialysis_goods)
+           
             for(let i = 0; i < res.data.dialysis_goods.length; i++){
               let arr =[]
               let obj = {
@@ -271,7 +272,7 @@
 
           }
 
-         console.log("list",this.list)
+         console.log("list222222",this.list)
 
         })
 
@@ -320,7 +321,26 @@
       search() {
         this.query.page = 1
         this.GetDialysisgoods()
-      }
+      },
+
+       exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = this.good_types
+         const filterVal = ['name','']
+        
+         const data = this.formatJson(filterVal, this.list)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析耗材查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+
     }
   }
 </script>

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -220,10 +220,12 @@ export default {
     methods:{
         selectSchedulType(scheduleType) {
             this.scheduleType = scheduleType;
+            this.tableData = []
             this.getlist()
         },
         selectPartitionType(partitionType) {
           this.partitionType = partitionType;
+          this.tableData = []
           this.getlist()
         },
         getAllZone: function() {
@@ -258,7 +260,7 @@ export default {
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-            
+              
                 this.tableData = schedule
                 var total = response.data.data.total
                 this.total = total
@@ -352,6 +354,7 @@ export default {
               limit:this.limit,
               page:this.page
             }
+           console.log("params9999999",params)
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
@@ -478,7 +481,7 @@ export default {
              dryWeight = this.dialysisBefor[i].dry_weight
           }
         }
-        console.log("dryweight=====",dryWeight)
+       
        return dryWeight
      },
      getSysBloodPressure(id){
@@ -488,7 +491,7 @@ export default {
              sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
           }
         }
-        console.log("sysBloodPressure=====",sysBloodPressure)
+      
         return sysBloodPressure
      },
      getTargetUltrafiltration(id){

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -54,15 +54,15 @@
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form class="physiqueForm" :model="case_history" ref="form" label-width="80px">
-      <el-form-item label="体温:" prop="name">
+      <el-form-item label="体温:" prop="temperature">
         <el-input v-model="case_history.temperature" placeholder=""></el-input>
         <span>℃</span>
       </el-form-item>
-      <el-form-item label="脉搏: " prop="name">
+      <el-form-item label="脉搏: " prop="pulse">
         <el-input v-model="case_history.pulse" placeholder=""></el-input>
         (次/分)
       </el-form-item>
-      <el-form-item label="呼吸: " prop="name">
+      <el-form-item label="呼吸: " prop="breathing">
         <el-input v-model="case_history.breathing" placeholder=""></el-input>
         (次/分)
       </el-form-item>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -257,8 +257,12 @@
             this.addtions_charge = []
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
-            this.case_history = response.data.data.case_history
-
+            var case_history = response.data.data.case_history
+            console.log("case_history22222222",case_history)
+            if (case_history.breathing  == 0) {
+                case_history.breathing = ""
+            }
+            this.case_history = case_history
             this.info = response.data.data.info
 
             this.addtions_charge = response.data.data.addtions_charge

src/xt_pages/outpatientRegistration/index.vue

@@ -9,12 +9,12 @@
                 <el-form class="basicForm" :model="form"  :rules="rules"  ref="form"  label-width="100px">
                     <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
                         <!-- <el-input  v-model="form.name"></el-input> -->
-                       <el-select v-model="form.name" placeholder="请选择">
+                       <el-select v-model="form.name" placeholder="请选择" @change="changeName">
                             <el-option
                             v-for="item in patient"
                             :key="item.patient_id"
                             :label="item.name"
-                            :value="item.name">
+                            :value="item.patient_id">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -46,11 +46,17 @@
 
                       <el-form-item label="医疗类别：">
                         <el-select v-model="form.medicalCare" placeholder="请选择">
-                            <el-option
+                            <!-- <el-option
                             v-for="item in medicalCare"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
+                            </el-option> -->
+                           <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -86,11 +92,17 @@
 
                    <el-form-item label="社保类型:">
                         <el-select v-model="form.social_type" placeholder="请选择">
-                            <el-option
+                            <!-- <el-option
                             v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
                             :key="index"
                             :label="item.name"
                             :value="item.id">
+                            </el-option> -->
+                          <el-option
+                            v-for="item in medicalCare"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -165,8 +177,9 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { basename } from 'path'
-import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient } from "@/api/project/project"
+import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient,getPatientDetail } from "@/api/project/project"
 import { getDictionaryDataConfig } from '@/utils/data'
+import { uParseTime } from "@/utils/tools";
 const moment = require('moment')
 export default {
     components:{
@@ -199,13 +212,16 @@ export default {
                 phone:'',
                 social_type:'',
             },
-            settlement: [{
-                value: 1,
-                label: '医保'
-                }, {
-                value: 2,
-                label: '自费'
-            }],
+          settlement: 
+            [
+              {value: 1,label: '医保'},
+              {value: 2,label: '自费'},
+              {value: 3,label:'公费'},
+              {value: 4,label:'农保'},
+              {value: 5,label:'会员'},
+              {value: 6,label:'职工'},
+              {value: 7,label:'合同'}
+            ],
             sex: [{
                 value: 1,
                 label: '男'
@@ -447,6 +463,14 @@ export default {
              this.is_Name = true
              return
           }
+          var name = ""
+          for(let i=0;i<this.patient.length;i++){
+            if(this.form.name == this.patient[i].patient_id){
+                name = this.patient[i].name
+            }
+          }
+          console.log("name",name)
+          this.form.name  = name
           this.$refs[formName].validate((valid)=>{
              if(valid){
                   if(this.form.costChecked == true){
@@ -480,7 +504,7 @@ export default {
                     social_type:this.form.social_type
                 }
                 console.log("params",params)
-
+                
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -535,6 +559,19 @@ export default {
              
             }
          }
+      },
+      changeName(id){
+        getPatientDetail(id).then(response=>{
+           if(response.data.state == 1){
+             var patient =  response.data.data.patient
+             console.log("patient",patient)
+             this.form.sex = patient.gender 
+             this.form.age = patient.age
+             this.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+             this.form.phone = patient.phone
+             this.form.idCard = patient.id_card_no
+          }
+        })
       }
     },
     created(){

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -79,8 +79,8 @@
                 <el-table-column align="center" prop="name" label="证件号" width='180'>
                     <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
                 </el-table-column>
-                <el-table-column align="center" label="患者保险类型">
-                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.medical_treatment_type)}}</template>
+                <el-table-column align="center" label="社保类型">
+                    <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
                     <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
@@ -126,6 +126,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";
+
 export default {
     components:{
         BreadCrumb
@@ -148,8 +149,8 @@ export default {
                 {value: 4,label: "免收诊金"},
                 {value: 5,label: "专家"}
             ],
-            start_time:"",
-            end_time:"",
+            start_time:moment().format("YYYY-MM-DD"),
+            end_time:moment().format("YYYY-MM-DD"),
             limit:20,
             page:1,
             total:0,
@@ -178,6 +179,7 @@ export default {
                 id: 7,
                 name: "生育保险"
             }],
+            
             tablePatient:[]
         }
     },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -208,6 +208,7 @@ export default {
   },
   watch: {
     weekTime: function() {
+     
       var theType = this.weekType(this.weekTime);
       this.getSchedules(theType);
     }
@@ -224,12 +225,12 @@ export default {
           week_type:this.week_type,
           week_time:this.week_time,
         }
-        console.log("params------",params)
+       
       getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
           this.scheduleData = response.data.data.schdules;
-          console.log("排班-----", this.scheduleData);
+         
         } else {
           this.$message.error("网络错误");
           return false;

src/xt_pages/workforce/remind.vue

@@ -10,12 +10,15 @@
         <el-tab-pane name="thisWeek">
             <span slot="label"><i class="el-icon-date"></i> 本周（{{theWeek.thisWeek}}）</span>
         </el-tab-pane>
-        <!-- <el-tab-pane name="nextWeek">
+        <el-tab-pane name="nextWeek">
             <span slot="label"><i class="el-icon-date"></i> 下一周（{{theWeek.nextWeek}}）</span>
-        </el-tab-pane>  -->
+        </el-tab-pane> 
     </el-tabs>
     <table-push v-if="activeName=='pushTime'"></table-push>
-    <table-weeks v-else :week-time="activeName"> </table-weeks>
+    <!-- <table-weeks v-else :week-time="activeName"> </table-weeks> -->
+     
+   <table-weeks v-if="activeName == 'thisWeek'"> </table-weeks>
+   <nextTableWeeks v-if="activeName =='nextWeek'"></nextTableWeeks>
   </div>
 </div>
 </template>
@@ -23,6 +26,7 @@
 <script>
 import {getWeekPanels} from '@/api/schedule';
 import tableWeeks from './components/tableWeeks'
+import nextTableWeeks from './components/nextTableWeeks'
 import tablePush from './components/tablePush'
 import BreadCrumb from '../components/bread-crumb'
 export default {
@@ -40,7 +44,8 @@ export default {
     components:{
       BreadCrumb,
         tableWeeks,
-        tablePush
+        tablePush,
+        nextTableWeeks
     },
     methods: {
 
@@ -61,10 +66,19 @@ export default {
       },
       handleClick(tab, event) {
         console.log(tab, event);
+      },
+      changeActiveName(val){
+        console.log("val------",val)
+        this.activeName = val
       }
     },
     created(){
         this.getWeekPanels();
+    },
+    watch:{
+      activeName:function(val){
+       console.log("val----",val)
+      }
     }
 };
 </script>