8月22日杨青

src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue

@@ -14,44 +14,44 @@
           <div  style="position: absolute;top:50px;left:250px;"></div>
       </div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:50px;left:480px;" v-if="list.gender == 1">√</div>
-          <div  style="position: absolute;top:50px;left:540px;" v-else-if="list.gender == 2">√</div>
+          <div  style="position: absolute;top:50px;left:570px;" v-if="list.gender == 1">√</div>
+          <div  style="position: absolute;top:50px;left:630px;" v-else-if="list.gender == 2">√</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:68px;left:120px;">医保</div>
-      <div  style="position: absolute;top:68px;left:300px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
-      <div  style="position: absolute;top:68px;left:480px;">现金</div>
+      <div  style="position: absolute;top:88px;left:120px;">医保</div>
+      <div  style="position: absolute;top:88px;left:340px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
+      <div  style="position: absolute;top:88px;left:570px;">现金</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:124px;left:0px;">西药费</div>
-      <div  style="position: absolute;top:124px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:124px;left:120px;">化验费</div>
-      <div  style="position: absolute;top:124px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:124px;left:240px;">治疗费</div>
-      <div  style="position: absolute;top:124px;left:320px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:124px;left:410px;">处置费</div>
-      <div  style="position: absolute;top:124px;left:480px;">0</div>
+      <div  style="position: absolute;top:150px;left:0px;">西药费</div>
+      <div  style="position: absolute;top:150px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:120px;">化验费</div>
+      <div  style="position: absolute;top:150px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:270px;">治疗费</div>
+      <div  style="position: absolute;top:150px;left:340px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:490px;">处置费</div>
+      <div  style="position: absolute;top:150px;left:570px;">0</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:150px;left:0px;">中成药</div>
-      <div  style="position: absolute;top:150px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:150px;left:120px;">诊疗费</div>
-      <div  style="position: absolute;top:150px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:150px;left:240px;">材料费</div>
-      <div  style="position: absolute;top:150px;left:320px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div> 
-      <div  style="position: absolute;top:150px;left:410px;">护理费</div>
-      <div  style="position: absolute;top:150px;left:480px;">0</div>
+      <div  style="position: absolute;top:188px;left:0px;">中成药</div>
+      <div  style="position: absolute;top:188px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:120px;">诊疗费</div>
+      <div  style="position: absolute;top:188px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:270px;">材料费</div>
+      <div  style="position: absolute;top:188px;left:340px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div> 
+      <div  style="position: absolute;top:188px;left:490px;">护理费</div>
+      <div  style="position: absolute;top:188px;left:570px;">0</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
-      <div  style="position: absolute;top:176px;left:0px;">注射费</div>
-      <div  style="position: absolute;top:176px;left:60px;">0</div> 
-      <div  style="position: absolute;top:176px;left:120px;">检查费</div>
-      <div  style="position: absolute;top:176px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:176px;left:240px;">输氧费</div>
-      <div  style="position: absolute;top:176px;left:320px;">0</div>
-      <div  style="position: absolute;top:176px;left:410px;">其他</div>
-      <div  style="position: absolute;top:176px;left:480px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:0px;">注射费</div>
+      <div  style="position: absolute;top:225px;left:60px;">0</div> 
+      <div  style="position: absolute;top:225px;left:120px;">检查费</div>
+      <div  style="position: absolute;top:225px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:270px;">输氧费</div>
+      <div  style="position: absolute;top:225px;left:340px;">0</div>
+      <div  style="position: absolute;top:225px;left:490px;">其他</div>
+      <div  style="position: absolute;top:225px;left:570px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:202px;left:60px;"></div>
@@ -61,64 +61,63 @@
     </div>
     <div>
       <span>
-        <span  style="position: absolute;top:230px;left:120px">
+        <span  style="position: absolute;top:288px;left:120px">
           <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:160px">
+        <span  style="position: absolute;top:288px;left:160px">
             <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:210px">
+        <span  style="position: absolute;top:288px;left:210px">
             <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  style="position: absolute;top:288px;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:230px;left:310px">
+        <span style="position: absolute;top:288px;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:230px;left:360px">
+        <span  style="position: absolute;top:288px;left:360px">
            <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:420px">
+        <span  style="position: absolute;top:288px;left:420px">
              <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:480px">
+        <span  style="position: absolute;top:288px;left:480px">
              <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:530px">{{ totalPrice.toFixed(2) }}</span>
+      <span style="position: absolute;top:288px;left:600px">{{ totalPrice.toFixed(2) }}</span>
     </div>
 
-
     <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:283px;left:100px;">阳春{{ org_name}}</div>
