8月15日

src/api/dialysis.js

@@ -355,3 +355,11 @@ export function getDialysisAdviceSchedudeList(params) {
     params: params
   })
 }
+
+export function getDialysisParameterGoodList(params) {
+  return request({
+    url: '/api/patient/getdialysisparametergoodlist',
+    method: 'get',
+    params: params
+  })
+}

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

@@ -242,12 +242,79 @@
       :total="total"
     >
     </el-pagination>
+
+
+   <el-dialog
+      title="药品统计表"
+      :visible.sync="startdialogVisible"
+      width="70%">
+      <span>
+        <div class="cell clearfix">
+          <label class="title"> <span class="name">排班班次</span> : </label>
+           <el-select v-model="schedule_type" placeholder="请选择">
+            <el-option
+              v-for="item in schedulArr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+           </el-select>
+           <label class="title"> <span class="name">病区选择</span> : </label>
+           <el-select v-model="partion_type" placeholder="请选择">
+            <el-option
+              v-for="item in partitionArr"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+           </el-select>
+        </div> 
+       <el-table
+        :data="tableList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center"  label="序号">
+           <template slot-scope="scope">
+              {{scope.$index+1}}
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"   label="名称">
+         <template slot-scope="scope">
+             {{scope.row.name}}
+         </template>
+        </el-table-column>
+        <el-table-column  align="center"  label="规格">
+           <template slot-scope="scope">
+             {{scope.row.specification_name}}
+           </template>
+        </el-table-column>
+       
+        <el-table-column  align="center"   label="数量">
+           <template slot-scope="scope">
+            {{scope.row.count}}
+           </template>
+        </el-table-column>
+        
+     
+
+      </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startdialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="startdialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 
 <script>
-  import { GetAllZone,saveDialysisSetting,getDialysisSetting,getDialysisParameter } from '@/api/dialysis'
+  import { GetAllZone,saveDialysisSetting,getDialysisSetting,getDialysisParameter,getDialysisParameterGoodList } from '@/api/dialysis'
   import { uParseTime } from "@/utils/tools";
   import { getDataConfig } from '@/utils/data'
   import store from "@/store";
@@ -326,6 +393,9 @@
         bicarbonate:false,
         glucose:false,
         blood_access_option:[],
