长沙南雅打印单问题修改

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -328,7 +328,7 @@
                         <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
-                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                        <!-- <td width="60" style="height:20px;line-height:20px">温度<br />°C</td> -->
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
@@ -352,7 +352,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
 
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
-                        <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
+                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td> -->
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
@@ -716,6 +716,7 @@ export default {
       .then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
+          this.loading = false
           this.org_template_info = resp.data.templateInfo
 
           this.records = this.records.concat(resp.data.schedules)
@@ -887,7 +888,7 @@ export default {
           this.adminSign = name
           console.log('name是', name)
           console.log('记录', this.records)
-          this.loading = false
+          
         } else {
           this.loading = false
           this.$message.error(resp.msg)

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1873,8 +1873,8 @@ export default {
 
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
-              console.log("wode数据",(-100).toString())
-              console.log("数据哦哦😯噢232o",this.SchedualPatientsTableData)
+              // console.log("wode数据",(-100).toString())
+              // console.log("数据哦哦😯噢232o",this.SchedualPatientsTableData)
 
             }
           }

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2327,6 +2327,9 @@
               this.dialysisPrescription.bicarbonate = 31.1
               this.dialysisPrescription.dialysate_flow = 500
             }
+            if(this.$store.getters.xt_user.org.id == 10447){
+              this.dialysisPrescription.dialysate_flow = 500
+            }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
           
@@ -3546,6 +3549,7 @@
           this.dialysisPrescription.displace_liqui_value = ""
           this.dialysisPrescription.displace_liqui_part = ""
         }
+        
         const ParamsQuery = {}
         ParamsQuery['patient_id'] = this.$route.query.patient_id
         ParamsQuery['mode_id'] = id
@@ -3680,6 +3684,12 @@
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
+
+          //针对新化博翔
+          if(this.$store.getters.xt_user.template_info.org_id ==10447){
+             this.dialysisPrescription.displace_liqui_part = 1
+             this.dialysisPrescription.displace_liqui_value = 35
+          }
         }
 
       },

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -892,7 +892,7 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 ">{{
                           lastafterdialysis.weight_after
                         }}</span>
                         <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
@@ -910,7 +910,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
+                      <span v-if="org_id !=10447 && org_id != 9675">{{
                           predialysis.weight_before
                             ? parseFloat(
                                 predialysis.weight_before -
@@ -918,6 +918,17 @@
                               ).toFixed(1)
                             : "/"
                         }}
+                      </span>
+                       <span v-if="org_id==10447 || org_id == 9675">
+                        {{
+                          predialysis.weight_before
+                            ? parseFloat(
+                                predialysis.weight_before -
+                                  predialysis.additional_weight
+                              ).toFixed(1)
+                            : "未称重"
+                        }}
+                       </span>
                       </div>
                       kg
                     </div>
@@ -2160,6 +2171,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
+                      <span v-if="org_id!=9675&&org_id!=10447">
                         {{
                           afterdialysis.weight_after
                             ? parseFloat(
@@ -2168,6 +2180,18 @@
                               ).toFixed(1)
                             : "/"
                         }}
+                      </span>
+                      <span v-if="org_id ==9675 || org_id==10447">
+                        {{
+                          afterdialysis.weight_after
+                            ? parseFloat(
+                                afterdialysis.weight_after -
+                                  afterdialysis.additional_weight
+                              ).toFixed(1)
+                            : "未称重"
+                        }}
+                      </span>
+                       
                       </div>
                       kg
                     </div>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -508,6 +508,7 @@
       additions: Array,
       patientInfo: Object,
       hisPatientInfo: Object,
+      goodOutOpen:Object,
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
@@ -2547,7 +2548,7 @@
                           }
                         }
                       }
-                      console.log("new233223322323",newArr)
+                     // console.log("new233223322323",newArr)
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
                           if(newArr[i].is_user!=1){
@@ -2565,8 +2566,9 @@
                     }
                   }
                 }
-
-               if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
+               
+              //  console.log("good_isopen--------------------",this.goodOutOpen)
+               if(this.goodOutOpen.is_open == 1){
                   var project_arr = []
                   //耗材
                   for(let i=0;i<this.prescriptions.length;i++){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -165,7 +165,7 @@
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            v-on:getSunziValue = "getSunziValue"
-                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                           :hisPatientInfo="hisPatientInfo" :goodOutOpen="goodOutOpen" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
@@ -607,6 +607,7 @@ export default {
       printList:[],
       printDate:'',
       anticoagulants_confit:null,
+      goodOutOpen:{}
     }
   },
 
@@ -1433,6 +1434,10 @@ export default {
           this.sick = response.data.data.sick
           this.diagnoses = response.data.data.diagnose
           this.additions = response.data.data.additions
+          
+          var goodOutOpen = response.data.data.goodOutOpen
+          console.log("goodOutOpen----------------------",goodOutOpen)
+          this.goodOutOpen = goodOutOpen
 
         }
       })

src/xt_pages/stock/detail/stockInDetail.vue

@@ -460,10 +460,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     startTimeChange(val) {
 
@@ -474,6 +476,7 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getPrintStockGood()
 
       }
     },
@@ -485,6 +488,7 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -791,8 +791,8 @@ export default {
       },
 
     exportList(){
-      console.log("shij232333",this.tableOut)
-     
+      
+       console.log("到处数据------------------------",this.tableOut)
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -820,6 +820,8 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10188){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10402){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
@@ -828,11 +830,13 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+        //手动自动出库
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 10402){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919){
+        //自动出库
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919  && this.orgId!=10402){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/stock/stockFlow.vue

@@ -132,11 +132,7 @@
            </template>
         </el-table-column>
 
-        <el-table-column prop="drug_name" label="剩余库存" align="center">
-           <template slot-scope="scope">
-             <span > {{scope.row.over_count}}</span>
-           </template>
-        </el-table-column>
+     
        </el-table>
        
       <el-pagination

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))