-      <div style="position: absolute;top:283px;left:240px;"></div>
-      <div style="position: absolute;top:283px;left:410px;">{{list.admin_user_name}}</div>
+      <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>
   </div>
 </template>

src/xt_pages/sign/Schedulingdisplay.vue

@@ -46,8 +46,8 @@
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
                           <p style="width:12%">分区</p>
-                          <p style="width:5%">{{ getdays(day) }}</p>
-                          <p style="width:79%">病人姓名 </p>
+                          <p style="width:6%">{{ getdays(day) }}</p>
+                          <p style="width:78%">病人姓名 </p>
                         </div>
                     </div>
                     <div class="lineUpList">
@@ -55,7 +55,7 @@
                         <p style="display: inline-block;width:12%;text-align: center;">{{ item[1].name }}</p>
                         <p style="display: inline-block;width:87%">
                           <span v-for="(it,index) in item[1].data" :key="index" >
-                            {{ it.name }}&nbsp;&nbsp;
+                            {{nameSplit(it.name)}}&nbsp;&nbsp;
                           </span>
                         </p>
                       </div>
@@ -81,7 +81,8 @@
                             <p style="display: inline-block;width:12%;text-align: center;">{{ item[1].name }}</p>
                             <p style="display: inline-block;width:87%">
                               <span v-for="(it,index) in item[1].data" :key="index" >
-                                {{ it.name }}&nbsp;&nbsp;
+                                <!-- {{ it.name }}&nbsp;&nbsp; -->
+                                {{nameSplit(it.name)}}
                               </span>
                             </p>
                           </div>
@@ -131,7 +132,7 @@ export default {
       currentPage: 1,
       total:0,
       page:0,
-      pagesize:6,
+      pagesize:4,
       day:'',
       teem_sel: [
         { name: "上午", id: 1 },
@@ -144,7 +145,9 @@ export default {
           {"name":"周名浩","patient_id":"12394","partition_id":"1291","bed_id":"3593","zon_name":"A1区","number":"4"},
           {"name":"许素琼","patient_id":"10893","partition_id":"1291","bed_id":"3594","zon_name":"A1区","number":"5"},
           {"name":"陈少荣","patient_id":"17925","partition_id":"1291","bed_id":"3595","zon_name":"A1区","number":"6"},
-          {"name":"石佩贤","patient_id":"21244","partition_id":"1291","bed_id":"5455","zon_name":"A1区","number":"31（滤）"}]},
+          {"name":"石佩贤","patient_id":"21244","partition_id":"1291","bed_id":"5455","zon_name":"A1区","number":"31（滤）"},
+          {"bed_id": "4500",'name': "B区刘春秀","number": "B1","partition_id": "1797","patient_id": "17581","zon_name": "B区"},
+          {"bed_id": "4406",'name': "右7H34杨贵益","number": "1号床","partition_id": "1797","patient_id": "17581","zon_name": "B区"}]},
           "1333":{"name":"A2区","data":[{"name":"王梓绵","patient_id":"20283","partition_id":"1333","bed_id":"3596","zon_name":"A2区","number":"7"},
           {"name":"陈惠艮","patient_id":"17935","partition_id":"1333","bed_id":"3597","zon_name":"A2区","number":"8"},
           {"name":"曾御贞","patient_id":"11218","partition_id":"1333","bed_id":"3598","zon_name":"A2区","number":"9"},
@@ -361,12 +364,28 @@ export default {
           return this.teem_sel[i].name
         }
       }
-    }
+    },
+    nameSplit(val) {
+      var reg = /[\u4e00-\u9fa5]/g
+      let name = val
+      name = name.substr(-4)
+      var names = name.match(reg)
+      name = names.join('')
+      if (name.includes('区')) {
+        name = name.replace('区', '')
+      }
+      if (name.includes('号')) {
+        name = name.replace('号', '')
+      }
+      return name
+    },
 
   },
   created(){ 
-    this.org_id = this.$store.getters.xt_user.org_id
-    // this.schArr = Object.entries(this.data);
+    
+    // console.log('jiequsdfasdfas',this.nameSplit('左B区陈漫'));
+    this.org_id = this.$store.getters.xt_user.org_id 
+    this.schArr = Object.entries(this.data);
     // console.log('5555555555',Math.ceil(this.schArr.length / this.pagesize));
     // console.log('00000',arr);
     // this.getindexschedulelist()
@@ -381,6 +400,7 @@ export default {
 <style lang="scss" scoped>
 .main-contain{
     height: 100%;
+    
 }
 .page_lineUp{
     height: 100%;