8月15日

src/api/dialysis.js

@@ -315,3 +315,19 @@ export function getDialysisAdviceTemplateList(params) {
     params: params
   })
 }
+
+export function saveDialysisSetting(params) {
+  return request({
+    url: '/api/patient/savedialysissetting',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDialysisSetting(params) {
+  return request({
+    url: '/api/patient/getdialysissetting',
+    method: 'get',
+    params: params
+  })
+}

src/views/layout/Layout.vue

@@ -28,9 +28,9 @@
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>
         </div>
-        <div v-if="kuyishoppingShow" :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'酷医商城')">
+        <div v-if="kuyishoppingShow" :class="index == 4 ? 'navOne navActive' : 'navOne'" @click="clickActive(4,'圣械通')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
-          <p>酷医商城</p>
+          <p>圣械通</p>
         </div>
 
         <div class="navOne" @click="open">

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

@@ -79,24 +79,36 @@
       </el-table>
 
       <el-dialog
-        title="提示"
+        title="统计类型设置"
         :visible.sync="dialogVisible"
         width="30%">
         <span>
-          <el-checkbox-group v-model="form.predialysis_condition">
-            <el-checkbox
-              v-for="item in predialysisConditionOptions"
-              :label="item.filed_name_cn"
-              :key="item.value"
-              :value="item.filed_name_cn"
-              disabled
-              >{{ item.filed_name_cn }}</el-checkbox
-            >
-          </el-checkbox-group>
+           <el-checkbox v-model="device_number" label="透析机号"></el-checkbox>
+           <el-checkbox v-model="device_type" label="设备型号"></el-checkbox>
+           <el-checkbox v-model="name" label="姓名"></el-checkbox>
+           <el-checkbox v-model="admission_number" label="住院(门诊)号"></el-checkbox>
+           <el-checkbox v-model="dialysis_no" label="透析号"></el-checkbox>
+           <el-checkbox v-model="weight_befor" label="透前体重"></el-checkbox>
+           <el-checkbox v-model="dry_weight" label="干体重"></el-checkbox>
+           <el-checkbox v-model="blood_pressure" label="透前血压"></el-checkbox>
+           <el-checkbox v-model="ultrafiltration_volume" label="目标脱水量"></el-checkbox>
+           <el-checkbox v-model="internal_fistula" label="血管通路"></el-checkbox>
+           <el-checkbox v-model="blood_flow_volume" label="血流量"></el-checkbox>
+           <el-checkbox v-model="anticoagulant" label="抗凝剂(首剂)(维持)(总量)"></el-checkbox>
+           <el-checkbox v-model="sealing_fluid_dispose" label="封管液"></el-checkbox>
+           <el-checkbox v-model="mode_id" label="透析模式"></el-checkbox>
+           <el-checkbox v-model="dialysis_time" label="透析时长"></el-checkbox>
+           <el-checkbox v-model="dialysis_dialyszers" label="透析器"></el-checkbox>
+           <el-checkbox v-model="dialysis_irrigation" label="灌流器"></el-checkbox>
+           <el-checkbox v-model="gaijiliang" label="钙"></el-checkbox>
+           <el-checkbox v-model="kalium" label="钾"></el-checkbox>
+           <el-checkbox v-model="displace_liqui_value" label="置换总量"></el-checkbox>
+           <el-checkbox v-model="bicarbonate" label="碳酸氢根"></el-checkbox>
+           <el-checkbox v-model="glucose" label="葡萄糖"></el-checkbox>
         </span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button type="primary" @click="saveDialysisSetting">确 定</el-button>
        </span>
       </el-dialog>
 
@@ -119,10 +131,9 @@
 
 
 <script>
-  import { GetAllZone } from '@/api/dialysis'
-
+  import { GetAllZone,saveDialysisSetting,getDialysisSetting } from '@/api/dialysis'
   import { uParseTime } from "@/utils/tools";
-
+  import store from "@/store";
   export default {
     components: {
       
@@ -173,6 +184,30 @@
         total:0,
         dialogVisible:false,
         predialysisConditionOptions:[],
+        predialysis_condition:false,
+
+        device_number:false,
+        device_type:false,
+        name:false,
+        admission_number:false,
+        dialysis_no:false,
+        weight_befor:false,
+        dry_weight:false,
+        blood_pressure:false,
+        ultrafiltration_volume:false,
+        internal_fistula:false,
+        blood_flow_volume:false,
+        anticoagulant:false,
+        sealing_fluid_dispose:false,
+        mode_id:false,
+        dialysis_time:false,
+        dialysis_dialyszers:false,
+        dialysis_irrigation:false,
+        gaijiliang:false,
+        kalium:false,
+        displace_liqui_value:false,
+        bicarbonate:false,
+        glucose:false
       }
     },
     created() {
@@ -211,6 +246,9 @@
      
     },
     methods: {
+      open(){
+
+      },
       getlist(){
 
       },
@@ -337,7 +375,317 @@
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     toDialog(){
+      console.log("触发222222222222222我v")
+      getDialysisSetting().then(response=>{
+        if(response.data.state == 1){
+           this.dialogVisible = true
+          var dialysisSett = response.data.data.dialysisSett
+          if(dialysisSett!=undefined){
+           if(dialysisSett.device_number == 1){
+                this.device_number = true
+            }else{
+              this.device_number = false
+            }
+            if(dialysisSett.device_type == 1){
+                this.device_type = true
+            }else{
+              this.device_type = false
+            }
+            if(dialysisSett.name == 1){
+              this.name = true
+            }else{
+              this.name = false
+            }
+            if(dialysisSett.admission_number == 1){
+              this.admission_number = true
+            }else{
+              this.admission_number = false
+            }
+            if(dialysisSett.dialysis_no == 1){
+              this.dialysis_no = true
+            }else{
+              this.dialysis_no = false
+            }
+            if(dialysisSett.weight_befor == 1){
+              this.weight_befor = true
+            }else{
+              this.weight_befor = false
+            }
+            if(dialysisSett.dry_weight == 1){
+              this.dry_weight = true
+            }else{
+              this.dry_weight = false
+            }
+            if(dialysisSett.blood_pressure == 1){
+              this.blood_pressure = true
+            }else{
+              this.blood_pressure = false
+            }
+            if(dialysisSett.ultrafiltration_volume == 1){
+                this.ultrafiltration_volume = true
+            }else{
+              this.ultrafiltration_volume = false
+            }
+            if(dialysisSett.internal_fistula == 1){
+              this.internal_fistula = true
+            }else{
+              this.internal_fistula = false
+            }
+            if(dialysisSett.blood_flow_volume == 1){
+              this.blood_flow_volume = true
+            }else{
+              this.blood_flow_volume = false
+            }
+            if(dialysisSett.anticoagulant == 1){
+              this.anticoagulant = true
+            }else{
+              this.anticoagulant = false
+            }
+            if(dialysisSett.sealing_fluid_dispose == 1){
+              this.sealing_fluid_dispose = true
+            }else{
+              this.sealing_fluid_dispose = false
+            }
+            if(dialysisSett.mode_id == 1){
+              this.mode_id = true
+            }else{
+              this.mode_id = false
+            }
+            if(dialysisSett.dialysis_time == 1){
+                this.dialysis_time = true
+            }else{
+              this.dialysis_time = false
+            }
+            if(dialysisSett.dialysis_dialyszers == 1){
+              this.dialysis_dialyszers = true
+            }else{
+              this.dialysis_dialyszers = false
+            }
+
+            if(dialysisSett.dialysis_irrigation == 1){
+              this.dialysis_irrigation = true
+            }else{
+              this.dialysis_irrigation = false
+            }
 
+            if(dialysisSett.gaijiliang ==1){
+              this.gaijiliang =true
+            }else{
+              this.gaijiliang = false
+            }
+            if(dialysisSett.kalium == 1){
+              this.kalium =true
+            }else{
+              this.kalium = false
+            }
+            if(dialysisSett.displace_liqui_value == 1){
+              this.displace_liqui_value = true
+            }else{
+              this.displace_liqui_value = false
+            }
+            if(dialysisSett.bicarbonate == 1){
+              this.bicarbonate =true
+            }else{
+              this.bicarbonate = false
+            }
+            if(dialysisSett.glucose == 1){
+            this.glucose =true
+            }else{
+              this.glucose = false
+            }
+          }
+     
+        }
+      })
+      
+     },
+     saveDialysisSetting(){
+       var device_number_set = 0 
+       var device_type_set = 0
+       var name_set = 0
+       var admission_number_set = 0
+       var dialysis_no_set = 0
+       var weight_befor_set = 0
+       var dry_weight_set = 0
+       var blood_pressure_set = 0
+       var ultrafiltration_volume_set= 0
+       var internal_fistula_set = 0
+       var blood_flow_volume_set = 0
+       var anticoagulant_set = 0
+       var sealing_fluid_dispose_set = 0
+       var mode_id_set =0
+       var dialysis_time_set =0
+       var dialysis_dialyszers_set =0
+       var dialysis_irrigation_set =0
+       var gaijiliang_set = 0
+       var kalium_set = 0
+       var displace_liqui_value_set =0
+       var bicarbonate_set =0
+       var glucose_set = 0
+       if(this.device_number == false){
+          device_number_set = 2
+        }
+       if(this.device_number == true){
+          device_number_set = 1
+        }
+        if(this.device_type == false){
+          device_type_set = 2
+        }
+        if(this.device_type == true){
+          device_type_set = 1
+        }
+        if(this.name == false){
+          name_set = 2
+        }
+        if(this.name == true){
+          name_set = 1
+        }
+        if(this.admission_number == false){
+          admission_number_set = 2
+        }
+        if(this.admission_number== true){
+          admission_number_set = 1
+        }
+        if(this.dialysis_no == false){
+           dialysis_no_set = 2
+        }
+        if(this.dialysis_no == true){
+           dialysis_no_set = 1
+        }
+        if(this.weight_befor == false){
+           weight_befor_set = 2
+        } 
+        if(this.weight_befor == true){
+           weight_befor_set = 1
+        }
+        if(this.dry_weight == false){
+           dry_weight_set = 2
+        }
+        if(this.dry_weight == true){
+           dry_weight_set = 1
+        }   
+        if(this.blood_pressure == false){
+          blood_pressure_set = 2
+        }
+        if(this.blood_pressure == true){
+           blood_pressure_set = 1
+        }
+        if(this.ultrafiltration_volume == false){
+           ultrafiltration_volume_set = 2
+        }
+        if(this.ultrafiltration_volume == true){
+           ultrafiltration_volume_set = 1
+        }
+        if(this.internal_fistula == false){
+            internal_fistula_set = 2
+        }
+        if(this.internal_fistula == true){
+          internal_fistula_set= 1
+        }
+        if(this.blood_flow_volume == false){
+           blood_flow_volume_set = 2
+        }
+        if(this.blood_flow_volume == true){
+         blood_flow_volume_set = 1
+        }
+        if(this.anticoagulant == false){
+           anticoagulant_set = 2
+        }
+        if(this.anticoagulant == true){
+          anticoagulant_set = 1
+        }
+        if(this.sealing_fluid_dispose == false){
+          sealing_fluid_dispose_set = 2
+        }
+        if(this.sealing_fluid_dispose == true){
+          sealing_fluid_dispose_set = 1
+        }
+        if(this.mode_id == false){
+          mode_id_set = 2
+        }
+        if(this.mode_id == true){
+          mode_id_set = 1
+        }
+        if(this.dialysis_time == false){
+          dialysis_time_set = 2
+        }
+         if(this.dialysis_time == true){
+          dialysis_time_set = 1
+        }
+        if(this.dialysis_dialyszers == false){
+          dialysis_dialyszers_set = 2
+        }
+        if(this.dialysis_dialyszers == true){
+           dialysis_dialyszers_set = 1
+        }
+        if(this.dialysis_irrigation == false){
+           dialysis_irrigation_set = 2
+        }
+        if(this.dialysis_irrigation == true){
+           dialysis_irrigation_set = 1
+        }
+        if(this.gaijiliang == false){
+          this.gaijiliang = 2
+        }
+        if(this.gaijiliang == true){
+          this.gaijiliang = 1
+        }
+        if(this.kalium == false){
+          kalium = 2
+        }
+        if(this.kalium == true){
+          kalium = 1
+        }
+        if(this.displace_liqui_value == false){
+          displace_liqui_value_set = 2
+        }
+        if(this.displace_liqui_value == true){
+          displace_liqui_value_set = 1
+        }
+        if(this.bicarbonate == false){
+          bicarbonate_set = 2
+        }
+        if(this.bicarbonate == true){
+          bicarbonate_set = 1
+        }
+        if(this.glucose == false){
+           glucose_set = 2
+        }
+        if(this.glucose == true){
+           glucose_set = 1
+        }
+        var params = {
+          device_number_set:device_number_set,
+          device_type_set:device_type_set,
+          name_set:name_set,
+          admission_number_set:admission_number_set,
+          dialysis_no_set:dialysis_no_set,
+          weight_befor_set:weight_befor_set,
+          dry_weight_set:dry_weight_set,
+          blood_pressure_set:blood_pressure_set,
+          ultrafiltration_volume_set:ultrafiltration_volume_set,
+          internal_fistula_set:internal_fistula_set,
+          blood_flow_volume_set:blood_flow_volume_set,
+          anticoagulant_set:anticoagulant_set,
+          sealing_fluid_dispose_set:sealing_fluid_dispose_set,
+          mode_id_set:mode_id_set,
+          dialysis_time_set:dialysis_time_set,
+          dialysis_dialyszers_set:dialysis_dialyszers_set,
+          dialysis_irrigation_set:dialysis_irrigation_set,
+          gaijiliang_set:gaijiliang_set,
+          kalium_set:kalium_set,
+          displace_liqui_value_set:displace_liqui_value_set,
+          bicarbonate_set:bicarbonate_set,
+          glucose_set:glucose_set,
+        }
+       saveDialysisSetting(params).then(response=>{
+         if(response.data.state == 1){
+           var dialysisSetting = response.data.data.dialysisSetting
+           this.dialogVisible = false
+         }
+       })
+     }
     }
   }
 </script>

src/xt_pages/stock/cancelStockOrder.vue

@@ -82,7 +82,7 @@
         >
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small" type="primary" @click="toExport">导出</el-button>
+        <el-button size="small" type="primary" @click="toExport" :disabled="exportLoding">导出</el-button>
 
         <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">审核状态</span> :</label>
@@ -368,7 +368,8 @@ export default {
        {id:0,name:"全部"},
        {id:1,name:"已审核"},
        {id:2,name:"未审核"},
-      ]
+      ],
+      exportLoding:false,
     };
   },
   methods: {
@@ -673,6 +674,7 @@ export default {
       }
     },
     getCancelExportList(){
+      this.exportLoding = true
        const Params = {
         start_time: this.start_time,
         end_time: this.end_time,
@@ -683,6 +685,7 @@ export default {
         if(response.data.state == 1){
           var list =  response.data.data.list
           this.exportList = list
+          this.exportLoding = false
         }
      })
     },

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -337,7 +337,11 @@ export default {
         } else {
 
           this.total = response.data.data.total;
+          this.wareOutList = []
+          this.wareOutList =  response.data.data.list
+          console.log("党的20大长长",this.wareOutList)
           var total = 0
+
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
 
@@ -393,6 +397,7 @@ export default {
            this.houseList.push(response.data.data.houseList[i])
           }
           this.wareOutList =  response.data.data.list
+          console.log("党的20大长长",this.wareOutList)
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
@@ -785,7 +790,9 @@ export default {
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10210){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
-        }else if(this.orgId == 9671){
+        }else if(this.orgId == 9675){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 9679){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 9956){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
@@ -803,11 +810,11 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9671 || this.orgId == 10210 || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+        if(this.orgId == 10210 || this.orgId == 9675 || this.orgId == 9679 || this.orgId == 10210 || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
           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!=10210&&this.orgId!=9671 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId == 9679 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -90,9 +90,7 @@
           >删除</el-button
         >
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small" type="primary" @click="toExport"
-          >导出</el-button
-        >
+        <el-button size="small" type="primary" @click="toExport" :disabled="exportLoding">导出</el-button>
         <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">审核状态</span> :</label>
         <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
@@ -388,7 +386,8 @@ export default {
        {id:0,name:"全部"},
        {id:1,name:"已审核"},
        {id:2,name:"未审核"},
-      ]
+      ],
+      exportLoding:false,
     };
   },
   methods: {
@@ -712,14 +711,15 @@ export default {
       });
     },
     getDrugCancelExportList() {
+      this.exportLoding = true
       const params = {
         order_id: this.order_id,
       };
       getDrugCancelExportList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
-          //  console.log("导出数据222",list)
           this.exportList = list;
+          this.exportLoding = false
         }
       });
     },

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

