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

src/api/fapiao.js

@@ -11,9 +11,27 @@ export function getOrderFapiaoList(params){
 
 export function getFapiaoList(params){
   return request({
-    url:"/api/fapiao/list",
+    url:"/api/gdfapiao/list",
     methods:"get",
     params:params
   })
 }
 
+
+
+export function OpenBlueFapiao(params){
+  return request({
+    url:"/api/fapiao/blue",
+    methods:"get",
+    params:params
+  })
+}
+
+
+export function OpenRedFapiao(params){
+  return request({
+    url:"/api/fapiao/red",
+    methods:"get",
+    params:params
+  })
+}

src/router/modules/Dialysisanalysis.js

@@ -42,7 +42,6 @@ export default {
     //   }
     // },
 
-
     {//透析总量分析
       path: '/Dialysisanalysis/qualitycontrol/new_otherIndicators/Total_analysis',
       component: () => import('@/xt_pages/Dialysisanalysis/new_otherIndicators/components/Total_analysis'),

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -60,7 +60,7 @@
                           }}
                         </div>
                         <div style="flex: 1;">
-                          透析次数:{{ record.patient.total_dialysis +
+                          透析次数：  {{ record.patient.total_dialysis +
                             record.patient.user_sys_before_count
                               ? record.patient.total_dialysis +
                                 record.patient.user_sys_before_count

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -580,7 +580,7 @@
                                 <span v-if="item.prescribing_number">&nbsp;&nbsp; {{ item.prescribing_number }}{{ item.prescribing_number_unit }}</span>
                                 <span v-if="item.single_dose != 0">{{ item.single_dose }}{{ item.single_dose_unit }}</span>
                                 <span v-if="item.parent_id == 0">{{ item.delivery_way }}</span>
-                                <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span>
+                                <!-- <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span> -->
                                 <span v-if="item.parent_id == 0 && item.remark.length > 0">({{ advice.remark }})</span>
                                 <span v-if="item.children && !Array.isArray(item)" style="display:block;border-top: 1px solid #000;" v-for="(child, childindex) in item.children" :key="childindex" class="advice-children">
                                     <span style="padding-left: 20px !important;">---></span>

src/xt_pages/dialysis/details/index.vue

@@ -297,7 +297,7 @@
                   <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 ">
                   <div style="">透析模式:
                    <span>{{getModeName(main_collection.prescription.mode_id)  }}</span>
                   </div>
@@ -545,7 +545,7 @@
                   </span>
                   </span>
                 </div>
-                <div class="printCell" style="display:flex;"  v-if="org_id==10598 || org_id == 0">
+                <div class="printCell" style="display:flex;"  v-if="org_id==10598">
                   <span style="display: block;width: 45%;">处方脱水量：{{main_collection.prescription.prescription_water}}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                      <span v-else>L</span>
@@ -554,7 +554,7 @@
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598">
                   <div style="">透析时长:
                    <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分 </span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                   </div>
@@ -562,6 +562,12 @@
                     {{ getDisplaceLiquiPart(main_collection.prescription.displace_liqui_part) }}
                   </div>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10635 || org_id == 0">
+                  <div>
+                    处方脱水量：{{main_collection.prescription.prescription_water}} L
+                  </div>
+                  <div></div>
+                </div>
               </div>
             </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -36,7 +36,7 @@
                     {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                   </div>
                   <div style="flex: 1;">
-                    透析次数:{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ? 
+                    透析次数：  {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ? 
                                 patientInfo.total_dialysis + patientInfo.user_sys_before_count : "/" }}
                   </div>
                 </div>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -666,7 +666,7 @@
               <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
               <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
               <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-              <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
+              <!-- <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span> -->
               <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
             </td>
             <td height="40px">
@@ -1649,6 +1649,8 @@ export default {
               response.data.data.advices == null
                 ? []
                 : response.data.data.advices
+                console.log('this.doctor_advices',this.doctor_advices);
+                
             for (let index = 0; index < this.doctor_advices.length; index++) {
               this.doctor_advices[index]['isShow'] = 2
             }

src/xt_pages/fapiao/fapiao.vue

@@ -237,8 +237,8 @@ export default {
   },
 
   created() {
-    this.getInitData()
-    this.fetchAllAdminUsers()
+    // this.getInitData()
+    // this.fetchAllAdminUsers()
     // this.getDoctorList()
     this.getHisOrderList()
     // this.getAllstaff()

src/xt_pages/fapiao/newSettleDetail.vue

@@ -149,10 +149,10 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
-                       @click="blue(scope.row)">
+                       @click="blue()">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 1" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
                        @click="hongchong(scope.row)">
               红冲
             </el-button>
@@ -197,7 +197,7 @@ import { fetchAllAdminUsers } from '@/api/doctor'
 import axios from 'axios'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import {
-  getOrderFapiaoList
+  getOrderFapiaoList, OpenBlueFapiao, OpenRedFapiao
 } from '../../api/fapiao'
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
@@ -280,6 +280,46 @@ export default {
   },
 
   methods: {
+    hongchong(row){
+      var  id = row.result.id
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      OpenRedFapiao(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$message.success(response.data.msg)
+          this.getHisOrderList()
+        }
+      })
+    },
+    blue(){
+      console.log(this.selecting_schs)
+      var order_ids = ""
+      for(let i = 0; i < this.selecting_schs.length;i++){
+        if(order_ids.length == 0){
+          order_ids = this.selecting_schs[i].id
+        }else{
+          order_ids =order_ids + ","+this.selecting_schs[i].id
+        }
+      }
+      let params = {
+        "order_ids":order_ids,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      OpenBlueFapiao(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$message.success(response.data.msg)
+          this.getHisOrderList()
+        }
+      })
+    },
     getData(patient_id){
       this.patient_id = patient_id
       this.getHisOrderList()
@@ -294,11 +334,7 @@ export default {
 
 
     },
-    blue(row){
-
-    }, yulan(row){
-
-    },hongchong(row){
+    yulan(row){
 
     },
     getAllstaff(){

src/xt_pages/fapiao/patientSettleDetail.vue

@@ -8,7 +8,7 @@
       class="app-container"
       style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
     >
-      <div class="mainLeft">
+      <div class="mainLeft">d
         <div>
           <div
             style="
@@ -66,6 +66,7 @@
 import { GetDetailPatients } from "@/api/his/his_tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import NewSettleDetail from './newSettleDetail.vue'
+import { OpenBlueFapiao, OpenRedFapiao } from '../../api/fapiao'
 export default {
   components: {
     NewSettleDetail,

src/xt_pages/fapiao/settleDetail.vue

@@ -150,7 +150,7 @@
                         @click="blue(scope.row)">
               开票
             </el-button>
-            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 1" size="mini" type="primary"
+            <el-button v-if="scope.row.result.id > 0 && scope.row.result.is_red_washed == 0" size="mini" type="primary"
                         @click="hongchong(scope.row)">
               红冲
             </el-button>
@@ -197,7 +197,9 @@ import { fetchAllAdminUsers } from '@/api/doctor'
 import axios from 'axios'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import {
-  getOrderFapiaoList
+  getOrderFapiaoList,
+  OpenBlueFapiao,
+  OpenRedFapiao
 } from '../../api/fapiao'
 
 import { getDialysisRecordInitData } from '@/api/dialysis_record'
@@ -286,11 +288,39 @@ export default {
 
     },
     blue(row){
-
+     var  ids = row.id
+      let params = {
+        "order_ids":ids,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      OpenBlueFapiao(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$message.success(response.data.msg)
+          this.getHisOrderList()
+        }
+      })
     }, yulan(row){
 
-    },hongchong(row){
 
+
+    },hongchong(row){
+      var  id = row.result.id
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      OpenRedFapiao(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$message.success(response.data.msg)
+          this.getHisOrderList()
+        }
+      })
     },
     getAllstaff(){
       adminMainView()

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3862,7 +3862,7 @@ export default {
             var that = this
             this.ws.onopen = function(event){
               if (that.$store.getters.xt_user.org_id == 10387){
-                that.ws.send("{\"url\":\"http://10.93.33.243:20001/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
+                that.ws.send("{\"url\":\"https://dvs.hun.hsip.gov.cn/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"罗佳菊\",\"orgId\":\"H43082200408\"},\"orgId\":\"H43082200408\",\"transType\":\"ec.query\"}}");
               }
                 // else if(that.$store.getters.xt_user.org_id == 10318){
                 //   that.ws.send("{\"url\":\"http://igb.hsa.gdgov.cn/prd_nation_eccode/prd_eccode/localcfc/api/hsecfc/localQrCodeQuery\",\"indata\":{\"data\":{\"businessType\":\"01301\",\"deviceType\":\"\",\"officeId\":\"32760\",\"officeName\":\"肾内科\",\"operatorId\":\"admin\",\"operatorName\":\"邹刘阳\",\"orgId\":\"H44011701749\"},\"orgId\":\"H44011701749\",\"transType\":\"ec.query\"}}");

src/xt_pages/outpatientCharges/summary.vue

@@ -3355,7 +3355,8 @@ export default {
       let params = {
         start_time: this.start_time,
         end_time: this.end_time,
-        p_type: 2
+        p_type: 2,
+        sort_type:this.sort_type
       }
       getExportConsumeDetailList(params).then((response) => {
         if (response.data.state == 0) {