+        startdialogVisible:false,
+        schedule_type:"",
+        partion_type:"",
       }
     },
     created() {
@@ -456,7 +526,108 @@
         })
       },
       statistics() {
-        this.$refs.consumables.show()
+         var params = {
+          schedule_type:this.schedule_type,
+          partion_type:this.partion_type,
+          selected_date:this.query.schedule_date,
+        }
+        getDialysisParameterGoodList(params).then(response=>{
+           if(response.data.state == 1){
+            this.startdialogVisible = true
+            var list = response.data.data.list
+            console.log("list232323223222wid",list)
+            if(list!=null && list.length>0){
+              for(let i=0;i<list.length;i++){
+                 list[i].dialysis_dialyszers_arr = []
+                 list[i].dialyzer_perfusion_apparatus_arr = []
+                 list[i].dialysis_irrigation_arr = []
+                 if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
+                   list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
+                 }
+                 if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
+                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
+                 }
+                 if(list[i].dialysis_prescription.dialysis_irrigation!=""){
+                   list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
+                 }
+              }
+            }
+            var dialysisDialyszersArr = []
+            var dialyzerPerfusionApparaArr = []
+            var dialysisIrrigationArr = []
+            for(let i=0;i<list.length;i++){
+             for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
+              console.log("list23323232",list[i].dialysis_dialyszers_arr[j])
+               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
+             }
+             for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
+              dialyzerPerfusionApparaArr.push(list[i].dialyzer_perfusion_apparatus_arr[z])
+             }
+             for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
+              dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
+             }
+            }
+            console.log("透析器",dialysisDialyszersArr)
+            console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
+            console.log("灌流器",dialysisIrrigationArr)
+             
+           let obj = {}
+           let objOne = {}
+           let objTwo = {}
+           for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
+            if(obj[dialysisDialyszersArr[i]]){
+               obj[dialysisDialyszersArr[i]] +=1
+            }else{
+              obj[dialysisDialyszersArr[i]] = 1
+            }
+           }
+           let Arr = [];
+            for (let i in obj) {
+              let a = {};
+              a[i] = obj[i];
+              a.name = "透析器"
+              a.count = obj[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+          
+           for(let i=0;i<dialyzerPerfusionApparaArr.length;i++){
+            if(objOne[dialyzerPerfusionApparaArr[i]]){
+                objOne[dialyzerPerfusionApparaArr[i]] +=1
+             }else{
+              objOne[dialyzerPerfusionApparaArr[i]] = 1
+             }   
+           }
+           
+           for (let i in objOne) {
+              let a = {};
+              a[i] = objOne[i];
+              a.name = "透析器/灌流器"
+              a.count = objOne[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+
+           for(let i=0;i<dialysisIrrigationArr.length;i++){
+            if(objTwo[dialysisIrrigationArr[i]]){
+              objTwo[dialysisIrrigationArr[i]] +=1
+             }else{
+              objTwo[dialysisIrrigationArr[i]] = 1
+             }   
+           }
+
+           for (let i in objTwo) {
+              let a = {};
+              a[i] = objTwo[i];
+              a.name = "灌流器"
+              a.count = objTwo[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+            console.log("newa",Arr)
+            this.tableList = Arr
+           }
+        })
       },
       handleScheduleDateChange(val) {
         this.query.schedule_date = val

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -198,14 +198,32 @@
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id!=9990'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
+                            <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant==7" :label="'首剂(mg):'"> 
+                               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+                            </el-form-item>
+                           <el-form-item v-else :label="'首剂(iu):'"> 
+                               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+                            </el-form-item>
+
+
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 && dialysisPrescription.anticoagulant == 2'
                                     :label="'首剂(mg) : '">
@@ -255,22 +273,26 @@
 
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 ">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id == 9990">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54 && this.$store.getters.xt_user.template_info.org_id != 9990">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54 ||  this.$store.getters.xt_user.template_info.org_id == 10346 ||  this.$store.getters.xt_user.template_info.org_id == 10387">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54 ||  this.$store.getters.xt_user.template_info.org_id == 10346 ||  this.$store.getters.xt_user.template_info.org_id == 10387  ||  this.$store.getters.xt_user.template_info.org_id == 9990">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
+                           
+             
+                         
+
                           </div>
                           <div v-else>
                             <el-form-item :label="'维持(iu/h) : '"
@@ -287,8 +309,13 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
+                           
+                           
+                
                           </div>
                         </div>
+
+
                         <div v-else>
                             <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'维持(mg/h) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -302,6 +329,7 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
+
                         </div>
 
                     </el-col>
@@ -310,7 +338,7 @@
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -325,6 +353,21 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
+
+                             <el-form-item
+                                    v-if='this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant == 7'
+                                    :label="'总量(mg)'">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+                            </el-form-item>
+                            <el-form-item v-else  :label="总量(mg)">
+                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+                            </el-form-item>
                           </div>
                           <div v-else>
                             <el-form-item
@@ -2034,7 +2077,7 @@
           }
           if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
-          }else if(this.$store.getters.xt_user.org.id == 10234 || this.$store.getters.xt_user.org.id == 9671){
+          }else if(this.$store.getters.xt_user.org.id == 10234 || this.$store.getters.xt_user.org.id == 9990){
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '06:00'
             } else if (schedual.schedule_type == 2) {

src/xt_pages/outpatientCharges/summary.vue

@@ -108,7 +108,7 @@
           >报表下载
           </el-button
           >
-          <el-button v-if="$store.getters.xt_user.org_id == 10106" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
+          <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          >报表下载2-->
@@ -1499,17 +1499,20 @@ export default {
             for (let i = 0; i < med_chrgitm_types.length; i++) {
               let price = 0
               let obj = {
+
                 number:"440722196501072316",
                 name: order.patient.name,
-                idNo: order.patient.id_card_no,
+                idNo: "",
                 med_chrgitm_name:this.getType(med_chrgitm_types[i]),
                 price:"",
                 remark:"",
               }
               if(i == 0){
                 obj.remark = "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay
+                obj.idNo = order.patient.id_card_no
               }else{
                 obj.remark = ""
+                obj.idNo = ""
               }
               for (let b = 0; b < order.info.length; b++) {
                 if(med_chrgitm_types[i] ==  order.info[b].med_chrgitm_type){
@@ -1520,18 +1523,48 @@ export default {
               obj.price = price
               list.push(obj)
             }
+          }
+          let list_two = []
+          const obj = {}
+          for(let i = 0; i < list.length; i++){
+            console.log(list[i])
+            list_two.push(list[i].name)
+          }
+
+          list_two = list_two.reduce((cur, next) => {
+            obj[next] ? '' : obj[next] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
+          for(let i = 0; i < list_two.length; i++){
+            for(let b = 0; b < list.length; b++){
+              if(list_two[i] == list[b].name){
+                list[b]['index'] = i+1
+              }
+            }
           }
 
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
+              "订单序号": list[i].index,
+              "订单号码":"",
               "购方名称": list[i].name,
-              "购方纳税人识别号":list[i].number,
-              "身份证":  list[i].idNo,
+              "购方纳税人识别号":list[i].idNo,
+              "开户行及账号":"",
+              "地址电话":"",
+              "税收编码":"3070202000000000000",
               "商品名称": list[i].med_chrgitm_name,
+              "规格型号":"",
+              "计量单位":"",
+              "数量":"",
+              "单价":"",
               "金额": list[i].price,
+              "税率":"0%",
+              "优惠政策":"普通零税率",
+              "税额":"0",
               "备注": list[i].remark,
+              "电子邮箱":"",
 
             }
             tarList.push(obj)
@@ -1539,20 +1572,44 @@ export default {
 
           import("@/vendor/Export2Excel").then((excel) => {
             const tHeader = [
-              "购方名称",
-              "购方纳税人识别号",
-              "身份证",
-              "商品名称",
-              "金额",
-              "备注",
+              "订单序号",
+                "订单号码",
+                "购方名称",
+                "购方纳税人识别号",
+                "开户行及账号",
+                "地址电话",
+                "税收编码",
+                "商品名称",
+                "规格型号",
+                "计量单位",
+                "数量",
+                "单价",
+                "金额",
+                "税率",
+                "优惠政策",
+                "税额",
+                "备注",
+                "电子邮箱",
             ];
             const filterVal = [
+              "订单序号",
+              "订单号码",
               "购方名称",
               "购方纳税人识别号",
-              "身份证",
+              "开户行及账号",
+              "地址电话",
+              "税收编码",
               "商品名称",
+              "规格型号",
+              "计量单位",
+              "数量",
+              "单价",
               "金额",
+              "税率",
+              "优惠政策",
+              "税额",
               "备注",
+              "电子邮箱",
             ];
             const data = this.formatJson(filterVal, tarList);
             excel.export_json_to_excel({

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

@@ -36,7 +36,7 @@
             class="filter-item"
             type="primary"
             @click="toCheck"
-            >脚本
+            >调试
           </el-button> -->
           <el-button
             size="small"

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

@@ -18,8 +18,8 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
-           ></el-date-picker> 
-            <span>-</span> 
+           ></el-date-picker>
+            <span>-</span>
             <el-date-picker
               size="small"
               v-model="end_time"
@@ -32,7 +32,7 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
-          ></el-date-picker>  
+          ></el-date-picker>
           <span style="font-size:14px;color:#606266">药品类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
@@ -84,33 +84,33 @@
               </template>
             </el-table-column>
             <el-table-column label="期初结余" align="center">
-               
+
                  <el-table-column prop="drugIn" label="数量" width="100" align="center">
-                   
+
                  </el-table-column>
-              
+
                 <el-table-column prop="drugInMoney" label="进货金额" width="100" align="center">
-                   
+
                 </el-table-column>
                 <el-table-column prop="drugSaleMoney" label="销售金额" width="100" align="center">
-                 
+
                 </el-table-column>
-             
+
             </el-table-column>
             <el-table-column label="本期增加" align="center">
-             
+
                 <el-table-column prop="drugAdd" label="数量" width="100" align="center">
-                
+
                 </el-table-column>
-             
+
                 <el-table-column prop="drugAddPrice" label="进货金额" width="100" align="center">
-                  
+
                 </el-table-column>
                 <el-table-column  prop="drugAddSalePrice" label="销售金额"  width="100" align="center">
                 </el-table-column>
-              
+
             </el-table-column>
-         
+
             <el-table-column label="本期减少" align="center">
                <el-table-column prop="drugOut" label="数量" width="100" align="center">
                 </el-table-column>
@@ -119,7 +119,7 @@
                 <el-table-column prop="drugOutSalePrice" label="销售金额" width="100" align="center">
                 </el-table-column>
             </el-table-column>
-          
+
             <el-table-column label="期末结余" align="center">
               <el-table-column prop="overDrug" label="数量" width="100" align="center">
               </el-table-column>
@@ -129,7 +129,7 @@
               </el-table-column>
             </el-table-column>
 
-          
+
           </el-table>
            <el-pagination
             @size-change="handleSizeChange"
@@ -147,7 +147,7 @@
 
 
 
-  
+
 
   </div>
 </template>
@@ -192,7 +192,7 @@ export default {
      specification_name:"",
      loading:false,
     }
-  
+
   },
   methods:{
     changeStorehouseName(){
@@ -212,7 +212,7 @@ export default {
              this.houseList.push(houseList[i])
            }
            this.manufacturerList = response.data.data.manufacturerList
-        
+
            this.patientList = response.data.data.patientList
          }
       })
@@ -241,7 +241,7 @@ export default {
                   }
                 }
               }
-             
+
              //期初结余出库
               if(list[i].DrugWarehouseOutInfoStart!=null && list[i].DrugWarehouseOutInfoStart.length>0){
                 for(let j=0;j<list[i].DrugWarehouseOutInfoStart.length;j++){
@@ -269,7 +269,7 @@ export default {
                    }
                 }
               }
-             
+
               //期末结余出库
                if(list[i].DrugWarehouseOutInfoEnd!=null && list[i].DrugWarehouseOutInfoEnd.length>0){
                 for(let j=0;j<list[i].DrugWarehouseOutInfoEnd.length;j++){
@@ -296,7 +296,7 @@ export default {
                    }
                 }
               }
-           
+
               //期中减少
               if(list[i].DrugWarehouseOutInfoStartEnd!=null && list[i].DrugWarehouseOutInfoStartEnd.length > 0){
                 for(let j=0;j<list[i].DrugWarehouseOutInfoStartEnd.length;j++){
@@ -314,8 +314,8 @@ export default {
                    }
                 }
               }
-           
-           
+
+
 
               //期初盘盈
               if(list[i].WareStartStockInventoryProfit!=null && list[i].WareStartStockInventoryProfit.length > 0){
@@ -334,8 +334,8 @@ export default {
                    }
                  }
               }
-              
-      
+
+
 
              //期中盘盈
              if(list[i].WareStartEndStockInventoryProfit!=null && list[i].WareStartEndStockInventoryProfit.length > 0){
@@ -400,7 +400,7 @@ export default {
             for(let i=0;i<drugTypeList.length;i++){
                this.drugTypeList.push(drugTypeList[i])
             }
-           
+
          }
       })
     },
@@ -495,18 +495,18 @@ export default {
    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
-     } 
+     }
   }
   // console.log("totalONE223323232323232",totalOne)
   // console.log("totalTwo2oo2o32o3o32o23",totalTwo)
@@ -533,9 +533,9 @@ export default {
   if(max_str == "" && min_str == ""){
     return "0"
   }else{
-   return max_str + min_str 
+   return max_str + min_str
   }
- 
+
 
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
@@ -549,12 +549,12 @@ export default {
    var min_str = "";
    if(arr!=null && arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      total_one += arr[i].count 
+      total_one += arr[i].count
      }
    }
    if(arr4!=null && arr4.length > 0){
     for(let i=0;i<arr4.length;i++){
-      total_four += arr4[i].count 
+      total_four += arr4[i].count
      }
    }
    if(arr2!=null && arr2.length > 0){
@@ -565,13 +565,13 @@ export default {
    if(arr3!=null && arr3.length >0){
      for(let i=0;i<arr3.length;i++){
        total_three +=arr3[i].count
-     }  
+     }
    }
 
     if(arr5!=null && arr5.length >0){
      for(let i=0;i<arr5.length;i++){
        total_five +=arr5[i].count
-     }  
+     }
    }
 
   total = total_one - total_four +total_two - total_three + total_five
@@ -596,7 +596,7 @@ export default {
    if(max_str == "" && min_str == ""){
      return "0"
    }else{
-     return max_str + min_str;  
+     return max_str + min_str;
    }
 
   },
@@ -614,7 +614,7 @@ export default {
    if(outArr.length > 0){
      for(let i=0;i<outArr.length;i++){
       out_total+= outArr[i].count
-     }  
+     }
    }
    total = add_total - out_total
   if (total < min_number) {
@@ -632,7 +632,7 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  return max_str + min_str;
 
   },
  getDrugWarehouseInfoMoneyStart(arr,min_number,min_unit,max_unit,last_price,outArr){
@@ -655,7 +655,7 @@ export default {
 
    total = addTotal - outTotal
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -665,7 +665,7 @@ export default {
       min_str = (total % min_number);
     }
    }
- 
+
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
 
    return total_price
@@ -681,7 +681,7 @@ export default {
      }
    }
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -691,13 +691,13 @@ export default {
       min_str = (total % min_number);
     }
    }
- 
+
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
-   
+
    return total_price
   },
   getDrugWarehouseInfoStockAdd(arr,min_number,min_unit,max_unit){
-  
+
    var total = 0
    var max_str = "";
    var min_str = "";
@@ -721,7 +721,7 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  return max_str + min_str;
   },
   getDrugWarehouseInfoaddMoney(arr,min_number,min_unit,max_unit,last_price){
    var total = 0
@@ -734,7 +734,7 @@ export default {
      }
    }
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -744,12 +744,12 @@ export default {
       min_str = (total % min_number);
     }
    }