@@ -507,10 +507,10 @@ export default {
       totalfive += arr5[i].count
      } 
   }
-  console.log("totalONE223323232323232",totalOne)
-  console.log("totalTwo2oo2o32o3o32o23",totalTwo)
-  console.log("totalfive",totalfive)
-  console.log("00-------------------------")
+  // console.log("totalONE223323232323232",totalOne)
+  // console.log("totalTwo2oo2o32o3o32o23",totalTwo)
+  // console.log("totalfive",totalfive)
+  // console.log("00-------------------------")
   total = totalOne - totalTwo + totalthree - totalfour + totalfive
   if (total < min_number) {
      min_str = total + min_unit;
@@ -527,7 +527,14 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  console.log("max_str",max_str)
+  console.log("min_str",min_str)
+  if(max_str == "" && min_str == ""){
+    return "0"
+  }else{
+   return max_str + min_str 
+  }
+ 
 
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
@@ -585,7 +592,11 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+   if(max_str == "" && min_str == ""){
+     return "0"
+   }else{
+     return max_str + min_str;  
+   }
 
   },
   getDrugWarehouseInfoStart(arr,min_number,min_unit,max_unit,outArr){
@@ -779,7 +790,7 @@ export default {
    if(total_price >0){
     return total_price
    }else{
-    return 0
+    return "0.00"
    }
   
   },
@@ -825,7 +836,7 @@ export default {
    if(total_price > 0){
      return total_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   },
   getSaleMoney(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
@@ -871,7 +882,7 @@ export default {
    if(total_price >0){
      return total_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   
   },
@@ -911,17 +922,17 @@ export default {
       total_five+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
      }
    }
-   console.log("total_one",totalOne)
-   console.log("totalTwo",totalTwo)
-   console.log("total_three",total_three)
-   console.log("total_four",total_four)
+  //  console.log("total_one",totalOne)
+  //  console.log("totalTwo",totalTwo)
+  //  console.log("total_three",total_three)
+  //  console.log("total_four",total_four)
   
-   console.log("total_pricewode",(totalOne - totalTwo+total_three - total_four).toFixed(2))
+  //  console.log("total_pricewode",(totalOne - totalTwo+total_three - total_four).toFixed(2))
    total_price =(totalOne - totalTwo+total_three - total_four + total_five).toFixed(2)
    if(total_price > 0){
       return total_price
    }else{
-     return 0
+     return "0.00"
    }
   
   },
@@ -1015,7 +1026,12 @@ export default {
         min_str = (total % min_number) + min_unit;
       }
     }
-    return max_str + min_str;  
+    if(max_str == "" && min_str == ""){
+      return "0"
+    }else{
+      return max_str + min_str  
+    }
+   
    },
    getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
