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

src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue

@@ -2,9 +2,9 @@
   <div id='invoice-print' style="position: relative;">
     <div>
       <div style="display: inline-block; position: absolute;top: 30px;left: 30px;">{{list.order.mdtrt_id}}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 230px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 280px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
-      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 260px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
+      <div style="display: inline-block; position: absolute;top: 30px;left: 400px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
     </div>
     <div>
       <div style="position: absolute;top: 50px;left: 60px;">{{ paramsObj.name }}</div>
@@ -61,63 +61,62 @@
     </div>
     <div>
       <span>
-        <span  style="position: absolute;top:288px;left:120px">
+        <span  style="position: absolute;top:280px;left:100px">
           <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:288px;left:160px">
+        <span  style="position: absolute;top:280px;left:140px">
             <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:288px;left:210px">
+        <span  style="position: absolute;top:280px;left:190px">
             <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:288px;left:260px">
+        <span  style="position: absolute;top:280px;left:260px">
             <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span style="position: absolute;top:288px;left:310px">
+        <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('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:288px;left:360px">
+        <span  style="position: absolute;top:280px;left:380px">
            <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:288px;left:420px">
+        <span  style="position: absolute;top:280px;left:450px">
              <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-
-        <span  style="position: absolute;top:288px;left:480px">
+        <span  style="position: absolute;top:280px;left:510px">
              <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:288px;left:600px">{{ totalPrice.toFixed(2) }}</span>
+      <span style="position: absolute;top:280px;left:600px">{{ totalPrice.toFixed(2) }}</span>
     </div>
 
     <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:330px;left:100px;">阳春{{ org_name}}</div>
-      <div style="position: absolute;top:330px;left:240px;"></div>
-      <div style="position: absolute;top:330px;left:410px;">{{list.admin_user_name}}</div>
+      <div style="position: absolute;top:370px;left:100px;">{{ org_name}}</div>
+      <div style="position: absolute;top:370px;left:240px;"></div>
+      <div style="position: absolute;top:370px;left:460px;">{{list.admin_user_name}}</div>
     </div>
   </div>
 </template>