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

.idea/.gitignore

@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml

config/index.js

@@ -30,7 +30,7 @@ module.exports = {
     //  host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package-lock.json

@@ -7943,7 +7943,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "normalize.css": {

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/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>
@@ -138,6 +138,7 @@
         new_list:[],
 
         good_types: [],
+        arrKey:[],
 
       }
     },
@@ -178,18 +179,19 @@
 
       },
       getGoodUserInfo(good_type_id,good_user,last_good_user) {
+        var arrlist =[] 
         if (good_user != null && good_user.length > 0) {
           let desc = ""
           for (let b = 0; b < good_user.length; b++){
             if(good_type_id == good_user[b].good_type_id)
               desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
           }
-
-
+          arrlist.push(desc)
           return desc
         }
+       console.log("arrlist---------",arrlist)
         return ""
-
+       
         // else if (good_user != null && good_user.length <= 0) {
         //   if (last_good_user != null && last_good_user.length > 0) {
         //     let desc = ""
@@ -219,13 +221,20 @@
             var res = response.data
             this.total = res.data.total
             this.good_types.push("姓名")
-
+            var arr = []
+            arr.push("name")
             for (let a = 0; a <  res.data.good_type.length; a++){
+              Object.keys(res.data.good_type[a]).map(item => {
+                if(item == 'type_name'){
+                  arr.push(item)
+                }
+              })
               this.good_types.push(res.data.good_type[a].type_name)
             }
-            console.log("res====",res.data.good_type)
+            this.arrKey.push(...arr)
+          
             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 +280,7 @@
 
           }
 
-         console.log("list",this.list)
+         console.log("list222222",this.list)
 
         })
 
@@ -320,7 +329,26 @@
       search() {
         this.query.page = 1
         this.GetDialysisgoods()
-      }
+      },
+
+       exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = this.good_types
+         const filterVal = this.arrKey
+        
+         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/dialysis/template/DialysisPrintOrderTen.vue

@@ -1399,8 +1399,8 @@ export default {
 
         this.prescription = response.data.data.dialysisPrescription;
 
-        this.receiverTreatmentAccess =
-          response.data.data.receiverTreatmentAccess;
+        this.receiverTreatmentAccess =response.data.data.receiverTreatmentAccess;
+        console.log("透析监测",this.receiverTreatmentAccess)
         this.prescription.mode = this.modeName(this.prescription.mode_id);
         var rwLen = this.replacementWays.length;
         this.prescription.replacement = "";
@@ -1738,10 +1738,10 @@ export default {
       }
     },
     "patientInfo.source": function() {
-      if (this.patientInfo.source == 1) {
+      if (this.receiverTreatmentAccess.condition == 2 ) {
         this.patientInfo_source_1 = true;
         this.patientInfo_source_2 = false;
-      } else if (this.patientInfo.source == 2) {
+      } else if (this.receiverTreatmentAccess.condition == 1) {
         this.patientInfo_source_2 = true;
         this.patientInfo_source_1 = false;
       } else {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -44,9 +44,9 @@
       <div class="mainRight">
 
         <div class="mainCell" style="margin-bottom:10px;flex-direction: row-reverse;">
-          <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
-          <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
-          <el-button size="small" @click="open(3)" type="primary">打印</el-button>
+          <!-- <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
+          <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button> -->
+          <el-button size="small" @click="open(3)" type="primary" style="margin-left:10px;">打印</el-button>
           <el-button v-loading="loadingone" size="small"
                      @click="open(6)"
                      v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -46,7 +46,7 @@
                     </div>
                     <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                         <p style="width:50%;">现金支付</p>
-                        <p style="width:50%;"></p>
+                        <p style="width:50%;">{{list.order_info.psn_cash_pay}}</p>
                     </div>
                 </div>
                 <div style="width:80%;display:flex;height:600px;">
@@ -71,8 +71,8 @@
             
         </div>
         <div class="moneyBox">
-            <p>实收金：</p>
-            <p>记账前金额：</p>
+            <p>实收金：{{list.order_info.medfee_sumamt}}</p>
+            <p>记账前金额：{{list.order_info.preselfpay_amt}}</p>
             <p>扣款金额：</p>
             <p>记账后金额：</p>
             <p>找赎金：</p>

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -58,6 +58,7 @@
       },
       show() {
         this.chargeTable = []
+       
         this.visible = true
         for (let i = 0; i < this.additions.length; i++) {
           let obj = {
@@ -83,7 +84,7 @@
     },
     watch: {
       hisPatientInfo: function(val) {
-        // console.log('患者ID', this)
+        console.log('患者ID', this)
       }
     }
   }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -56,7 +56,7 @@
         <div class="tabsBox">
 
           <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
-          <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
+          <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" closable @tab-remove="removeTab"
                    :before-leave="moreState" @tab-click="tabclickEvent">
             <el-tab-pane
               v-for="(item, index) in prescriptions"
@@ -427,7 +427,8 @@
 
         }
 
-      }, getTotalOne() {
+      }, 
+      getTotalOne() {
         var total = 0
         console.log(this.prescriptions)
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -458,7 +459,8 @@
         }
         return total
 
-      }, getCurTotal() {
+      }, 
+      getCurTotal() {
         var total = 0
 
         if(this.curPrescriptions.type == 1) {
@@ -1265,8 +1267,8 @@
 
   .addTab {
     position: absolute;
-    right: 0;
-    top: 6px;
+    right: 3px;
+    top: 3px;
     z-index: 20;
   }
 

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

@@ -67,14 +67,14 @@
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
         <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-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                          ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
+                          :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
+                          v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
+                    :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
-         <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
-         <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+        <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
+        <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
 
     </div>
@@ -107,7 +107,7 @@
         width="200">
         <template slot-scope="scope">
           <span>
-           <el-input v-model="scope.row.id"></el-input>
+           <el-input v-model="scope.row.prescription_number" :disabled="true"></el-input>
           </span>
         </template>
       </el-table-column>
@@ -179,7 +179,7 @@
         centerDialogVisible:false,
         tableData:[],
         selecting_schs: [],
-        index:0
+        index:0,
       }
     },
     methods: {
@@ -401,6 +401,12 @@
             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.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
             if (this.case_history.temperature <= 0) {
@@ -515,10 +521,11 @@
         })
       },
       open(index) {
-        if(this.prescriptions.length == 0){
+        console.log("index0999999",this.prescriptions)
+         if(this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0){
            this.$message.error("请先开处方")
            return
-        }
+          }
         this.index = index
         if (index == 1) {
           this.$refs.prescriptions.open(1)
@@ -532,7 +539,6 @@
           this.$refs.prescriptions.open(4)
         }else if(index == 6){
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
-
           this.getPrescriptionList(this.patientid)
           // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id)
 
@@ -549,7 +555,7 @@
           }
           this.$refs.child.createCaseHistory()
         } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