@@ -1098,7 +1114,12 @@ export default {
         min_str = (total % min_number) + min_unit;
       }
    }
-   return max_str + min_str;  
+   if(max_str == "" && min_str == ""){
+     return "0"
+   }else{
+    return max_str + min_str;  
+   }
+ 
    },
    getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
     
@@ -1133,7 +1154,7 @@ export default {
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
-     return 0
+     return "0.00"
     }
     
    },
@@ -1165,7 +1186,7 @@ export default {
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
-     return 0
+     return "0.00"
     }
     
    },

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

@@ -421,7 +421,12 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+   if(max_str == "" && min_str == ""){
+    return "0"
+   }else{
+     return max_str + min_str;  
+   }
+ 
 
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
@@ -479,8 +484,11 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
-
+  if(max_str == ""&&min_str == ""){
+    return "0"
+  }else{
+   return max_str + min_str;  
+  }
   },
   getDrugWarehouseInfoStart(arr,min_number,min_unit,max_unit,outArr){
    var total = 0
@@ -674,7 +682,7 @@ export default {
    if(total_price >0){
     return total_price
    }else{
-    return 0
+    return "0.00"
    }
   
   },
@@ -720,7 +728,7 @@ export default {
    if(total_price > 0){
      return total_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   },
   getSaleMoney(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
@@ -766,7 +774,7 @@ export default {
    if(total_price >0){
      return total_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   
   },
@@ -811,7 +819,7 @@ export default {
    if(total_price > 0){
       return total_price
    }else{
-     return 0
+     return "0.00"
    }
   
   },
@@ -898,7 +906,12 @@ export default {
         min_str = (total % min_number) + min_unit;
       }
     }
-    return max_str + min_str;  
+    if(max_str == ""&& min_str == ""){
+      return "0"
+    }else{
+      return max_str + min_str;  
+    }
+   
    },
     getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
@@ -981,7 +994,12 @@ export default {
         min_str = (total % min_number) + min_unit;
       }
    }
-   return max_str + min_str;  
+   if(max_str == "" && min_str == ""){
+     return "0"
+   }else{
+     return max_str + min_str; 
+   }
+   
    },
      getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
     