- 
+
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
    return total_price
   },
   getDrugInMoneyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
-   
+
    var totalOne = 0
    var totalTwo =0
    var total_three = 0
@@ -758,20 +758,20 @@ export default {
    var total_price = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      totalOne += (arr[i].count/min_number*arr[i].price) + arr[i].count*(arr[i].price/min_number)
+      totalOne += (arr[i].count/min_number*arr[i].price) + arr[i].count*(arr[i].price%min_number)
      }
    }
-  
+
   if(arr2!=null&&arr2.length > 0){
     for(let i=0;i<arr2.length;i++){
       totalTwo += ((arr2[i].count/min_number) * arr2[i].price) + ((arr2[i].count%min_number)*(arr2[i].price/min_number))
      }
    }
 
-  
+
   if(arr3!=null&&arr3.length > 0){
     for(let i=0;i<arr3.length;i++){
-      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price 
+      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price
      }
    }
 
@@ -788,15 +788,21 @@ 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{
     return "0.00"
    }
-  
+
   },
   getDrugInMoney(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
-  
+
    var total_price = 0
    var total_one_price = 0
    var total_two_price = 0
@@ -805,13 +811,14 @@ export default {
    var total_five_price = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      total_one_price += arr[i].count * (arr[i].price/min_number)
+      total_one_price += arr[i].count * (arr[i].price/min_number) + arr[i].count * (arr[i].price%min_number)
      }
    }
