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

src/xt_pages/hospitalStation/allListTemplate/printOne.vue

@@ -118,14 +118,6 @@
       }
 
     },
-    watch:{
-        list: {
-            handler(newVal) {
-                this.getPage()
-            },
-            deep: true
-        }
-    }
   }
 
 

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -13,9 +13,9 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-if="org_id!=10215 && org_id!=10265 && org_id!=0" :paramsObj="invoiceParams"></printOne>
-            <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
-            <printThree v-if="org_id == 0 || org_id == 10265 ||org_id == 4" :paramsObj="invoiceParams"></printThree>
+            <printOne v-if="org_id != 10215 && org_id != 10265 && org_id !=0" :paramsObj="invoiceParams"></printOne>
+            <printTwo v-if="org_id == 10215  " :paramsObj="invoiceParams"></printTwo>
+            <printThree v-if="org_id == 10265" :paramsObj="invoiceParams"></printThree>
         </div>
     </div>
   </div>
@@ -95,7 +95,7 @@ export default {
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
         this.invoiceParams = val
-        
+
       },
       deep:true
     }
@@ -149,7 +149,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -1,9 +1,9 @@
 <template>
     <div id='invoice-print'>
-       
+
         <div style="display:flex;justify-content: space-between;">
             <!-- 机构名称 -->
-            <div>{{ list.department_name }}</div>
+            <div>{{ list.org_name }}</div>
             <!-- 单据号 -->
             <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
             <div></div>
@@ -18,20 +18,20 @@
             <!-- 个人电脑编号 -->
             <div style="position: absolute;top:90px;left:240px;"></div>
             <!-- 科室 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{'血透'}}</div>
             <!-- 床号 -->
             <div style="position: absolute;top:90px;left:240px;"></div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 住院号 -->
-            <div style="position: absolute;top:90px;left:120px;"> {{ list.number }}</div>
+            <div style="position: absolute;top:90px;left:120px;"> {{ list.his_hospital_record.number?list.order.mdtrt_id:'' }}</div>
             <!-- 入院日期 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.in_hosptial_time?list.his_hospital_record.in_hosptial_time.spilt(' ')[0]:''}}</div>
             <!-- 出院日期 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.out_hosptial_time?list.his_hospital_record.out_hosptial_time.spilt(' ')[0]:''}}</div>
             <!-- 住院天数 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+          <div style="position: absolute;top:90px;left:240px;">{{getDay(list.his_hospital_record.in_hosptial_time.split(' ')[0] ,list.his_hospital_record.out_hosptial_time.split(' ')[0])}}</div>
         </div>
 
         <!-- <div style="display:flex;justify-content: space-between;">
@@ -47,37 +47,37 @@
             <div style="position: absolute;top:160px;left:180px">检查费</div>
             <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
             <div style="position: absolute;top:160px;left:340px">护理费</div>
-            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:420px"></div>
             <div style="position: absolute;top:160px;left:500px">麻醉费</div>
-            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:190px;left:40px">中成药费</div>
-            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:110px"></div>
             <div style="position: absolute;top:190px;left:180px">治疗费</div>
-            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:260px">{{list.treatCostTotal}}</div>
             <div style="position: absolute;top:190px;left:340px">CT核磁</div>
-            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:420px"></div>
             <div style="position: absolute;top:190px;left:500px">床位费</div>
-            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:220px;left:40px">中草药费</div>
-            <div style="position: absolute;top:220px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:110px"></div>
             <div style="position: absolute;top:220px;left:180px">手术费</div>
-            <div style="position: absolute;top:220px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:260px">{{ list.operationCostTotal }}</div>
             <div style="position: absolute;top:220px;left:340px">输血费</div>
-            <div style="position: absolute;top:220px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:420px"></div>
             <div style="position: absolute;top:220px;left:500px">取暖费</div>
-            <div style="position: absolute;top:220px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:580px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:250px;left:40px">高压氧费</div>
-            <div style="position: absolute;top:250px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:110px"></div>
             <div style="position: absolute;top:250px;left:180px">化验费</div>
             <div style="position: absolute;top:250px;left:260px">{{ list.laboratoryCostTotal }}</div>
             <div style="position: absolute;top:250px;left:340px">氧气费</div>
-            <div style="position: absolute;top:250px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:420px"></div>
             <div style="position: absolute;top:250px;left:500px">其他</div>
             <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
         </div>
@@ -139,57 +139,63 @@
 
         <div style="position: absolute;top:310px;left:320px">
             <!-- 个人账户支付 -->
+          {{list.order.acct_pay?list.order.acct_pay:''}}
         </div>
         <div style="position: absolute;top:310px;left:380px">
             <!-- 统筹支付 -->
