11月7

src/xt_pages/outpatientCharges/invoiceTemplate/printFive.vue

@@ -2,6 +2,7 @@
     <div id='invoice-print'>
         <div v-for='(i,index) in pageArr.length' :key="index">
             <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:70+ 'px',}">{{ list.order_number }}</div>
+            <div :style="{position: 'absolute',top:(10 + (index * 400))  + 'px',left:400+ 'px',}">{{list.order.fa_piao_number}}</div>
             <div style="display:flex;justify-content: space-between;">
                 <div :style="{position: 'absolute',top:(40 + (index * 400))  + 'px',left:80+ 'px',}"> {{ paramsObj.name }}</div>
             </div>
@@ -44,23 +45,22 @@
             <div :style="{position: 'absolute',top:(315 + (index * 400))  + 'px',left:460+ 'px'}">{{ list.medfee_sumamt }}</div>
             <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(330 + (index * 400))  + 'px',left:110+ 'px',width:100 + '%'}">
                 <div style="display:flex;">
-                  <div style="width:150px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
-                  <div style="width:150px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
-                  <div style="width:150px">统筹支出：{{ list.order.hifp_pay }}</div>
-                  <div style="width:150px">大病支出：{{list.order.hifmi_pay}}</div>
+                  <div style="width:170px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+                  <div style="width:170px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+                  <div style="width:170px">统筹支出：{{ list.order.hifp_pay }}</div>
+                  <div style="width:170px">大病支出：{{list.order.hifmi_pay}}</div>
 
                 </div>
                 <div style="display:flex;">
-                  <div style="width:150px">个人账户支付：{{ list.order.acct_pay }}</div>
-                  <div style="width:150px">现金支出：{{ list.order.psn_cash_pay }}</div>
-                  <div style="width:150px">本次账户：0</div>
-                  <div style="width:150px">上次账户：0</div>
+                  <div style="width:170px">个人账户支付：{{ list.order.acct_pay }}</div>
+                  <div style="width:170px">现金支出：{{ list.order.psn_cash_pay }}</div>
+                  <div style="width:170px">本次账户：0</div>
+                  <div style="width:170px">上次账户：0</div>
                 </div>
               <div style="display:flex;">
-                <div style="width:150px">账户余额：{{ list.order.balc }}</div>
-                <div style="width:150px">其他支出：{{ list.order.oth_pay }}</div>
-                <div style="width:150px">大病补充保险支出：0</div>
-                <div style="width:150px">民政支出：0</div>
+                <div style="width:170px">账户余额：{{ list.order.balc }}</div>
+                <div style="width:170px">其他支出：{{ list.order.oth_pay }}</div>
+                <div style="width:170px">民政支出：0</div>
               </div>
               <div style="display:flex;">
                 <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1631,10 +1631,9 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-
             // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
-
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            this.allProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
               arr = arr.concat(this.allProject[i])
             }