-   
+
    if(arr4!=null && arr4.length > 0){
      for(let i=0;i<arr4.length;i++){
-       total_four_price +=arr4[i].count * arr4[i].xt_drug_warehouse_info.price/min_number
+      //  total_four_price +=arr4[i].count * arr4[i].xt_drug_warehouse_info.price/min_number
+      total_four_price+= ((arr4[i].count/min_number) * arr4[i].price) + ((arr4[i].count%min_number)*(arr4[i].price/min_number))
      }
    }
 
@@ -820,7 +827,7 @@ export default {
        total_two_price += arr2[i].count * arr2[i].xt_drug_warehouse_info.price/min_number
      }
    }
-  
+
   if(arr3!=null && arr3.length > 0){
      for(let i=0;i<arr3.length;i++){
        total_three_price += arr3[i].count * arr3[i].xt_drug_warehouse_info.price/min_number
@@ -832,7 +839,7 @@ export default {
        total_five_price += arr5[i].count * arr5[i].xt_drug_warehouse_info.price/min_number
      }
    }
- 
+
    total_price = total_one_price - total_four_price + total_two_price - total_three_price + total_five_price
    if(total_price > 0){
      return total_price.toFixed(2)
@@ -841,7 +848,7 @@ export default {
    }
   },
   getSaleMoney(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
-  
+
    var total_price = 0
    var total_price_one = 0
    var total_price_two = 0
@@ -862,21 +869,21 @@ export default {
     for(let i=0;i<arr2.length;i++){
      total_price_two += arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
     }
-    
+
    }
 
   if(arr3!=null && arr3.length > 0){
     for(let i=0;i<arr3.length;i++){
       total_price_three += arr3[i].count * arr3[i].xt_drug_warehouse_info.retail_price
     }
-    
+
    }
 
   if(arr5!=null && arr5.length > 0){
     for(let i=0;i<arr5.length;i++){
       total_price_five += arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
     }
-    
+
    }
 
   total_price = total_price_one - total_price_four + total_price_two - total_price_three + total_price_five
@@ -885,7 +892,7 @@ export default {
    }else{
     return "0.00"
    }
-  
+
   },
   getSaleMoneyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
   var totalOne = 0
@@ -896,19 +903,19 @@ export default {
    var total_five = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      totalOne += arr[i].count*arr[i].xt_drug_warehouse_info.retail_price 
+      totalOne += arr[i].count*arr[i].xt_drug_warehouse_info.retail_price
      }
    }
-  
+
   if(arr2!=null&&arr2.length > 0){
     for(let i=0;i<arr2.length;i++){
       totalTwo += arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
      }
    }
