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

src/api/advice.js

@@ -358,9 +358,9 @@ export function EditNewDoctorAdvice(patient, id, advice, mode) {
       mode,
     method: 'Put',
     data: advice,
-    headers: {
-      Permission: 2
-    }
+    // headers: {
+    //   Permission: 2
+    // }
   })
 }
 

src/xt_pages/dialysis/PatientBox.vue

@@ -865,6 +865,8 @@ export default {
         return "modeRed";
       } else if (id == 3) {
         return "modePurple";
+      }else if(id == 9){
+        return "modePurple";
       }
     },
     

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfour.vue

@@ -26,7 +26,7 @@
               <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
                 <tbody>
                   <tr>
-                    <td width="80" style="line-height:30px;">治疗日期: 
+                    <td width="80" style="line-height:30px;">治疗日期:
                       {{ getTime(record.schedule_date, "{y}年{m}月{d}日") }}
                     </td>
                   </tr>
@@ -50,7 +50,7 @@
                             record.dialysis_order.device_number.number.length >
                               0
                               ? record.dialysis_order.device_number.number
-                              : record.device_number.number 
+                              : record.device_number.number
                           }}
                         </div>
                       </div>
@@ -97,7 +97,7 @@
                           {{ anticoagulantName(record.prescription) }} &nbsp;&nbsp;
                           {{record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "0"}}
                         </span>U&nbsp;&nbsp;
-                        
+
                         <label-box :isChecked="record.prescription.anticoagulant==2 ? true :false" showValue="普通肝素:"></label-box>&nbsp;&nbsp;
                         <div style="display: inline-block;">
                           首剂：
@@ -125,7 +125,9 @@
                       <div style="line-height:30px;">
                         <span v-if="org_id != 9779">处方脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} ml &nbsp;&nbsp;</span>
                         <span v-if="org_id == 9779">目标脱水量:{{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
-                        <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
+                        <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>
+                        <span v-if="org_id!=9779">ml/h</span>
+                        <span v-if="org_id==9779">ml/min</span>
                       </div>
                     </td>
                     <td >
@@ -149,7 +151,7 @@
                   </td>
                   <td style="width: 30%;line-height: 30px;">
                     透析(滤)器:
-                    
+
                     {{ record.prescription.dialysis_dialyszers ? record.prescription.dialysis_dialyszers : "" }}
 
                     {{ record.prescription.dialysis_strainer ? record.prescription.dialysis_strainer : "" }}
@@ -287,7 +289,7 @@
                           record.lastafterweight.weight_after
                           ).toFixed(1)
                           : '未称重'
-                          }}kg 
+                          }}kg
                       </td>
                     </tr>
 
@@ -575,7 +577,7 @@
               }
 
               var delghTwo = 0
-              
+
               if (
                 this.records[recordIndex].advices &&
                 this.records[recordIndex].advices.length < 13
@@ -584,7 +586,7 @@
               } else {
                 delghTwo = 0
               }
-              
+
               if (delghTwo > 0) {
                 if (
                   typeof this.records[recordIndex].advices === 'undefined' ||
@@ -812,7 +814,7 @@
           return ''
         }
         if (key[id] in this.operatorMaps) {
-          
+
           return this.operatorMaps[key[id]].es_url
         } else {
           return ''

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1153,6 +1153,7 @@
                           <span v-if="record.prescription.anticoagulant == 15"
                             >&nbsp;甲磺酸萘莫司他</span
                           >
+                            <span v-if="record.prescription.anticoagulant == 16">&nbsp;低分子量肝素钙</span>
                         </div>
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1" >
@@ -3453,7 +3454,7 @@ export default {
       });
   },
   methods: {
-  
+
     getTimeOne(val) {
       return uParseTime(val, "{y}");
     },

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -192,7 +192,7 @@ import org from '../../../../router/modules/org'
         name ="IUF"
       }
       if(val == 8){
-        name ="IUF"
+        name ="HFHD"
       }
       if(val == 9){
         name ="HFHD+HP"

src/xt_pages/dialysis/details/consumable/signPrint.vue

@@ -492,6 +492,43 @@
         if(name == 7){
          name = "低分子肝素钠"
        }
+       if(name == 8){
+         name = "依诺肝素"
+       }
+       if(name == 9){
+         name = "达肝素"
+       }
+       if(name == 10){
+         name = "体外抗凝"
+       }
+       if(name == 11){
+         name = "那屈肝素"
+       }
+       if(name == 12){
+         name = "无抗凝剂"
+       }
+       if(name == 13){
+         name = "那屈肝素钙"
+       }
+       if(name == 14){
+         name = "肝素钙注射液"
+       }
+       if(name == 15){
+         name = "甲磺酸萘莫司他"
+       }
+       if(name == 16){
+         name = "低分子量肝素钙"
+       }
+       if(name == 17){
+         name = "肝素钠"
+       }
+       if(name == 18){
+         name = "贝米肝素钠注射液"
+       }
+       if(name == 19){
+         name = "低分子量肝素钠"
+       }
+
 
        return name
      },

src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue

@@ -64,7 +64,7 @@
 
             <tr>
               <td colspan="3">
-            
+
                 <div class="row" style="padding: 2px 0; line-height: 23px;display: inline-block;" >
                   <div class="inline_block" style="flex: 0.8;">
                     T：
