8月15日

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

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

@@ -1047,18 +1047,22 @@ export default {
        this.$router.push("/drugs/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
     },
     exportStock() {
+      console.log("tablelist23322332",this.tableList)
+   
       if(this.tableList!=null && this.tableList.length > 0){
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i +1
           this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
           this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
-          this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_warehouse_info, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
-          this.tableList[i].stock_out_count = this.getStockOut(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
-          this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_cancel_stock_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].act_cout =  this.getActCount(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+
+          this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
+
+          this.tableList[i].stock_out_count = this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+          this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          this.tableList[i].act_cout =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
         }
       }
  
@@ -1182,7 +1186,7 @@ export default {
     var min_str = "";
     if (arr.length > 0) {
     for (let i = 0; i < arr.length; i++) {
-      total += parseInt(arr[i].warehousing_count);
+      total += parseInt(arr[i].sum_in_count);
     }
     }
     if (total < min_number) {
@@ -1208,20 +1212,20 @@ export default {
       //总库存
       var total = 0;
       var totalOne = 0
-      var totalTwo = 0
+      // var totalTwo = 0
       if(info!=null && info.length > 0){
         for (let i = 0; i < info.length; i++) {
-           totalOne += info[i].count;
+           totalOne += info[i].sum_out_count;
         }
       }
 
-      if(val!=null && val.length > 0){
-        for (let i = 0; i < val.length; i++) {
-          totalTwo += val[i].count;
-        }
-      }
+      // if(val!=null && val.length > 0){
+      //   for (let i = 0; i < val.length; i++) {
+      //     totalTwo += val[i].sum_cancel_count;
+      //   }
+      // }
      
-      total = totalOne + totalTwo
+      total = totalOne 
 
 
       if (parseInt(total / min_number) != 0) {
@@ -1238,7 +1242,7 @@ export default {
       //总库存
       var total = 0;
       for (let i = 0; i < info.length; i++) {
-        total += info[i].count;  
+        total += info[i].sum_cancel_count;  
       }
       if (parseInt(total / min_number) != 0) {
         str = parseInt(total / min_number) + max_unit;
@@ -1255,7 +1259,7 @@ export default {
       var total = 0;
       for (let i = 0; i < info.length; i++) {
      
-        total += info[i].count;
+        total += info[i].sum_act_out_count;
         
       }
 
@@ -1271,12 +1275,10 @@ export default {
       var max_str = "";
       var min_str = "";
       var total = 0;
-      var newarr = arr;
-      
-      if (newarr.length > 0) {
-        for (let i = 0; i < newarr.length; i++) {
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
          
-         total += newarr[i].stock_max_number + newarr[i].stock_min_number;
+         total += arr[i].flush_count
           
         }
       }

src/xt_pages/stock/query/goodNewQuery.vue

@@ -767,25 +767,25 @@ export default {
    },
    exportList(){
       import('@/vendor/Export2Excel').then(excel => {
-         console.log("table")
+      
          if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
             this.tableList[i].index = i+1
             this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
             this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
-            this.tableList[i].manufacturer = this.getManufacturName(this.tableList[i].manufacturer)
-            this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_info,this.tableList[i].id)
-            this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_info,this.tableList[i].id) 
-            this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_info,this.tableList[i].id)
-            this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_info,this.tableList[i].id) 
-            this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_info,this.tableList[i].id) 
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+            this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+            this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
             this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
 
           }
          }
          
          const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
-         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer','social_security_directory_code','stock_in_count','stock_out_count','stock_cancel_count','act_out_count','over_count','sum_count']
+         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
         
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({