-  
+
   if(arr3!=null&&arr3.length > 0){
     for(let i=0;i<arr3.length;i++){
-      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price 
+      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price
      }
    }
 
@@ -927,7 +934,7 @@ export default {
   //  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))
    total_price =(totalOne - totalTwo+total_three - total_four + total_five).toFixed(2)
    if(total_price > 0){
@@ -935,7 +942,7 @@ export default {
    }else{
      return "0.00"
    }
-  
+
   },
   getDrugWarehouseOutInfo(arr,min_number,min_unit,max_unit){
    var total = 0
@@ -961,7 +968,7 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  return max_str + min_str;
   },
   getDrugWarehouseOutMoney(arr,min_number,min_unit,max_unit,last_price){
    var total = 0
@@ -974,7 +981,7 @@ export default {
      }
    }
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -993,7 +1000,7 @@ export default {
     this.getStorehouseList()
     this.getlist()
    },
-  
+
   drugAddInfo(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
     var totalone = 0
@@ -1030,13 +1037,13 @@ export default {
     if(max_str == "" && min_str == ""){
       return "0"
     }else{
-      return max_str + min_str  
+      return max_str + min_str
     }
-   
+
    },
    getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
-    var totalone =0 
+    var totalone =0
     var totaltwo = 0
     var total_price = 0
 
@@ -1045,7 +1052,7 @@ export default {
         totalone += arr[i].count * arr[i].xt_drug_warehouse_info.price/min_number
       }
     }
-   
+
     if(arr2!=null && arr2.length > 0){
      for(let i=0;i<arr2.length;i++){
        totaltwo +=arr2[i].count * arr2[i].xt_drug_warehouse_info.price/min_number
@@ -1071,7 +1078,7 @@ export default {
        total_two +=arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
       }
     }
-    
+
     total = total_one + total_two
 
     total_price = total.toFixed(2)
@@ -1118,12 +1125,12 @@ export default {
    if(max_str == "" && min_str == ""){
      return "0"
    }else{
-    return max_str + min_str;  
+    return max_str + min_str;
    }
- 
+
    },
    getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
-    
+
     var total_price = 0
     var total_one_price =0
     var total_two_price = 0
@@ -1133,7 +1140,7 @@ export default {
     var total_three = 0
     if(arr!=null&&arr.length > 0){
       for(let i=0;i<arr.length;i++){
-        total_one_price += arr[i].count * (arr[i].xt_drug_warehouse_info.price/min_number) 
+        total_one_price += arr[i].count * (arr[i].xt_drug_warehouse_info.price/min_number)
         total += arr[i].count
       }
     }
@@ -1150,20 +1157,20 @@ export default {
         total_three +=arr3[i].count
       }
     }
-   
+
     total_price = total_one_price + total_two_price - total_three_price
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
      return "0.00"
     }
-    
+
    },
    getDrugOutSaleprice(arr,min_number,min_unit,max_unit,arr3,arr4){
     var total_price = 0
     var total_price_one = 0
     var total_price_two = 0
-    var total_price_three = 0 
+    var total_price_three = 0
     if(arr!=null&&arr.length > 0){
       for(let i=0;i<arr.length;i++){
         total_price_one += arr[i].count * arr[i].xt_drug_warehouse_info.retail_price
@@ -1181,15 +1188,15 @@ export default {
          total_price_three +=arr4[i].count * arr4[i].xt_drug_warehouse_info.retail_price
       }
     }
-   
+
    total_price = total_price_one + total_price_two - total_price_three
-    
+
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
      return "0.00"
     }
-    
+
    },
    toPrint(){
     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})