@@ -1016,7 +1034,7 @@ export default {
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
-     return 0
+     return "0.00"
     }
     
    },
@@ -1048,7 +1066,7 @@ export default {
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
-     return 0
+     return "0.00"
     }
     
    },

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -109,10 +109,7 @@
         <el-button size="small" type="primary" @click="drugPrint()"
           >打印</el-button
         >
-        <el-button size="small" type="primary" @click="toExport()"
-          >导出</el-button
-        >
-        <el-button @click="lili">调试</el-button>
+        <el-button size="small" type="primary" @click="toExport()" :disabled="exportLoding">导出</el-button>
         <div>
           <span>&nbsp;&nbsp;</span>
           <label class="title"><span class="name">审核状态</span> :</label>
@@ -532,6 +529,7 @@ export default {
         { id: 1, name: "已审核" },
         { id: 2, name: "未审核" },
       ],
+      exportLoding:false,
     };
   },
 
@@ -980,6 +978,7 @@ export default {
       var params = {
         order_id: this.order_id,
       };
+      this.exportLoding = true
       exportDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
@@ -989,6 +988,7 @@ export default {
             list[i].expiry_date = this.getTime(list[i].expiry_date);
           }
           this.exportList = list;
+          this.exportLoding = false
           var manufacturerList = response.data.data.manufacturerList;
           this.manufacturerList = manufacturerList;
           var dealerList = response.data.data.dealerList;

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -108,9 +108,7 @@
           >删除</el-button
         >
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small" type="primary" @click="toExport"
-          >导出</el-button
-        >
+        <el-button size="small" type="primary" @click="toExport" :disabled="exportLoding">导出</el-button>
 
         <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
@@ -666,6 +664,7 @@ export default {
       tabListOne:[],
       outList:[],
       warehouseOutList:[],
+      exportLoding:false,
     };
   },
   methods: {
@@ -1098,26 +1097,26 @@ export default {
       });
       this.sameRowArr = sameRowArr;
     },
