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

src/api/drug/drug.js

@@ -620,6 +620,15 @@ export function getPurchaseNewDrugQuery(params) {
   })
 }
 
+export function getPurchaseDrugQueryList(params){
+  
+  return request({
+    url:"/api/stock/getpurchaseDrugQueryList",
+    method:"get",
+    params:params,
+  })
+}
+
 export function getGoodOverCount(params) {
   return request({
     url: '/api/stock/getgoodovercount',

src/api/drug/drug_stock.js

@@ -645,3 +645,11 @@ export function getDrugInitDataList(params) {
   })
 }
 
+export function getDrugFlowDetailByDrugId(params){
+  
+  return request({
+    url:"/api/drug/getdrugflowdetailbyid",
+    method:"Get",
+    params:params
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2144,7 +2144,7 @@
                         <td height="32px">
                             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         </td>
-                    </tr>
+                        </tr>
                         </template>
                       </tbody>
                     </table>
@@ -3401,6 +3401,17 @@ export default {
               this.records[recordIndex].isShowZero = true;
             }
 
+
+            if(this.org_id == 0|| this.org_id ==10571){
+             
+               if(this.records!=null&& this.records.length>0){
+                for(let i=0;i<this.records.length;i++){
+                  this.records[i].advices.push(...this.records[i].his_advices)
+                 }
+               }
+             
+            }
+
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
@@ -3424,6 +3435,8 @@ export default {
             }
 
 
+
+
           
             if(this.org_id == 10206){
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
@@ -3525,6 +3538,8 @@ export default {
             }
           }
           console.log("数据我哦我我", this.records);
+
+        
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -188,33 +188,19 @@
               {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
             </span>L
           </div>
-          <div style="flex: 1;">
+          <div style="flex: 1;display: flex">
             透析液：
-            <!-- <div style="display: inline-block;margin-right: 10px;">
-            
-              <div style="display: inline-block;width: 10px;height: 10px;border: 1px solid black;position: relative;top: 5px;">
-                <span style="position: relative; top: -4px; left: -2px;">
-                   <span v-if="prescription.dialyzate.indexOf('碳酸')!=-1">√</span>
-                </span>
-              </div>&nbsp;碳酸
-              <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
-                      碳酸
-               </div>
-            </div> -->
-            <!-- <div style="display: inline-block;">
-             
-              <div style="display: inline-block;width: 10px;height: 10px;border: 1px solid black;position: relative;top: 5px;">
-                <span v-if="prescription.dialyzate.indexOf('醋酸')!=-1">√</span>
-              </div>&nbsp;醋酸
-            
-            </div> -->
-            <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
-                 碳酸
+            <div style="">
+              <check-box text="碳酸" :checked="prescription_dialyzate1"></check-box>&nbsp;
+              <check-box text="醋酸" :checked="prescription_dialyzate2"></check-box>
+              <!-- <check-box :checked="patientInfo_gender_2"></check-box>&nbsp; -->
             </div>
-
-            <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('醋酸')>-1">
-                醋酸
+              <!-- <div class="under_line" style="width: 100px; text-align: center;display: inline-block;" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
+                    碳酸
                </div>
+            <div class="under_line" style="width: 100px; text-align: center;display: inline-block;" v-if="prescription.dialyzate.indexOf('醋酸')>-1">
+                醋酸
+            </div> -->
           </div>
         </div>
         <div style="display: flex;border-left: 1px solid black;border-right: 1px solid black;padding: 5px;">
@@ -336,7 +322,7 @@
                 {{
                   monitor.ultrafiltration_volume
                     ? monitor.ultrafiltration_volume
-                    : "0"
+                    : " "
                 }}
               </span>
             </td>
@@ -389,6 +375,11 @@
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
             </td>
             <td>
+              <template 
+              v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)&&(org_id!=10414) "
+              >
+                【开始透析】
+              </template>
               <span v-if="monitor.symptom || monitor.dispose || monitor.result">
                 {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{
                   monitor.result
@@ -424,26 +415,6 @@
               </td>
             </tr>
 
-            <!-- <tr>
-              <td style="width:13%;height:40px">
-                <p style="height:20px;line-height:20px">时间</p>
-              </td>
-              <td style="width:;height:40px">
-                <p style="height:20px;line-height:20px">医嘱执行记录</p>
-              </td>
-              <td style="width:10%;height:40px">
-                <p style="height:20px;line-height:20px">执行</p>
-              </td>
-              <td style="width:10%;height:60px">
-                <p style="height:20px;line-height:20px">核对</p>
-              </td>
-              <td style="width:14%;height:40px">
-                <p style="height:20px;line-height:20px">上次透后体重</p>
-              </td>
-              <td style="width:8%;height:40px">
-                {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
-              </td>
-            </tr> -->
             <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
               <td style="min-width:60px;height:40px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
               <td>
@@ -485,12 +456,10 @@
           </tbody>
         </table>
 
-
-
         <div style="border-top: none;border: 1px solid black;padding: 5px;">
           <div style="width: 100%;">
             治疗小结:
-            <span class="under-line" style="width: 60%;display: inline-block;">&nbsp;{{ summary.dialysis_summary }}</span>
+            <span class="under-line" style="">&nbsp;{{ summary.dialysis_summary }}</span>
           </div>
           <div style="display: flex;">
             <div style="flex: 1;"></div>
@@ -527,6 +496,7 @@
 </template>
 
 <script>
+import CheckBox from "../batch_print/option_check_box";
 import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
@@ -541,6 +511,7 @@ export default {
   components: {
     // DialysisPrintOrderOne,
     // DialysisPrintOrderTwo,
+    CheckBox,
     LabelBox,
     BreadCrumb
   },
@@ -588,6 +559,8 @@ export default {
       patientInfo_gender_2: false,
       patientInfo_source_2: false,
       patientInfo_source_1: false,
+      prescription_dialyzate1:false,
+      prescription_dialyzate2:false,
       modeOptions: {},
       replacementWays: [],
       perfusionApparatus: [],
@@ -621,7 +594,8 @@ export default {
       },
       prescription: {
         dialysate_formulation_name: "",
-        device: {}
+        device: {},
+        dialyzate:''
       },
       advices: [],
       users: [],
@@ -1480,6 +1454,20 @@ export default {
         this.patientInfo_source_2 = false;
         this.patientInfo_source_1 = false;
       }
+    },
+    "prescription.dialyzate": function() {
+      if(this.prescription.dialyzate !='undefined'){
+        if(prescription.dialyzate.indexOf('碳酸')>-1){
+          this.prescription_dialyzate1 =true
+          this.prescription_dialyzate2 = false
+        }else if(prescription.dialyzate.indexOf('醋酸')>-1){
+          this.prescription_dialyzate1 =false
+          this.prescription_dialyzate2 = true
+        }else{
+          this.prescription_dialyzate1 =false
+          this.prescription_dialyzate2 = false
+        }
+      }
     }
   },
   created() {
@@ -1688,4 +1676,10 @@ export default {
 .print-template-two tr {
   line-height: 30px;
 }
+.check_box_panel .did_checke::after {
+  font-size: 8px;
+  margin-left: 2px;
+  margin-top: 2px;
+  position: absolute;
+}
 </style>

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

@@ -17,9 +17,9 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
             @change="startTimeChange"
-             :picker-options="pickerOptions"
-             :clearable="false"
+            :clearable="false"
            ></el-date-picker>
             <span>-</span>
             <el-date-picker
@@ -33,8 +33,8 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              @change="endTimeChange"
               :picker-options="pickerOptions"
+              @change="endTimeChange"
               :clearable="false"
           ></el-date-picker>
           <span style="font-size:14px;color:#606266">药品类型:</span>
@@ -72,6 +72,11 @@
                  {{getDrugTypeName(scope.row.drug_type)}}
               </template>
             </el-table-column>
+            <el-table-column label="药品别名" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.drug_alias}}
+              </template>
+            </el-table-column>
             <el-table-column label="药品名称" align="center">
               <template slot-scope="scope">
                  {{scope.row.drug_name}}
@@ -92,6 +97,11 @@
                  {{getDearName(scope.row.dealer)}}
               </template>
             </el-table-column>
+            <el-table-column label="单位" align="center">
+              <template slot-scope="scope">
+                 {{ scope.row.min_unit }}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
 
                  <el-table-column prop="drugIn" label="数量" width="100" align="center">
@@ -161,7 +171,7 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getPurchaseDrugQuery } from "@/api/drug/drug"
+import { getStorehouseList,getPurchaseDrugQueryList,getDrugOverCount } from "@/api/drug/drug"
 const moment = require('moment')
 import { uParseTime } from '@/utils/tools'
 export default {
@@ -202,7 +212,7 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            return v.getTime() < 1667232000000
+            return v.getTime() < 1667491200000
           },
       },
      dealerList:[]
@@ -229,7 +239,6 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
 
            this.patientList = response.data.data.patientList
-
            this.dealerList = response.data.data.dealerList
          }
       })
@@ -244,7 +253,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
         }
-      getPurchaseDrugQuery(params).then(response=>{
+        getPurchaseDrugQueryList(params).then(response=>{
          if(response.data.state == 1){
             this.loading = false
             var list = response.data.data.list
@@ -389,33 +398,36 @@ export default {
              }
             }
 
-          
+            console.log("list23323223322332232323322323wode",list)
             for(let i=0;i<list.length;i++){
               list[i].last_price_in = 0
-              list[i].drugInOne = 0
-              list[i].drugAddOne =0
+              list[i].drugAddOne= 0
               list[i].drugOutOne =0
-              list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugInOne = this.getDrugWarehouseInfoTwentyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+              list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+          
+              list[i].drugInMoney = list[i].last_price
+              list[i].drugSaleMoney = (list[i].drugIn * list[i].drugInMoney).toFixed(2)
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddOne = this.drugAddInfoTwetyOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+              list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+           
+              list[i].drugAddPrice = list[i].last_price
+              list[i].drugAddSalePrice = (list[i].drugAdd * list[i].drugAddPrice).toFixed(2)
 
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutOne=  this.getDrugOutTwetyOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-
-              // list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-              list[i].overDrug = this.getOverDrug(list[i].drugInOne,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-              list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-              list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+              list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+           
+              list[i].drugOutPrice = list[i].min_price
+              list[i].drugOutSalePrice = (list[i].drugOut*list[i].drugOutPrice).toFixed(2)
+
+          
+           
+             list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            
+            
+             list[i].overDrugPrice = list[i].last_price
+             list[i].oveDrugSaleMoney = (list[i].overDrug * list[i].overDrugPrice).toFixed(2)
             }
-            console.log("我的世界搜哦对哦奥法",list)
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
@@ -533,7 +545,10 @@ export default {
       totalfive += arr5[i].count
      }
   }
-  
+  // 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;
@@ -559,48 +574,6 @@ export default {
   }
 
 
-  },
-
-  getDrugWarehouseInfoTwentyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
-   var total = 0
-   var totalOne =0
-   var totalTwo = 0
-   var totalthree= 0
-   var totalfour = 0
-   var totalfive = 0
-   var max_str = "";
-   var min_str = "";
-   if(arr!=null && arr.length > 0){
-    for(let i=0;i<arr.length;i++){
-      totalOne += arr[i].count
-     }
-   }
-   if(arr2!=null && arr2.length > 0){
-    for(let i=0;i<arr2.length;i++){
-      totalTwo += arr2[i].count
-     }
-   }
-   if(arr3!=null && arr3.length > 0){
-    for(let i=0;i<arr3.length;i++){
-      totalthree += arr3[i].count
-     }
-   }
-  if(arr4!=null && arr4.length > 0){
-    for(let i=0;i<arr4.length;i++){
-      totalfour += arr4[i].count
-     }
-  }
-
-  if(arr5!=null && arr5.length > 0){
-    for(let i=0;i<arr5.length;i++){
-      totalfive += arr5[i].count
-     }
-  }
-  
-  total = totalOne - totalTwo + totalthree - totalfour + totalfive
- 
-  
-   return total
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
    var total = 0
@@ -852,12 +825,7 @@ export default {
    }
 
    total_price =(totalOne - totalTwo + total_three - total_four + totalFive).toFixed(2)
-   console.log("totalONE232332323323223322323wi",totalOne)
-   console.log("totalTwo99999999999999988888888",totalTwo)
-   console.log("total_three99999999999999988888888",total_three)
-   console.log("total_four99999999999999988888888",total_four)
-   console.log("totalFive99999999999999988888888",totalFive)
-   console.log("-------------------------------------------")
+ 
    if(total_price >0){
     return total_price
    }else{
@@ -1059,7 +1027,8 @@ export default {
    }
   },
    open(){
-    // this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+   
+    // this.start_time = moment().year(2022).month(10).date(4).format('YYYY-MM-DD')
     this.start_time = moment().startOf('month').format('YYYY-MM-DD')
     this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
@@ -1086,30 +1055,11 @@ export default {
     }
     total = totalone + totaltwo
 
-    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(max_str == "" && min_str == ""){
-      return "0"
-    }else{
-      return max_str + min_str
-    }
+     
+    return total
 
    },
-
-  drugAddInfoTwetyOne(arr,min_number,min_unit,max_unit,arr2){
+   drugAddInfoOne(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
     var totalone = 0
     var totaltwo = 0
@@ -1128,7 +1078,6 @@ export default {
     total = totalone + totaltwo
 
     
-    
     return total
 
    },
@@ -1197,30 +1146,13 @@ export default {
         totalthree +=arr3[i].count
       }
     }
+   
     total = totalone + totaltwo - totalthree
-    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(max_str == "" && min_str == ""){
-     return "0"
-   }else{
-    return max_str + min_str;
-   }
+    
+    return total
 
    },
-   getDrugOutTwetyOne(arr,min_number,min_unit,max_unit,arr2,arr3){
+   getDrugOutOne(arr,min_number,min_unit,max_unit,arr2,arr3){
     var total = 0
     var totalone = 0
     var totaltwo = 0
@@ -1243,7 +1175,7 @@ export default {
       }
     }
     total = totalone + totaltwo - totalthree
-     
+    
     return total
 
    },
@@ -1320,6 +1252,7 @@ export default {
     this.$router.push({path:"/drugs/purchase/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
     exportList: function() {
+       
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
@@ -1328,12 +1261,14 @@ export default {
           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           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].drugInMoney = this.tableList[i].last_price
+
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
-           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+           const multiHeader = [['序号', '查询日期','  药品类型','药品别名','药品名称','规格&单位','生产产商','经销商','单位', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:I2', 'J1:L1', 'M1:O1', 'P1:R1','S1:U1']
+           const filterVal = ['index', 'query_date', 'good_type','drug_alias','drug_name','specification_name','manufacturer_name','dealer_name','min_unit','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
 
            const data = this.formatJson(filterVal, this.tableList)
 
@@ -1352,19 +1287,38 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
-    getDearName(id){
-      var dear_name = ""
-      for(let i=0;i<this.dealerList.length;i++){
-        if(id == this.dealerList[i].id){
-          dear_name = this.dealerList[i].dealer_name
-        }
-      }
-      return dear_name
+    GetDrugStartFlow(total,min_number,min_unit,max_unit){
+      // var min_str = ""
+      // var max_str = ""
+      // 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(max_str == "" && min_str == ""){
+      //       return "0"
+      //   }else{
+      //       return max_str + min_str;
+      //   }
+      return total
     },
-    getOverDrug(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
-      var total = 0
-      total = totalone + totaltwo - totalthree
-      if (total < min_number) {
+
+  
+    GetDrugEndFlow(total,min_number,min_unit,max_unit){
+
+     var min_str = ""
+     var max_str = ""    
+     if (total < min_number) {
         min_str = total + min_unit;
       }
       if (total == 0) {
@@ -1373,18 +1327,41 @@ export default {
       }
       if (total >= min_number) {
         if (parseInt(total / min_number) != 0) {
-          max_str = parseInt(total / min_number) + max_unit;
+            max_str = parseInt(total / min_number) + max_unit;
         }
         if (total % min_number != 0) {
-          min_str = (total % min_number) + min_unit;
+            min_str = (total % min_number) + min_unit;
         }
+      }
+     if(max_str == "" && min_str == ""){
+            return "0"
+        }else{
+            return max_str + min_str;
+       }
+    },
+    toOverCount(){
+      getDrugOverCount().then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          this.$message.success("调试成功")
+        }
+      })  
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
+    GetDrugOver(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+    
+      total = totalone + totaltwo - totalthree
+      return total
     }
-    if(max_str == "" && min_str == ""){
-      return "0"
-    }else{
-      return max_str + min_str;
-    }
-   }
   }
 }
 </script>

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -10,14 +10,14 @@
               <DrugQuery></DrugQuery>
             </el-tab-pane>
           
-           <!-- <el-tab-pane label="进销存查询" name="second">
-              <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
-            </el-tab-pane>  -->
-
-             <el-tab-pane label="进销存查询" name="five">
+           <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
             </el-tab-pane>
         
+            <el-tab-pane label="进销存查询" name="second">
+              <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
+            </el-tab-pane> 
+
             <el-tab-pane label="有效期查询" name="third">
                 <ExpiryDateDrugQuery ref="mychildOne"></ExpiryDateDrugQuery>
             </el-tab-pane>

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -51,6 +51,8 @@
         
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+
+          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
         </span>
         
       </div>
@@ -186,7 +188,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow } from '@/api/drug/drug_stock'
+  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList,getDrugFlow,getDrugFlowDetailByDrugId } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -725,6 +727,14 @@
     formatJson(filterVal, jsonData) {
      return jsonData.map(v => filterVal.map(j => v[j]))
     },
+    toTongBu(){
+      var params = {
+        drug_id:this.$route.query.drug_id
+      }
+      getDrugFlowDetailByDrugId(params).then(response=>{
+
+      })
+    }
     }
   }
 </script>