@@ -1201,19 +1208,19 @@ export default {
           this.tableList[i].good_type = this.getDrugTypeName(this.tableList[i].drug_type)
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
           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
-          
+
         }
         import('@/vendor/Export2Excel').then(excel => {
            const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
            const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
            const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
            const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
-    
+
            const data = this.formatJson(filterVal, this.tableList)
-           
+
            const filename = '药品进销存查询'
-     
-          
+
+
             excel.export_json_to_excel({
               multiHeader,
               header,

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

@@ -15,10 +15,10 @@
                         <span class="main_title">药品进销存查询表</span>
                     </div>
                     <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
-                      <span class="time_p">查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span> 
+                      <span class="time_p">查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span>
                     </div>
                     <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
-                      <span class="time_p">打印时间：{{time_now}}</span> 
+                      <span class="time_p">打印时间：{{time_now}}</span>
                     </div>
                     <div class="table_panel">
                         <table class="table">
@@ -29,26 +29,26 @@
                                   <td rowspan="2" width="80">药品名称</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                   <td rowspan="2" width="80">生产厂商</td>
-                                  <td width="80" colspan="3">期初结余</td>    
-                                  <td width="80" colspan="3">本期增加</td>   
-                                  <td width="80" colspan="3">本期减少</td>  
-                                  <td width="80" colspan="3">期末结余</td>                                             
+                                  <td width="80" colspan="3">期初结余</td>
+                                  <td width="80" colspan="3">本期增加</td>
+                                  <td width="80" colspan="3">本期减少</td>
+                                  <td width="80" colspan="3">期末结余</td>
                                 </tr>
                                 <tr>
-                                  <td>数量</td>   
-                                  <td>进货金额</td> 
-                                  <td>销售金额</td>   
-                                  <td>数量</td>   
-                                  <td>进货金额</td> 
-                                  <td>销售金额</td> 
-                                  <td>数量</td>   
-                                  <td>进货金额</td> 
-                                  <td>销售金额</td> 
-                                  <td>数量</td>   
-                                  <td>进货金额</td> 
-                                  <td>销售金额</td>    
+                                  <td>数量</td>
+                                  <td>进货金额</td>
+                                  <td>销售金额</td>
+                                  <td>数量</td>
+                                  <td>进货金额</td>
+                                  <td>销售金额</td>
+                                  <td>数量</td>
+                                  <td>进货金额</td>
+                                  <td>销售金额</td>
+                                  <td>数量</td>
+                                  <td>进货金额</td>
+                                  <td>销售金额</td>
                                 </tr>
-                               
+
                             </thead>
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
@@ -57,19 +57,19 @@
                                  <td> {{item.drug_name}}</td>
                                  <td> {{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</td>
                                  <td>{{getManufacturName(item.manufacturer)}}</td>
-                                 <td>{{item.drugIn}}</td>   
-                                 <td>{{item.drugInMoney}}</td> 
-                                 <td>{{item.drugSaleMoney}}</td>   
-                                 <td>{{item.drugAdd}}</td>   
-                                 <td>{{item.drugAddPrice}}</td> 
-                                 <td>{{item.drugAddSalePrice}}</td> 
-                                 <td>{{item.drugOut}}</td>   
-                                 <td>{{item.drugOutPrice}}</td> 
-                                 <td>{{item.drugOutSalePrice}}</td> 
-                                 <td>{{item.overDrug}}</td>   
-                                 <td>{{item.overDrugPrice}}</td> 
-                                 <td>{{item.oveDrugSaleMoney}}</td>    
-                                </tr>  
+                                 <td>{{item.drugIn}}</td>
+                                 <td>{{item.drugInMoney}}</td>
+                                 <td>{{item.drugSaleMoney}}</td>
+                                 <td>{{item.drugAdd}}</td>
+                                 <td>{{item.drugAddPrice}}</td>
+                                 <td>{{item.drugAddSalePrice}}</td>
+                                 <td>{{item.drugOut}}</td>
+                                 <td>{{item.drugOutPrice}}</td>
+                                 <td>{{item.drugOutSalePrice}}</td>
+                                 <td>{{item.overDrug}}</td>
+                                 <td>{{item.overDrugPrice}}</td>
+                                 <td>{{item.oveDrugSaleMoney}}</td>
+                                </tr>
                             </tbody>
                         </table>
                     </div>
@@ -162,7 +162,7 @@ export default {
                   }
                 }
               }
-             
+
              //期初结余出库
               if(list[i].DrugWarehouseOutInfoStart!=null && list[i].DrugWarehouseOutInfoStart.length>0){
                 for(let j=0;j<list[i].DrugWarehouseOutInfoStart.length;j++){
@@ -190,7 +190,7 @@ export default {
                    }
                 }
               }
-             
+
               //期末结余出库
                if(list[i].DrugWarehouseOutInfoEnd!=null && list[i].DrugWarehouseOutInfoEnd.length>0){
                 for(let j=0;j<list[i].DrugWarehouseOutInfoEnd.length;j++){
@@ -217,7 +217,7 @@ export default {
                    }
                 }
               }
-           
+
               //期中减少
               if(list[i].DrugWarehouseOutInfoStartEnd!=null && list[i].DrugWarehouseOutInfoStartEnd.length > 0){
                 for(let j=0;j<list[i].DrugWarehouseOutInfoStartEnd.length;j++){
@@ -235,8 +235,8 @@ export default {
                    }
                 }
               }
-           
-           
+
+
 
               //期初盘盈
               if(list[i].WareStartStockInventoryProfit!=null && list[i].WareStartStockInventoryProfit.length > 0){
@@ -255,8 +255,8 @@ export default {
                    }
                  }
               }
-              
-      
+
+
 
              //期中盘盈
              if(list[i].WareStartEndStockInventoryProfit!=null && list[i].WareStartEndStockInventoryProfit.length > 0){
@@ -294,7 +294,7 @@ export default {
             }
 
 
-           
+
              for(let i=0;i<list.length;i++){
               list[i].last_price_in = 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)
@@ -322,7 +322,7 @@ export default {
             for(let i=0;i<drugTypeList.length;i++){
                this.drugTypeList.push(drugTypeList[i])
             }
-           
+
          }
       })
     },
@@ -367,7 +367,7 @@ export default {
      return storehouse_name
    },
 
-  
+
    startFirstTimeChange(){
      this.getlist()
    },
@@ -421,18 +421,18 @@ export default {
    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
@@ -454,9 +454,9 @@ export default {
    if(max_str == "" && min_str == ""){
     return "0"
    }else{
-     return max_str + min_str;  
+     return max_str + min_str;
    }
- 
+
 
   },
   getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
@@ -470,12 +470,12 @@ export default {
    var min_str = "";
    if(arr!=null && arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      total_one += arr[i].count 
+      total_one += arr[i].count
      }
    }
    if(arr4!=null && arr4.length > 0){
     for(let i=0;i<arr4.length;i++){
-      total_four += arr4[i].count 
+      total_four += arr4[i].count
      }
    }
    if(arr2!=null && arr2.length > 0){
@@ -486,13 +486,13 @@ export default {
    if(arr3!=null && arr3.length >0){
      for(let i=0;i<arr3.length;i++){
        total_three +=arr3[i].count
-     }  
+     }
    }
 
     if(arr5!=null && arr5.length >0){
      for(let i=0;i<arr5.length;i++){
        total_five +=arr5[i].count
-     }  
+     }
    }
 
   total = total_one - total_four +total_two - total_three + total_five
@@ -517,7 +517,7 @@ export default {
   if(max_str == ""&&min_str == ""){
     return "0"
   }else{
-   return max_str + min_str;  
+   return max_str + min_str;
   }
   },
   getDrugWarehouseInfoStart(arr,min_number,min_unit,max_unit,outArr){
@@ -534,7 +534,7 @@ export default {
    if(outArr.length > 0){
      for(let i=0;i<outArr.length;i++){
       out_total+= outArr[i].count
-     }  
+     }
    }
    total = add_total - out_total
   if (total < min_number) {
@@ -552,7 +552,7 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  return max_str + min_str;
 
   },
  getDrugWarehouseInfoMoneyStart(arr,min_number,min_unit,max_unit,last_price,outArr){
@@ -576,7 +576,7 @@ export default {
    console.log("233232232tade",outTotal)
    total = addTotal - outTotal
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -586,7 +586,7 @@ export default {
       min_str = (total % min_number);
     }
    }
- 
+
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
     console.log("total_price",total_price)
    return total_price
@@ -602,7 +602,7 @@ export default {
      }
    }
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -612,13 +612,13 @@ export default {
       min_str = (total % min_number);
     }
    }
- 
+
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
     console.log("total_price",total_price)
    return total_price
   },
   getDrugWarehouseInfoStockAdd(arr,min_number,min_unit,max_unit){
-  
+
    var total = 0
    var max_str = "";
    var min_str = "";
@@ -642,7 +642,7 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  return max_str + min_str;
   },
   getDrugWarehouseInfoaddMoney(arr,min_number,min_unit,max_unit,last_price){
    var total = 0
@@ -655,7 +655,7 @@ export default {
      }
    }
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -665,12 +665,12 @@ export default {
       min_str = (total % min_number);
     }
    }
