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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1037,11 +1037,11 @@
           >
           </DialysisPrintOrderFortySeven>
 
-           <DialysisPrintOrderFiftyOne
+           <DialysisPrintOrderFortyEight
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 48"
           >
-          </DialysisPrintOrderFiftyOne>
+          </DialysisPrintOrderFortyEight>
 
             <DialysisPrintOrderFortyNine
             v-bind:childResponse="childResponse"

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -76,7 +76,7 @@ export default {
     printThisPage() {
       if (this.org_id == 10265 || this.org_id == 0 || this.org_id == 4) {
         const style1 =
-          "@media print {#invoice-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}";
+          "@page{size:landscape ; margin: 20mm;} @media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}";
         printJS({
           printable: "invoice-print",
           type: "html",

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -12,14 +12,15 @@
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 机构名称 -->
-            <div style="position: absolute;top:70px;left:40px">机构名称：{{ list.org_name }}</div>
+            <div style="position: absolute;top:70px;left:40px">机构名称：赤峰费森血液透析中心</div>
             <!-- 单据号 -->
-            <div  style="position: absolute;top:70px;left:200px">{{ list.number }}</div>
-            <div></div>
-            <div  style="position: absolute;left:560px;top:70px;">
+            <!-- <div  style="position: absolute;top:70px;left:200px">单据号:{{ list.number }}</div> -->
+            <!-- <div></div> -->
             <!-- 发票序号 -->
-            </div>
-             <div  style="position: absolute;left:460px;top:70px;">
+            <!-- <div  style="position: absolute;left:560px;top:70px;">
+            
+            </div> -->
+             <div  style="position: absolute;left:650px;top:70px;">
             <!-- 类别 -->
             类别：医保
             </div>
@@ -27,24 +28,24 @@
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 姓名 -->
-            <div style="position: absolute;top:90px;left:40px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:90px;left:40px;"> 姓名：{{ paramsObj.name }}</div>
             <!-- 个人电脑编号 -->
-            <div style="position: absolute;top:90px;left:220px;">{{psn_no}}</div>
+            <div style="position: absolute;top:90px;left:220px;">个人电脑编号:{{psn_no}}</div>
             <!-- 科室 -->
-            <div style="position: absolute;top:90px;left:420px;">{{'血透'}}</div>
+            <div style="position: absolute;top:90px;left:530px;">科室：{{'血液透析室'}}</div>
             <!-- 床号 -->
-            <div style="position: absolute;top:90px;left:560px;"></div>
+            <div style="position: absolute;top:90px;left:700px;">床号：</div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 住院号 -->
-            <div style="position: absolute;top:120px;left:40px;"> {{ number?number:'' }}</div>
+            <div style="position: absolute;top:120px;left:40px;"> 住院号：{{ number?number:'' }}</div>
             <!-- 入院日期 -->
-            <div style="position: absolute;top:120px;left:220px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
+            <div style="position: absolute;top:120px;left:280px;">入院日期：{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
             <!-- 出院日期 -->
-            <div style="position: absolute;top:120px;left:420px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
+            <div style="position: absolute;top:120px;left:460px;">出院日期：{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
             <!-- 住院天数 -->
-          <div style="position: absolute;top:120px;left:560px;">{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
+          <div style="position: absolute;top:120px;left:640px;">住院天数：{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
         </div>
 
         <!-- <div style="display:flex;justify-content: space-between;">
@@ -57,42 +58,42 @@
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:160px;left:40px">西药费</div>
             <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
-            <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"></div>
-            <div style="position: absolute;top:160px;left:500px">麻醉费</div>
-            <div style="position: absolute;top:160px;left:580px"></div>
+            <div style="position: absolute;top:160px;left:220px">检查费</div>
+            <div style="position: absolute;top:160px;left:290px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:400px">材料费</div>
+            <div style="position: absolute;top:160px;left:470px"></div>
+            <div style="position: absolute;top:160px;left:580px">麻醉费</div>
+            <div style="position: absolute;top:160px;left:650px"></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"></div>
-            <div style="position: absolute;top:190px;left:180px">治疗费</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"></div>
-            <div style="position: absolute;top:190px;left:500px">床位费</div>
-            <div style="position: absolute;top:190px;left:580px"></div>
+            <div style="position: absolute;top:190px;left:220px">治疗费</div>
+            <div style="position: absolute;top:190px;left:290px">{{list.treatCostTotal}}</div>
+            <div style="position: absolute;top:190px;left:400px">CT核磁</div>
+            <div style="position: absolute;top:190px;left:470px"></div>
+            <div style="position: absolute;top:190px;left:580px">床位费</div>
+            <div style="position: absolute;top:190px;left:650px"></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"></div>
-            <div style="position: absolute;top:220px;left:180px">手术费</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"></div>
-            <div style="position: absolute;top:220px;left:500px">取暖费</div>
-            <div style="position: absolute;top:220px;left:580px"></div>
+            <div style="position: absolute;top:220px;left:220px">手术费</div>
+            <div style="position: absolute;top:220px;left:290px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:220px;left:400px">输血费</div>
+            <div style="position: absolute;top:220px;left:470px"></div>
+            <div style="position: absolute;top:220px;left:580px">取暖费</div>
+            <div style="position: absolute;top:220px;left:650px"></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"></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"></div>
-            <div style="position: absolute;top:250px;left:500px">其他费</div>
-            <div style="position: absolute;top:250px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:220px">化验费</div>
+            <div style="position: absolute;top:250px;left:290px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:250px;left:400px">氧气费</div>
+            <div style="position: absolute;top:250px;left:470px"></div>
+            <div style="position: absolute;top:250px;left:580px">其他费</div>
+            <div style="position: absolute;top:250px;left:650px">{{ list.otherCostTotal }}</div>
         </div>
 
         <div>
@@ -100,54 +101,54 @@
             <span style="position: absolute;top:280px;left:40px">合计金额（大写）：</span> 
             <span  style="position: absolute;top:280px;left:180px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
-                    {{ zhongwen.substring(0,1) }}
+                    {{ zhongwen.substring(0,1) }}十万
                 </span>
-                <span v-else>零</span>
+                <span v-else>零十万</span>
             </span>
-            <span  style="position: absolute;top:280px;left:220px">
+            <span  style="position: absolute;top:280px;left:230px">
                 <span v-if="zhongwen.indexOf('万') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}万
                 </span>
-                <span v-else>零</span>
+                <span v-else>零万</span>
             </span>
-            <span  style="position: absolute;top:280px;left:260px">
+            <span  style="position: absolute;top:280px;left:270px">
                 <span v-if="zhongwen.indexOf('仟') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}仟
                 </span>
-                <span v-else>零</span>
+                <span v-else>零仟</span>
             </span>
-            <span  style="position: absolute;top:280px;left:300px">
+            <span  style="position: absolute;top:280px;left:310px">
                 <span v-if="zhongwen.indexOf('佰') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}佰
                 </span>
-                <span v-else>零</span>
+                <span v-else>零佰</span>
             </span>
-            <span style="position: absolute;top:280px;left:340px">
+            <span style="position: absolute;top:280px;left:350px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾
                 </span>
-                <span v-else>零</span>
+                <span v-else>零拾</span>
             </span>
-            <span  style="position: absolute;top:280px;left:380px">
-                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
-                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+            <span  style="position: absolute;top:280px;left:390px">
+                <span v-if="zhongwen.indexOf('元') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}元
                 </span>
-                <span v-else>零</span>
+                <span v-else>零元</span>
             </span>
-            <span  style="position: absolute;top:280px;left:420px">
+            <span  style="position: absolute;top:280px;left:430px">
                 <span v-if="zhongwen.indexOf('角') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}角
                 </span>
-                <span v-else>零</span>
+                <span v-else>零角</span>
             </span>
-            <span  style="position: absolute;top:280px;left:460px">
+            <span  style="position: absolute;top:280px;left:470px">
                 <span v-if="zhongwen.indexOf('分') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}分
                 </span>
-                <span v-else>零</span>
+                <span v-else>零分</span>
             </span>
             </span>
-            <span style="position: absolute;top:280px;left:540px">{{ list.order.medfee_sumamt }}</span>
+            <span style="position: absolute;top:280px;left:510px">合计：{{ list.order.medfee_sumamt }}</span>
         </div>
 
 

src/xt_pages/hospitalStation/listTemplate/printTwo.vue

@@ -1,7 +1,9 @@
 <template>
   <div id="list-print" class="list-print">
     <div v-for="(i, index) in pageArr.length" :key="index">
-      <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
+      <div class="listTitle">
+        {{ $store.getters.xt_user.org.org_name }}费用清单
+      </div>
       <!-- <div class="listTitle" :style="{position: 'absolute',top:(20 + (index * 160))  + 'px',left:200+ 'px',}">赤峰市肿瘤医院病人费用明细清单</div> -->
       <div class="listInfo">
         <div>病人ID:</div>
@@ -63,7 +65,6 @@
           <td style="width: 6%">小计：</td>
         </tr>
 
-
         <tr style="border: 1px solid">
           <td style="width: 19%">账单名称：护理费</td>
           <td style="width: 31%">费用名称</td>
@@ -122,7 +123,7 @@
           <td style="width: 6%">小计：</td>
         </tr>
 
-        <tr style="border: 1px solid;page-break-after:always">
+        <tr style="border: 1px solid; page-break-after: always">
           <td style="width: 19%">账单名称：检查费</td>
           <td style="width: 31%">费用名称</td>
           <td style="width: 14%">规格</td>
@@ -131,7 +132,6 @@
           <td style="width: 6%">数量</td>
           <td style="width: 10%">金额(元)</td>
         </tr>
-        
 
         <tr v-for="item in list.slice(index * 13, index * 13 + pageArr[index])">
           <td style="width: 19%"></td>
@@ -181,8 +181,6 @@
           <td style="width: 6%">小计：</td>
         </tr>
 
-         
-
         <tr style="border: 1px solid">
           <td style="width: 19%">账单名称：其他费</td>
           <td style="width: 31%">费用名称</td>
@@ -231,7 +229,7 @@
           <td style="width: 6%">{{ item.count }}{{ item.unit }}</td>
           <td style="width: 10%">{{ (item.price * item.count).toFixed(2) }}</td>
         </tr>
-        <tr style="page-break-after:always">
+        <tr style="page-break-after: always">
           <td style="width: 19%">甲类：</td>
           <td style="width: 31%">乙类药品：</td>
           <td style="width: 14%">非药品：</td>
@@ -241,7 +239,6 @@
           <td style="width: 6%">小计：</td>
         </tr>
 
-
         <tr style="border: 1px solid">
           <td style="width: 19%">账单名称：手术费</td>
           <td style="width: 31%">费用名称</td>
@@ -271,7 +268,6 @@
           <td style="width: 6%">小计：</td>
         </tr>
 
-
         <tr style="border: 1px solid">
           <td style="width: 19%">账单名称：西药费</td>
           <td style="width: 31%">费用名称</td>
@@ -301,7 +297,6 @@
           <td style="width: 6%">小计：</td>
         </tr>
 
-
         <tr style="border: 1px solid">
           <td style="width: 19%">账单名称：治疗费</td>
           <td style="width: 31%">费用名称</td>
@@ -359,6 +354,14 @@
           <td></td>
           <td style="width: 6%">小计：</td>
         </tr>
+      </table>
+      <table
+        class="listTable"
+        border="1"
+        frame="below"
+        rules="none"
+        cellspacing="0"
+      >
         <tr>
           <td></td>
           <td></td>
@@ -366,9 +369,7 @@
           <td></td>
           <td></td>
           <td></td>
-          <td>
-            总费用：
-          </td>
+          <td>总费用：</td>
         </tr>
 
         <tr>
@@ -379,10 +380,7 @@
           <td>非药品：</td>
           <td></td>
           <td>其他：</td>
-          
         </tr>
-
-
       </table>
       <div class="tableBottom">
         <!-- <div class="tableBottomOne">制表人：{{ admin.user_name }}</div> -->
@@ -468,7 +466,7 @@ export default {
         }
       }
 
-      console.log(this.pageArr,'this.pageArr')
+      console.log(this.pageArr, "this.pageArr");
     },
   },
   watch: {

src/xt_pages/outpatientCharges/summary.vue

@@ -277,6 +277,27 @@
         settlementObj: {}
 
       }
+    },
+      //判断列表页是否刷新
+    // beforeRouteLeave(to, from, next) {
+    // console.log(to.path,from,'测试')
+    // if(from.path==='/outpatientCharges/summary'&&to.path === '/outpatientCharges/summary'){
+    //     from.meta.keepAlive = true
+    //     console.log(from.meta,'from.meta跳转后')
+    //     next()
+        
+    //   }
+    //     else {
+    //     next()
+    //   }
+    // },
+
+    created() {
+
+      this.fetchAllAdminUsers()
+      this.getDoctorList()
+      this.getHisOrderList()
+
     },
     methods: {
       getMedType(med_type) {
@@ -766,13 +787,16 @@
         return uParseTime(time, '{y}-{m}-{d}')
       },
       toDetail(row) {
+        
         this.$router.push('/outpatientCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
-      }, getTime(value, temp) {
+      },
+      getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)
         }
         return ''
-      }, getHisOrderList() {
+      }, 
+      getHisOrderList() {
         let params = {
           page: this.page,
           limit: this.limit,
@@ -793,7 +817,8 @@
           }
         })
 
-      }, getDoctorList() {
+      }, 
+      getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -827,12 +852,6 @@
       }
     }
     ,
-    created() {
-
-      this.fetchAllAdminUsers()
-      this.getDoctorList()
-      this.getHisOrderList()
-
-    }
+    
   }
 </script>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -197,7 +197,9 @@ export default {
       search_input: '',
       order:{},
     }
-  },created(){
+  },
+
+  created(){
     this.GetOrderDetail()
   },methods:{
       // console.log("hisPatientInfo",this.hisPatientInfo)