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

src/router/modules/hisTool.js

       is_menu: false,
       meta: { title: 'gatherPrint', noCache: true }
     },
+    // 灵山盛康汇总打印发票
+    {
+      path: '/hisTool/garherinvoice_lingshang',
+      component: () => import('@/xt_pages/outpatientTool/garherinvoice_lingshang'),
+      name: 'gatherPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'gatherPrint', noCache: true }
+    },
     {
       path: '/hisTool/export',
       component: () => import('@/xt_pages/outpatientTool/export'),

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

       <tr>
         <td>床位费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.bedSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
         <td>西成药</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.western_medicine_cost_self_total + info.westernMedicineSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
       </tr>
       <tr>
         <td>中成药</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.chinese_traditional_medicine_cost_self_total + info.chineseTraditionalSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">
           {{info.chinese_traditional_medicine_cost_part_self_total}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.check_cost_self_total + info.checkSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
       </tr>
       <tr>
         <td>治疗费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.treat_cost_self_total + info.treatSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
         <td>放射费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
       <tr>
         <td>手术费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.operation_cost_self_total + info.operationSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
         <td>化验费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.laboratory_cost_self_total + info.laboratorySelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
       </tr>
       <tr>
       <tr>
         <td>其他</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.other_cost_self_total + info.otherSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
         <td>麻醉费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
       <tr>
         <td>材料费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.material_cost_self_total + info.materialSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
         <td>特殊检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
           parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
-          parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
-          parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
-          parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+parseFloat(info.bedSelfTotal)+
+          parseFloat(info.operation_cost_self_total)+parseFloat(info.operationSelfTotal) + parseFloat(info.other_cost_self_total) +parseFloat(info.otherSelfTotal)+
+          parseFloat(info.material_cost_self_total) + parseFloat(info.materialSelfTotal)  + parseFloat(info.western_medicine_cost_self_total) + parseFloat(info.westernMedicineSelfTotal) +
+          parseFloat(info.chinese_traditional_medicine_cost_self_total)  +  parseFloat(info.chineseTraditionalSelfTotal)  + parseFloat(info.check_cost_self_total) + parseFloat(info.checkSelfTotal) +
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.laboratorySelfTotal)  + parseFloat(info.treat_cost_self_total) +parseFloat(info.treatSelfTotal) ).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +

src/xt_pages/outpatientCharges/invoicePrint.vue

         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485 && org_id != 10375"><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
-            <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
+            <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
+            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
         </div>
     </div>
 
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485  || org_id == 0">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485">
       <div class='dialysisPage'>
         <print-eleven :paramsObj="invoiceParams"></print-eleven>
       </div>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

             </tr>
         </table>
         <div class="tableBottom">
-            <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
-            <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
-            <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+          <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
+          <div class="tableBottomOne" v-if="$store.getters.xt_user.org.id != 10318">制表日期：{{ getNowTime()}}</div>
+          <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
           <div class="tableBottomOne">基金总额：{{order.fund_pay_sumamt}}元</div>
           <div class="tableBottomOne">统筹支付：{{order.hifp_pay}}元</div>
           <div class="tableBottomOne">医疗救助：{{order.maf_pay}}元</div>
           <div class="tableBottomOne">医保报销：{{order.fund_pay_sumamt}}元</div>
           <div class="tableBottomOne">个人支付：{{order.psn_cash_pay}}元</div>