- 
+
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
    return total_price
   },
   getDrugInMoneyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
-   
+
    var totalOne = 0
    var totalTwo =0
    var total_three = 0
@@ -679,20 +679,20 @@ export default {
    var total_price = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      totalOne += (arr[i].count/min_number*arr[i].price) + arr[i].count*(arr[i].price/min_number)
+      totalOne += arr[i].count*(arr[i].price/min_number)+ arr[i].count*(arr[i].price%min_number)
      }
    }
-  
+
   if(arr2!=null&&arr2.length > 0){
     for(let i=0;i<arr2.length;i++){
       totalTwo += ((arr2[i].count/min_number) * arr2[i].price) + ((arr2[i].count%min_number)*(arr2[i].price/min_number))
      }
    }
 
-  
+
   if(arr3!=null&&arr3.length > 0){
     for(let i=0;i<arr3.length;i++){
-      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price 
+      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price
      }
    }
 
@@ -714,10 +714,10 @@ export default {
    }else{
     return "0.00"
    }
-  
+
   },
   getDrugInMoney(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
-  
+
    var total_price = 0
    var total_one_price = 0
    var total_two_price = 0
@@ -726,13 +726,14 @@ export default {
    var total_five_price = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      total_one_price += arr[i].count * (arr[i].price/min_number)
+      total_one_price += (arr[i].count/min_number*arr[i].price) + arr[i].count*(arr[i].price%min_number)
      }
    }
-   
+
    if(arr4!=null && arr4.length > 0){
      for(let i=0;i<arr4.length;i++){
-       total_four_price +=arr4[i].count * arr4[i].xt_drug_warehouse_info.price/min_number
+      //  total_four_price +=arr4[i].count * arr4[i].xt_drug_warehouse_info.price/min_number
+      total_four_price+= ((arr4[i].count/min_number) * arr4[i].price) + ((arr4[i].count%min_number)*(arr4[i].price/min_number))
      }
    }
 
@@ -741,7 +742,7 @@ export default {
        total_two_price += arr2[i].count * arr2[i].xt_drug_warehouse_info.price/min_number
      }
    }
-  
+
   if(arr3!=null && arr3.length > 0){
      for(let i=0;i<arr3.length;i++){
        total_three_price += arr3[i].count * arr3[i].xt_drug_warehouse_info.price/min_number
@@ -753,7 +754,7 @@ export default {
        total_five_price += arr5[i].count * arr5[i].xt_drug_warehouse_info.price/min_number
      }
    }
- 
+
    total_price = total_one_price - total_four_price + total_two_price - total_three_price + total_five_price
    if(total_price > 0){
      return total_price.toFixed(2)
@@ -762,7 +763,7 @@ export default {
    }
   },
   getSaleMoney(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
-  
+
    var total_price = 0
    var total_price_one = 0
    var total_price_two = 0
@@ -783,21 +784,21 @@ export default {
     for(let i=0;i<arr2.length;i++){
      total_price_two += arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
     }
-    
+
    }
 
   if(arr3!=null && arr3.length > 0){
     for(let i=0;i<arr3.length;i++){
       total_price_three += arr3[i].count * arr3[i].xt_drug_warehouse_info.retail_price
     }
-    
+
    }
 
   if(arr5!=null && arr5.length > 0){
     for(let i=0;i<arr5.length;i++){
       total_price_five += arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
     }
-    
+
    }
 
   total_price = total_price_one - total_price_four + total_price_two - total_price_three + total_price_five
@@ -806,7 +807,7 @@ export default {
    }else{
     return "0.00"
    }
-  
+
   },
   getSaleMoneyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
   var totalOne = 0
@@ -817,19 +818,19 @@ export default {
    var total_five = 0
    if(arr!=null&&arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      totalOne += arr[i].count*arr[i].xt_drug_warehouse_info.retail_price 
+      totalOne += arr[i].count*arr[i].xt_drug_warehouse_info.retail_price
      }
    }
-  
+
   if(arr2!=null&&arr2.length > 0){
     for(let i=0;i<arr2.length;i++){
       totalTwo += arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
      }
    }
-  
+
   if(arr3!=null&&arr3.length > 0){
     for(let i=0;i<arr3.length;i++){
-      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price 
+      total_three+=arr3[i].count* arr3[i].xt_drug_warehouse_info.retail_price
      }
    }
 
@@ -844,14 +845,14 @@ export default {
       total_five+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
      }
    }
