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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -3292,9 +3292,9 @@ export default {
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 20
+              this.records[recordIndex].advices.length < 10
             ) {
-              delghTwo = 20 - this.records[recordIndex].advices.length;
+              delghTwo = 10 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -33,12 +33,12 @@
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
+    <div class="app-container" style="" v-if="org_id == 10217 ">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>
     </div>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 ">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 || org_id == 0">
       <div class='dialysisPage'>
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -1,7 +1,6 @@
-
 <template>
   <div id='invoice-print' >
-    <div v-for='(i,index) in pageArr.length' :key="index" :style="{'position':index == pageArr.length - 1 ? 'relative' : 'static'}">
+    <div v-for='(i,index) in pageArr.length' :key="index" >
       <div :style="{position: 'absolute',top:(0 + (index * 420))  + 'px',left:152+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
       <div :style="{position: 'absolute',top:(18 + (index * 420))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div >
@@ -17,7 +16,7 @@
           <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
           <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
       </div>
-      <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:247+ 'px'}">
+      <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:270+ 'px'}">
           <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
               <span style="display:inline-block;width:200px;">
                   <span v-if="item.advice.id == 0">
@@ -44,7 +43,7 @@
       </div>
       <div :style="{position: 'absolute',top:(305 + (index * 420))  + 'px',left:121+ 'px'}">{{ zhongwen }}</div>
       <div :style="{position: 'absolute',top:(305 + (index * 420))  + 'px',left:490+ 'px'}">{{ list.medfee_sumamt }}</div>
-      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(350 + (index * 420))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
+      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(320 + (index * 420))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
           <div style="display:flex;">
             <div style="width:140px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
             <div style="width:140px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
@@ -71,28 +70,28 @@
 
       </div>
       <div v-if="index != pageArr.length - 1">
-          <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-          <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
-          <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:435+ 'px'}">
+          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
+          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:435+ 'px'}">
               <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
           </div>
-          <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:479+ 'px'}">
+          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:479+ 'px'}">
               <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
           </div>
-          <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:500+ 'px'}">
+          <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:500+ 'px'}">
               <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
           </div>
       </div>
       <div v-if="index == pageArr.length - 1">
-        <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
-        <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
-        <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:435+ 'px'}">
+        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
+        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:374+ 'px'}">{{ paramsObj.chargeName }}</div>
+        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:435+ 'px'}">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
         </div>
-        <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:479+ 'px'}">
+        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:479+ 'px'}">
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
         </div>
-        <div :style="{position: 'absolute',top:(405 + (index * 420))  + 'px',left:500+ 'px'}">
+        <div :style="{position: 'absolute',top:(390 + (index * 420))  + 'px',left:500+ 'px'}">
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
         </div>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -1,116 +1,128 @@
 <template>
   <div id='invoice-print' style="position: relative;">
-    <div style="border: 1px solid black;padding: 5px;width:600px;min-height:390px;">
-      <div style="display: flex;width: 575px;margin-bottom: 5px; position: absolute; top: 70px;left: 522px;">
+    
+      <div style="display: flex;width: 575px;margin-bottom: 5px; position: relative;left: 506px;">
         {{printDate}}
       </div>
-      <div style="display: flex; justify-content: space-between;width: 573px;">
-        <div style="position: absolute;top: 85px;">
-          <span>{{paramsObj.name}}</span>
-          <span></span>
-          <span style="margin-left: 60px;" v-if="list.gender == 1">女</span>
-          <span style="margin-left: 60px;" v-else-if="list.gender == 2">男</span>
-
-          <span></span>
+      
+        <div style="display: flex; justify-content: space-between;width: 573px;border: 1px solid black; position: relative;padding: 5px;">
+          <div >
+            <span>姓名：{{paramsObj.name}}</span>
+            <span style="margin-left: 60px;">性别：</span>
+            <span style="" v-if="list.gender == 1">女</span>
+            <span style="" v-else-if="list.gender == 2">男</span>
+          </div>
+          <div>
+            <span style="margin-right: 60px;">NO：</span>
+          </div>
         </div>