+          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
         } else if (index == 3) {
           this.$refs.medicalRecord.show()
         } else if (index == 4) {
@@ -587,7 +593,7 @@
            if(response.data.state == 1){
              this.centerDialogVisible = true
              var list = response.data.data.list
-             console.log("list9999999",list)
+             // console.log("list9999999",list)
              this.tableData = list
            }
         })

src/xt_pages/outpatientDoctorStation/print.vue

@@ -81,9 +81,9 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
       printJS({
-        printable: "prescription-print",
+        printable: "prescriptionPrint",
         type: "html",
         style: style,
         scanStyles: false

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="app-container" style="min-height:0;">
         <el-container class="newContainer">
-            <div style="width:270px;margin-right:20px;">
+            <!-- <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" :model="keyword" @click="searchAction">搜索</el-button>
@@ -31,7 +31,7 @@
                         </template>
                     </el-table-column>
                 </el-table>
-            </div>
+            </div> -->
             
             <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
               <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient = "hispatient" :history="history"></printOne>

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -93,7 +93,7 @@
 <script>
 
 import { getDataConfig } from "@/utils/data";
-import { getAllDoctorList } from "@/api/project/project"
+import { getAllDoctorList,getPatientCaseHistory } from "@/api/project/project"
 export default {
     props:{
       patient:Object,
@@ -137,12 +137,32 @@ export default {
         }
         return name
       },
-      
+      getPatientCaseHistory(){
+
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      console.log("病历22222",params)
+      getPatientCaseHistory(params).then(response=>{
+         if(response.data.state == 1){
+           var patient = response.data.data.patient
+           console.log("patinet",patient)
+           this.patient = patient
+           var history = response.data.data.history
+           console.log("history",history)
+           this.history = history
+           var hispatient = response.data.data.hispatient
+           console.log("hispatient",hispatient)
+           this.hispatient = hispatient
+         }
+      })
+    },
     },
     created(){
       this.educationOptions = getDataConfig("patient", "education_types");
       console.log("22222",this.educationOptions)
       this.getAllDoctorList()
+      this.getPatientCaseHistory()
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -1,41 +1,53 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
-        <div class="printTitle">血液透析中心处方笺</div>
-        <div class="infoTitle">
-            <p>姓名：{{patient.name?patient.name:""}}</p>
-            <p>性别：
-               <span v-if="patient.gender == 1">男</span>
-               <span v-if="patient.gender == 2">女</span>
-            </p>
-            <p>年龄：{{patient.age?patient.age:""}}岁</p>
-        </div>
-        <div class="infoMain">
-            <div style="margin-bottom: 10px;">门诊号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
-            <div style="margin-bottom: 10px;">科室：{{getDepart(this.hisPatient.departments?this.hisPatient.departments:"")}}</div>
-            <div style="margin-bottom: 10px;">医保卡号：{{this.hisPatient.number?this.hisPatient.number:""}}</div>
-            <div style="margin-bottom: 10px;">电话：{{patient.phone}}</div>
-            <div>地址：{{patient.home_address}}</div>
-            <div style="display:flex;width:50%;">临床诊断：{{patient.diagnose}}</div>
-        </div>
-        <div class="prescriptionBox">
-            <div class="Rp">Rp:</div>
-            <div class="drugsBox" v-for="(item,index) in advicePrint" :key="index">
-                <div class="drugsOne">{{item.advice_name?item.advice_name:""}}&nbsp;&nbsp;{{item.single_dose}}{{item.single_dose_unit}}&nbsp;×&nbsp; {{item.prescribing_number}}{{item.prescribing_number_unit}}</div>
-                <div style="margin-left:100px;"><span>用法：{{item.single_dose}}{{item.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{item.execution_frequency}}</span>&nbsp;&nbsp;<span>{{item.advice_desc}}</span></div>
-            </div>
-        </div>
-        <div class="doctorBox">
-            <p>医师：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
-            <p>日期：{{getTime(advicePrint[0].advice_date)?getTime(advicePrint[0].advice_date):""}}</p>
-        </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>核对：{{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>
-        </div>
+  <div id='prescriptionPrint'>
+    <div v-for="(item,index) in advicePrint" :key="index">
+      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <div class="printTitle">血液透析中心处方笺</div>
+          <div class="infoTitle">
+              <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
+              <p>性别：
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
+              </p>
+              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+          </div>
+          <div class="infoMain">
+              <div style="margin-bottom: 10px;">门诊号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">科室：{{getDepart(item.hisPatient.departments?item.hisPatient.departments:"")}}</div>
+              <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
+              <div>地址：{{item.patient.home_address}}</div>
+              <div style="display:flex;width:50%;">临床诊断：{{item.patient.diagnose}}</div>
+          </div>
+          <div class="prescriptionBox">
+              <div class="Rp">Rp:</div>
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+                  <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
+
+          </div>
+          <div class="doctorBox">
+              <p>医师：{{getDoctor(item.doctor)?getDoctor(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>核对：{{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>
+          </div>
+          <div style="page-break-after:always"></div>
+      </div>
     </div>
+    
+  </div>
+
+    
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -55,7 +67,9 @@ export default {
         tableData:[],
         prescriptionInfo:[],
         hisPatient:{},
-        department:[]
+        department:[],
+        prescriptions:[]
+
       }
     },
    methods:{
@@ -92,29 +106,16 @@ export default {
           // 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 
+          prescription_id:this.$route.query.prescription_id,
+          ids:this.$route.query.ids
         }
-        console.log("params---",params)
+        console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){
             var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint",advicePrint)
+            console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            var doctorPorject = response.data.data.doctorPorject
-          
-            var arr = doctorPorject.project
-              console.log("我的中谷歌",arr)
-            for(let i=0;i<arr.length;i++){
-              console.log("arr",arr[i].project_name)
-            }
-            this.tableData = arr
-            console.log("3333",this.tableData)
-            var prescriptioninfo = response.data.data.prescriptionInfo
-            console.log("prescriptioninfo",prescriptioninfo)
-            this.prescriptionInfo = prescriptioninfo
+            this.prescriptions = advicePrint
           }
        })
      },
@@ -146,13 +147,39 @@ export default {
            }
        }
        return name
-     }
+     },
+     getTotalOne(id) {
+        
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+          
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+        return total + addtotal
+       }
+      }, 
+
+
    },
    created(){
       this.getAllDoctorList()
       this.getInitData()
       this.getPrescriptionPrint()
       this.getHisPatientDetail()
+
+     
    },
   //  watch:{
   //    patient_id:function(val){

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
        <template>
         <el-button
           :loading="loading"
@@ -59,15 +59,19 @@ export default {
   },
   data() {
     return {
-       record_date:"",
-       patientTableData:[],
-       advicePrint:[],
-       hisPatient:{},
-       patient:{},
-       search_input:"",
-       loading:false,
-       patient_id:0,
-       prescription_id:0
+      crumbs: [
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '打印' }
+      ],
+      record_date:"",
+      patientTableData:[],
+      advicePrint:[],
+      hisPatient:{},
+      patient:{},
+      search_input:"",
+      loading:false,
+      patient_id:0,
+      prescription_id:0
     };
   },
   methods:{
@@ -76,9 +80,9 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 300px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;min-height:600px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
       printJS({
-        printable: "prescription-print",
+        printable: "prescriptionPrint",
         type: "html",
         style: style,
         scanStyles: false

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -1,5 +1,7 @@
 <template>
-    <div id='prescription-print' class="prescription-print">
+   <div>
+    <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
+
         <div style="display:flex;justify-content: space-between;font-weight:bold;">
             <p style="width:300px;display:flex;justify-content: space-between;font-weight:bold;">
                 <span>费别</span>
@@ -8,28 +10,33 @@
                 <span>保险</span>
                 <span>其他</span>
             </p>
-            <p>就诊日期：{{this.$route.query.record}}</p>
+            <p>就诊日期：{{getTime(item.ctime)}}</p>
         </div>
+
         <div class="printTitle">血液透析中心</div>
+
         <div class="printTitle">处方、治疗单</div>
+
         <div class="infoTitle">
-            <p>门诊编号：34567876532345678</p>
+            <p>门诊编号：</p>
             <p>电脑号：</p>
         </div>
+
         <div class="infoMain">
-            <p style="margin-bottom: 10px;width:25%">姓名：{{patient.name}}</p>
+            <p style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</p>
             <p style="margin-bottom: 10px;width:25%">性别：
-                <span v-if="patient.gender == 1">男</span>
-                <span v-if="patient.gender == 2">女</span>
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
             </p>
             <p style="margin-bottom: 10px;width:25%">年龄：
-                <span>{{patient.age}}</span>
+                <span>{{item.patient.age}}</span>
             </p>
             <p style="margin-bottom: 10px;width:25%">参保类型：</p>
-            <p style="margin-bottom: 10px;width:50%;">联系电话：{{patient.phone}}</p>
-            <p style="width:50%;">地址：{{patient.unit_address}}</p>
-            <p style="width:50%;">诊断：{{patient.diagnose}}</p>
+            <p style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</p>
+            <p style="width:50%;">地址：{{item.patient.unit_address}}</p>
+            <p style="width:50%;">诊断：{{item.patient.diagnose}}</p>
         </div>
+
         <div class="prescriptionBox">
             <table style="width:100%;text-align:center;line-height:25px;">
                 <tr>
@@ -42,27 +49,30 @@
                     <td>备注</td>
                     <td>天数</td>
                 </tr>
-                <tr v-for="(item,index) in this.tableData" :key="index">
+                <tr v-for="(it,index) in item.project" :key="index">
                     <td>{{index+1}}</td>
-                    <td>{{item.project_name}}</td>
-                    <td>{{item.single_dose}}</td>
-                    <td>{{item.unit}}</td>
-                    <td>{{item.price}}</td>
+                    <td>{{getProjectName(it.project_id)}}</td>
+                    <td>{{it.single_dose}}</td>
+                    <td>{{getUnit(it.unit)}}</td>
+                    <td>{{it.price}}</td>
                     <td></td>
-                    <td>{{item.remark}}</td>
-                    <td>{{item.day}}</td>
-                   
+                    <td>{{it.remark}}</td>
+                    <td>{{it.day}}</td>
+
                 </tr>
             </table>
         </div>
+
         <div class="infoTitle">
-            <p>开单医生：{{getDoctor(this.prescriptionInfo[0].creator)?getDoctor(this.prescriptionInfo[0].creator):""}}</p>
+            <p>开单医生：{{item.doctor?item.doctor:""}}</p>
             <p>签章：</p>
         </div>
+
         <div class="actionBar">
-            <p>执行医生：{{getDoctor(this.prescriptionInfo[0].creator)?getDoctor(this.prescriptionInfo[0].creator):""}}</p>
-            <p>费用：</p>
+            <p>执行医生：{{item.doctor?item.doctor:""}}</p>
+            <p>费用：{{getTotalOne(item.id)?getTotalOne(item.id):''}}元</p>
         </div>
+
         <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
             <tr>
                 <td style="width:16%;">治疗时间</td>
@@ -89,7 +99,113 @@
                 <td style="width:16px;"></td>
             </tr>
         </table>
+     </div>
+
+
+    <div id='prescriptionPrint'>
+
+        <div v-for="(item,index) in advicePrint" :key="index">
+            <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+                <div style="display:flex;justify-content: space-between;font-weight:bold;">
+                    <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                        <span>费别</span>
+                        <span>自费</span>
+                        <span>公费</span>
+                        <span>保险</span>
+                        <span>其他</span>
+                    </div>
+                    <div>就诊日期：{{getTime(item.ctime)}}</div>
+                </div>
+
+                <div class="printTitle">血液透析中心</div>
+
+                <div class="printTitle">处方、治疗单</div>
+
+                <div class="infoTitle">
+                    <div>门诊编号：</div>
+                    <div>电脑号：</div>
+                </div>
+
+                <div class="infoMain">
+                    <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+                    <div style="margin-bottom: 10px;width:25%">性别：
+                        <span v-if="item.patient.gender == 1">男</span>
+                        <span v-if="item.patient.gender == 2">女</span>
+                    </div>
+                    <div style="margin-bottom: 10px;width:25%">年龄：
+                        <span>{{item.patient.age}}</span>
+                    </div>
+                    <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+                    <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+                    <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                    <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
+                </div>
+                
+                <div class="prescriptionBox">
+                    <table style="width:100%;text-align:center;line-height:25px;">
+                        <tr>
+                            <td>序号</td>
+                            <td>项目名称</td>
+                            <td>数量</td>
+                            <td>单位</td>
+                            <td>单价</td>
+                            <td>部位</td>
+                            <td>备注</td>
+                            <td>天数</td>
+                        </tr>
+                        <tr v-for="(it,index) in item.project" :key="index">
+                            <td>{{index+1}}</td>
+                            <td>{{getProjectName(it.project_id)}}</td>
+                            <td>{{it.single_dose}}</td>
+                            <td>{{getUnit(it.unit)}}</td>
+                            <td>{{it.price}}</td>
+                            <td></td>
+                            <td>{{it.remark}}</td>
+                            <td>{{it.day}}</td>
+
+                        </tr>
+                    </table>
+                </div>
+                <div class="infoTitle">
+                    <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                    <div>签章：</div>
+                </div>
+                <div class="actionBar">
+                    <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                    <div>费用：</div>
+                </div>
+                <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+                    <tr>
+                        <td style="width:16%;">治疗时间</td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                    </tr>
+                    <tr>
+                        <td style="width:16%;">医生签字</td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                    </tr>
+                    <tr>
+                        <td style="width:16px;">患者签字</td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                    </tr>
+                </table>
+            </div>
+
+        </div>
+
     </div>
+  </div>
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -99,14 +215,16 @@ export default {
       patient_id:Number,
       record_date:String,
       prescription_id:Number
-    }, 
+    },
     data(){
       return {
         doctorList:[],
         advicePrint:{},
         patient:{},
         tableData:[],
-        prescriptionInfo:[]
+        prescriptionInfo:[],
+        projectList:[],
+        prescriptions:[]
       }
     },
    methods:{
@@ -127,10 +245,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -155,7 +273,8 @@ export default {
         //   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 
+          prescription_id:this.$route.query.prescription_id,
+          ids:this.$route.query.ids,
         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
@@ -163,25 +282,55 @@ export default {
             var advicePrint =  response.data.data.advicePrint
             console.log("adviceprint",advicePrint)
             this.advicePrint = advicePrint
-            var patient =  response.data.data.patient
-            console.log("patient",patient)
-            this.patient = patient
-            this.tableData = arr
-            console.log("3333",this.tableData)
-            var prescriptioninfo = response.data.data.prescriptionInfo
-            console.log("prescriptioninfo",prescriptioninfo)
-            this.prescriptionInfo = prescriptioninfo
+            this.prescriptions = advicePrint
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
 
-            var doctorPorject = response.data.data.doctorPorject
-          
-            var arr = doctorPorject.project
-              console.log("治疗单",arr)
-            for(let i=0;i<arr.length;i++){
-              console.log("arr",arr[i].project_name)
-            }
           }
        })
-     }
+     },
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+     getUnit(id){
+        var unit=""
+       for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               unit = this.projectList[i].unit
+           }
+        }
+        return unit
+     },
+
+       getTotalOne(id) {
+
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+        return total + addtotal
+       }
+      },
    },
    created(){
       this.getAllDoctorList()
@@ -198,8 +347,11 @@ export default {
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    font-size: 14px;
+}
 .printTitle{
-    font-size: 22px;
+    font-size: 18px;
     text-align: center;
     font-weight: bold;
 }
@@ -210,7 +362,7 @@ export default {
     line-height: 24px;
     padding:0 10px;
 }
-.infoTitle p{
+.infoTitle div{
     width: 300px;
 }
 .infoMain{
@@ -219,7 +371,7 @@ export default {
     border-bottom: 2px solid #000;
     padding:0 10px;
 }
-.infoMain p{
+.infoMain div{
     width: 50%;
     line-height: 24px;
 }
@@ -246,11 +398,11 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }
-.actionBar p{
+.actionBar div{
     width:150px;
 }
 </style>

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>
@@ -117,7 +129,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="医生："  prop="doctor" :validate-event="is_Name" >
-                        <el-select v-model="form.doctor" placeholder="请选择">
+                        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
                             <el-option
                             v-for="item in doctorList"
                             :key="item.admin_user_id"
@@ -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: '男'
@@ -394,6 +410,7 @@ export default {
            getAllDoctorList().then(response=>{
              if(response.data.state == 1){
                var doctor =  response.data.data.doctor
+               console.log("doctor-----",doctor)
                this.doctorList = doctor
                var department = response.data.data.department
                console.log("department",department)
@@ -446,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){
@@ -479,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
@@ -520,8 +545,34 @@ export default {
        },
        getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
+      },
 
+      changeDoctor(id){
+          
+         for(let i=0;i<this.doctorList.length;i++){
+            if(this.doctorList[i].admin_user_id == id){
+              if(this.doctorList[i].department_id == 0){
+                 this.form.department = this.departmentList[0].id
+              }else{
+                this.form.department = this.doctorList[i].department_id
+              }
+             
+            }
+         }
       },
+      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/ScheduleItem.vue

@@ -2,7 +2,7 @@
     <div >
         <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
             <div slot="content">
-                {{scheduleDetail.patient}}11
+                {{scheduleDetail.patient}}
                 <br/>
                 <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
             </div>

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -0,0 +1,416 @@
+<template>
+  <div>
+    <div class="cell clearfix" style="float: right">
+      <el-button
+        style="float: right"
+        size="small"
+        icon="el-icon-printer"
+        @click="printAction()"
+        type="primary"
+        >打印
+      </el-button>
+    </div>
+
+    <div class="cell clearfix">
+      <label class="title"> <span class="name">时间</span> : </label>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == week_type ? 'active' : ''"
+            @click="selectWeekType(item.id)"
+            v-for="item in weekArr"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+      
+      <div  class="title"><span class="name">班 次</span> :</div>
+      <div class="time">
+        <ul class>
+          <li
+            :class="item.id == week_time ? 'active' : ''"
+            @click="selectWeekTime(item.id)"
+            v-for="item in weekTimes"
+            :key="item.id"
+          >
+            {{ item.name }}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <el-table
+      :row-style="{ color: '#303133' }"
+      :data="scheduleData"
+      border
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      style="width: 100%"
+    >
+      <el-table-column label="姓名" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.patient }}
+        </template>
+      </el-table-column>
+      <el-table-column label="分区" min-width="70" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.zone.name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="班次" min-width="70" align="center">
+        <template slot-scope="scope">
+          {{ getSchedulesType(scope.row.schedule_type) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="机号" min-width="70" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.number.number }}
+        </template>
+      </el-table-column>
+      <el-table-column label="透析模式" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{
+            scope.row.mode_id && modeOptions[scope.row.mode_id]
+              ? modeOptions[scope.row.mode_id].name
+              : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="透析器" min-width="100" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+        </template>
+      </el-table-column>
+      <el-table-column label="抗凝剂" min-width="100" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
+          <span v-if="scope.row.prescription.anticoagulant === 2"
+            >普通肝素</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 3"
+            >低分子肝素</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 4"
+            >阿加曲班</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 5"
+            >枸橼酸钠</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 6"
+            >低分子肝素钙</span
+          >
+          <span v-if="scope.row.prescription.anticoagulant === 7"
+            >低分子肝素钠</span
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="总量" min-width="100" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.prescription.anticoagulant == 1">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 2">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 3">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 4">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 5">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 6">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+          <span v-if="scope.row.prescription.anticoagulant == 7">{{
+            scope.row.prescription.anticoagulant_zongliang
+              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+              : ""
+          }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="长期医嘱" min-width="440" align="center">
+        <template slot-scope="scope">
+          <span style="white-space: pre">{{
+            getAdvice(scope.row.doctor_advice)
+          }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { getNextScheduleWeekDay } from "@/api/schedule";
+import WeekItem from "./WeekItem";
+const moment = require('moment')
+export default {
+  name: "tableWeeks",
+  props: {
+    weekTime: {
+      type: String,
+      default: "thisWeek"
+    }
+  },
+
+  data() {
+    return {
+      weekArr: [
+        { id: 1, name: "周一" },
+        { id: 2, name: "周二" },
+        { id: 3, name: "周三" },
+        { id: 4, name: "周四" },
+        { id: 5, name: "周五" },
+        { id: 6, name: "周六" },
+        { id: 7, name: "周日" }
+      ],
+      anticoagulants_confit: null,
+
+      week_type: "1",
+      week_time:0,
+      weekTimes:[
+        {id:0,name:"全部"},
+        {id:1,name:"上午"},
+        {id:2,name:"下午"},
+        {id:3,name:"晚上"},
+      ],
+      weekTitle: ["", "", "", "", "", "", ""],
+      weekData: {
+        Monday: [],
+        Tuesday: [],
+        Wednesday: [],
+        Thursday: [],
+        Friday: [],
+        Saturday: [],
+        Sunday: []
+      },
+      scheduleData: [],
+      modeOptions: null
+    };
+  },
+  watch: {
+  
+    weekTime: function() {
+      
+      var theType = this.weekType(this.weekTime);
+      this.getSchedules(theType);
+    }
+  },
+
+  methods: {
+    printAction() {
+      this.$router.push({
+        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time
+      });
+    },
+    getNextScheduleWeekDay() {
+        const params = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+          week_type:this.week_type,
+          week_time:this.week_time,
+        }
+      
+      getNextScheduleWeekDay(params).then(response => {
+        this.scheduleData = [];
+        if (response.data.state == 1) {
+          this.scheduleData = response.data.data.schedule;
+          console.log("下周数据",response.data.data.schedule)
+         
+        } else {
+          this.$message.error("网络错误");
+          return false;
+        }
+      });
+    },
+
+    weekType(weekTime) {
+      var theType = 2;
+      switch (weekTime) {
+        case "lastWeek":
+          theType = 1;
+          break;
+        case "thisWeek":
+          theType = 2;
+          break;
+        case "nextWeek":
+          theType = 3;
+          break;
+        case "nextTwoWeek":
+          theType = 4;
+          break;
+        default:
+          theType = 2;
+          break;
+      }
+      return theType;
+    },
+    weekPath(week) {
+      var weekArr = {
+        1: "Monday",
+        2: "Tuesday",
+        3: "Wednesday",
+        4: "Thursday",
+        5: "Friday",
+        6: "Saturday",
+        7: "Sunday"
+      };
+      if (typeof weekArr[week] == "undefined") {
+        return "";
+      }
+      return weekArr[week];
+    },
+    selectWeekType(type) {
+      this.week_type = type;
+      // let params = {
+      //   week_type: this.week_type
+      // };
+      this.getNextScheduleWeekDay();
+    },
+    selectWeekTime(type){
+       this.week_time = type
+       this.getNextScheduleWeekDay()
+    },
+
+    getSchedulesType: function(type) {
+      let type_name = "";
+      switch (type) {
+        case 1:
+          type_name = "上午";
+          break;
+        case 2:
+          type_name = "下午";
+          break;
+        case 3:
+          type_name = "晚上";
+          break;
+      }
+      return type_name;
+    },
+    getAdvice: function(doctor_advice) {
+      if (doctor_advice != null) {
+        let name = "";
+        for (let i = 0; i < doctor_advice.length; i++) {
+          let prescribing_number = "";
+          let single_dose = "";
+          let drug_spec = "";
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number =
+              doctor_advice[i].prescribing_number +
+              doctor_advice[i].prescribing_number_unit;
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose =
+              " 单次用量 " +
+              doctor_advice[i].single_dose +
+              doctor_advice[i].single_dose_unit;
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec =
+              doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit;
+          }
+
+          name =
+            name +
+            doctor_advice[i].advice_name +
+            " " +
+            drug_spec +
+            " " +
+            prescribing_number +
+            " " +
+            single_dose +
+            " " +
+            doctor_advice[i].delivery_way +
+            " " +
+            doctor_advice[i].execution_frequency +
+            " " +
+            doctor_advice[i].remark +
+            "\n";
+
+          if (doctor_advice[i].child.length > 0) {
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]["presc"] =
+                  doctor_advice[i].child[a].prescribing_number +
+                  doctor_advice[i].child[a].prescribing_number_unit;
+              } else {
+                doctor_advice[i].child[a]["presc"] = "";
+              }
+
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]["single"] =
+                  " " +
+                  " 单次用量 " +
+                  " " +
+                  doctor_advice[i].child[a].single_dose +
+                  doctor_advice[i].child[a].single_dose_unit;
+              } else {
+                doctor_advice[i].child[a]["single"] = "";
+              }
+
+              name =
+                name +
+                "▲" +
+                doctor_advice[i].child[a].advice_name +
+                "" +
+                doctor_advice[i].child[a].advice_desc +
+                doctor_advice[i].child[a].drug_spec_unit +
+                doctor_advice[i].child[a].presc +
+                doctor_advice[i].child[a].single +
+                "\n";
+            }
+          }
+        }
+        return name;
+      }
+    }
+  },
+  components: {
+    WeekItem
+  },
+  created() {
+    this.modeOptions = this.$store.getters.treatment_mode;
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
+    console.log("抗凝机", this.anticoagulants_confit);
+    this.week_type = new Date().getDay();
+    if (this.week_type == 0) {
+      this.week_type = 7;
+    }
+    this.getNextScheduleWeekDay();
+  }
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss">
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/workforce/components/tableData.vue

@@ -733,6 +733,7 @@ export default {
   watch: {
     weekTime: function() {
       var theType = this.weekType(this.weekTime);
+      console.log("999999999",theType)
       this.getSchedules(theType);
     },
     scheduleZoneRow: function() {

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

@@ -0,0 +1,348 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-row style="float:right;">
+        <el-col :span="24">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            >打印</el-button
+          >
+        </el-col>
+      </el-row>
+    </div>
+    <div class="app-container" style="background-color: white;">
+      <div id="print_content">
+        <div class="print_main_content">
+          <div class="order_title_panl">
+            <span class="main_title">{{day}}排班提醒（{{ currentDate }}）</span>
+          </div>
+          <div class="table_panel">
+            <table class="table">
+              <thead>
+                <tr>
+                  <!-- <td :width="td_1_width">姓名</td>
+                  <td :width="td_1_width">分区</td>
+                  <td :width="td_1_width">班次</td>
+                  <td :width="td_1_width">机号</td>
+                  <td :width="td_1_width">透析模式</td>
+                  <td :width="td_2_width">透析器</td>
+                  <td :width="td_2_width">抗凝剂</td>
+                  <td :width="td_2_width">低分子肝素</td>
+                  <td :width="td_4_width">长期医嘱</td> -->
+                  <td width="100">姓名</td>
+                  <td width="70">分区</td>
+                  <td width="70">班次</td>
+                  <td width="70">机号</td>
+                  <td width="120">透析模式</td>
+                  <td width="100">透析器</td>
+                  <td width="120">抗凝剂</td>
+                  <td width="100">总量</td>
+                  <td width="300">长期医嘱</td>
+                </tr>
+              </thead>
+              <tbody>
+              <tr v-for="(main_collection, index) in scheduleData" :key="index">
+                <td :width="td_1_width">{{ main_collection.patient}}</td>
+                <td :width="td_1_width">{{ main_collection.zone.name }}</td>
+                <td :width="td_1_width">
+                  {{getSchedulesType(main_collection.schedule_type)}}
+                </td>
+                <td :width="td_1_width">
+                  {{main_collection.number.number}}
+
+                </td>
+                <td :width="td_1_width">
+                  {{modeOptions[main_collection.mode_id].name}}
+                </td>
+                <td :width="td_1_width">
+                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
+
+
+                </td>
+                <td :width="td_1_width">
+                  {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
+
+                </td>
+                <td :width="td_1_width">
+                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
+                </td>
+                <td :width="td_4_width" style="text-align:left" >
+                  <span style="white-space: pre">{{getAdvice(main_collection.doctor_advice)}}</span>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getNextScheduleWeekDay } from '@/api/schedule'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  const moment = require('moment') 
+  export default {
+    name: 'SchedulePrint',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '排班提醒' },
+          { path: false, name: '排班提醒打印' }
+        ],
+        scheduleData:[],
+        week_type: 0,
+        day:'',
+        td_1_width: '10%',
+        td_2_width: '10%',
+        td_3_width: '25%',
+        td_4_width: '45%',
+        modeOptions: null,
+        anticoagulants_confit:null,
+        currentDate:'',
+        start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+        end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+      }
+    },
+    components: {
+      BreadCrumb
+    },
+    created() {
+     this.currentDate = this.getCurrentDate()
+      this.modeOptions = this.$store.getters.treatment_mode
+      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+      this.week_type = this.$route.query.week_type
+      this.week_time  = this.$route.query.week_time
+      
+      const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      console.log("打印下周",params)
+      getNextScheduleWeekDay(params).then(rs => {
+        var resp = rs.data
+        console.log(resp)
+        if (resp.state == 1) {
+          this.scheduleData = resp.data.schedule
+        } else {
+          this.$message.error(resp.msg)
+        }
+      }).catch(err => {
+        this.$message.error(err)
+      })
+    },
+    methods: {
+      getAdvice:function(doctor_advice) {
+        if (doctor_advice != null) {
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++) {
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
+
+          if (doctor_advice[i].child.length > 0) {
+
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+              } else {
+                doctor_advice[i].child[a]['presc'] = ''
+              }
+
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]['single'] = " " + ' 单次用量 ' + " " + doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+              } else {
+                doctor_advice[i].child[a]['single'] = ''
+              }
+
+              name = name + "▲" + doctor_advice[i].child[a].advice_name + ""
+                + doctor_advice[i].child[a].advice_desc
+                + doctor_advice[i].child[a].drug_spec_unit
+                + doctor_advice[i].child[a].presc
+                + doctor_advice[i].child[a].single + "\n"
+            }
+
+          }
+        }
+          return name
+
+
+        }
+
+      },
+      printAction: function() {
+        const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+        })
+      }, getSchedulesType: function(type) {
+        let type_name = ''
+        switch (type) {
+          case 1:
+            type_name = '上午'
+            break
+          case 2:
+            type_name = '下午'
+            break
+          case 3:
+            type_name = '晚上'
+            break
+        }
+        return type_name
+      },
+      getCurrentDate: function () {
+        console.log(this.$route.query.week_type)
+        var myDate = new Date();
+        var year = myDate.getFullYear(); //年
+        var month = myDate.getMonth() + 1; //月
+        var day = myDate.getDate() + 7; //日
+        var newday = myDate.getDay();
+        var days = parseInt(this.$route.query.week_type);
+        var dayNum = parseInt(this.$route.query.week_type);
+        switch(days) {
+          case 1:
+            days = '星期一';
+            break;
+          case 2:
+            days = '星期二';
+            break;
+          case 3:
+            days = '星期三';
+            break;
+          case 4:
+            days = '星期四';
+            break;
+          case 5:
+            days = '星期五';
+            break;
+          case 6:
+            days = '星期六';
+            break;
+          case 7:
+            days = '星期日';
+            break;
+        }
+        if(newday > dayNum){
+          let lastDay = day - (newday - dayNum)
+          console.log("lastDay1",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else if(newday < dayNum){
+          let lastDay = day + (dayNum - newday)
+          console.log("lastDay2",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else{
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          return str;
+        }
+        
+        
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 20px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

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">-->
-            <!--<span slot="label"><i class="el-icon-date"></i> 下周（{{theWeek.nextWeek}}）</span>-->
-        <!--</el-tab-pane>-->
+        <el-tab-pane name="nextWeek">
+            <span slot="label"><i class="el-icon-date"></i> 下一周（{{theWeek.nextWeek}}）</span>
+        </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: {
 
@@ -50,7 +55,8 @@ export default {
             return false
           }
           this.theWeek.thisWeek = response.data.data.theWeek;
-          this.theWeek.nextWeek = this.theWeek.thisWeek+1;
+         console.log("上一周",this.theWeek.thisWeek)
+        //  this.theWeek.nextWeek = this.theWeek.thisWeek+1;
 
           let childrenRefs = this.$refs.elTabs.$children
           this.$nextTick(() => {
@@ -60,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>