-   
+
    total_price =(totalOne - totalTwo+total_three - total_four + total_five).toFixed(2)
    if(total_price > 0){
       return total_price
    }else{
      return "0.00"
    }
-  
+
   },
   getDrugWarehouseOutInfo(arr,min_number,min_unit,max_unit){
    var total = 0
@@ -877,7 +878,7 @@ export default {
       min_str = (total % min_number) + min_unit;
     }
    }
-  return max_str + min_str;  
+  return max_str + min_str;
   },
   getDrugWarehouseOutMoney(arr,min_number,min_unit,max_unit,last_price){
    var total = 0
@@ -890,7 +891,7 @@ export default {
      }
    }
    if (total < min_number) {
-      min_str = total 
+      min_str = total
    }
    if (total >= min_number) {
     if (parseInt(total / min_number) != 0) {
@@ -939,13 +940,13 @@ export default {
     if(max_str == ""&& min_str == ""){
       return "0"
     }else{
-      return max_str + min_str;  
+      return max_str + min_str;
     }
-   
+
    },
     getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
     var total = 0
-    var totalone =0 
+    var totalone =0
     var totaltwo = 0
     var total_price = 0
 
@@ -954,7 +955,7 @@ export default {
         totalone += arr[i].count * arr[i].xt_drug_warehouse_info.price/min_number
       }
     }
-   
+
     if(arr2!=null && arr2.length > 0){
      for(let i=0;i<arr2.length;i++){
        totaltwo +=arr2[i].count * arr2[i].xt_drug_warehouse_info.price/min_number
@@ -980,7 +981,7 @@ export default {
        total_two +=arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
       }
     }
-    
+
     total = total_one + total_two
 
     total_price = total.toFixed(2)
@@ -1027,12 +1028,12 @@ export default {
    if(max_str == "" && min_str == ""){
      return "0"
    }else{
-     return max_str + min_str; 
+     return max_str + min_str;
    }
-   
+
    },
      getDrugOutPrice(arr,min_number,min_unit,max_unit,arr2,arr3){
-    
+
     var total_price = 0
     var total_one_price =0
     var total_two_price = 0
@@ -1042,7 +1043,7 @@ export default {
     var total_three = 0
     if(arr!=null&&arr.length > 0){
       for(let i=0;i<arr.length;i++){
-        total_one_price += arr[i].count * (arr[i].xt_drug_warehouse_info.price/min_number) 
+        total_one_price += arr[i].count * (arr[i].xt_drug_warehouse_info.price/min_number)
         total += arr[i].count
       }
     }
@@ -1059,20 +1060,20 @@ export default {
         total_three +=arr3[i].count
       }
     }
-   
+
     total_price = total_one_price + total_two_price - total_three_price
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
      return "0.00"
     }
-    
+
    },
    getDrugOutSaleprice(arr,min_number,min_unit,max_unit,arr3,arr4){
     var total_price = 0
     var total_price_one = 0
     var total_price_two = 0
-    var total_price_three = 0 
+    var total_price_three = 0
     if(arr!=null&&arr.length > 0){
       for(let i=0;i<arr.length;i++){
         total_price_one += arr[i].count * arr[i].xt_drug_warehouse_info.retail_price
@@ -1090,20 +1091,20 @@ export default {
          total_price_three +=arr4[i].count * arr4[i].xt_drug_warehouse_info.retail_price
       }
     }
-   
+
    total_price = total_price_one + total_price_two - total_price_three
-    
+
     if(total_price > 0){
       return total_price.toFixed(2)
     }else{
      return "0.00"
     }
-    
+
    },
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id
-     
+
       var starttime =  this.$route.query.start_time
       this.start_time = starttime
       var endtime =  this.$route.query.end_time
@@ -1143,7 +1144,7 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
-      
+
 
       thead {
         tr {

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -9,11 +9,11 @@
             <el-tab-pane label="库存查询" name="first">
               <DrugQuery></DrugQuery>
             </el-tab-pane>
-            <div v-if="org_id!=10265">
-              <el-tab-pane label="进销存查询" name="second">
-                <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
-              </el-tab-pane>
-           </div>
+          
+            <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/query/purchaseStockQuery.vue

@@ -195,6 +195,13 @@ export default {
      good_name:"",
      specification_name:"",
      loading:false,
+     pickerOptions:{ //禁用当前日期之前的日期
+           disabledDate(v) {
+            //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
+            console.log("vvvvvvvvvv",v.getTime(), new Date().getTime() - 86400000)
+            return v.getTime() < new Date().getTime() - 86400000;
+          },
+      },
     }
   
   },
@@ -993,6 +1000,7 @@ export default {
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     
   },
   // created(){
   //   this.getStorehouseList()

src/xt_pages/stock/stockNewQuery.vue

@@ -9,11 +9,11 @@
             <el-tab-pane label="库存查询" name="first">
               <GoodNewQuery></GoodNewQuery>
             </el-tab-pane>
-           <div v-if="org_id!=10265">
+          
             <el-tab-pane label="进销存查询" name="second">
                <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
             </el-tab-pane>
-           </div>
+         
             <el-tab-pane label="有效期查询" name="third">
                 <expiryDateQuery ref="mychildone"></expiryDateQuery>
             </el-tab-pane>