@@ -193,7 +193,10 @@
                   <span v-if="org_id == 9779">目标脱水量:{{ prescription.target_ultrafiltration ?
                     prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
                   <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }}
-                  </span>ml/h&nbsp;&nbsp;
+                  </span>
+                  <span v-if="org_id!=9779">ml/h</span>
+                  <span v-if="org_id==9779">ml/min</span>
+                  &nbsp;&nbsp;
                   <span>
                     透析(滤)器:
                     {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }} &nbsp;
@@ -247,7 +250,7 @@
                   <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') != -1 ? true : false"
                   showValue="股静脉"></label-box>&nbsp;
                 其他:
-                <div style="display: inline-block;" 
+                <div style="display: inline-block;"
                   v-if="predialysis.blood_access_part_opera_name.indexOf('内瘘') == -1 &&
                   predialysis.blood_access_part_opera_name.indexOf('无绦纶套') == -1 &&
                   predialysis.blood_access_part_opera_name.indexOf('带隧道带绦纶套') == -1 &&
@@ -969,7 +972,7 @@ export default {
         const obj45='备注'
         checkDate.push(obj45)
       }
-      
+
       if (
         this.dialysisOrder == null ||
         this.dialysisOrder.start_nurse == 0

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -1038,6 +1038,8 @@ export default {
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId==10635){
            this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId==10744){
+           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)
         }
@@ -1045,13 +1047,13 @@ export default {
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610){
             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 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721 || this.orgId == 10633 || this.orgId == 0  || this.orgId == 10387 || this.orgId == 10571){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721 || this.orgId == 10633 || this.orgId == 0  || this.orgId == 10387 || this.orgId == 10571 || this.orgId == 10744){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
         }
         if(this.orgId ==10445){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
-        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!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721 && this.orgId!=10633 && this.orgId!=0&& this.orgId!=10387&& this.orgId!=10571){
+        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!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721 && this.orgId!=10633 && this.orgId!=0&& this.orgId!=10387&& this.orgId!=10571&& this.orgId!=10744){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -289,13 +289,13 @@ export default {
                
               }
              
-               if(this.org_id ==10697){
+               if(this.org_id ==10697 || this.org_id == 0){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else if(this.org_id ==9671){
                 list[i].stock_in_price = list[i].buy_price
                 list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id == 10644 || this.org_id == 10752 || this.org_id == 0){
+               }else if(this.org_id == 10644 || this.org_id == 10752){
                  list[i].stock_in_price = "/"
                  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
                  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -1002,13 +1002,18 @@ export default {
                 mode = "3-1";
               }
             }
-            console.log("编辑",submitForm)
+            console.log("编辑43333",submitForm)
+            if(submitForm.push_start_time == "null" || submitForm.push_start_time == {}|| submitForm.push_start_time == undefined){
+                console.log("hahahhahahah")
+                submitForm.push_start_time = ""
+            }
             if(_this.groupForm.advice_type=="临时"){
                  _this.groupForm.advice_type = 2
               }
             if(_this.groupForm.advice_type=="长期"){
                  _this.groupForm.advice_type = 1
             }
+            console.log("-----------------",submitForm)
             EditNewDoctorAdvice(
               this.patientID,
               this.groupSelectRow.id,

src/xt_pages/user/courseOfDisease_new.vue

@@ -1469,6 +1469,8 @@
        });
       },
       add_click(){
+        this.record_date = ""
+        this.record_date = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         this.admin_user_id = ""
         this.admin_user_id = this.$store.getters.xt_user.user.id
         this.fetchAllDoctorAndNurse()

src/xt_pages/user/doctorAdvice.vue

@@ -2385,6 +2385,8 @@ export default {
 
           console.log("2323223",this.adviceForm)
 
+         
+
           EditNewDoctorAdvice(
             this.patientID,
             this.adviceForm.id,
@@ -3150,7 +3152,6 @@ export default {
         adviceNames: [],
         advice_doctor: groups[0].user_name,
         doctor: groups[0].advice_doctor,
-
         remark: groups[0].remark,
         groupno: groupno,
         
@@ -3202,6 +3203,8 @@ export default {
           remark:groups[index].remark
         };
 
+        console.log("push_start_time======",item.push_start_time)
+
         if (item.id in childMap) {
           for (const key in childMap[item.id]) {
             this.rowKey++;

src/xt_pages/user/templateSummary.vue

@@ -1860,6 +1860,10 @@
           this.startYear = val+"-" + "31"
         }else if(val == "2024-02"){
           this.startYear = val+"-" + "29"
+        }else if(val == "2025-02"){
+          this.startYear = val+"-" + "28"
+        }else if(val == "2026-02"){
+          this.startYear = val+"-" + "28"
         }else{
           this.startYear = val+"-" + "30"
         }

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -50,7 +50,7 @@ export default {
 
             }else if(name == 'HDF'){
                 return 'modeRed'
-            }else if(name == 'HD+HP'){
+            }else if(name == 'HD+HP' || name=='HFHD+HP' ){
                 return 'modePurple'
             }else if(name == 'PHF'){
                 return 'modephf'

src/xt_pages/workforce/components/template_table_item.vue

@@ -36,7 +36,7 @@ export default {
 
           }else if(name == 'HDF'){
               return 'modeRed'
-          }else if(name == 'HD+HP'){
+          }else if(name == 'HD+HP' || name=='HFHD+HP' ){
               return 'modePurple'
           }
       }