-    getDrugAutoMaticList(id, recordTime, warehouse_out_order_number) {
-      var params = {
-        warehous_out_id: id,
-        record_time: recordTime,
-        warehouse_out_order_number: warehouse_out_order_number,
-      };
-      getDrugAutoMaticList(params).then((response) => {
-        if (response.data.state == 1) {
-          var list = response.data.data.list;
-          this.list = list;
-          var drugConfig = response.data.data.drugConfig;
-
-          this.drugConfig = drugConfig;
-          var drugList = response.data.data.drugList;
-          this.drugList = drugList;
-          var manulist = response.data.data.manufacturerList;
-          this.manufacturerList = manulist;
-        }
-      });
-    },
+    // getDrugAutoMaticList(id, recordTime, warehouse_out_order_number) {
+    //   var params = {
+    //     warehous_out_id: id,
+    //     record_time: recordTime,
+    //     warehouse_out_order_number: warehouse_out_order_number,
+    //   };
+    //   getDrugAutoMaticList(params).then((response) => {
+    //     if (response.data.state == 1) {
+    //       var list = response.data.data.list;
+    //       this.list = list;
+    //       var drugConfig = response.data.data.drugConfig;
+
+    //       this.drugConfig = drugConfig;
+    //       var drugList = response.data.data.drugList;
+    //       this.drugList = drugList;
+    //       var manulist = response.data.data.manufacturerList;
+    //       this.manufacturerList = manulist;
+    //     }
+    //   });
+    // },
     getDrugCount(id) {
       var count = 0;
       for (let i = 0; i < this.list.length; i++) {
@@ -1451,9 +1450,6 @@ export default {
       return total_price;
     },
     getDrugBatchNumber(drugid, count) {
-      // console.log("drug_id2323", drugid);
-      // console.log("count", count);
-      // console.log("hhhhhhhhhhh", this.batchNumberList);
       var arr = [];
       for (let i = 0; i < this.batchNumberList.length; i++) {
         if (
@@ -1470,11 +1466,13 @@ export default {
       var params = {
         order_id: this.order_id,
       };
+      this.exportLoding = true
       getExportOutOrderDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
         
           this.exportList = list;
+          this.exportLoding = false
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
         }
@@ -1513,8 +1511,7 @@ export default {
         );
         for (let j = 0; j < this.manufacturerList.length; j++) {
           if (this.exportList[i].manufacturer == this.manufacturerList[j].id) {
-            this.exportList[i].manufacturer =
-              this.manufacturerList[j].manufacturer_name;
+            this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name;
           }
         }
 

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -245,12 +245,12 @@ export default {
               list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
               
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-              list[i].addStockMoney = (this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)).toFixed(2)
-              list[i].saleStockMoney = (this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)).toFixed(2)
+              list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
+              list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              list[i].stockOutprice = (this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)).toFixed(2)
-              list[i].saleOutMoney = (this.saleOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)).toFixed(2)
+              list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+              list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
               
               list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
               list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
@@ -624,9 +624,9 @@ export default {
     }
   all_price = total_price + total_price_one
    if(all_price >0 ){
-    return total_price
+    return total_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   },
   getSaleStockMony(val,val2){
@@ -645,9 +645,9 @@ export default {
    }
    all_price = total_price + total_price_one
    if(all_price >0 ){
-    return all_price
+    return all_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   },
   getWarehouseOut(val){
@@ -708,7 +708,7 @@ export default {
      if (total_price_all > 0) {
        return total_price_all.toFixed(2)
      }else{
-      return  0
+      return  "0.00"
      }
    },
    getWarehouseInfoStartMoney(arr,arr1,arr2,arr3,arr4){
@@ -751,7 +751,7 @@ export default {
     if (total_price_all > 0) {
        return total_price_all.toFixed(2)
      }else{
-      return  0
+      return  "0.00"
      }
    },
    getWarehosueOutInfo(val,val2,val3){
@@ -803,9 +803,9 @@ export default {
      }
      all_price = total_price + total_price_one - total_price_two
      if(all_price >0){
-       return all_price
+       return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
   saleOutprice(val,val2,val3){
@@ -830,9 +830,9 @@ export default {
      }
      all_price = total_price + total_price_one - total_price_two
      if(all_price >0){
-       return total_price
+       return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
    getEndWarehouseInfo(val,val3,val1,val2,val4){
@@ -916,7 +916,7 @@ export default {
      if(all_price >0){
        return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
    getEndSalePrice(val,val3,val1,val2,val4){
@@ -955,7 +955,7 @@ export default {
      if(all_price >0){
        return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
    toPrint(){

src/xt_pages/stock/query/purchaseStockQueryPrint.vue

@@ -165,12 +165,12 @@ export default {
                   list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
                   
                   list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-                  list[i].addStockMoney = (this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)).toFixed(2)
-                  list[i].saleStockMoney = (this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)).toFixed(2)
+                  list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
+                  list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
 
                   list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-                  list[i].stockOutprice = (this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)).toFixed(2)
-                  list[i].saleOutMoney = (this.saleOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)).toFixed(2)
+                  list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
+                  list[i].saleOutMoney = this.saleOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                   
                   list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
                   list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
@@ -224,7 +224,7 @@ export default {
     if (total_price_all > 0) {
        return total_price_all.toFixed(2)
      }else{
-      return  0
+      return  "0.00"
      }
    },
     getWarehosueOutInfo(val,val2,val3){
@@ -276,9 +276,9 @@ export default {
      }
      all_price = total_price + total_price_one - total_price_two
      if(all_price >0){
-       return all_price
+       return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
      saleOutprice(val,val2,val3){
@@ -303,9 +303,9 @@ export default {
      }
      all_price = total_price + total_price_one - total_price_two
      if(all_price >0){
-       return total_price
+       return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
    getEndWarehouseInfo(val,val3,val1,val2,val4){
@@ -416,7 +416,7 @@ export default {
      if(all_price >0){
        return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
    getEndSalePrice(val,val3,val1,val2,val4){
@@ -551,7 +551,7 @@ export default {
      if (total_price_all > 0) {
        return total_price_all.toFixed(2)
      }else{
-      return  0
+      return  "0.00"
      }
    },
   getWarehouseInfoOne(val,val2){
@@ -595,9 +595,9 @@ export default {
     }
   all_price = total_price + total_price_one
    if(all_price >0 ){
-    return total_price
+    return total_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   },
    getSaleStockMony(val,val2){
@@ -616,9 +616,9 @@ export default {
    }
    all_price = total_price + total_price_one
    if(all_price >0 ){
-    return all_price
+    return all_price.toFixed(2)
    }else{
-    return 0
+    return "0.00"
    }
   },
     getWarehouseOut(val){
@@ -673,17 +673,17 @@ export default {
          total_price_four +=val4[i].count * val4[i].buy_price
        }
      }
-     console.log("total_price",total_price)
-     console.log("total_price_three",total_price_three)
-     console.log("total_price_two",total_price_two)
-     console.log("total_price_one",total_price_one)
-     console.log("total_price_four",total_price_four)
+    //  console.log("total_price",total_price)
+    //  console.log("total_price_three",total_price_three)
+    //  console.log("total_price_two",total_price_two)
+    //  console.log("total_price_one",total_price_one)
+    //  console.log("total_price_four",total_price_four)
      all_price = total_price- total_price_three +total_price_one - total_price_two + total_price_four
      console.log("arrll_price",all_price)
      if(all_price >0){
        return all_price.toFixed(2)
      }else{
-      return 0
+      return "0.00"
      }
    },
    },

src/xt_pages/stock/stockInOrder.vue

@@ -104,7 +104,7 @@
 
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
 
-        <el-button size="small" type="primary" @click="toExport">导出</el-button>
+        <el-button size="small" type="primary" @click="toExport" @disabled="exportLoding">导出</el-button>
 
           <span>&nbsp;&nbsp;</span>
           <label class="title"><span class="name">审核状态</span> :</label>
@@ -854,6 +854,7 @@ export default {
        {id:2,name:"未审核"},
       ],
       check_id: 0,
+      exportLoding:false,
     };
 
 
@@ -1606,6 +1607,7 @@ export default {
       }
     },
     getlist(){
+      this.exportLoding = true
       var params = {
         id:this.order_id,
         start_time:this.start_time,
@@ -1616,7 +1618,7 @@ export default {
       getExportStockList(params).then(response=>{
         if(response.data.state == 1){
            var list = response.data.data.list
-
+          
            for(let i=0;i<this.goodType.length;i++){
              for(let j=0;j<list.length;j++){
                if(this.goodType[i].id == list[j].good_type_id){
@@ -1640,6 +1642,7 @@ export default {
                }
             }
           }
+          this.exportLoding = false
           this.exportList = list
         }
       })

src/xt_pages/stock/stockOutOrder.vue

@@ -106,9 +106,7 @@
           >删除</el-button
         >
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small" type="primary" @click="toExport"
-          >导出</el-button
-        >
+        <el-button size="small" type="primary" @click="toExport" :disabled="exportLoding">导出</el-button>
         <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
@@ -1039,32 +1037,35 @@ export default {
       check_id: 0,
       flowList:[],
       cancelInfoList:[],
+      exportLoding:false,
     };
   },
   methods: {
     changeTypeName() {
       this.getlist();
     },
-    getlist() {
-      var params = {
-        check_id: this.check_id,
-        start_time: this.start_time,
-        end_time: this.end_time,
-        keyword: this.keywords,
-        page: this.page,
-        limit: this.limit,
-      };
-      getAllSecondOrderList(params).then((response) => {
-        if (response.data.state == 1) {
-          var list = response.data.data.list;
-          this.tableList = list;
-          var total = response.data.data.total;
-          this.total = total;
-          this.houseList = response.data.data.houseList;
-          this.doctorList = response.data.data.doctorList;
-        }
-      });
-    },
+    // getlist() {
+     
+    //   var params = {
+    //     check_id: this.check_id,
+    //     start_time: this.start_time,
+    //     end_time: this.end_time,
+    //     keyword: this.keywords,
+    //     page: this.page,
+    //     limit: this.limit,
+    //   };
+    //   getAllSecondOrderList(params).then((response) => {
+    //     if (response.data.state == 1) {
+         
+    //       var list = response.data.data.list;
+    //       this.tableList = list;
+    //       var total = response.data.data.total;
+    //       this.total = total;
+    //       this.houseList = response.data.data.houseList;
+    //       this.doctorList = response.data.data.doctorList;
+    //     }
+    //   });
+    // },
     search: function () {
       const Params = {
         page: this.page,
@@ -1301,7 +1302,6 @@ export default {
       }
     },
     select(selection) {
-     
       var ids = [];
       for (let i = 0; i < selection.length; i++) {
         ids.push(selection[i].id);
@@ -1989,31 +1989,22 @@ export default {
       }
     },
     getlist() {
+      this.exportLoding = true
       var params = {
         id: this.order_id,
         start_time: this.start_time,
         end_time: this.end_time,
       };
-      console.log("params2332323232de",params)
       getOutExportList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
           var outCount = response.data.data.outCount;
-
+          
           for (let i = 0; i < list.length; i++) {
-            list[i].unit =
-              list[i].specification_name + "/" + list[i].packing_unit;
-            list[i].total_price = (list[i].total_count * list[i].price).toFixed(
-              2
-            );
-            list[i].expiry_date = this.getTime(
-              list[i].expiry_date,
-              "{y}-{m}-{d}"
-            );
-            list[i].product_date = this.getTime(
-              list[i].product_date,
-              "{y}-{m}-{d}"
-            );
+            list[i].unit = list[i].specification_name + "/" + list[i].packing_unit;
+            list[i].total_price = (list[i].total_count * list[i].price).toFixed(2);
+            list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}");
+            list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}");
             for (let j = 0; j < this.manufacturer.length; j++) {
               if (list[i].manufacturer == this.manufacturer[j].id) {
                 list[i].manufacturer = this.manufacturer[j].manufacturer_name;
@@ -2030,8 +2021,9 @@ export default {
               }
             }
           }
-
+          console.log("list232332232332323223",list)
           this.exportList = list;
+          this.exportLoding = false
         }
       });
     },