-           
+          {{list.order.hifp_pay?list.order.hifp_pay:''}}
         </div>
         <div style="position: absolute;top:310px;left:500px">
-            <!-- 现金支付 -->
+          {{list.order.psn_cash_pay?list.order.psn_cash_pay:''}}
+          <!-- 现金支付 -->
         </div>
         <div style="position: absolute;top:340px;left:320px">
-            <!-- 公务员补助 -->
+          {{list.order.cvlserv_pay?list.order.cvlserv_pay:''}}
+          <!-- 公务员补助 -->
         </div>
         <div style="position: absolute;top:340px;left:380px">
-            <!-- 医疗救助 -->
-            
+          {{list.order.maf_pay?list.order.maf_pay:''}}
+          <!-- 医疗救助 -->
         </div>
         <div style="position: absolute;top:340px;left:500px">
             <!-- 大病 -->
-            
+          {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
+
+
         </div>
         <div style="position: absolute;top:340px;left:560px">
             <!-- 其他基金支付 -->
-            
+          {{list.order.oth_pay?list.order.oth_pay:''}}
+
         </div>
         <div style="position: absolute;top:370px;left:320px">
             <!-- 预交款合计 -->
-            
+
         </div>
         <div style="position: absolute;top:370px;left:380px">
             <!-- 补交款 -->
-            
         </div>
         <div style="position: absolute;top:370px;left:500px">
             <!-- 应退款 -->
-            
         </div>
         <div>
             <div style="position: absolute;top:400px;left:40px">
                 <!-- 开票日期 -->
-                
+              {{printDate}}
+
             </div>
             <div style="position: absolute;top:400px;left:280px">
                 <!-- 结算日期： -->
+              {{list.order.setl_time?list.order.setl_time.split(' ')[0]:''}}
             </div>
             <div style="position: absolute;top:400px;left:580px">
                 <!-- 经手人： -->
+              {{list.admin_user_name}}
             </div>
         </div>
     </div>
 </template>
 
-
 <script>
 import { getInvoice } from '@/api/project/project'
 export default {
@@ -222,6 +228,19 @@ export default {
         this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
+      getDay(dateString1,dateString2){
+        var  startDate = Date.parse(dateString1);
+        var  endDate = Date.parse(dateString2);
+        if (startDate>endDate){
+          return 0;
+        }
+        if (startDate==endDate){
+          return 1;
+        }
+        var days=(endDate - startDate)/(1*24*60*60*1000);
+        return  days;
+
+      },
         getInvoice(params){
             getInvoice(params).then((res) => {
                 console.log('res',res)

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -35,8 +35,8 @@
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
             <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
-            <div style="position: absolute;top:110px;left:260px;">{{ list.his_hospital_record.number.length <= 13 ? (totalPrice - list.order.psn_cash_money).toFixed(2) : '0.00' }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{ list.his_hospital_record.number.length <= 13 ? list.order.psn_cash_money.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ list.his_hospital_record.number.length <= 13 ? (totalPrice - list.order.psn_cash_pay).toFixed(2) : '0.00' }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{ list.his_hospital_record.number.length <= 13 ? list.order.psn_cash_pay.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
             <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -98,7 +98,6 @@
 
             <el-button v-loading="loadingone" size="small"
                        v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
-
                        @click="open(2)"
                        type="primary">出院
             </el-button>
@@ -129,11 +128,11 @@
                        type="primary">收费
             </el-button>
 
-            <el-button v-loading="loadingtwo"
-                       size="small"
-                       @click="open(3)"
-                       type="primary">收费
-            </el-button>
+<!--            <el-button v-loading="loadingtwo"-->
+<!--                       size="small"-->
+<!--                       @click="open(3)"-->
+<!--                       type="primary">收费-->
+<!--            </el-button>-->
             <el-button size="small" @click="open(4)" type="primary"
                        v-if="this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
               退费

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -63,7 +63,6 @@
                                 </template>
                             </el-table-column>
 
-
                             <el-table-column align="center" prop="name" width="80" label="备注">
                                 <template slot-scope="scope">
                                     <!--<el-input v-model="scope.row.remark" readonly></el-input>-->

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/index.vue

@@ -14,7 +14,7 @@
 
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>
+<!--        <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>-->
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue

@@ -410,17 +410,7 @@ export default {
     this.orgname = xtuser.org.org_name
 
   },
-  watch: {
-    // patient_id: function(val) {
-    //   console.log('101000010101010', this.patient_id, this.record_date, this.prescription_id)
-    //   //    this.getPrescriptionPrint()
-    // },
-    // ids: function(val) {
-    //   this.ids = val
-    //   console.log('this.idsids', this.ids)
-    //   this.getPrescriptionPrint()
-    // }
-  }
+
 }
 </script>
 

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))