-        <div style="position: absolute;top: 85px;left: 351px;">
-          <span style="margin-right: 60px;"></span>
+        <div style="display: flex;justify-content: space-around;width: 573px;  padding: 5px;border-left: 1px solid black;border-right: 1px solid black;border-bottom: 1px solid black;">
+          <div>项目</div>
+          <div>金额</div>
+          <div>项目</div>
+          <div>金额</div>
+          <div>项目</div>
+          <div>金额</div>
         </div>
-      </div>
-      <div style="display:flex;justify-content: space-between;">
-        <div style="position: absolute;top:120px;left:80px">西药费</div>
-        <div style="position: absolute;top:120px;left:171px">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:120px;left:262px">检查费</div>
-        <div style="position: absolute;top:120px;left:353px">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:120px;left:444px">治疗费</div>
-        <div style="position: absolute;top:120px;left:535px">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
-      </div>
+        <div style="border: 1px solid black; border-top: none; width: 573px;min-height: 220px;">
+          <div style="display:flex;justify-content: space-around;">
+            
+            <div style="">西药费</div>
+            <div style="">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
+            <div style="">检查费</div>
+            <div style="">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+            <div style="">治疗费</div>
+            <div style="position:  relative;left: 16px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+          </div>
 
-      <div style="display:flex;justify-content: space-between;">
-        <div style="position: absolute;top:140px;left:80px">床位费</div>
-        <div style="position: absolute;top:140px;left:171px">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:140px;left:262px">中成药</div>
-        <div style="position: absolute;top:140px;left:353px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:140px;left:444px">化验费</div>
-        <div style="position: absolute;top:140px;left:535px">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
-      </div>
+          <div style="display:flex;justify-content: space-around;">
+           
+            <div style="">床位费</div>
+            <div style="">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
+            <div style="position:  relative;left: -15px;">中成药</div>
+            <div style="">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
+            <div style="position:  relative;left: -16px;">化验费</div>
+            <div style="">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+          </div>
 
-      <div style="display:flex;justify-content: space-between;">
-        <div style="position: absolute;top:160px;left:80px">手术费</div>
-        <div style="position: absolute;top:160px;left:171px">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:160px;left:262px">中成药</div>
-        <div style="position: absolute;top:160px;left:353px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:160px;left:444px">其他费</div>
-        <div style="position: absolute;top:160px;left:535px">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
-      </div>
+          <div style="display:flex;justify-content: space-around;">
+            <div style="">手术费</div>
+            <div style="">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
+            <div style="position:  relative;left: -15px;">中成药</div>
+            <div style="">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
+            <div style="position:  relative;left: -16px;">其他费</div>
+            <div style="">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+          </div>
 
-      <div style="display:flex;justify-content: space-between;">
-        <div style="position: absolute;top:180px;left:80px">诊察费</div>
-        <div style="position: absolute;top:180px;left:171px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
-        <div style="position: absolute;top:180px;left:262px">材料费</div>
-        <div style="position: absolute;top:180px;left:353px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
-      </div>
-
-      <div>
-        <span>
-        <span  style="position: absolute;top:230px;left:120px">
-          <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
-                      {{ zhongwen.substring(0,1) }}
-                  </span>
-                  <span v-else>零</span>
+          <div style="display:flex;justify-content: space-around;">
+            <div style="position:  relative;left: -24px;">诊察费</div>
+            <div style="position:  relative;left: -75px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+            <div style="position:  relative;left: -115px;">材料费</div>
+            <div style="position:  relative;left: -169px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
+          </div>
+        </div>
+        <div style="border: 1px solid black;border-top:none;padding: 5px;width: 573px;">
+          
+          <div style="border-right: 1px solid black;display: inline-block;width: 360px;">
+            <span>合计（大写）:</span>
+            <span  style="">
+              <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
+                          {{ zhongwen.substring(0,1) }}
+                      </span>
+                      <span v-else>零</span>
 