-
         </div>
         </div>
     </div>

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

                 <div style="width: 6.7%;padding: 5px;text-align: center;">{{subItem.count}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
-                <!-- <div style="width: 10.1%;padding: 5px;"></div> -->
-                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
+                 <div style="width: 10.1%;padding: 5px;"></div>
+<!--/*                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>*/-->
               </div>
             </div>
           </td>

src/xt_pages/outpatientDoctorStation/print.vue

           :prescription_id="prescription_id"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375 || org_id == 0"
+        <prinSeven v-if="org_id == 10375 "
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientTool/components/gatherStatistics.vue

       end_time: "",
       his_record_patient: {},
       orderList: [],
+      org_id:'',
     };
   },
   methods: {
       }
     },
     toPrintInvoice() {
-      this.$router.push({
-        path:
-          "/hisTool/gatherPrintInvoice?patient_id=" +
-          this.patient_id +
-          "&start_time=" +
-          this.start_time +
-          "&end_time=" +
-          this.end_time +
-          "&type=" +
-          this.item_type +
-          "&keyword=" +
-          this.keywords,
-      });
+      if(this.org_id != 10375 ){
+        this.$router.push({
+          path:
+            "/hisTool/gatherPrintInvoice?patient_id=" +
+            this.patient_id +
+            "&start_time=" +
+            this.start_time +
+            "&end_time=" +
+            this.end_time +
+            "&type=" +
+            this.item_type +
+            "&keyword=" +
+            this.keywords,
+        });
+      }
+      if(this.org_id == 10375 || this.org_id == 0){
+        this.$router.push({
+          path:
+            "/hisTool/garherinvoice_lingshang?patient_id=" +
+            this.patient_id +
+            "&start_time=" +
+            this.start_time +
+            "&end_time=" +
+            this.end_time +
+            "&type=" +
+            this.item_type +
+            "&keyword=" +
+            this.keywords,
+        });
+      }
+
     },
     setMonthPrescription(month_prescriptions) {
       let drug_month_prescriptions = {
     },
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org_id
+
     let list_1 = this.$store.getters.pagedata.list;
     if (!list_1.start_time || list_1.start_time == "") {
       this.chargeDate[0] = moment(new Date())

src/xt_pages/workforce/Patientshift.vue

                 <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
-                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':hidder ? '30px': '110px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" draggable="true"   @dragover="allowDrop"> 
+                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':hidder ? '30px': '110px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
                       <div class="huanzhekuai">
-                        <div v-for="(item2) in item.list"  draggable="true" @dragstart.self="curInfoDragStart($event,item2)">
+                        <div v-for="(item2) in item.list"   draggable="true" >
                           <template >
                             <div v-if="it.id==item2.bed_id" style="display: inline-block;">
                               <div>
                                 <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
-                                <div v-if="!hidder" >
-                                  <span style="font-size: 14px;color: rgb(19, 241, 175);margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
-                                  <span style="font-size: 14px;color:orange;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
-                                  <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
-                                </div> 
+                                <span v-if="!hidder" >
+                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
+                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
+                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
+                                </span> 
                               </div>
                             </div>
                           </template> 
                   <div>
                     <div style="margin: 10px 30px 10px 10px;background: rgb(74 211 235 / 51%);height: 110px;width: 125px;text-align: center;">
                       <span >{{ huanzhe.name}}({{getmode(huanzhe.mode_id)}})</span><br>
-                      <span style="font-size: 14px;color: rgb(12, 185, 50);margin-bottom: 5px;">
+                      <span style="font-size: 14px;margin-bottom: 5px;">
                         {{ huanzhe.zeng_fenqu }}-{{ huanzhe.zeng_chuang }}
                       </span><br>
-                      <span style="font-size: 14px;color:orange;margin-bottom: 5px;">{{getBloodAccess(huanzhe.boolen_id)}}</span><br>
-                      <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{huanzhe.schedule_remark}}</span> 
+                      <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(huanzhe.boolen_id)}}</span><br>
+                      <span style="font-size: 13px;margin-bottom: 5px;">{{huanzhe.schedule_remark}}</span> 
                     </div>
                      <div style="margin-left: 10px;">{{getZoneName(xian_fenqu.zone_id)}}-{{xian_fenqu.number}}</div>
                   </div>
                   <div>
                     <div style="margin: 10px 30px 10px 10px;background: rgb(74 197 235);height: 110px;width: 125px;text-align: center;">
                       <span >{{genghuan.name}}</span><span v-if="genghuan.mode_id !=''">({{genghuan.mode_id}})</span><br>
-                      <span style="font-size: 14px;color: rgb(12, 185, 50);margin-bottom: 5px;">
+                      <span style="font-size: 14px;margin-bottom: 5px;">
                         {{ genghuan.genghuan_fenqu }}-{{ genghuan.genghuan_chuang }}
                         <!-- A1区-6号床 -->
                       </span><br>
-                      <span style="font-size: 14px;color:orange;margin-bottom: 5px;"></span>{{getBloodAccess(genghuan.g_boolen_id)}}<br>
-                      <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{genghuan.genghuan_remark}}</span>
+                      <span style="font-size: 14px;margin-bottom: 5px;"></span>{{getBloodAccess(genghuan.g_boolen_id)}}<br>
+                      <span style="font-size: 13px;margin-bottom: 5px;">{{genghuan.genghuan_remark}}</span>
                     </div>
                     <div style="margin-left: 10px;">{{getZoneName(g_xian_fenqu.zone_id)}}-{{g_xian_fenqu.number}}</div>
                   </div>
       tipDialogVisible:false,
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
-      hidder: false,
+      hidder: true,
       td_1_width: '8%',
       td_3_width: '90%',
       date:'',
       var bedname=''
       var zonename=''
       var zoneid=''
-      console.log('6666',val,value);
-      console.log('7777',this.numberlist);
+      console.log('kkkkk',e.target.innerText);
       const inntext= e.target.innerText.split('(')[0]
-     
       for(let i=0;i<val.list.length;i++){
         if(inntext == val.list[i].name){
+          console.log('6666',val,value);
+          console.log('7777',this.numberlist);
           this.tipDialogVisible=true
           this.currentData={
             currentData_id:val.list[i].id,
           zonename = this.partitionArr[y].name
         }
       }
-      console.log('3333',bedid);
+      
       if(e.target.innerText == ''){
+        console.log('3333',e.target.innerText);
         this.schedule={
           schedule_date:this.date,
           schedule_type:this.classes,
     },
     // 需要拖动的
     curInfoDragStart(e,val){
-      this.cur_drag_info={
-        id:val.id,
-        name:val.name,
-        quhao:val.order.DeviceNumber.zone.name,
-        chaung:val.order.DeviceNumber.number,
-        patient_id:val.patient_id,
-        bed_id:val.bed_id,
-        mode_id:val.mode_id,
-        partition_id:val.partition_id,
-        schedule_date:this.date,
-        schedule_type:this.classes,
-        schedule_week: val.schedule_week,
+      const inntext2= e.target.innerText.split('(')[0]
+      for(let i=0;i<val.list.length;i++){
+        if(inntext2 == val.list[i].name){
+          this.cur_drag_info={
+            id:val.list[i].id,
+            name:val.list[i].name,
+            quhao:val.list[i].order.DeviceNumber.zone.name,
+            chaung:val.list[i].order.DeviceNumber.number,
+            patient_id:val.list[i].patient_id,
+            bed_id:val.list[i].bed_id,
+            mode_id:val.list[i].mode_id,
+            partition_id:val.list[i].partition_id,
+            schedule_date:this.date,
+            schedule_type:this.classes,
+            schedule_week: val.list[i].schedule_week,
+          }
+        }
       }
+     
+      console.log('bbbb',e.target.innerText);
       console.log('4444',val);
       console.log('5555',this.cur_drag_info);
     },