Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -724,6 +724,83 @@
                           >
                             血浆胆红素吸附+HP
                           </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 150px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 31"
+                          >
+                           HPD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 32"
+                          >
+                          HDP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 33"
+                          >
+                          HFD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 34"
+                          >
+                          HDF100
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 35"
+                          >
+                          HDF600
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 36"
+                          >
+                          HDF800
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 37"
+                          >
+                          HDF1000
+                          </div>
                         </div>
                       </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -725,7 +725,7 @@
                       <div
                         class="under_line"
                         style="
-                          bwidth: 150px;
+                          width: 150px;
                           text-align: center;
                           font-weight: 600;
                         "
@@ -736,7 +736,7 @@
                       <div
                         class="under_line"
                         style="
-                          bwidth: 150px;
+                          width: 150px;
                           text-align: center;
                           font-weight: 600;
                         "
@@ -746,8 +746,7 @@
                       </div>
                       <div
                         class="under_line"
-                        style="
-                          bwidth: 150px;
+                        style="width: 100px;
                           text-align: center;
                           font-weight: 600;
                         "
@@ -769,7 +768,7 @@
                       <div
                         class="under_line"
                         style="
-                          width: 150px;
+                          width: 100px;
                           text-align: center;
                           font-weight: 600;
                         "
@@ -777,6 +776,83 @@
                       >
                         血浆胆红素吸附+HP
                       </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 31"
+                      >
+                       HDP
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 32"
+                      >
+                      HDP
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 33"
+                      >
+                      HFD
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 34"
+                      >
+                      HDF100
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 35"
+                      >
+                      HDF600
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 36"
+                      >
+                      HDF800
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          font-weight: 600;
+                        "
+                        v-if="prescription.mode_id == 37"
+                      >
+                      HDF1000
+                      </div>
                     </div>
 
                     <div

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -1508,26 +1508,31 @@ export default {
       console.log("盘亏",total_four)
       console.log("退库",total_five)
       var total = total_one + total_two -total_three-total_four + total_five
-      if (total < min_number) {
+      if (total <=0) {
+        return 0
+      }else{
+        if (total < min_number) {
           min_str = total + min_unit;
         }
-        if (total == 0) {
-          min_str = "";
-          max_str = "";
-        }
-        if (total >= min_number) {
-          if (parseInt(total / min_number) != 0) {
-            max_str = parseInt(total / min_number) + max_unit;
-          }
-          if (total % min_number != 0) {
-            min_str = (total % min_number) + min_unit;
+          if (total == 0) {
+            min_str = "";
+            max_str = "";
           }
+          if (total >= min_number) {
+            if (parseInt(total / min_number) != 0) {
+              max_str = parseInt(total / min_number) + max_unit;
+            }
+            if (total % min_number != 0) {
+              min_str = (total % min_number) + min_unit;
+            }
+        }
+        if(max_str == "" && min_str == ""){
+          return "0"
+        }else{
+          return max_str + min_str;
+        }
       }
-      if(max_str == "" && min_str == ""){
-        return "0"
-      }else{
-        return max_str + min_str;
-      }
+     
     },
     GetInitStartFlowOne(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
       var total_one =0
@@ -1573,8 +1578,12 @@ export default {
       console.log("盘亏",total_four)
       console.log("退库",total_five)
       var total = total_one + total_two -total_three-total_four + total_five
-      
-      return total
+      if(total>0){
+        return total
+      }else{
+        return 0
+      }
+     
     }
   }
 }

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

@@ -1341,26 +1341,32 @@ export default {
       }  
     
       var total = total_one + total_two -total_three-total_four + total_five
-      if (total < min_number) {
+
+      if (total >0) {
+        if (total < min_number) {
           min_str = total + min_unit;
         }
-        if (total == 0) {
-          min_str = "";
-          max_str = "";
-        }
-        if (total >= min_number) {
-          if (parseInt(total / min_number) != 0) {
-            max_str = parseInt(total / min_number) + max_unit;
-          }
-          if (total % min_number != 0) {
-            min_str = (total % min_number) + min_unit;
+          if (total == 0) {
+            min_str = "";
+            max_str = "";
           }
-      }
-      if(max_str == "" && min_str == ""){
-        return "0"
+          if (total >= min_number) {
+            if (parseInt(total / min_number) != 0) {
+              max_str = parseInt(total / min_number) + max_unit;
+            }
+            if (total % min_number != 0) {
+              min_str = (total % min_number) + min_unit;
+            }
+        }
+        if(max_str == "" && min_str == ""){
+          return "0"
+        }else{
+          return max_str + min_str;
+        }
       }else{
-        return max_str + min_str;
+        return 0
       }
+    
     },
     GetInitStartFlowOne(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
       var total_one =0
@@ -1402,8 +1408,12 @@ export default {
       }  
      
       var total = total_one + total_two -total_three-total_four + total_five
-      
-      return total
+       if (total > 0) {
+         return total
+       }else{
+         return 0
+       }
+     
     }
    },
     created(){

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -269,6 +269,9 @@ export default {
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
                 list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                if(list[i].stockIn <0){
+                  list[i].stockIn =0
+                }
               }
               //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                list[i].stock_in_price = "/"

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -173,6 +173,9 @@ export default {
                        list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                     }else{
                        list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
+                       if(list[i].stockIn <0){
+                         list[i].stockIn =0
+                       }
                     }
                     list[i].stock_in_price = "/"
                     list[i].stockMoney = "/"

src/xt_pages/workforce/appointment.vue

@@ -158,7 +158,7 @@
               <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
               <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
               <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-                导出排班333
+                导出排班
               </el-button>
               <el-button
                   @click="generateLog()"
@@ -1198,7 +1198,8 @@ export default {
             data.push(Object.values(item))
 
           })
-
+          console.log("tablesit",this.tableList)
+          return
           const filename = '排班模版'
 
           if (this.$store.getters.xt_user.org.id == 10234) {