-        </span>
-        <span  style="position: absolute;top:230px;left:140px">
-            <span v-if="zhongwen.indexOf('万') > -1">
-                      {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
-                  </span>
-                  <span v-else>零</span>
+            </span>
+            <span  style="">
+                <span v-if="zhongwen.indexOf('万') > -1">
+                          {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                      </span>
+                      <span v-else>零</span>
 
-        </span>
-        <span  style="position: absolute;top:230px;left:160px">
-          <span v-if="zhongwen.indexOf('仟') > -1">
-                      {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
-                  </span>
-                  <span v-else>零</span>
+            </span>
+            <span  style="">
+              <span v-if="zhongwen.indexOf('仟') > -1">
+                          {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
+                      </span>
+                      <span v-else>零</span>
 
-        </span>
-        <span  style="position: absolute;top:230px;left:180px">
-            <span v-if="zhongwen.indexOf('佰') > -1">
-                      {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
-                  </span>
-                  <span v-else>零</span>
+            </span>
+            <span  style="">
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                          {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                      </span>
+                      <span v-else>零</span>
 
-        </span>
-        <span style="position: absolute;top:230px;left:200px">
-            <span v-if="zhongwen.indexOf('拾') > -1">
-                      {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
-                  </span>
-                  <span v-else>零</span>
+            </span>
+            <span style="">
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                          {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                      </span>
+                      <span v-else>零</span>
 
-        </span>
-        <span  style="position: absolute;top:230px;left:220px">
-            <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
-                      {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
-                  </span>
-                  <span v-else>零</span>
-        </span>
-        <span  style="position: absolute;top:230px;left:240px">
-            <span v-if="zhongwen.indexOf('角') > -1">
-                      {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
-                  </span>
-                  <span v-else>零</span>
-        </span>
-        <span  style="position: absolute;top:230px;left:260px">
-          <span v-if="zhongwen.indexOf('分') > -1">
-                      {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
-                  </span>
-                  <span v-else>零</span>
-        </span>
-        </span>
-        <span style="position: absolute;top:230px;left:450px">￥：{{totalPrice.toFixed(2)}}</span>
-      </div>
-
-      <div style="border-bottom: 1px solid black;position: absolute;top:250px;left:110;width:573px;font-Size:12px">
+            </span>
+            <span  style="">
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
+                          {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+                      </span>
+                      <span v-else>零</span>
+            </span>
+            <span  style="">
+                <span v-if="zhongwen.indexOf('角') > -1">
+                          {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                      </span>
+                      <span v-else>零</span>
+            </span>
+            <span  style="">
+              <span v-if="zhongwen.indexOf('分') > -1">
+                          {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                      </span>
+                      <span v-else>零</span>
+            </span>
+          </div>
+          <span style="position: relative;top:0px;left:0px">￥：{{totalPrice.toFixed(2)}}</span>
+        </div>
+      
+      <div style="border-bottom: 1px solid black;width:573px;font-Size:12px">
         <div  style="display:flex;margin: 3px 0px;">
           <div style="width:140px">医保：门慢统筹：{{list.order.hifp_pay}}</div>
           <div style="width:140px">大病保险：{{list.order.hifmi_pay}}</div>
@@ -123,7 +135,7 @@
           <div style="width:140px">个账余额：{{list.order.balc}}</div>
         </div>
       </div>
-      <div style="position: absolute;top:290px;left:110;width:573px;font-Size:12px">
+      <div style="width:573px;font-Size:12px">
         <div style="display:flex;margin: 3px 0px;">
           <div style="width:140px">现金支付：{{list.order.psn_cash_pay}}</div>
           <div style="width:140px">预存扣减：</div>
@@ -134,7 +146,7 @@
           <div style="width:140px">收款人：{{list.admin_user_name}}</div>
         </div>
       </div>
-    </div>
+   
   </div>
 </template>
 <script>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -40,7 +40,7 @@
                 <div style="width:100%;">诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
             </div>
 
-            <div class="prescriptionBox" style="min-height: 425px;">
+            <div class="prescriptionBox" style="min-height: 420px;">
                 <table style="width:100%;text-align:center;line-height:25px;">
                     <tr>
                         <td>序号</td>