9月16日杨青

src/router/modules/hisTool.js

@@ -132,6 +132,15 @@ export default {
       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/outpatientTool/components/gatherStatistics.vue

@@ -230,6 +230,7 @@ export default {
       end_time: "",
       his_record_patient: {},
       orderList: [],
+      org_id:'',
     };
   },
   methods: {
@@ -849,19 +850,37 @@ export default {
       }
     },
     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 = {
@@ -1253,6 +1272,8 @@ export default {
     },
   },
   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

@@ -59,16 +59,16 @@
                   <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 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" @dragstart.self="curInfoDragStart($event,item2)">
                           <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> 
@@ -121,11 +121,11 @@
                   <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>
@@ -133,12 +133,12 @@
                   <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>
@@ -243,7 +243,7 @@ export default {
       tipDialogVisible:false,
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
-      hidder: false,
+      hidder: true,
       td_1_width: '8%',
       td_3_width: '90%',
       date:'',
@@ -658,12 +658,12 @@ export default {
       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,
@@ -686,8 +686,9 @@ export default {
           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,