8月15日

src/api/config.js

@@ -60,7 +60,6 @@ export function getSystemPrescription(params) {
     url: '/api/systemprescription/get',
     method: 'get',
     params: params
-
   })
 }
 

src/api/dialysis.js

@@ -299,3 +299,12 @@ export function changeRole(params) {
     params: params
   })
 }
+
+export function getPatientDialysisSolutionGroupList(params) {
+  console.log('params22222', params)
+  return request({
+    url: '/api/patient/getpatientdialysissolutiongrouplist',
+    method: 'get',
+    params: params
+  })
+}

src/api/drug/drug.js

@@ -587,3 +587,11 @@ export function getDrugWarehouseOutInfoById(params) {
     params: params
   })
 }
+
+export function toSendGoodInfomation(params) {
+  return request({
+    url: '/api/stock/tosendgoodinfomation',
+    method: 'get',
+    params: params
+  })
+}

src/api/drug/drug_stock.js

@@ -636,3 +636,11 @@ export function returnDrugCancelStock(params) {
     params: params
   })
 }
+
+export function getDrugInitDataList(params) {
+  return request({
+    url: '/api/drug/getdruginitdatalist',
+    method: 'get',
+    params: params
+  })
+}

src/api/patient.js

@@ -58,6 +58,14 @@ export function fetchPatientDialysisSolutions(params) {
   })
 }
 
+export function findePatientDialysisLongSolutions(params) {
+  return request({
+    url: '/api/patient/findepatientdialysislongsolutions',
+    method: 'get',
+    params: params
+  })
+}
+
 export function createPatientDialysisSolution(id, solution, mode) {
   return request({
     url: '/api/patients/dialysissolution/create?patient=' + id + '&mode=' + mode,
@@ -597,3 +605,10 @@ export function getPatientInfo(params) {
   })
 }
 
+export function getDialysisSolutionDetailList(params) {
+  return request({
+    url: '/api/patient/getdialysissolutiondetaillist',
+    method: 'get',
+    params: params
+  })
+}

src/router/index_路由未分离前.js

@@ -817,12 +817,13 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
         name: 'otherCancelStockOrder',
         meta: { title: 'otherCancelStockOrder', noCache: true }
-      }, {
-        path: '/stock/query',
-        component: () => import('@/xt_pages/stock/stockQuery'),
-        name: 'stockQuery',
-        meta: { title: 'stockQuery' }
       },
+      // {
+      //   path: '/stock/query',
+      //   component: () => import('@/xt_pages/stock/stockQuery'),
+      //   name: 'stockQuery',
+      //   meta: { title: 'stockQuery' }
+      // },
       {
         path: '/stock/detail',
         component: () => import('@/xt_pages/stock/stockDetailIndex'),

src/router/modules/dialysis.js

@@ -78,6 +78,15 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/consumable/index',
+      component: () => import('@/xt_pages/dialysis/details/consumable/index'),
+      name: '透前准备',
+      meta: {
+        title: '透前准备',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/consumableDrugs_print',
       component: () => import('@/xt_pages/dialysis/consumableDrugs_print'),

src/router/modules/drugs.js

@@ -12,12 +12,12 @@ export default {
     isChild: true
   },
   children: [
-    {
-      path: '/stock/drugs/stock/query',
-      component: () => import('@/xt_pages/stock/drugs/query'),
-      name: 'drugsQuery',
-      meta: { title: 'drugsQuery', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/stock/query',
+    //   component: () => import('@/xt_pages/stock/drugs/query'),
+    //   name: 'drugsQuery',
+    //   meta: { title: 'drugsQuery', noCache: true }
+    // },
     {
       path: '/stock/drugs/drugNewQuery',
       component: () => import('@/xt_pages/stock/drugs/drugNewQuery'),

src/router/modules/stock.js

@@ -12,18 +12,19 @@ export default {
     isChild: true
   },
   children: [
-    {
-      path: '/stock/query',
-      component: () => import('@/xt_pages/stock/stockQuery'),
-      name: 'stockQuery',
-      meta: { title: 'stockQuery', noCache: true }
-    },
+    // {
+    //   path: '/stock/query',
+    //   component: () => import('@/xt_pages/stock/stockQuery'),
+    //   name: 'stockQuery',
+    //   meta: { title: 'stockQuery', noCache: true }
+    // },
     {
       path: '/stock/new/query',
       component: () => import('@/xt_pages/stock/stockNewQuery'),
       name: 'stockNewQuery',
       meta: { title: 'stockNewQuery', noCache: true }
     },
+
     {
       path: '/stock/in',
       component: () => import('@/xt_pages/stock/stockInOrder'),
@@ -369,7 +370,6 @@ export default {
         noCache: true
       }
     },
-
     {
       path: '/stock/inventoryTransfer/Addtrans',
       component: () => import('@/xt_pages/stock/inventoryTransfer/Addtrans'),
@@ -404,6 +404,71 @@ export default {
         title: '编辑调拨',
         noCache: true
       }
+    },
+    {
+      path: '/good/new/query/print',
+      component: () => import('@/xt_pages/stock/query/goodNewQueryPrint'),
+      name: 'goodNewQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'goodNewQueryPrint', noCache: true }
+    },
+    {
+      path: '/purchase/stock/query/print',
+      component: () => import('@/xt_pages/stock/query/purchaseStockQueryPrint'),
+      name: 'purchaseStockQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'purchaseStockQueryPrint', noCache: true }
+    },
+    {
+      path: '/expiry/date/query/print',
+      component: () => import('@/xt_pages/stock/query/expiryDateQueryPrint'),
+      name: 'expiryDateQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'expiryDateQueryPrint', noCache: true }
+    },
+    {
+      path: '/patient/query/print',
+      component: () => import('@/xt_pages/stock/query/patientQueryPrint'),
+      name: 'patientQuery',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'patientQuery', noCache: true }
+    },
+    {
+      path: '/drugs/purchase/query/print',
+      component: () => import('@/xt_pages/stock/drugs/components/purchaseDrugQueryPrint'),
+      name: 'purchaseDrugQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'purchaseDrugQueryPrint', noCache: true }
+    },
+    {
+      path: '/drugs/expiry/date/query/print',
+      component: () => import('@/xt_pages/stock/drugs/components/expiryDateDrugQueryPrint'),
+      name: 'expiryDateDrugQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'expiryDateDrugQueryPrint', noCache: true }
+    },
+    {
+      path: '/drugs/patient/print',
+      component: () => import('@/xt_pages/stock/drugs/components/drugPatientQueryPrint'),
+      name: 'drugPatientQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugPatientQueryPrint', noCache: true }
+    },
+    {
+      path: '/drugs/query/print',
+      component: () => import('@/xt_pages/stock/drugs/components/drugQueryPrint'),
+      name: 'drugQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugQueryPrint', noCache: true }
     }
+
   ]
 }

src/xt_pages/data/druguseTemplate.vue

@@ -889,7 +889,7 @@
                             v-for="item in unitsOption"
                             :key="item.id"
                             :label="item.name "
-                            :value="item.id"
+                            :value="item.name"
                           ></el-option>
                         </el-select>
                       </el-col>
@@ -2283,7 +2283,8 @@
             return row.drug_spec + '' + row.drug_spec_unit + ' * ' + row.prescribing_number + row.prescribing_number_unit
           }
         }
-      }, newRecordActionTwo() {
+      },
+       newRecordActionTwo() {
         this.templateFormTwoVisible = true
       }, deleteRecordActionTwo() {
         if (this.table_current_index_two == -1) {

src/xt_pages/dialysis/components/consumables.vue

@@ -304,7 +304,7 @@
               }
             }
 
-          //  console.log("99999999",this.list)
+           console.log("99999999",this.list)
            let a = []
           this.list.map(item => {
             a.push(item.good_type)
@@ -346,11 +346,11 @@
               obj2[str] = i[str]
             })
             tempTwo.push(obj2)
-            console.log(325556574342354234234,tempTwo)
+            // console.log(325556574342354234234,tempTwo)
           })
 
           this.arrList.push(...tempTwo)
-          console.log("cccccccc",this.arrList)
+          // console.log("cccccccc",this.arrList)
           }
         })
       },

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -181,6 +181,7 @@
           <span class="content">{{this.record.blood_access_part_id}}</span>
           <span class="unit"> </span>
         </li>
+
       </ul>
       <ul>
         <li v-if="isShow('舒张压')">
@@ -267,8 +268,8 @@
           <span class="unit"></span>
         </li>
 
-        <li v-if="isShow('血管通路操作')">
-          <label>血管通路操作:</label>
+        <li v-if="isShow('血管通路')">
+          <label>血管通路:</label>
           <span class="content">{{
             getBloodAccessOpera(this.record.blood_access_part_opera_id)
           }}</span>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -18,6 +18,7 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-loding="loading"
           class="filter-item"
           >保 存</el-button>
 
@@ -372,6 +373,7 @@ export default {
       storehouse_id:"",
       cancel_stock_id:0,
       showCheck:false,
+      loading:false,
     };
   },
   methods: {
@@ -580,6 +582,7 @@ export default {
       this.$router.go(-1);
     },
     submit() {
+      this.loading = true
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
@@ -633,6 +636,7 @@ export default {
               loading.close()
               return false;
             } else {
+            this.loading = false
              this.$message.success("保存成功!")
              var cancelStock = response.data.data.cancelStock
              this.cancel_stock_id = cancelStock.id

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -5,7 +5,7 @@
       <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+        <el-button size="small"  type="primary" @click="submit()" v-loading="loding" class="filter-item" >保 存</el-button>
         <el-button size="small"  type="primary" @click="toCheck()" class="filter-item" v-if="is_check == 2">审 核</el-button>
         <el-button size="small"  type="primary" @click="toReturnCheck()" class="filter-item" v-if="is_check == 1">反 审 核</el-button>
       </div>
@@ -339,6 +339,7 @@
         list:[],
         is_check:0,
         disabled:false,
+        loading:false
       }
     },
     methods: {
@@ -535,6 +536,7 @@
         this.$router.go(-1)
       },
       submit() {
+        this.loading = true
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -578,6 +580,7 @@
                 loading.close()
                 return false
               } else {
+                this.loading = false
                 var msg =  response.data.data.msg
                 if (msg == 1){
                     this.$message.error("该耗材无出库记录")

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

@@ -1,6 +1,7 @@
 <template>
     <div class="main-contain">
-        <div class="app-container">
+        <div class="app-container"  v-loading="loading"
+        element-loading-text="拼命加载中">
          <el-container>
                <div style="width:27%">
                 <el-row>
@@ -41,6 +42,7 @@
                   </el-row>
 
                   <el-row>
+                    
                       <el-table
                           ref="singleTable"
                           :data="patientList"
@@ -83,7 +85,10 @@
                   <el-tabs>
 
                    <el-tab-pane label="患者使用列表">
-                   
+                     <div style="float:right;margin-bottom:10px">
+                      <el-button type="primary" @click="toPrint">打印</el-button>
+                      <el-button type="primary" @click="exportList">导出</el-button>
+                      </div>
                      <el-table
                           :data="tableList"
                           highlight-current-row
@@ -101,7 +106,7 @@
                       align="center"
                       >
                       <template slot-scope="scope">
-                        {{scope.row.drug.drug_name}}
+                        {{scope.row.drug_name}}
                       </template>
                     </el-table-column>
                      <el-table-column
@@ -109,7 +114,7 @@
                       label="生产厂家"
                       align="center">
                       <template slot-scope="scope">
-                        {{getManufacturName(scope.row.manufacturer)}}
+                        {{scope.row.manufacturer}}
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -117,7 +122,7 @@
                       label="规格&单位"
                       align="center">
                       <template slot-scope="scope">
-                        {{scope.row.drug.dose}}{{scope.row.drug.dose_unit}} * {{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+                        {{scope.row.dose}}{{scope.row.dose_unit}} * {{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -125,14 +130,14 @@
                       label="数量"
                       align="center">
                       <template slot-scope="scope">
-                        {{scope.row.count}}
+                         {{getCount(scope.row.child,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
                       </template>
                      </el-table-column>
 
                      </el-table>
                       <el-pagination
                         @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
+                        @current-change="handleCurrentChangeOne"
                         :page-sizes="[10, 50, 100,200,500,1000]"
                         :page-size="10"
                         background
@@ -175,6 +180,7 @@ export default {
       limit:10,
       page:1,
       total:0,
+      loading:false,
     }
   },
   methods:{
@@ -182,8 +188,9 @@ export default {
       this.limit = val;
       this.getDrugWarehouseOutDetailByPatientId()
     },
-    handleCurrentChange(val) {
+    handleCurrentChangeOne(val) {
       this.page = val;
+      console.log("val3232232323",val)
       this.getDrugWarehouseOutDetailByPatientId()
     },
     startTimeChange(){
@@ -193,11 +200,13 @@ export default {
       this.handleCurrentChange(this.patient)
     },
     getlist(){
+        this.loading = true
         var params = {
           keyword:this.keyword,
         }
       getGoodPatientList(params).then(response=>{
         if(response.data.state == 1){
+          this.loading = false
           var list = response.data.data.list
           this.patientList = list
           this.$refs.singleTable.setCurrentRow(this.patientList[0]);
@@ -220,25 +229,98 @@ export default {
      getDrugWarehouseOutDetailByPatientId(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+          console.log("list233223232323",list)
+          var outlist = response.data.data.outlist
           this.manufacturerList = response.data.data.manufacturerList
-          this.tableList = list
+          if(list!=null && list.length > 0){
+            for(let i=0;i<list.length;i++){
+              if(list[i].count_unit == list[i].drug.max_unit){
+                 list[i].count = list[i].count * list[i].drug.min_number
+              }
+            }
+          }
+          let dataInfo = {}
+          list.forEach((item, index) => {
+            let { drug_id } = item
+            if (!dataInfo[drug_id]) {
+              dataInfo[drug_id] = {
+                drug_id,
+                child: [],
+                dose:item.drug.dose,
+                dose_unit:item.drug.dose_unit,
+                min_number:item.drug.min_number,
+                min_unit:item.drug.min_unit,
+                max_unit:item.drug.max_unit,
+                drug_name:item.drug.drug_name,
+                manufacturer:this.getManufacturName(item.manufacturer),
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)
+          arr.forEach((item,index)=>{
+            for(let i=0;i<outlist.length;i++){
+               if(item.drug_id == outlist[i].drug_id){
+                 item.child.push(outlist[i])
+               }
+            }
+          })
+        
+        
+          this.tableList = arr
           this.total = response.data.data.total
         }
      })
    },
    getDrugWarehouseOutDetailByPatientId(){
       var params = {
-         patient_id:this.patient,
+         patient_id:this.patient.id,
          start_time:this.start_time,
          end_time:this.end_time,
          limit:this.limit,
          page:this.page,
        }
+      console.log("hh23232323232323",params)
      getDrugWarehouseOutDetailByPatientId(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+         console.log("list233223232323",list)
+          var outlist = response.data.data.outlist
           this.manufacturerList = response.data.data.manufacturerList
-          this.tableList = list
+          if(list!=null && list.length > 0){
+            for(let i=0;i<list.length;i++){
+              if(list[i].count_unit == list[i].drug.max_unit){
+                 list[i].count = list[i].count * list[i].drug.min_number
+              }
+            }
+          }
+          let dataInfo = {}
+          list.forEach((item, index) => {
+            let { drug_id } = item
+            if (!dataInfo[drug_id]) {
+              dataInfo[drug_id] = {
+                drug_id,
+                child: [],
+                dose:item.drug.dose,
+                dose_unit:item.drug.dose_unit,
+                min_number:item.drug.min_number,
+                min_unit:item.drug.min_unit,
+                max_unit:item.drug.max_unit,
+                drug_name:item.drug.drug_name,
+                manufacturer:this.getManufacturName(item.manufacturer),
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)
+          arr.forEach((item,index)=>{
+            for(let i=0;i<outlist.length;i++){
+               if(item.drug_id == outlist[i].drug_id){
+                 item.child.push(outlist[i])
+               }
+            }
+          })
+         
+         
+          this.tableList = arr
         }
      })
    },
@@ -250,7 +332,83 @@ export default {
         } 
      }
      return manufacturer_name
-   }
+   },
+   open(){
+    this.getlist()
+   },
+   getCount(val,min_number,max_unit,min_unit){
+    var total = 0
+    var min_str = ""
+    var max_str = ""
+    if(val!=null && val.length>0){
+      for(let i=0;i<val.length;i++){
+        total +=val[i].count
+      }
+    }
+    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;
+      }
+    }
+    return max_str + min_str;  
+   },
+   toPrint(){
+    var patient_name = ""
+    for(let i=0;i<this.patientList.length;i++){
+       if(this.patient.id == this.patientList[i].id){
+        patient_name = this.patientList[i].name
+       }
+    }
+    this.$router.push({path:"/drugs/patient/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&patient_id="+this.patient.id+"&patient_name="+patient_name})
+   },
+   exportList(){
+      for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].count_name = this.getCount(this.tableList[i].child,this.tableList[i].min_number,this.tableList[i].max_unit,this.tableList[i].min_unit)
+        this.tableList[i].query_date = this.start_time + "~" + this.end_time
+        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].patient_name = ""
+        if(this.tableList[i].index == 1){
+          this.tableList[i].patient_name = this.getPatientName(this.patient.id)
+        }
+      
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+       
+        const tHeader = ['序号','患者姓名','查询日期','药品名称','生产厂家','规格&单位','数量']
+        const filterVal = ['index','patient_name','query_date','drug_name', 'manufacturer','specification_name','count_name']
+
+        const data = this.formatJson(filterVal,this.tableList)
+
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '患者药品使用查询表'
+        })
+       })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+       getPatientName(id){
+         var patient_name = ""
+        for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+            patient_name = this.patientList[i].name
+          }
+        }
+        return patient_name
+       }
   },
   created(){
     var nowDate = new Date();
@@ -273,7 +431,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-     this.getlist()
+    
   },
   
 }

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

@@ -1,6 +1,7 @@
 <template>
   <div class="main-contain">
-     <div class="app-container ">
+     <div class="app-container "  v-loading="loading"
+        element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
           <span>有效期:</span>
@@ -28,6 +29,10 @@
           <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
+          <div>
+            <el-button  type="primary"  @click="toPrint">打印</el-button>
+            <el-button  type="primary"  @click="exportList">导出</el-button>
+         </div>
         </div>
            <el-table
             :row-style="{ color: '#303133' }"
@@ -66,7 +71,8 @@
             </el-table-column>
             <el-table-column label="库存" align="center">
               <template slot-scope="scope">
-                 {{scope.row.stock_max_number}}{{scope.row.XtBaseDrug.max_unit}}{{scope.row.stock_min_number}}{{scope.row.XtBaseDrug.min_unit}}
+                <span v-if="scope.row.stock_max_number > 0"> {{scope.row.stock_max_number}}{{scope.row.XtBaseDrug.max_unit}}</span>
+                <span v-if="scope.row.stock_min_number > 0">{{scope.row.stock_min_number}}{{scope.row.XtBaseDrug.min_unit}}</span>  
               </template>
             </el-table-column>
         
@@ -165,6 +171,7 @@ export default {
      nowtime:0,
      start_time:"",
      drugTypeList:[],
+     loading:false,
     }
   
   },
@@ -191,6 +198,7 @@ export default {
       })
     },
     getlist(){
+        this.loading = true
         var params = {
           storehouse_id:this.storehouse_id,
           expiry_type:this.expiry_type,
@@ -201,6 +209,7 @@ export default {
         }
       getDrugExpiryDateQuery(params).then(response=>{
          if(response.data.state == 1){
+            this.loading = false
             var list = response.data.data.list
             this.tableList = list
             var manufacturerList = response.data.data.manufacturerList
@@ -471,7 +480,8 @@ export default {
     return (startDate - endDate ) / (1 * 24 * 60 * 60 * 1000);
   },
   changeExpriyList(val){
-   
+    this.limit = 10
+    this.page = 1
     if(val ==0){
      this.start_time = ""
      this.getlist()
@@ -522,11 +532,43 @@ export default {
     var time = year + "-" + month + "-" + day
     return time;
   },
-  },
-  created(){
+  open(){
+    this.houseList = []
     this.getStorehouseList()
     this.getlist()
-  }
+  },
+  toPrint(){
+   this.$router.push({path:"/drugs/expiry/date/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&expiry_type="+this.expiry_type})
+  },
+  exportList(){
+       for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].good_type_name = this.getDrugTypeName(this.tableList[i].XtBaseDrug.drug_type)
+          this.tableList[i].drug_name = this.tableList[i].XtBaseDrug.drug_name
+          this.tableList[i].specification_name = this.tableList[i].XtBaseDrug.dose + this.tableList[i].XtBaseDrug.dose_unit +"*"+this.tableList[i].XtBaseDrug.min_number+this.tableList[i].XtBaseDrug.min_unit+"/"+this.tableList[i].XtBaseDrug.max_unit
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].expiry = this.getTime(this.tableList[i].expiry_date)
+          this.tableList[i].stock_count =  this.tableList[i].stock_max_number + this.tableList[i].XtBaseDrug.max_unit + this.tableList[i].stock_min_number + this.tableList[i].XtBaseDrug.min_unit
+          this.tableList[i].flush_date = this.getDaysBetween(this.getTime(this.tableList[i].expiry_date),this.getTime(this.nowtime))
+       }
+      import('@/vendor/Export2Excel').then(excel => {
+       
+        const tHeader = ['序号','药品类型','药品名称','规格&单位','生产厂商','进货价','库存','批号','有效期','剩余天数']
+        const filterVal = ['index','good_type_name', 'drug_name','specification_name','manufacturer_name','price','stock_count','batch_number','expiry','flush_date']
+
+        const data = this.formatJson(filterVal,this.tableList)
+
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '药品有效期查询表'
+        })
+       })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+  },
 }
 </script>
 

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

@@ -1,6 +1,7 @@
 <template>
   <div class="main-contain">
-     <div class="app-container ">
+     <div class="app-container " v-loading="loading"
+        element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
           <span>操作时间:</span>
@@ -37,14 +38,18 @@
            @change="changeGoodTypeName">
             <el-option
               v-for="item in drugTypeList"
-              :key="item.id"
+              :key="item.value"
               :label="item.name"
-              :value="item.id">
+              :value="item.value">
             </el-option>
           </el-select>
           <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
+         <div>
+           <el-button  type="primary" @click="toPrint">打印</el-button>
+           <el-button  type="primary" @click="exportList">导出</el-button>
+         </div>
         </div>
 
            <el-table
@@ -79,47 +84,47 @@
             </el-table-column>
             <el-table-column label="期初结余" align="center">
                
-                 <el-table-column prop="stockIn" label="数量" width="100" align="center">
+                 <el-table-column prop="drugIn" label="数量" width="100" align="center">
                    
                  </el-table-column>
               
-                <el-table-column prop="last_price" label="进货金额" width="100" align="center">
+                <el-table-column prop="drugInMoney" label="进货金额" width="100" align="center">
                    
                 </el-table-column>
-                <el-table-column prop="stockMoney" label="销售金额" width="100" align="center">
+                <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="stockAdd" label="数量" width="100" align="center">
+                <el-table-column prop="drugAdd" label="数量" width="100" align="center">
                 
                 </el-table-column>
              
-                <el-table-column prop="last_price" label="进货金额" width="100" align="center">
+                <el-table-column prop="drugAddPrice" label="进货金额" width="100" align="center">
                   
                 </el-table-column>
-                <el-table-column  prop="addStockMoney" label="销售金额"  width="100" align="center">
+                <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="outStock" label="数量" width="100" align="center">
+               <el-table-column prop="drugOut" label="数量" width="100" align="center">
                 </el-table-column>
-                <el-table-column  prop="last_price"  label="进货金额" width="100" align="center">
+                <el-table-column  prop="drugOutPrice"  label="进货金额" width="100" align="center">
                 </el-table-column>
-                <el-table-column prop="stockOutMoney" label="销售金额" width="100" align="center">
+                <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="overStock" label="数量" width="100" align="center">
+              <el-table-column prop="overDrug" label="数量" width="100" align="center">
               </el-table-column>
-              <el-table-column prop="last_price" label="进货金额" width="100" align="center">
+              <el-table-column prop="overDrugPrice" label="进货金额" width="100" align="center">
               </el-table-column>
-              <el-table-column prop="oveMoney" label="销售金额" width="100" align="center">
+              <el-table-column prop="oveDrugSaleMoney" label="销售金额" width="100" align="center">
               </el-table-column>
             </el-table-column>
 
@@ -147,7 +152,7 @@
 </template>
 <script>
 import { getStorehouseList,getPurchaseDrugQuery } from "@/api/drug/drug"
-
+const moment = require('moment')
 import { uParseTime } from '@/utils/tools'
 export default {
 
@@ -155,7 +160,7 @@ export default {
     return{
      tableList:[],
      goodList:[
-      {id:1,name:"全部耗材"},
+      {id:1,name:"全部药品"},
       {id:2,name:"库存预警"},
      ],
      houseList:[],
@@ -169,8 +174,8 @@ export default {
      total:0,
      keyword:"",
      drugTypeList:[],
-     start_time:"",
-     end_time:"",
+     start_time:moment().startOf('month').format("YYYY-MM-DD"),
+     end_time:moment().endOf('month').format("YYYY-MM-DD"),
      countList:[],
      outCountList:[],
      autoCountList:[],
@@ -184,7 +189,7 @@ export default {
      patientList:[],
      good_name:"",
      specification_name:"",
-     
+     loading:false,
     }
   
   },
@@ -193,6 +198,7 @@ export default {
 
     },
     changeGoodTypeName(){
+      this.drugTypeList = []
       this.getlist()
     },
     getStorehouseList(){
@@ -211,6 +217,7 @@ export default {
       })
     },
     getlist(){
+        this.loading = true
         var params = {
           good_type:this.good_type,
           keyword:this.keyword,
@@ -221,46 +228,173 @@ export default {
         }
       getPurchaseDrugQuery(params).then(response=>{
          if(response.data.state == 1){
+            this.loading = false
             var list = response.data.data.list
             for (let i = 0; i < list.length; i++) {
-              for (let j = 0; j < list[i].drug_warehouse_info.length; j++) {
-                if (list[i].max_unit == list[i].drug_warehouse_info[j].max_unit) {
-                   list[i].drug_warehouse_info[j].stock_max_number =list[i].min_number *list[i].drug_warehouse_info[j].stock_max_number
-                   list[i].drug_warehouse_info[j].warehousing_count =list[i].min_number *list[i].drug_warehouse_info[j].warehousing_count
-                 }
+
+              //期初结余入库
+              if(list[i].DrugWarehouseInfoStart!=null && list[i].DrugWarehouseInfoStart.length > 0){
+                for(let j=0;j<list[i].DrugWarehouseInfoStart.length;j++){
+                  if(list[i].max_unit == list[i].DrugWarehouseInfoStart[j].max_unit){
+                     list[i].DrugWarehouseInfoStart[j].count =list[i].min_number * list[i].DrugWarehouseInfoStart[j].count
+                  }
+                }
+              }
+             
+             //期初结余出库
+              if(list[i].DrugWarehouseOutInfoStart!=null && list[i].DrugWarehouseOutInfoStart.length>0){
+                for(let j=0;j<list[i].DrugWarehouseOutInfoStart.length;j++){
+                  if(list[i].max_unit == list[i].DrugWarehouseOutInfoStart[j].max_unit){
+                    list[i].DrugWarehouseOutInfoStart[j].count =  list[i].DrugWarehouseOutInfoStart[j].count*list[i].min_number
+                  }
+                }
+              }
+
+              //期初结余退库
+               if(list[i].WareStartStockCancelInfo!=null && list[i].WareStartStockCancelInfo.length>0){
+                for(let j=0;j<list[i].WareStartStockCancelInfo.length;j++){
+                  if(list[i].max_unit == list[i].WareStartStockCancelInfo[j].max_unit){
+                    list[i].WareStartStockCancelInfo[j].count =  list[i].WareStartStockCancelInfo[j].count*list[i].min_number
+                  }
+                }
+              }
+
+
+              //期末结余入库
+              if(list[i].DrugWarehouseInfoEnd!=null && list[i].DrugWarehouseInfoEnd.length > 0){
+                for(let j=0;j<list[i].DrugWarehouseInfoEnd.length;j++){
+                   if(list[i].max_unit == list[i].DrugWarehouseInfoEnd[j].max_unit){
+                     list[i].DrugWarehouseInfoEnd[j].count = list[i].min_number * list[i].DrugWarehouseInfoEnd[j].count
+                   }
+                }
+              }
+             
+              //期末结余出库
+               if(list[i].DrugWarehouseOutInfoEnd!=null && list[i].DrugWarehouseOutInfoEnd.length>0){
+                for(let j=0;j<list[i].DrugWarehouseOutInfoEnd.length;j++){
+                  if(list[i].max_unit == list[i].DrugWarehouseOutInfoEnd[j].max_unit){
+                    list[i].DrugWarehouseOutInfoEnd[j].count =  list[i].DrugWarehouseOutInfoEnd[j].count*list[i].min_number
+                  }
                 }
-                for (let y = 0; y < list[i].drug_warehouse_out.length; y++) {
-                  if (list[i].drug_warehouse_out[y].count_unit == list[i].max_unit) {
-                    list[i].drug_warehouse_out[y].count =list[i].drug_warehouse_out[y].count * list[i].min_number
+              }
+
+              //期末结余退库
+               if(list[i].WareEndStockCancelInfo!=null && list[i].WareEndStockCancelInfo.length>0){
+                for(let j=0;j<list[i].WareEndStockCancelInfo.length;j++){
+                  if(list[i].max_unit == list[i].WareEndStockCancelInfo[j].max_unit){
+                    list[i].WareEndStockCancelInfo[j].count =  list[i].WareEndStockCancelInfo[j].count*list[i].min_number
                   }
                 }
-                for (let z = 0; z < list[i].drug_cancel_stock_info.length; z++) {
-                  if (list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit) {
-                    list[i].drug_cancel_stock_info[z].count =list[i].drug_cancel_stock_info[z].count * list[i].min_number
+              }
+
+              //期中增加
+              if(list[i].DrugWarehouseInfoStartEnd!=null && list[i].DrugWarehouseInfoStartEnd.length > 0){
+                for(let j=0;j<list[i].DrugWarehouseInfoStartEnd.length;j++){
+                   if(list[i].max_unit == list[i].DrugWarehouseInfoStartEnd[j].max_unit){
+                     list[i].DrugWarehouseInfoStartEnd[j].count =list[i].min_number * list[i].DrugWarehouseInfoStartEnd[j].count
                    }
                 }
-            }
-            var arr = [];
-            for (let i = 0; i < list.length; i++) {
-             if (list[i].drug_warehouse_info.length > 0) {
-               arr.push(list[i]);
               }
+           
+              //期中减少
+              if(list[i].DrugWarehouseOutInfoStartEnd!=null && list[i].DrugWarehouseOutInfoStartEnd.length > 0){
+                for(let j=0;j<list[i].DrugWarehouseOutInfoStartEnd.length;j++){
+                   if(list[i].max_unit == list[i].DrugWarehouseOutInfoStartEnd[j].max_unit){
+                     list[i].DrugWarehouseOutInfoStartEnd[j].count =list[i].min_number * list[i].DrugWarehouseOutInfoStartEnd[j].count
+                   }
+                }
+              }
+
+              //期中退库
+              if(list[i].WareStartEndStockCancelInfo!=null && list[i].WareStartEndStockCancelInfo.length > 0){
+                for(let j=0;j<list[i].WareStartEndStockCancelInfo.length;j++){
+                   if(list[i].max_unit == list[i].WareStartEndStockCancelInfo[j].max_unit){
+                     list[i].WareStartEndStockCancelInfo[j].count =list[i].min_number * list[i].WareStartEndStockCancelInfo[j].count
+                   }
+                }
+              }
+           
+           
+
+              //期初盘盈
+              if(list[i].WareStartStockInventoryProfit!=null && list[i].WareStartStockInventoryProfit.length > 0){
+                for(let j=0;j<list[i].WareStartStockInventoryProfit.length;j++){
+                  if(list[i].max_unit == list[i].WareStartStockInventoryProfit[j].max_unit){
+                     list[i].WareStartStockInventoryProfit[j].count = list[i].WareStartStockInventoryProfit[j].count * list[i].min_number
+                  }
+                }
+              }
+
+              //期初盘亏
+              if(list[i].WareStartStockInventoryLosses!=null && list[i].WareStartStockInventoryLosses.length > 0){
+                 for(let j=0;j<list[i].WareStartStockInventoryLosses.length;j++){
+                   if(list[i].max_unit == list[i].WareStartStockInventoryLosses[j].max_unit){
+                      list[i].WareStartStockInventoryLosses.count = list[i].WareStartStockInventoryLosses[j].count * list[i].min_number
+                   }
+                 }
+              }
+              
+      
+
+             //期中盘盈
+             if(list[i].WareStartEndStockInventoryProfit!=null && list[i].WareStartEndStockInventoryProfit.length > 0){
+                for(let j=0;j<list[i].WareStartEndStockInventoryProfit.length;j++){
+                  if(list[i].max_unit == list[i].WareStartEndStockInventoryProfit[j].max_unit){
+                    list[i].WareStartEndStockInventoryProfit[j].count = list[i].WareStartEndStockInventoryProfit[j].count * list[i].min_number
+                  }
+                }
+             }
+
+             //期中盘亏
+             if(list[i].WareStartEndStockInventoryLosses!=null && list[i].WareStartEndStockInventoryLosses.length > 0){
+               for(let j=0;j<list[i].WareStartEndStockInventoryLosses.length;j++){
+                 if(list[i].max_unit == list[i].WareStartEndStockInventoryLosses[j].max_unit){
+                    list[i].WareStartEndStockInventoryLosses[j].count = list[i].WareStartEndStockInventoryLosses[j].count * list[i].min_number
+                 }
+               }
+             }
+             //期末盘盈
+             if(list[i].WareEndStockInventoryProfit!=null && list[i].WareEndStockInventoryProfit.length >0){
+               for(let j=0;j<list[i].WareEndStockInventoryProfit.length;j++){
+                 if(list[i].max_unit == list[i].WareEndStockInventoryProfit[j].max_unit){
+                    list[i].WareEndStockInventoryProfit[j].count = list[i].WareEndStockInventoryProfit[j].count * list[i].min_number
+                 }
+               }
+             }
+             //期末盘亏
+             if(list[i].WareEndStockInventoryLosses!=null && list[i].WareEndStockInventoryLosses.length > 0){
+               for(let j=0;j<list[i].WareEndStockInventoryLosses.length;j++){
+                if(list[i].max_unit == list[i].WareEndStockInventoryLosses[j].max_unit){
+                   list[i].WareEndStockInventoryLosses[j].count = list[i].WareEndStockInventoryLosses[j].count * list[i].min_number
+                }
+               }
+             }
             }
-            for(let i=0;i<arr.length;i++){
-              arr[i].stockIn = this.getDrugWarehouseInfoStart(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].drug_warehouse_out)
-              arr[i].stockMoney = this.getDrugWarehouseInfoMoneyStart(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price,arr[i].drug_warehouse_out)
-              arr[i].stockAdd = this.getDrugWarehouseInfoStockAdd(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
-              arr[i].addStockMoney = this.getDrugWarehouseInfoaddMoney(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price)
-              arr[i].outStock = this.getDrugWarehouseOutInfo(arr[i].drug_warehouse_out,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
-              arr[i].stockOutMoney = this.getDrugWarehouseOutMoney(arr[i].drug_warehouse_out,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price)
-              arr[i].overStock = this.getDrugWarehouseInfo(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
-              arr[i].oveMoney =  this.getDrugWarehouseInfoMoney(arr[i].drug_warehouse_info,arr[i].min_number,arr[i].min_unit,arr[i].max_unit,arr[i].last_price)
+
+            console.log("list23323223322332232323322323wode",list)
+            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)
+              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].drugAdd = this.drugAddInfo(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].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].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].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)
             }
-            this.tableList = arr;
+            this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
             var drugTypeList = response.data.data.drugTypeList
-            var obj = {id:0,name:"全部"}
+            var obj = {value:0,name:"全部"}
             this.drugTypeList.push(obj)
             for(let i=0;i<drugTypeList.length;i++){
                this.drugTypeList.push(drugTypeList[i])
@@ -279,14 +413,18 @@ export default {
       return manufacturer_name
     },
     handleSizeChange(val) {
+      this.drugTypeList = []
       this.limit = val;
       this.getlist()
     },
     handleCurrentChange(val) {
       this.page = val;
+      this.drugTypeList = []
       this.getlist()
     },
    seach(){
+    this.drugTypeList = []
+    this.houseList= []
     this.getlist()
    },
    getDrugTypeName(id){
@@ -335,20 +473,109 @@ export default {
     return name
   },
   endTimeChange(){
-
+    this.getlist()
   },
   startTimeChange(){
+    this.getlist()
+  },
+  getDrugWarehouseInfoOne(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
+     } 
+  }
+  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;
+   }
+  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;
+    }
+   }
+  return max_str + min_str;  
 
   },
-  getDrugWarehouseInfo(arr,min_number,min_unit,max_unit){
+  getDrugWarehouseInfo(arr,arr4,min_number,min_unit,max_unit,arr2,arr3,arr5){
    var total = 0
+   var total_one= 0
+   var total_two = 0
+   var total_three = 0
+   var total_four = 0
+   var total_five = 0
    var max_str = "";
    var min_str = "";
-   if(arr.length > 0){
+   if(arr!=null && arr.length > 0){
     for(let i=0;i<arr.length;i++){
-      total += arr[i].stock_max_number + arr[i].stock_min_number
+      total_one += arr[i].count 
+     }
+   }
+   if(arr4!=null && arr4.length > 0){
+    for(let i=0;i<arr4.length;i++){
+      total_four += arr4[i].count 
      }
    }
+   if(arr2!=null && arr2.length > 0){
+     for(let i=0;i<arr2.length;i++){
+       total_two+= arr2[i].count
+     }
+   }
+   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
+  if(total < 0){
+    total = 0
+  }
   if (total < min_number) {
      min_str = total + min_unit;
    }
@@ -373,7 +600,7 @@ export default {
    var out_total = 0
    var max_str = "";
    var min_str = "";
-   if(arr.length > 0){
+   if(arr!=null &&arr.length > 0){
     for(let i=0;i<arr.length;i++){
       add_total += arr[i].warehousing_count
      }
@@ -419,8 +646,7 @@ export default {
       outTotal += outArr[i].count
      }
    }
-   console.log("adw23223wode",addTotal)
-   console.log("233232232tade",outTotal)
+
    total = addTotal - outTotal
    if (total < min_number) {
       min_str = total 
@@ -435,7 +661,7 @@ export default {
    }
  
    total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
-    console.log("total_price",total_price)
+
    return total_price
   },
   getDrugWarehouseInfoMoney(arr,min_number,min_unit,max_unit,last_price){
@@ -461,7 +687,7 @@ export default {
    }
  
    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){
@@ -516,6 +742,192 @@ export default {
    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
+   var total_four = 0
+   var totalFive = 0
+   var total_price = 0
+   if(arr!=null&&arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      totalOne += (arr[i].warehousing_count/min_number*arr[i].price) + arr[i].warehousing_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 
+     }
+   }
+
+  if(arr4!=null&&arr4.length > 0){
+    for(let i=0;i<arr4.length;i++){
+      total_four+=arr4[i].count * arr4[i].xt_drug_warehouse_info.retail_price
+     }
+   }
+
+  if(arr5!=null&&arr5.length > 0){
+    for(let i=0;i<arr5.length;i++){
+      totalFive += ((arr5[i].count/min_number) * arr5[i].price) + ((arr5[i].count%min_number)*(arr5[i].price/min_number))
+     }
+   }
+
+   total_price =(totalOne - totalTwo + total_three - total_four + totalFive).toFixed(2)
+   if(total_price >0){
+    return total_price
+   }else{
+    return 0
+   }
+  
+  },
+  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
+   var total_four_price =0
+   var total_three_price = 0
+   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)
+     }
+   }
+   
+   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
+     }
+   }
+
+   if(arr2!=null && arr2.length > 0){
+     for(let i=0;i<arr2.length;i++){
+       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
+     }
+   }
+
+   if(arr5!=null && arr5.length > 0){
+     for(let i=0;i<arr5.length;i++){
+       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)
+   }else{
+    return 0
+   }
+  },
+  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
+   var total_price_four = 0
+   var total_price_three =0
+   var total_price_five = 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
+     }
+   }
+   if(arr4!=null && arr4.length>0){
+    for(let i=0;i<arr4.length > 0;i++){
+      total_price_four += arr4[i].count * arr4[i].xt_drug_warehouse_info.retail_price
+    }
+   }
+   if(arr2!=null && arr2.length > 0){
+    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
+   if(total_price >0){
+     return total_price.toFixed(2)
+   }else{
+    return 0
+   }
+  
+  },
+  getSaleMoneyOne(arr,min_number,min_unit,max_unit,arr2,arr3,arr4,arr5){
+  var totalOne = 0
+   var totalTwo =0
+   var total_price = 0
+   var total_three= 0
+   var total_four = 0
+   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 
+     }
+   }
+  
+  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 
+     }
+   }
+
+  if(arr4!=null&&arr4.length > 0){
+    for(let i=0;i<arr4.length;i++){
+      total_four+=arr4[i].count * arr4[i].xt_drug_warehouse_info.retail_price
+     }
+   }
+
+   if(arr5!=null&&arr5.length > 0){
+    for(let i=0;i<arr5.length;i++){
+      total_four+=arr5[i].count * arr5[i].xt_drug_warehouse_info.retail_price
+     }
+   }
+   console.log("arr333333333332",arr3)
+   console.log("arr4233232323223233wi",arr4)
+   console.log("total_pricewode",(totalOne - totalTwo+total_three - total_four).toFixed(2))
+   total_price =(totalOne - totalTwo+total_three - total_four + total_five).toFixed(2)
+   if(total_price > 0){
+      return total_price
+   }else{
+     return 0
+   }
+  
+  },
   getDrugWarehouseOutInfo(arr,min_number,min_unit,max_unit){
    var total = 0
    var max_str = "";
@@ -565,13 +977,236 @@ export default {
     total_price = (max_str * last_price + min_str*(last_price/min_number)).toFixed(2)
     return total_price
    }
-  }
-  
   },
-  created(){
+   open(){
+    this.houseList= []
+    this.drugTypeList = []
     this.getStorehouseList()
     this.getlist()
+   },
   
+  drugAddInfo(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 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
+      }
+    }
+    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;
+      }
+    }
+    return max_str + min_str;  
+   },
+   getdrugAddPrice(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var totalone =0 
+    var totaltwo = 0
+    var total_price = 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.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
+      }
+    }
+    total = totalone + totaltwo
+    total_price =total.toFixed(2)
+    return total_price
+   },
+   drugAddSalePrice(arr,min_number,min_unit,max_unit,arr2){
+    var total = 0
+    var total_one = 0
+    var total_two = 0
+    var total_price = 0
+    if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total_one += 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++){
+       total_two +=arr2[i].count * arr2[i].xt_drug_warehouse_info.retail_price
+      }
+    }
+    
+    total = total_one + total_two
+
+    total_price = total.toFixed(2)
+    return total_price
+   },
+   getDrugOut(arr,min_number,min_unit,max_unit,arr2,arr3){
+    var total = 0
+    var totalone = 0
+    var totaltwo = 0
+    var totalthree = 0
+    var min_str = ""
+    var max_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
+      }
+    }
+    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;
+      }
+   }
+   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
+    var total_three_price = 0
+    var total = 0
+    var total_two = 0
+    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 += arr[i].count
+      }
+    }
+    if(arr2!=null && arr2.length>0){
+      for(let i=0;i<arr2.length;i++){
+        total_two_price +=arr2[i].count * arr2[i].xt_drug_warehouse_info.price/min_number
+        total_two +=arr2[i].count
+      }
+    }
+
+    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
+        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
+    }
+    
+   },
+   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 
+    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
+      }
+    }
+
+    if(arr3!=null && arr3.length >0){
+      for(let i=0;i<arr3.length;i++){
+         total_price_two +=arr3[i].count * arr3[i].xt_drug_warehouse_info.retail_price
+      }
+    }
+
+    if(arr4!=null && arr4.length >0){
+      for(let i=0;i<arr4.length;i++){
+         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
+    }
+    
+   },
+   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})
+   },
+    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
+          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,
+              merges,
+              data,
+              filename
+            })
+        })
+     },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]));
+    },
   }
 }
 </script>

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -13,7 +13,7 @@
         > 
       </div>
       <div class="cell clearfix">
-        <span>日期查询:</span>
+        <span>入库时间:</span>
         <el-date-picker
           size="small"
           v-model="start_time"
@@ -41,6 +41,34 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
+        <span>有效期:</span>
+        <el-date-picker
+          size="small"
+          v-model="start_first_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeFirstChange"
+        ></el-date-picker
+        >-
+        <el-date-picker
+          size="small"
+          v-model="end_first_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px; margin-right: 10px"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeFirstChange"
+        ></el-date-picker>
       </div>
 
       <el-table :data="tableList" border style="width: 100%">
@@ -104,12 +132,12 @@
             {{ scope.row.price }}
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
+        <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
           <template slot-scope="scope">
            <span v-if="scope.row.stock_max_number >0">{{ scope.row.stock_max_number }}{{drug.max_unit}}</span> 
            <span v-if="scope.row.stock_min_number >0">{{scope.row.stock_min_number}}{{drug.min_unit}}</span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
          <el-table-column prop="remake" label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.remark }}
@@ -209,6 +237,8 @@ export default {
       drugOutList: [],
       drug: {},
       houseList: [],
+      start_first_time:"",
+      end_first_time:"",
     };
   },
   watch: {
@@ -222,6 +252,10 @@ export default {
         drug_id: this.$route.query.drug_id,
         page: this.page,
         limit: this.limit,
+        start_time:this.start_time,
+        end_time:this.end_time,
+        start_first_time:this.start_first_time,
+        end_first_time:this.end_first_time,
       };
       getBatchOrderDetail(params).then((response) => {
         if (response.data.state == 1) {
@@ -400,6 +434,12 @@ export default {
       }
       return storehouse_name;
     },
+    startTimeFirstChange(){
+      this.getlist()
+    },
+    endTimeFirstChange(){
+      this.getlist()
+    }
   },
 };
 </script>

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -10,13 +10,13 @@
               <DrugQuery></DrugQuery>
             </el-tab-pane>
             <el-tab-pane label="进销存查询" name="second">
-               <PurchaseDrugQuery></PurchaseDrugQuery>
+               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
            </el-tab-pane>
             <el-tab-pane label="有效期查询" name="third">
-                <ExpiryDateDrugQuery></ExpiryDateDrugQuery>
+                <ExpiryDateDrugQuery ref="mychildOne"></ExpiryDateDrugQuery>
             </el-tab-pane>
             <el-tab-pane label="患者查询" name="fourth">
-                <DrugPatientQuery></DrugPatientQuery>
+                <DrugPatientQuery ref="mychildtwo"></DrugPatientQuery>
             </el-tab-pane>
         </el-tabs>
      </div>
@@ -51,8 +51,16 @@ export default {
     };
   },
   methods:{
-    handleClick(){
-        
+    handleClick(val){
+      if(val.name == "second"){
+       this.$refs.mychild.open()
+      }   
+      if(val.name == "third"){
+       this.$refs.mychildOne.open()
+      }
+      if(val.name == "fourth"){
+        this.$refs.mychildtwo.open()
+      }
     }
   }
 };

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -95,17 +95,19 @@
               <span>{{getHouseName(scope.row.storehouse_id)}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="数量" align="center">
+        <el-table-column prop="drug_name" label="数量&单位" align="center">
            <template slot-scope="scope">
-              {{scope.row.count}}
+              <span v-if="scope.row.consumable_type != 2 &&  scope.row.consumable_type != 3 && scope.row.consumable_type != 5 && scope.row.consumable_type != 7">{{scope.row.count}}{{scope.row.max_unit}}</span>
+              <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && parseInt(scope.row.count/scope.row.BaseDrugLib.min_number) >0">{{parseInt(scope.row.count/scope.row.BaseDrugLib.min_number)}}{{scope.row.BaseDrugLib.max_unit}}</span>
+              <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && scope.row.count%scope.row.BaseDrugLib.min_number >0">{{scope.row.count%scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}}</span>
            </template>
         </el-table-column>
 
-        <el-table-column prop="drug_name" label="单位" align="center">
+        <!-- <el-table-column prop="drug_name" label="单位" align="center">
            <template slot-scope="scope">
               {{scope.row.max_unit}}
            </template>
-        </el-table-column>
+        </el-table-column> -->
 
 
        <!-- <el-table-column prop="drug_name" label="剩余量" align="center">
@@ -270,6 +272,7 @@
                list[i].drug_way = 4
                this.tableList.push(list[i])
             }
+            console.log("tablelist323223232323wode",this.tableList)
             var total = response.data.data.total
             this.total = total
             var manufacturerList = response.data.data.manufacturerList
@@ -489,7 +492,7 @@
        getDrugFlow(params).then(response=>{
           if(response.data.state ==1){
             var list = response.data.data.list
-           
+            console.log("list2o2o33o23233o3oowo",list)
             this.tableList = list
             var total = response.data.data.total
            

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -259,6 +259,7 @@
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266',
           }"
+          :cell-class-name="cellStyle"
         >
           <el-table-column label="药品名称" align="center">
             <template slot-scope="scope">
@@ -287,36 +288,45 @@
               {{ getHouseName(scope.row.storehouse_id) }}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="剩余库存" align="center" v-if="is_sys == 0">
+          <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              {{scope.row.stock_count}}
+
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end:none;text-align: center">
+                    <span v-if="is_sys==1">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
+                    <!-- <span v-if="is_sys == 1"> {{getOutCount(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> -->
+                    <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
+                  </td>
+               </tr>
             </template>
-          </el-table-column> -->
-          <el-table-column label="出库数量" align="center">
+          </el-table-column>
+          <el-table-column label="批次" align="center">
             <template slot-scope="scope">
-              <span>
-                {{
-                  getTotalCountOne(
-                    scope.row.drug_id,
-                    scope.row.min_number,
-                    scope.row.max_unit,
-                    scope.row.min_unit
-                  )
-                }}</span
-              >
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end:none;text-align: center">
+                    <span v-if="is_sys == 1">{{getBatchNumber(item.warehousing_detail_id)}}</span> 
+                    <span v-if="is_sys == 0">{{getBatchNumberOne(item.batch_number)}}</span>
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
-              <span>{{ getXuserName(scope.row.admin_user_id) }} </span>
+                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{getXuserName(scope.row.admin_user_id)}}
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="单价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0"> {{ scope.row.price }}</span>
-              <span v-if="scope.row.price == 0">
-                {{ scope.row.retail_price }}</span
-              >
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys == 1">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                    <span v-if="is_sys == 0">{{getPriceOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <!-- <el-table-column label="进货价" align="center" v-if="is_sys == 0">
@@ -326,64 +336,73 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="org_id == 10210 || org_id == 9671">{{
-                (scope.row.count * scope.row.price).toFixed(2)
-              }}</span>
-              <span v-if="org_id != 10210 && org_id != 9671">
-                <span v-if="scope.row.price > 0">{{
-                  getAllPriceOne(
-                    scope.row.drug_id,
-                    scope.row.price,
-                    scope.row.price,
-                    scope.row.max_unit,
-                    scope.row.count_unit,
-                    scope.row.min_number,
-                    scope.row.is_sys
-                  ).toFixed(2)
-                }}</span>
-                <span v-if="scope.row.price == 0">{{
-                  getAllPriceOne(
-                    scope.row.drug_id,
-                    scope.row.retail_price,
-                    scope.row.min_price,
-                    scope.row.max_unit,
-                    scope.row.count_unit,
-                    scope.row.min_number,
-                    scope.row.is_sys
-                  ).toFixed(2)
-                }}</span>
-              </span>
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys == 1">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 0">{{getTotalPriceOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                  </td>
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
             <template slot-scope="scope">
-              {{ getManufacturerName(scope.row.manufacturer) }}
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys == 1"> {{getAllManufacturerName(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 0"> {{getManufacturerName(scope.row.manufacturer)}}</span>
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="生产日期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.product_date) }}
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys == 1"> {{getProductDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 0"> {{getTime(scope.row.product_date)}}</span>
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="有效日期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.expiry_date) }}
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                   <span v-if="is_sys == 1"> {{getExpiryDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                   <span v-if="is_sys == 0"> {{getTime(scope.row.expiry_date)}}</span>
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="经销商" align="center">
             <template slot-scope="scope">
-              {{ getDealerName(scope.row.dealer) }}
+                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys ==1">{{getDealer(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys ==0">{{getDealerName(scope.row.dealer)}}</span>  
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="批准文号" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.number != ''">{{ scope.row.number }}</span>
-              <span v-if="scope.row.number == '0'"></span>
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys == 1">{{getNumber(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                    <span v-if="is_sys == 0">{{scope.row.number}}</span> 
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
-              {{ scope.row.remark }}
+               <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    <span v-if="is_sys == 1">{{getRemark(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 0">{{scope.row.remark}}</span>
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
@@ -438,7 +457,7 @@
             </template>
             <template slot-scope="scope">
               <span
-                >{{ scope.row.ctime | parseTime("{y}-{m}-{d} {h}:{i}") }}
+                >{{ scope.row.ctime | parseTime("{y}-{m}-{d}") }}
               </span>
             </template>
           </el-table-column>
@@ -493,7 +512,7 @@
             </template>
             <template slot-scope="scope">
               <span
-                >{{ scope.row.ctime | parseTime("{y}-{m}-{d} {h}:{i}") }}
+                >{{ scope.row.ctime | parseTime("{y}-{m}-{d}") }}
               </span>
             </template>
           </el-table-column>
@@ -635,7 +654,10 @@ export default {
        {id:0,name:"全部"},
        {id:1,name:"已审核"},
        {id:2,name:"未审核"},
-      ]
+      ],
+      tabList:[],
+      tabListOne:[],
+      outList:[],
     };
   },
   methods: {
@@ -1162,37 +1184,43 @@ export default {
           this.tableShow = true;
           this.tableList = [];
           var list = response.data.data.list;
-          // console.log("lisrt233232323232233223", list);
+         
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
           var drugFlowList = response.data.data.drugFlowList;
+          var drugList = response.data.data.drugList
+        
+          this.tabList = drugList
+          var drugListOne = response.data.data.drugListFlow
+          var drugListTwo=  response.data.data.drugListOne
 
+          var drugoutlist = response.data.data.drugoutlist
+          this.outList = drugoutlist
           if (is_sys == 1) {
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
-                if (
-                  drugFlowList[i].count_unit ==
-                  drugFlowList[i].XtBaseDrug.max_unit
-                ) {
-                  drugFlowList[i].count =
-                    drugFlowList[i].count *
-                    drugFlowList[i].XtBaseDrug.min_number;
+                 drugFlowList[i].child = []
+                if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.max_unit) {
+                   drugFlowList[i].count =drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number;
                 }
-                if (
-                  drugFlowList[i].count_unit ==
-                  drugFlowList[i].XtBaseDrug.min_unit
-                ) {
-                  drugFlowList[i].count = drugFlowList[i].count;
+                if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit) {
+                    drugFlowList[i].count = drugFlowList[i].count;
+                }
+                for(let j=0;j<drugListOne.length;j++){
+                   if(drugFlowList[i].drug_id == drugListOne[j].drug_id){
+                       drugFlowList[i].child.push(drugListOne[j])
+                   }
                 }
               }
             }
-
+            console.log("数据元23322323232323322332我的",drugFlowList)
             this.drugFlowList = drugFlowList;
           }
           if (is_sys == 0 || is_sys == 12) {
             var flowlist = response.data.data.flowlist;
             this.drugFlowList = [];
             for (let i = 0; i < flowlist.length; i++) {
+               flowlist[i].child = []
               if (flowlist[i].count_unit == flowlist[i].max_unit) {
                 flowlist[i].count = flowlist[i].count * flowlist[i].min_number;
                 flowlist[i].count_unit = flowlist[i].min_unit;
@@ -1200,8 +1228,24 @@ export default {
               if (flowlist[i].count_unit == flowlist[i].min_unit) {
                 flowlist[i].count = flowlist[i].count;
               }
+              if(list[i].is_sys == 1){
+               for(let j=0;j<drugListOne.length;j++){
+                if(flowlist[i].drug_id == drugListOne[j].drug_id){
+                  flowlist[i].child.push(drugListOne[j])
+                }
+               }
+              }
+              if(list[i].is_sys == 0){
+               for(let j=0;j<drugListTwo.length;j++){
+                if(flowlist[i].drug_id == drugListTwo[j].drug_id){
+                  flowlist[i].child.push(drugListTwo[j])
+                }
+               }
+              }
+             
             }
             this.drugFlowList = flowlist;
+            console.log("数据我的喔喔喔喔喔喔",this.drugFlowList)
           }
 
           for (let i = 0; i < list.length; i++) {
@@ -1212,9 +1256,25 @@ export default {
             if (list[i].number == "0" || list[i].number == 0) {
               list[i].number = "";
             }
+            list[i].child = []
+            if(list[i].is_sys == 1){
+              for(let j=0;j<drugListOne.length;j++){
+                if(list[i].drug_id == drugListOne[j].drug_id){
+                  list[i].child.push(drugListOne[j])
+                }
+             }
+            }
+            if(list[i].is_sys == 0){
+              for(let j=0;j<drugListTwo.length;j++){
+                if(list[i].drug_id == drugListTwo[j].drug_id){
+                  list[i].child.push(drugListTwo[j])
+                }
+               }
+            }
           }
+         console.log("list2332323232232323",list)
           this.tableList = list;
-          // console.log("单价23323232323232232332232323233223", this.tableList);
+
         }
       });
     },
@@ -1555,6 +1615,424 @@ export default {
     },
     changeCheckType(){
       this.GetWarehouseOut();
+    },
+    // 合并单元格样式
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      let arr = [5,6, 7, 8, 9,10,11,12,13,14];
+      if (arr.indexOf(columnIndex) > -1) {
+        return "spanClass";
+      }
+    },
+    getOutCountSix(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+      for(let j=0;j<this.outList.length;j++){
+        if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
+           arr.push(this.outList[j])
+        }
+      }
+      
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+        }
+      }
+     
+      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;
+        }
+      }
+      return max_str + min_str;
+    },
+    getOutCount(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+        }
+      }
+     
+      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;
+        }
+      }
+      return max_str + min_str;
+    },
+    getOutCountOne(batch_number,max_unit,min_unit,min_number){
+     
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+      for(let j=0;j<this.tabList.length;j++){
+        if(batch_number == this.tabList[j].batch_number){
+           arr.push(this.tabList[j])
+        }
+      }
+      
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+        }
+      }
+     
+      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;
+        }
+      }
+      return max_str + min_str;
+    },
+    getBatchNumber(warehouse_info_id){
+     var arr = []
+     var batch_number = 0
+     for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+     if(arr.length > 0){
+       batch_number = arr[0].batch_number
+     }
+     return batch_number
+    },
+   getBatchNumberOne(number){
+     var arr = []
+     var batch_number = 0
+     for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].batch_number){
+           arr.push(this.tabList[j])
+        }
+      }
+     if(arr.length > 0){
+       batch_number = arr[0].batch_number
+     }
+     return batch_number
+    },
+    getPrice(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var price = 0
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      
+      if(arr.length > 0){
+        price = arr[0].price
+      }
+      return price
+    },
+    getPriceOne(number,max_unit,min_unit,min_number){
+      var arr = []
+      var price = 0
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].batch_number){
+           arr.push(this.tabList[j])
+        }
+      }
+      
+      if(arr.length > 0){
+        price = arr[0].price
+      }
+      return price
+    },
+    getTotalPrice(warehouse_info_id,max_unit,min_unit,min_number){
+      
+      var arr = []
+      var total = 0
+      var max_str = 0
+      var min_str = 0
+      var price = 0
+      var all_price = 0
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+     
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+           price = arr[0].price
+        }
+      }
+     
+      if (total < min_number) {
+        min_str = total
+      }
+      if (total == 0) {
+        min_str = 0;
+        max_str = 0;
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number)
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number)
+        }
+      }
+      if(max_unit!=min_unit){
+        all_price = max_str * min_number * price + min_str * price
+      }
+      if(max_unit == min_unit){
+         all_price = max_str * price + min_str * price
+      }
+      if(all_price > 0){
+        return all_price.toFixed(2)
+      }else{
+        return 0
+      }
+    },
+   getTotalPriceOne(number,max_unit,min_unit,min_number){
+   
+      var arr = []
+      var total = 0
+      var max_str = 0
+      var min_str = 0
+      var price = 0
+      var all_price = 0
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].batch_number){
+           arr.push(this.tabList[j])
+        }
+      }
+      console.log("Arr233322332",arr)
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+           price = arr[0].price
+        }
+      }
+     
+      if (total < min_number) {
+        min_str = total
+      }
+      if (total == 0) {
+        min_str = 0;
+        max_str = 0;
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number)
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number)
+        }
+      }
+     
+      if(max_unit!=min_unit){
+        all_price = max_str  * min_number * price + min_str * price
+      }
+      if(max_unit == min_unit){
+         all_price = max_str * price + min_str * price
+      }
+      if(all_price > 0){
+        return all_price.toFixed(2)
+      }else{
+        return 0
+      }
+    },
+    getAllManufacturerName(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var manufacture_id = 0
+      var manufacturer_name = ""
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        manufacture_id = arr[0].manufacturer
+      }
+      manufacturer_name = this.getManufacturerName(manufacture_id)
+      return manufacturer_name
+    },
+    getAllManufacturerNameOne(number,max_unit,min_unit,min_number){
+      var arr = []
+      var manufacture_id = 0
+      var manufacturer_name = ""
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].number){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        manufacture_id = arr[0].manufacturer
+      }
+      manufacturer_name = this.getManufacturerName(manufacture_id)
+      return manufacturer_name
+    },
+    getProductDate(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var product_date = 0
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        product_date = arr[0].product_date
+      }
+      return this.getTime(product_date)
+    },
+   getProductDateOne(number,max_unit,min_unit,min_number){
+      var arr = []
+      var product_date = 0
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].number){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        product_date = arr[0].product_date
+      }
+      return this.getTime(product_date)
+    },
+    getExpiryDate(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var expiry_date = 0
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        expiry_date = arr[0].expire_date
+      }
+      return this.getTime(expiry_date)
+    },
+    getExpiryDateOne(number,max_unit,min_unit,min_number){
+      var arr = []
+      var expiry_date = 0
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].number){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        expiry_date = arr[0].expire_date
+      }
+      return this.getTime(expiry_date)
+    },
+    getDealer(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var dealer = 0
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        dealer = arr[0].dealer
+      }
+      return this.getDealerName(dealer)
+    },
+   getDealerOne(number,max_unit,min_unit,min_number){
+      var arr = []
+      var dealer = 0
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].number){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        dealer = arr[0].dealer
+      }
+      return this.getDealerName(dealer)
+    },
+    getNumber(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var number = ""
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        number = arr[0].number
+      }
+      return number
+    },
+    getNumberOne(number,max_unit,min_unit,min_number){
+      var arr = []
+      var number = ""
+      
+      for(let j=0;j<this.tabList.length;j++){
+        if(number == this.tabList[j].number){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        number = arr[0].number
+      }
+      return number
+    },
+    getRemark(warehouse_info_id,max_unit,min_unit,min_number){
+      var arr = []
+      var remark = ""
+      for(let j=0;j<this.tabList.length;j++){
+        if(warehouse_info_id == this.tabList[j].warehousing_detail_id){
+           arr.push(this.tabList[j])
+        }
+      }
+      if(arr.length >0){
+        if(arr[0].DrugWarehouseInfoOne!=null){
+         remark = arr[0].DrugWarehouseInfoOne.remark
+        }
+      }
+      return remark
     }
   },
 };
@@ -1625,3 +2103,49 @@ export default {
   background-color: #d0d3da;
 }
 </style>
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+/* 合并表格线样式 */
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+}
+.spanClass .cell tr:last-of-type td {
+  border-bottom: none;
+}
+</style>

src/xt_pages/stock/query/expiryDateQuery.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="main-contain">
-     <div class="app-container ">
+     <div class="app-container "
+        v-loading="loading"
+        element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
           <span>有效期:</span>
@@ -28,6 +30,10 @@
           <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
+         <div>
+           <el-button type="primary" size="small" @click="toPrint">打印</el-button>
+           <el-button type="primary" size="small" @click="exportList">导出</el-button>
+         </div>
         </div>
            <el-table
             :row-style="{ color: '#303133' }"
@@ -51,7 +57,7 @@
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                   {{scope.row.GoodInfo.specification_name}}
+                   {{scope.row.GoodInfo.specification_name}}/{{scope.row.GoodInfo.packing_unit}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
@@ -101,8 +107,8 @@
           >
             </el-pagination>
      </div>
-
-
+    
+  
 
    
 
@@ -164,6 +170,7 @@ export default {
      ],
      nowtime:0,
      start_time:"",
+     loading:false,
     }
   
   },
@@ -175,8 +182,10 @@ export default {
 
     },
     getStorehouseList(){
+
       getStorehouseList().then(response=>{
          if(response.data.state == 1){
+        
            var houseList = response.data.data.list
            var obj = {id:0,storehouse_name:"全部"}
            this.houseList.push(obj)
@@ -190,6 +199,7 @@ export default {
       })
     },
     getlist(){
+        this.loading = true
         var params = {
           storehouse_id:this.storehouse_id,
           expiry_type:this.expiry_type,
@@ -200,6 +210,7 @@ export default {
         }
       getGoodExpiryDateQuery(params).then(response=>{
          if(response.data.state == 1){
+           this.loading = false
             var list = response.data.data.list
             this.tableList = list
             var manufacturerList = response.data.data.manufacturerList
@@ -492,7 +503,8 @@ export default {
     return (startDate - endDate ) / (1 * 24 * 60 * 60 * 1000);
   },
   changeExpriyList(val){
-   
+    this.limit = 10
+    this.page = 1
     if(val ==0){
      this.start_time = ""
      this.getlist()
@@ -543,11 +555,43 @@ export default {
     var time = year + "-" + month + "-" + day
     return time;
   },
-  },
-  created(){
+  open(){
+    this.houseList = []
     this.getStorehouseList()
     this.getlist()
-  }
+  },
+  toPrint(){
+    this.$router.push({path:"/expiry/date/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&expiry_type="+this.expiry_type})
+  },
+   exportList(){
+       for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].good_type_name = this.getGoodTypeName(this.tableList[i].GoodInfo.good_type_id)
+          this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
+          this.tableList[i].specification_name = this.tableList[i].GoodInfo.specification_name + "/" + this.tableList[i].GoodInfo.packing_unit
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].expiry = this.getTime(this.tableList[i].expiry_date)
+          this.tableList[i].flush_date = this.getDaysBetween(this.getTime(this.tableList[i].expiry_date),this.getTime(this.nowtime))
+       }
+      import('@/vendor/Export2Excel').then(excel => {
+       
+        const tHeader = ['序号','耗材类型','耗材名称','规格&单位','生产厂商','进货价','库存','批号','有效期','剩余天数']
+        const filterVal = ['index','good_type_name', 'good_name','specification_name','manufacturer_name','price','stock_count','number','expiry','flush_date']
+
+        const data = this.formatJson(filterVal,this.tableList)
+
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '耗材有效期查询表'
+        })
+       })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+  },
+ 
 }
 </script>
 

src/xt_pages/stock/query/goodNewQuery.vue

@@ -30,6 +30,11 @@
           <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
+          <div>
+            <!-- <el-button size="small" type="primary" @click="toClickTwo">脚本</el-button> -->
+            <el-button size="small" type="primary" @click="exportList">导出</el-button>
+            <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+          </div>
         </div>
 
            <el-table
@@ -41,6 +46,7 @@
             :data="tableList"
             :class="signAndWeighBoxPatients"
             border
+           :cell-class-name="cellStyle"
           >
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
@@ -54,7 +60,7 @@
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                  {{scope.row.specification_name}}
+                  {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
@@ -69,31 +75,32 @@
             </el-table-column>
             <el-table-column label="仓库名称" align="center">
               <template slot-scope="scope">
-                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                <tr style="background: none" v-for="(item,index) in scope.row.xt_good_stock_info" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center" >
-                    {{getHouseName(item.storehouse_id)}}
+                      {{getHouseName(item.storehouse_id)}}
                   </td>
                 </tr>
               </template>
             </el-table-column>
         
-            <el-table-column label="入库量" align="center">
+            <el-table-column label="入库数量" align="center">
               <template slot-scope="scope">
-                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                <tr style="background: none" v-for="(item,index) in scope.row.xt_good_stock_info" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                  {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
+                    {{getGoodIn(scope.row.xt_good_stock,item.storehouse_id)}}
                   </td>
                 </tr>
                </template>
             </el-table-column>
           
-            <el-table-column label="出库量" align="center">
+            <el-table-column label="出库数量" align="center">
               <template slot-scope="scope">
-                <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
-                <span v-if="org_id!=3907 && org_id!=9583">
-                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_out_info" :key="index">
+                <span>
+                  <tr style="background: none" v-for="(item,index) in scope.row.xt_good_stock_info" :key="index">
                     <td style="border-right: none; border-inline-end: none;text-align: center">
-                      <span style="color:#0099FF" @click="toDialogClick(scope.row.id,scope.row.good_name,scope.row.specification_name)"> {{getWareOutInfoCount(scope.row.warehouse_out_info,item.storehouse_id)}}</span>&nbsp;
+                      <span> 
+                         {{getGoodAct(scope.row.xt_good_stock,item.storehouse_id)}}
+                      </span>
                     </td>
                   </tr>
               </span>
@@ -102,9 +109,9 @@
 
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
-                  <tr style="background: none" v-for="(item,index) in scope.row.cancel_stock_info" :key="index">
+                  <tr style="background: none" v-for="(item,index) in scope.row.xt_good_stock_info" :key="index">
                     <td style="border-right: none; border-inline-end: none;text-align: center">
-                      {{getCancelCountInfo(scope.row.cancel_stock_info,item.storehouse_id)}}&nbsp; 
+                      {{getGoodCancel(scope.row.xt_good_stock,item.storehouse_id)}}
                     </td>
                   </tr>
 
@@ -113,11 +120,14 @@
 
              <el-table-column label="实际出库" align="center">
               <template slot-scope="scope">
-                <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
-                <span v-if="org_id!=3907 && org_id!=9583">
-                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+              
+                <span>
+                  <tr style="background: none" v-for="(item,index) in scope.row.xt_good_stock_info" :key="index">
                     <td style="border-right: none; border-inline-end: none;text-align: center">
-                    {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
+                    
+                      <span style="color:#0099FF" @click="toDialogClick(scope.row.id,scope.row.good_name,scope.row.specification_name,item.storehouse_id)">
+                         {{getGoodOut(scope.row.xt_good_stock,item.storehouse_id)}} 
+                       </span>
                     </td>
                   </tr>
                </span>
@@ -126,18 +136,11 @@
 
             <el-table-column label="剩余库存" align="center">
               <template slot-scope="scope">
-                <span v-if="org_id == 3907 || org_id == 9583">
-                  {{
-                    getWareInfo(scope.row.xt_warehouse_info) -
-                    getAutoCount(scope.row.id) -
-                    getOutCount(scope.row.id) +
-                    getCancelCount(scope.row.id)
-                    }}
-                </span>
-                <span v-if="org_id!=3907 && org_id!=9583">
-                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                
+                <span>
+                  <tr style="background: none" v-for="(item,index) in scope.row.xt_good_stock_info" :key="index">
                     <td style="border-right: none; border-inline-end: none;text-align: center">
-                    {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;
+                      {{getGoodFlush(scope.row.xt_good_stock,item.storehouse_id)}}
                     </td>
                   </tr>
                 </span>
@@ -146,12 +149,14 @@
 
             <el-table-column label="总库存量" align="center">
               <template slot-scope="scope">
-                <span v-if="org_id == 3907 || org_id == 9583">
-                    {{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) -getOutCount(scope.row.id) +getCancelCount(scope.row.id)}}
-                </span>
-                <span v-if="org_id != 3907 && org_id != 9583">
-                   <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) <= scope.row.stock_warn_count" style="color:red"> {{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
-                   <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) > scope.row.stock_warn_count"> {{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+              
+                <span>
+                   <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) <= scope.row.stock_warn_count" style="color:red">
+                     {{getSumCount(scope.row.xt_good_stock,scope.row.id)}}
+                    </span>
+                   <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) > scope.row.stock_warn_count">
+                      {{getSumCount(scope.row.xt_good_stock,scope.row.id)}}
+                    </span>
                 </span>
                </template>
             </el-table-column>
@@ -237,6 +242,11 @@
           :class="signAndWeighBoxPatients"
           border
           >
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{scope.$index + 1}}
+            </template>
+          </el-table-column>
           <el-table-column label="单据编号" align="center">
             <template slot-scope="scope">
               {{scope.row.warehouse_out_order_number}}
@@ -244,17 +254,18 @@
           </el-table-column>
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
-              {{getTime(scope.row.ctime)}}
+              {{getTimeOne(scope.row.ctime)}}
             </template>
           </el-table-column>
           <el-table-column label="出库数量" align="center">
               <template slot-scope="scope">
-                {{scope.row.count}}
+                {{scope.row.count}}{{scope.row.GoodInfo.packing_unit}}
               </template>
           </el-table-column>
           <el-table-column label="库存数量" align="center">
             <template slot-scope="scope">
-               
+              {{scope.row.over_count}}
+              
             </template>
           </el-table-column>
           <el-table-column label="使用人" align="center">
@@ -289,11 +300,12 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getGoodNewQuery,getGoodWarehouseOutInfoById } from "@/api/drug/drug"
+import { getStorehouseList,getGoodNewQuery,getGoodWarehouseOutInfoById,toSendGoodInfomation } from "@/api/drug/drug"
 import {
   getStockDrugCount
 } from "@/api/stock";
 import { uParseTime } from '@/utils/tools'
+const moment = require('moment')
 export default {
 
   data(){
@@ -325,20 +337,26 @@ export default {
      cancelCountList:[],
      org_id:this.$store.getters.xt_user.org_id,
      dialogVisible:false,
-     start_first_time:"",
-     end_first_time:"",
+     start_first_time:moment().startOf('month').format("YYYY-MM-DD"),
+     end_first_time:moment().endOf('month').format("YYYY-MM-DD"),
      tableData:[],
      good_id:0,
      patientList:[],
      good_name:"",
      specification_name:"",
      loading:false,
+     warehouseInfoByList:[],
+     cancelStockInfoByList:[],
+     warehouseOutByList:[],
+     flushList:[],
+     type_name:0,
+     storehouseId:0
     }
   
   },
   methods:{
     changeStorehouseName(){
-
+      this.getlist()
     },
     changeGoodName(){
       this.getlist()
@@ -401,17 +419,10 @@ export default {
         }
       getGoodNewQuery(params).then(response=>{
          if(response.data.state == 1){
-            var list = response.data.data.list
+            // var list = response.data.data.list
+            var list =  response.data.data.stockList
             this.loading = false
-            if(list.length > 0){
-              var arr = []
-              for(let i=0;i<list.length;i++){
-                if(list[i].xt_warehouse_info.length > 0){
-                  arr.push(list[i])
-                }
-              }
-              this.tableList = arr
-            }
+            this.tableList = list
             this.total = response.data.data.total
            
          }
@@ -436,11 +447,11 @@ export default {
     },
     handleSizeChangeOne(val) {
       this.limitone = val;
-      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
     },
     handleCurrentChangeOne(val) {
       this.pageone = val;
-      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
     },
    seach(){
     this.getlist()
@@ -465,7 +476,7 @@ export default {
    },
    getWareInfoCount(val,storehouse_id){
      var count = 0
-     if(val.length > 0){
+     if(val!=null&&val.length > 0){
        for(let i=0;i<val.length;i++){
          if(val[i].storehouse_id == storehouse_id){
              count +=val[i].warehousing_count
@@ -497,7 +508,7 @@ export default {
     },
     getWareInfoCountOne(val,storehouse_id){
      var count = 0
-     if(val.length > 0){
+     if(val!=null&&val.length > 0){
        for(let i=0;i<val.length;i++){
          if(val[i].storehouse_id == storehouse_id){
              count +=val[i].stock_count
@@ -539,9 +550,9 @@ export default {
    },
    getCancelCountInfo(cancel_stock_info,storehouse_id){
      var count = 0 
-     if(cancel_stock_info.length >0){
+     if(cancel_stock_info!=null && cancel_stock_info.length >0){
         for(let i=0;i<cancel_stock_info.length;i++){
-          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+          if(cancel_stock_info[i].storehouse_id == storehouse_id){
               count += cancel_stock_info[i].count
           }
         }
@@ -550,7 +561,7 @@ export default {
    },
    getWareOutInfoCount(warehouse_out_info,storehouse_id){
      var count = 0
-     if(warehouse_out_info.length > 0){
+     if(warehouse_out_info!=null && warehouse_out_info.length > 0){
        for(let i=0;i<warehouse_out_info.length;i++){
          if(storehouse_id == warehouse_out_info[i].storehouse_id){
             count +=warehouse_out_info[i].count
@@ -639,40 +650,45 @@ export default {
    },
    getOverFlushInfo(arr){
      var total = 0
-     if(arr.length >0){
+     if(arr!=null&&arr.length >0){
       for(let i=0;i<arr.length;i++){
         total += arr[i].stock_count
       }
      }
      return total
    },
-   toDialogClick(id,good_name,specification_name){
+   toDialogClick(id,good_name,specification_name,storehouse_id){
+   
     this.good_id = id
     this.good_name = good_name
     this.specification_name = specification_name
+    this.storehouseId = storehouse_id
      var params = {
        good_id:id,
        limit:this.limitone,
        page:this.pageone,
        start_first_time:this.start_first_time,
        end_first_time:this.end_first_time,
+       storehouse_id:storehouse_id,
      }
      getGoodWarehouseOutInfoById(params).then(response=>{
        if(response.data.state == 1){
+         this.dialogVisible = true
          var list = response.data.data.list
-         console.log("list23233233232w",list)
          this.tableData = list
          this.totalone = response.data.data.total
-         this.dialogVisible = true
+      
+        //  this.flushList =  response.data.data.flushList
+        
        }
      })
    
    },
    startFirstTimeChange(){
-    
+    this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
    },
    endEndTimeChange(){
-
+    this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
    },
   getTime(val) {
     if(val < 0){
@@ -684,6 +700,16 @@ export default {
     return uParseTime(val, '{y}-{m}-{d}')
    }
    },
+   getTimeOne(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+   }
+   },
   getName(id){
     var name = ""
     for(let i=0;i<this.patientList.length;i++){
@@ -692,13 +718,428 @@ export default {
       }
     }
     return name
-  }
+  },
+  getCount(ctime){
+   var arr = []
+   var arrOut = []
+   var total_in = 0
+   var total_out = 0
+   for(let i=0;i<this.warehouseInfoByList.length;i++){
+      if(ctime >= this.warehouseInfoByList[i].ctime){
+         arr.push(this.warehouseInfoByList[i])
+      }
+   }
+   if(arr.length > 0){
+    for(let i=0;i<arr.length;i++){
+      total_in +=arr[i].warehousing_count
+    }
+   }
+   for(let i=0;i<this.warehouseOutByList.length;i++){
+     if(ctime <=this.warehouseOutByList[i].ctime){
+       arrOut.push(this.warehouseOutByList[i])
+     }
+   }
+   if(arrOut.length >0){
+    for(let i=0;i<arrOut.length;i++){
+      total_out +=arrOut[i].count
+    }
+   }
+   console.log("total23323223",total_in)
+   return total_in - total_out
+  },
+  getStockCountOne(warehouse_out_id,good_id,patient_id,sys_record_time){
+    var flush_count = 0
+    if(this.flushList!=null && this.flushList.length > 0){
+     for(let i=0;i<this.flushList.length;i++){
+      if(warehouse_out_id == this.flushList[i].warehouse_out_id && good_id == this.flushList[i].good_id && patient_id == this.flushList[i].patient_id && sys_record_time == this.flushList[i].system_time){
+         flush_count = this.flushList[i].flush_count
+      }
+     }
+    }
+    return flush_count
+  },
+   // 合并单元格样式
+  cellStyle({ row, column, rowIndex, columnIndex }) {
+    let arr = [5,6, 7, 8, 9,10,11];
+    if (arr.indexOf(columnIndex) > -1) {
+      return "spanClass";
+    }
+   },
+   exportList(){
+      import('@/vendor/Export2Excel').then(excel => {
+         console.log("table")
+         if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i+1
+            this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+            this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+            this.tableList[i].manufacturer = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_info,this.tableList[i].id)
+            this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_info,this.tableList[i].id) 
+            this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_info,this.tableList[i].id)
+            this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_info,this.tableList[i].id) 
+            this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_info,this.tableList[i].id) 
+            this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+
+          }
+         }
+         
+         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer','social_security_directory_code','stock_in_count','stock_out_count','stock_cancel_count','act_out_count','over_count','sum_count']
+        
+         const data = this.formatJson(filterVal, this.tableList)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '库存查询'
+         })
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+      toPrint(){
+        this.$router.push("/good/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
+      },
+      getCancelSotckInfo(arr){
+        var cancle_toal = 0
+        if(arr.length >0){
+         for(let z=0;z<arr.length;z++){
+           cancle_toal += arr[z].count
+         }
+        }
+        return cancle_toal
+      },
+     getStockOutFlow(arr,storehouse_id){
+       var count = 0
+       if(arr!=null && arr.length > 0){
+         for(let i=0;i<arr.length;i++){
+          if(arr[i].storehouse_id == storehouse_id){
+            count +=arr[i].count
+          }
+         
+         }
+       }
+       if(count > 0){
+          return count
+       }else{
+         return  0
+       }
+     },
+     GetStockInCount(val){
+       var count = 0
+       if(val!=null && val.length >0){
+        for(let i=0;i<val.length;i++){
+          count +=val[i].warehousing_count
+        }
+       }
+       if(count > 0){
+         return count
+       }else{
+         return  0
+       }
+
+     },
+     getStockOutCount(val){
+       var count = 0
+       if(val!=null && val.length >0){
+        for(let i=0;i<val.length;i++){
+          count +=val[i].count
+        }
+       }
+       if(count > 0){
+         return count
+       }else{
+         return  0
+       }
+     },
+     getCancelStockInfo(val){
+       var count = 0
+       if(val!=null && val.length >0){
+        for(let i=0;i<val.length;i++){
+          count +=val[i].count
+        }
+       }
+       if(count > 0){
+         return count
+       }else{
+         return  0
+       }
+     },
+     getOverCount(val){
+       var count = 0
+       if(val!=null && val.length >0){
+        for(let i=0;i<val.length;i++){
+          count +=val[i].stock_count
+        }
+       }
+       if(count > 0){
+         return count
+       }else{
+         return  0
+       }
+     },
+
+    //  修改后接口
+    getGoodIn(val,storehouse_id){
+      var sum_count = 0
+      if(val!=null && val!=undefined){
+        for(let i=0;i<val.length;i++){
+          if(storehouse_id == val[i].storehouse_id){
+             sum_count = val[i].stock_in_count
+          }
+        }
+      }
+      if(sum_count > 0){
+         return sum_count
+      }else{
+        return  0
+      }
+    },
+    getGoodOut(val,storehouse_id){
+      var sum_count = 0
+      if(val!=null && val!=undefined){
+        for(let i=0;i<val.length;i++){
+          if(storehouse_id == val[i].storehouse_id){
+             sum_count = val[i].stock_out_count
+          }
+        }
+      }
+      if(sum_count > 0){
+         return sum_count
+      }else{
+        return  0
+      }
+    },
+    getGoodCancel(val,storehouse_id){
+      var sum_count = 0
+      if(val!=null && val!=undefined){
+        for(let i=0;i<val.length;i++){
+          if(storehouse_id == val[i].storehouse_id){
+             sum_count = val[i].stock_cancel_count
+          }
+        }
+      }
+      if(sum_count > 0){
+         return sum_count
+      }else{
+        return  0
+      }
+    },
+    getGoodAct(val,storehouse_id){
+      var sum_count = 0
+      if(val!=null && val!=undefined){
+        for(let i=0;i<val.length;i++){
+          if(storehouse_id == val[i].storehouse_id){
+             sum_count = val[i].stock_act_out_count
+          }
+        }
+      }
+      if(sum_count > 0){
+         return sum_count
+      }else{
+        return  0
+      }
+    },
+    getGoodFlush(val,storehouse_id){
+      var sum_count = 0
+      if(val!=null && val!=undefined){
+        for(let i=0;i<val.length;i++){
+          if(storehouse_id == val[i].storehouse_id){
+             sum_count = val[i].flush_count
+          }
+        }
+      }
+      if(sum_count > 0){
+         return sum_count
+      }else{
+        return  0
+      }
+    },
+    getSumCount(val,good_id){
+      var sum_count = 0
+      var arr = []
+      if(val!=null && val!=undefined){
+        for(let i=0;i<val.length;i++){
+          if(good_id == val[i].good_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      for(let i=0;i<arr.length;i++){
+        sum_count +=arr[i].flush_count
+      }
+      if(sum_count > 0){
+         return sum_count
+      }else{
+        return  0
+      }
+    },
+    toClickTwo(){
+      toSendGoodInfomation().then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          console.log("脚本保存成功!")
+        }
+      })
+    },
+
+    //导出
+    GetExportStockInCount(val,id){
+      var sum_count = 0
+      var arr = []
+      if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].good_id == id){
+              arr.push(val[i])
+          }
+        }
+      }
+      for(let i=0;i<arr.length;i++){
+        sum_count +=arr[i].stock_in_count
+      }
+      if(sum_count > 0){
+        return sum_count
+      }else{
+        return 0
+      }
+    },
+    getExportStockOutCount(val,id){
+      var sum_count = 0
+      var arr = []
+      if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].good_id == id){
+              arr.push(val[i])
+          }
+        }
+      }
+      for(let i=0;i<arr.length;i++){
+        sum_count +=arr[i].stock_out_count
+      }
+      if(sum_count > 0){
+        return sum_count
+      }else{
+        return 0
+      }
+    },
+    getExportCancelStockInfo(val,id){
+      var sum_count = 0
+      var arr = []
+      if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].good_id == id){
+              arr.push(val[i])
+          }
+        }
+      }
+      for(let i=0;i<arr.length;i++){
+        sum_count +=arr[i].stock_cancel_count
+      }
+      if(sum_count > 0){
+        return sum_count
+      }else{
+        return 0
+      }
+    },
+    getExportActStockOutCount(val,id){
+      var sum_count = 0
+      var arr = []
+      if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].good_id == id){
+              arr.push(val[i])
+          }
+        }
+      }
+      for(let i=0;i<arr.length;i++){
+        sum_count +=arr[i].stock_act_out_count
+      }
+      if(sum_count > 0){
+        return sum_count
+      }else{
+        return 0
+      }
+    },
+    getExportOverCount(val,id){
+     var sum_count = 0
+      var arr = []
+      if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].good_id == id){
+              arr.push(val[i])
+          }
+        }
+      }
+      for(let i=0;i<arr.length;i++){
+        sum_count +=arr[i].flush_count
+      }
+      if(sum_count > 0){
+        return sum_count
+      }else{
+        return 0
+      }
+    }
+
   },
   created(){
+    this.houseList = []
     this.getStorehouseList()
     this.getlist()
-    this.getStockDrugCount()
+    
+    var org_id = this.$store.getters.xt_user.org_id
+    if(org_id == 9583 || org_id == 3907){
+     this.getStockDrugCount()
+    }
+ 
   }
 }
 </script>
 
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+/* 合并表格线样式 */
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+}
+.spanClass .cell tr:last-of-type td {
+  border-bottom: none;
+}
+</style>

src/xt_pages/stock/query/patientQuery.vue

@@ -1,6 +1,8 @@
 <template>
     <div class="main-contain">
-        <div class="app-container">
+        <div class="app-container"
+         v-loading="loading"
+        element-loading-text="拼命加载中">
          <el-container>
                <div style="width:27%">
                 <el-row>
@@ -77,13 +79,18 @@
                </div>
 
                  <el-main>
+                 
+                
                   <div class="main newMain">
                       
                         
                   <el-tabs>
-
+                  
                    <el-tab-pane label="患者使用列表">
-                   
+                    <div style="float:right;margin-bottom:10px">
+                      <el-button type="primary" size="small" @click="toPrint">打印</el-button>
+                      <el-button type="primary" size="small" @click="exportList">导出</el-button>
+                    </div>
                      <el-table
                           :data="tableList"
                           highlight-current-row
@@ -101,7 +108,7 @@
                       align="center"
                       >
                       <template slot-scope="scope">
-                        {{scope.row.GoodInfo.good_name}}
+                        {{scope.row.good_name}}
                       </template>
                     </el-table-column>
                      <el-table-column
@@ -109,7 +116,7 @@
                       label="生产厂家"
                       align="center">
                       <template slot-scope="scope">
-                        {{getManufacturName(scope.row.manufacturer)}}
+                       {{scope.row.manufacturer}}
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -117,7 +124,7 @@
                       label="规格&单位"
                       align="center">
                       <template slot-scope="scope">
-                        {{scope.row.GoodInfo.specification_name}}
+                        {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                       </template>
                      </el-table-column>
                       <el-table-column
@@ -125,14 +132,14 @@
                       label="数量"
                       align="center">
                       <template slot-scope="scope">
-                        {{scope.row.count}}
+                        {{getCount(scope.row.child)}}{{scope.row.packing_unit}}
                       </template>
                      </el-table-column>
 
                      </el-table>
                       <el-pagination
                         @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
+                        @current-change="handleCurrentChangeOne"
                         :page-sizes="[10, 50, 100,200,500,1000]"
                         :page-size="10"
                         background
@@ -175,6 +182,7 @@ export default {
       limit:10,
       page:1,
       total:0,
+      loading:false,
     }
   },
   methods:{
@@ -182,7 +190,7 @@ export default {
       this.limit = val;
       this.getWarehouseOutDetailByPatientId()
     },
-    handleCurrentChange(val) {
+    handleCurrentChangeOne(val) {
       this.page = val;
       this.getWarehouseOutDetailByPatientId()
     },
@@ -193,12 +201,15 @@ export default {
       this.handleCurrentChange(this.patient)
     },
     getlist(){
+       this.loading = true
         var params = {
           keyword:this.keyword,
         }
       getGoodPatientList(params).then(response=>{
         if(response.data.state == 1){
+          this.loading = false
           var list = response.data.data.list
+          
           this.patientList = list
           this.$refs.singleTable.setCurrentRow(this.patientList[0]);
           this.handleCurrentChange(this.patientList[0])
@@ -209,6 +220,7 @@ export default {
      this.getlist()
    },
    handleCurrentChange(val){
+    
        this.patient = val
        var params = {
          patient_id:val.id,
@@ -217,27 +229,89 @@ export default {
          limit:this.limit,
          page:this.page
        }
+      this.tableList = []
      getWarehouseOutDetailByPatientId(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          this.total = response.data.data.total
+          var outlist = response.data.data.outlist
           this.manufacturerList = response.data.data.manufacturerList
-          this.tableList = list
+          console.log("list",list)
+          let dataInfo = {}
+          if(list!=null && list.length > 0){
+            list.forEach((item, index) => {
+            let { good_id } = item
+            if (!dataInfo[good_id]) {
+              dataInfo[good_id] = {
+                good_id,
+                child: [],
+                specification_name:item.GoodInfo.specification_name,
+                good_name:item.GoodInfo.good_name,
+                packing_unit:item.GoodInfo.packing_unit,
+                manufacturer:this.getManufacturName(item.manufacturer),
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)
+          console.log("ar232323232",arr)
+          arr.forEach((item,index)=>{
+            for(let i=0;i<outlist.length;i++){
+               if(item.good_id == outlist[i].good_id){
+                 item.child.push(outlist[i])
+               }
+            }
+          }) 
+
+          this.tableList = arr
+         }
+          this.total = response.data.data.total
+         
+         
         }
      })
    },
    getWarehouseOutDetailByPatientId(){
      var params = {
-        patient_id:this.patient,
+        patient_id:this.patient.id,
         start_time:this.start_time,
         end_time:this.end_time,
+        limit:this.limit,
+        page:this.page
       }
     getWarehouseOutDetailByPatientId().then(response=>{
        if(response.data.state == 1){
-        var list = response.data.data.list
+         var list = response.data.data.list
+         var outlist = response.data.data.outlist
+         this.manufacturerList = response.data.data.manufacturerList
+            let dataInfo = {}
+          if(list!=null && list.length > 0){
+            list.forEach((item, index) => {
+            let { good_id } = item
+            if (!dataInfo[good_id]) {
+              dataInfo[good_id] = {
+                good_id,
+                child: [],
+                specification_name:item.GoodInfo.specification_name,
+                good_name:item.GoodInfo.good_name,
+                packing_unit:item.GoodInfo.packing_unit,
+                manufacturer:this.getManufacturName(item.manufacturer),
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)
+          console.log("ar232323232",arr)
+          arr.forEach((item,index)=>{
+            for(let i=0;i<outlist.length;i++){
+               if(item.good_id == outlist[i].good_id){
+                 item.child.push(outlist[i])
+               }
+            }
+          }) 
+          this.tableList = arr
+         }
+       
         this.total = response.data.data.total
-        this.manufacturerList = response.data.data.manufacturerList
-        this.tableList = list
+        
+       
        }
     })
    },
@@ -249,7 +323,71 @@ export default {
         } 
      }
      return manufacturer_name
-   }
+   },
+   open(){
+    this.getlist()
+   },
+   toPrint(){
+    var patient_name = ""
+
+    for(let i=0;i<this.patientList.length;i++){
+       if(this.patient.id == this.patientList[i].id){
+        patient_name = this.patientList[i].name
+       }
+    }
+
+    this.$router.push({path:"/patient/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&patient_id="+this.patient.id+"&patient_name="+patient_name})
+   },
+   exportList(){
+      for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].count_name = this.getCount(this.tableList[i].child) + this.tableList[i].packing_unit
+        this.tableList[i].specification_name = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+        this.tableList[i].query_date = this.start_time + "~" + this.end_time
+        this.tableList[i].patient_name = ""
+        if(this.tableList[i].index == 1){
+          this.tableList[i].patient_name = this.getPatientName(this.patient.id)
+        }
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+       
+        const tHeader = ['序号','患者姓名','查询日期','耗材名称','生产厂家','规格&单位','数量']
+        const filterVal = ['index','patient_name','query_date','good_name', 'manufacturer','specification_name','count_name']
+
+        const data = this.formatJson(filterVal,this.tableList)
+
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '患者耗材使用查询表'
+        })
+       })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+       getPatientName(id){
+         var patient_name = ""
+        for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+            patient_name = this.patientList[i].name
+          }
+        }
+        return patient_name
+       },
+       getCount(val){
+         var total_count = 0
+         if(val!=null && val.length > 0){
+           for(let i=0;i<val.length;i++){
+             total_count +=val[i].count
+           }
+         }
+         if(total_count > 0){
+           return total_count
+         }else{
+          return  0
+         }
+       }
   },
   created(){
     var nowDate = new Date();
@@ -272,7 +410,7 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-     this.getlist()
+     
   },
   
 }

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="main-contain">
-     <div class="app-container ">
+     <div class="app-container "
+       v-loading="loading"
+        element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
           <span>操作时间:</span>
@@ -45,6 +47,10 @@
           <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
+         <div>
+           <el-button type="primary" size="small" @click="toPrint">打印</el-button>
+           <el-button type="primary" size="small" @click="exportList">导出</el-button>
+         </div>
         </div>
 
            <el-table
@@ -69,7 +75,7 @@
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                  {{scope.row.specification_name}}
+                  {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
@@ -83,7 +89,7 @@
                    
                  </el-table-column>
               
-                <el-table-column prop="buy_price" label="进货金额" width="100">
+                <el-table-column prop="stock_in_price" label="进货金额" width="100">
                    
                 </el-table-column>
                 <el-table-column prop="stockMoney" label="销售金额" width="100">
@@ -97,10 +103,10 @@
                 
                 </el-table-column>
              
-                <el-table-column prop="buy_price" label="进货金额" width="100">
+                <el-table-column prop="addStockMoney" label="进货金额" width="100">
                   
                 </el-table-column>
-                <el-table-column  prop="addStockMoney" label="销售金额"  width="100">
+                <el-table-column  prop="saleStockMoney" label="销售金额"  width="100">
                 </el-table-column>
               
             </el-table-column>
@@ -108,18 +114,18 @@
             <el-table-column label="本期减少" align="center">
                <el-table-column prop="outStock" label="数量" width="100">
                 </el-table-column>
-                <el-table-column  prop="buy_price"  label="进货金额" width="100">
+                <el-table-column  prop="stockOutprice"  label="进货金额" width="100">
                 </el-table-column>
-                <el-table-column prop="stockOutMoney" label="销售金额" width="100">
+                <el-table-column prop="saleOutMoney" label="销售金额" width="100">
                 </el-table-column>
             </el-table-column>
           
             <el-table-column label="期末结余" align="center">
               <el-table-column prop="overStock" label="数量" width="100">
               </el-table-column>
-              <el-table-column prop="buy_price" label="进货金额" width="100">
+              <el-table-column prop="overPrice" label="进货金额" width="100">
               </el-table-column>
-              <el-table-column prop="oveMoney" label="销售金额" width="100">
+              <el-table-column prop="overMoney" label="销售金额" width="100">
               </el-table-column>
             </el-table-column>
 
@@ -151,6 +157,7 @@ import {
   getStockDrugCount
 } from "@/api/stock";
 import { uParseTime } from '@/utils/tools'
+const moment = require('moment')
 export default {
 
   data(){
@@ -171,8 +178,8 @@ export default {
      total:0,
      keyword:"",
      goodTypeList:[],
-     start_time:"",
-     end_time:"",
+     start_time:moment().startOf('month').format("YYYY-MM-DD"),
+     end_time:moment().endOf('month').format("YYYY-MM-DD"),
      countList:[],
      outCountList:[],
      autoCountList:[],
@@ -185,7 +192,8 @@ export default {
      good_id:0,
      patientList:[],
      good_name:"",
-     specification_name:""
+     specification_name:"",
+     loading:false,
     }
   
   },
@@ -217,6 +225,7 @@ export default {
       })
     },
     getlist(){
+        this.loading = true
         var params = {
           good_type:this.good_type,
           keyword:this.keyword,
@@ -228,17 +237,25 @@ export default {
       getPurchaseStockQuery(params).then(response=>{
          if(response.data.state == 1){
             var list = response.data.data.list
+            this.loading = false
             for(let i=0;i<list.length;i++){
-               list[i].stockIn = this.getWarehouseInfoStart(list[i].warehouse_info,list[i].warehouse_out_info)
-               list[i].stockMoney = (this.getWarehouseInfoStart(list[i].warehouse_info,list[i].warehouse_out_info) * list[i].buy_price).toFixed(2)
-               list[i].stockAdd = this.getWarehouseInfoOne(list[i].warehouse_info)
-               list[i].addStockMoney = (this.getWarehouseInfoOne(list[i].warehouse_info) *list[i].buy_price).toFixed(2)
-
-               list[i].outStock = this.getWarehouseOut(list[i].warehouse_out_info)
-               list[i].stockOutMoney = (this.getWarehouseOut(list[i].warehouse_out_info)*list[i].buy_price).toFixed(2)
+               
+              list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
+              list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
+              list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
+              
+              list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
+              list[i].addStockMoney = (this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)).toFixed(2)
+              list[i].saleStockMoney = (this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)).toFixed(2)
 
-               list[i].overStock = this.getWarehouseInfo(list[i].warehouse_info)
-               list[i].oveMoney = (this.getWarehouseInfo(list[i].warehouse_info)*list[i].buy_price).toFixed(2)
+              list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
+              list[i].stockOutprice = (this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)).toFixed(2)
+              list[i].saleOutMoney = (this.saleOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)).toFixed(2)
+              
+              list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+              list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+              list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
+             
             }
             this.tableList = list
             this.total = response.data.data.total
@@ -274,6 +291,8 @@ export default {
       this.toDialogClick(this.good_id,this.good_name,this.specification_name)
     },
    seach(){
+    this.goodTypeList = []
+    this.getStorehouseList()
     this.getlist()
    },
    getGoodTypeName(id){
@@ -504,26 +523,53 @@ export default {
     return name
   },
   endTimeChange(){
-
+   this.getlist()
   },
   startTimeChange(){
-
+    this.getlist()
   },
-  getWarehouseInfoStart(arr1,arr2){
+  getWarehouseInfoStart(arr1,arr2,arr3,arr4,arr5){
     var count =0
-    var addCount = 0 
-    var outCount = 0
-    for(let i=0;i<arr1.length;i++){
-      addCount +=arr1[i].warehousing_count
+    var countOne =0 
+    var countTwo= 0
+    var countthree = 0 //期初
+    var countfour = 0
+    var countfive = 0
+    if(arr1!=null && arr1.length > 0){
+      for(let i=0;i<arr1.length;i++){
+       countOne +=arr1[i].count
+      }
     }
-    for(let i=0;i<arr2.length;i++){
-      outCount +=arr2[i].count
+    if(arr2!=null && arr2.length > 0){
+      for(let i=0;i<arr2.length;i++){
+        countTwo +=arr2[i].count
+      }
+    }
+    if(arr3!=null && arr3.length > 0){
+      for(let i=0;i<arr3.length;i++){
+        countthree +=arr3[i].count
+      }
+    }
+    if(arr4!=null && arr4.length > 0){
+      for(let i=0;i<arr4.length;i++){
+        countfour +=arr4[i].count
+      }
+    }
+     if(arr5!=null && arr5.length > 0){
+      for(let i=0;i<arr5.length;i++){
+        countfive +=arr5[i].count
+      }
     }
-    count = addCount - outCount
+    console.log("countOne",countOne)
+    console.log("countTwo",countTwo)
+    console.log("countthree",countthree)
+    console.log("countfour",countfour)
+    console.log("*********************")
+    count = countOne - countTwo + countthree - countfour + countfive
     if(count > 0 ){
       return count
     }else{
-      return count
+      return 0
     }
   },
   getWarehouseInfo(val){
@@ -534,19 +580,75 @@ export default {
     if(count > 0 ){
       return count
     }else{
-      return count
+      return 0
     }
   },
-  getWarehouseInfoOne(val){
+  getWarehouseInfoOne(val,val2){
     var count =0 
-    for(let i=0;i<val.length;i++){
-      count +=val[i].warehousing_count
+    var countOne = 0
+    var all_count = 0
+    if(val!=null && val.length >0){
+     for(let i=0;i<val.length;i++){
+      count +=val[i].count
+     }
     }
-    if(count > 0 ){
-      return count
+    if(val2!=null && val2.length > 0){
+     for(let i=0;i<val2.length;i++){
+       countOne +=val2[i].count
+     }
+    }
+    all_count = count + countOne
+    console.log("count2332323223232o2222222222wide",count)
+    console.log("countONE23232322323323223",countOne)
+    console.log("all_count9999999999999wode",all_count)
+    console.log("-------------------------------------------")
+    if(all_count > 0 ){
+      return all_count
     }else{
-      return count
+      return 0
+    }
+  },
+  getAddStockMony(val,val2){
+    var total_price =0 
+    var total_price_one = 0
+    var all_price = 0
+    if(val!=null && val.length >0){
+     for(let i=0;i<val.length;i++){
+      total_price +=val[i].count * val[i].buy_price
+     }
+    }
+    if(val2!=null && val2.length > 0){
+      for(let i=0;i<val2.length;i++){
+       total_price_one +=val2[i].count * val2[i].price
+      }
+    }
+  all_price = total_price + total_price_one
+   if(all_price >0 ){
+    return total_price
+   }else{
+    return 0
+   }
+  },
+  getSaleStockMony(val,val2){
+    var total_price =0 
+    var total_price_one = 0
+    var all_price = 0
+    if(val!=null && val.length >0){
+     for(let i=0;i<val.length;i++){
+      total_price +=val[i].count * val[i].price
+     }
     }
+   if(val2!=null && val2.length > 0){
+     for(let i=0;i<val2.length;i++){
+      total_price_one +=val2[i].count * val2[i].price
+     }
+   }
+   all_price = total_price + total_price_one
+   if(all_price >0 ){
+    return all_price
+   }else{
+    return 0
+   }
   },
   getWarehouseOut(val){
     var count = 0
@@ -556,15 +658,346 @@ export default {
     if(count >0){
      return count
     }else{
-      return count
+      return 0
     }
-  }
-  },
-  created(){
+   },
+   open(){
+    this.houseList = []
+    this.goodTypeList= []
     this.getStorehouseList()
     this.getlist()
     this.getStockDrugCount()
-  }
+   },
+   getWarehouseInfoStartPrice(arr,arr1,arr2,arr3,arr4){
+     var total_price = 0
+     var total_price_one = 0
+     var total_price_two = 0
+     var total_price_three = 0
+     var total_price_four = 0
+     var total_price_all = 0
+     if(arr!=null&&arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total_price += arr[i].count * arr[i].buy_price
+      }
+     }
+     if(arr1!=null && arr1.length > 0){
+      for(let i=0;i<arr1.length;i++){
+        total_price_one +=arr1[i].count * arr1[i].buy_price
+      }
+      
+     }
+     if(arr2!=null && arr2.length > 0){
+      for(let i=0;i<arr2.length;i++){
+       total_price_two +=arr2[i].count * arr2[i].buy_price
+      }
+     
+     }
+    if(arr3!=null && arr3.length > 0){
+      for(let i=0;i<arr3.length;i++){
+        total_price_three +=arr3[i].count * arr3[i].buy_price
+      }
+     
+     }
+     if(arr4!=null && arr4.length > 0){
+      for(let i=0;i<arr4.length;i++){
+        total_price_three +=arr4[i].count * arr4[i].buy_price
+      }
+     
+     }
+     total_price_all = total_price - total_price_one + total_price_two - total_price_three + total_price_four
+     if (total_price_all > 0) {
+       return total_price_all.toFixed(2)
+     }else{
+      return  0
+     }
+   },
+   getWarehouseInfoStartMoney(arr,arr1,arr2,arr3,arr4){
+     var total_price = 0
+     var total_price_one = 0
+     var total_price_two = 0
+     var total_price_three = 0
+     var total_price_four = 0
+     var total_price_all = 0
+     if(arr!=null && arr.length >0){
+       for(let i=0;i<arr.length;i++){
+         total_price +=arr[i].count * arr[i].price
+       }
+     }
+     if(arr1!=null && arr1.length > 0){
+      for(let i=0;i<arr1.length;i++){
+        total_price_one +=arr1[i].count * arr1[i].price
+      }
+      
+     }
+     if(arr2!=null && arr2.length > 0){
+      for(let i=0;i<arr2.length;i++){
+       total_price_two +=arr2[i].count * arr2[i].price
+      }
+     
+     }
+    if(arr3!=null && arr3.length > 0){
+      for(let i=0;i<arr3.length;i++){
+        total_price_three +=arr3[i].count * arr3[i].price
+      }
+     
+     }
+    if(arr4!=null && arr4.length > 0){
+      for(let i=0;i<arr4.length;i++){
+        total_price_four +=arr4[i].count * arr4[i].price
+      }
+     
+     }
+     total_price_all = total_price - total_price_one + total_price_two - total_price_three + total_price_four
+    if (total_price_all > 0) {
+       return total_price_all.toFixed(2)
+     }else{
+      return  0
+     }
+   },
+   getWarehosueOutInfo(val,val2,val3){
+     var count = 0
+     var count_one = 0
+     var all_count = 0
+     var count_two = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+         count +=val[i].count
+       }
+     }
+     if(val2!=null && val2.length > 0){
+      for(let i=0;i<val2.length;i++){
+        count_one +=val2[i].count
+      }
+     }
+     if(val3!=null && val3.length > 0){
+      for(let i=0;i<val3.length;i++){
+        count_two +=val3[i].count
+      }
+     }
+     all_count = count +count_one - count_two
+     if(all_count >0){
+       return all_count
+     }else{
+      return 0
+     }
+   },
+   stockOutprice(val,val2,val3){
+     var total_price = 0
+     var total_price_one = 0
+     var total_price_two = 0
+     var all_price = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+         total_price +=val[i].count * val[i].buy_price
+       }
+     }
+     if(val2!=null && val2.length > 0){
+      for(let i=0;i<val2.length;i++){
+        total_price_one +=val2[i].count * val2[i].buy_price
+      }
+     }
+    if(val3!=null && val3.length > 0){
+      for(let i=0;i<val3.length;i++){
+        total_price_two +=val3[i].count * val3[i].buy_price
+      }
+     }
+     all_price = total_price + total_price_one - total_price_two
+     if(all_price >0){
+       return all_price
+     }else{
+      return 0
+     }
+   },
+  saleOutprice(val,val2,val3){
+     var total_price = 0
+     var total_price_one = 0
+     var all_price = 0
+     var total_price_two = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+         total_price +=val[i].count * val[i].xt_warehouse_info.packing_price
+       }
+     }
+     if(val2!=null && val2.length > 0){
+       for(let i=0;i<val2.length;i++){
+         total_price_one +=val2[i].count * val2[i].price
+       }
+     }
+     if(val3!=null && val3.length > 0){
+       for(let i=0;i<val3.length;i++){
+         total_price_two +=val3[i].count * val3[i].price
+       }
+     }
+     all_price = total_price + total_price_one - total_price_two
+     if(all_price >0){
+       return total_price
+     }else{
+      return 0
+     }
+   },
+   getEndWarehouseInfo(val,val3,val1,val2,val4){
+     var count = 0
+     var count_one = 0
+     var count_two = 0
+     var count_three =0
+     var count_four = 0
+     var all_count = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+         count +=val[i].count 
+       }
+     }
+     if(val1!=null&&val1.length >0){
+       for(let i=0;i<val1.length;i++){
+         count_one +=val1[i].count
+       }
+     }
+     if(val3!=null&& val3.length > 0){
+      for(let i=0;i<val3.length;i++){
+         count_three +=val3[i].count
+       }
+     }
+     if(val2!=null&&val2.length >0){
+       for(let i=0;i<val2.length;i++){
+         count_two +=val2[i].count
+       }
+     }
+     if(val4!=null&&val4.length >0){
+       for(let i=0;i<val4.length;i++){
+         count_four +=val4[i].count
+       }
+     }
+     all_count = count- count_three + count_one - count_two + count_four
+     if(all_count >0){
+       return all_count
+     }else{
+      return 0
+     }
+   },
+   getEndOverPrice(val,val3,val1,val2,val4){
+     var total_price = 0
+     var total_price_one = 0
+     var total_price_two = 0
+     var total_price_three = 0
+     var total_price_four =0
+     var all_price = 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+         total_price +=val[i].count * val[i].buy_price
+       }
+     }
+     if(val1!=null && val1.length > 0){
+       for(let i=0;i<val1.length;i++){
+         total_price_one +=val1[i].count * val1[i].buy_price
+       }
+     }
+     if(val3!=null && val3.length > 0){
+       for(let i=0;i<val3.length;i++){
+         total_price_three +=val3[i].count * val3[i].buy_price
+       }
+     }
+    if(val2!=null && val2.length > 0){
+       for(let i=0;i<val2.length;i++){
+         total_price_two +=val2[i].count * val2[i].buy_price
+       }
+     }
+      if(val4!=null && val4.length > 0){
+       for(let i=0;i<val4.length;i++){
+         total_price_four +=val4[i].count * val4[i].buy_price
+       }
+     }
+     console.log("total_price",total_price)
+     console.log("total_price_three",total_price_three)
+     console.log("total_price_two",total_price_two)
+     console.log("total_price_one",total_price_one)
+     console.log("total_price_four",total_price_four)
+     all_price = total_price- total_price_three +total_price_one - total_price_two + total_price_four
+     console.log("arrll_price",all_price)
+     if(all_price >0){
+       return all_price.toFixed(2)
+     }else{
+      return 0
+     }
+   },
+   getEndSalePrice(val,val3,val1,val2,val4){
+     var total_price = 0
+     var total_price_one = 0
+     var total_price_two = 0
+     var total_price_three = 0
+     var total_price_four = 0
+     var all_price= 0
+     if(val!=null && val.length >0){
+       for(let i=0;i<val.length;i++){
+         total_price +=val[i].count * val[i].price
+       }
+     }
+     if(val1!=null && val1.length >0){
+       for(let i=0;i<val1.length;i++){
+         total_price_one +=val1[i].count * val1[i].price
+       }
+     }
+    if(val3!=null && val3.length >0){
+       for(let i=0;i<val3.length;i++){
+         total_price_three +=val3[i].count * val3[i].price
+       }
+     }
+      if(val2!=null && val2.length >0){
+       for(let i=0;i<val2.length;i++){
+         total_price_two +=val2[i].count * val2[i].price
+       }
+     }
+       if(val4!=null && val4.length >0){
+       for(let i=0;i<val4.length;i++){
+         total_price_four +=val4[i].count * val4[i].price
+       }
+     }
+     var all_price = total_price-total_price_three + total_price_one - total_price_two + total_price_four
+     if(all_price >0){
+       return all_price.toFixed(2)
+     }else{
+      return 0
+     }
+   },
+   toPrint(){
+    this.$router.push({path:"/purchase/stock/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
+          this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].specification_name = this.tableList[i].specification_name + "/"+this.tableList[i].packing_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','good_name','specification_name','manufacturer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+    
+           const data = this.formatJson(filterVal, this.tableList)
+           
+           const filename = '进销存查询'
+     
+          
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+  },
+  // created(){
+  //   this.getStorehouseList()
+  //   this.getlist()
+  //   this.getStockDrugCount()
+  // }
 }
 </script>
 

src/xt_pages/stock/stockBatchNumber.vue

@@ -11,7 +11,7 @@
         厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
-        <span>日期查询:</span>
+        <span>入库时间:</span>
         <el-date-picker
             size="small"
             v-model="start_time"
@@ -38,7 +38,33 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>
-          
+          <span>有效期:</span>
+           <el-date-picker
+            size="small"
+            v-model="start_first_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeFirstChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_first_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;margin-right:10px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeFirstChange"
+          ></el-date-picker>
           
       </div>
       
@@ -93,11 +119,11 @@
              <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
            </template>
         </el-table-column>
-        <!-- <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
+        <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
            <template slot-scope="scope">
              <span> {{scope.row.stock_count}}</span>
            </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="drug_name" label="备注" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.remark}}</span>
@@ -168,6 +194,8 @@
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
         end_time: '',
+        start_first_time:'',
+        end_first_time:'',
         page: 1,
         limit: 10,
         goodType: [],
@@ -260,6 +288,8 @@
           id:this.$route.query.id,
           start_time:this.start_time,
           end_time:this.end_time, 
+          start_first_time:this.start_first_time,
+          end_first_time:this.end_first_time,
         } 
       getStockInList(params).then(response=>{
          if(response.data.state == 1){
@@ -372,6 +402,12 @@
          specification_name = this.good.specification_name
        }
        return specification_name
+     },
+     startTimeFirstChange(){
+       this.getlist()
+     },
+     endTimeFirstChange(){
+      this.getlist()
      }
 
     }

src/xt_pages/stock/stockFlow.vue

@@ -7,8 +7,8 @@
       <div class="cell clearfix">
        耗材名称:{{getGoodName(this.$route.query.id)}} &nbsp;
        库存: {{this.$route.query.overCount}}{{packing_unit}} &nbsp;
-       规格:{{this.$route.query.specification_name}} &nbsp;
-       厂家:{{getSpecName(this.$route.query.id)}}
+       规格:{{getSpecName(this.$route.query.id)}} &nbsp;
+       厂家:{{this.$route.query.manufacturer}}
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -218,6 +218,7 @@
           {id:2,name:"手动出库"},
           {id:3,name:"自动出库"},
           {id:4,name:"手动退库"},
+          {id:7,name:"自动退库"},
           {id:10,name:"盘盈"},
           {id:11,name:"盘亏"},
           {id:12,name:"调拨出库"},

src/xt_pages/stock/stockInOrderAdd.vue

@@ -7,12 +7,12 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item"  v-loading="loading">保 存</el-button>
         <el-button size="small" type="primary" v-show="showCheck" @click="toCheck()" class="filter-item">审 核</el-button>
         <!-- <el-button size="small" type="primary" v-show="showReturnCheck" @click="toReturnCheck()" class="filter-item">反 审 核</el-button> -->
       </div>
     </div>
-    <div class="app-container" v-loading="loading">
+    <div class="app-container">
 
       <stock-in-dialog ref="dialog" :propForm="propForm"
                        :visibility="isVisibility"
@@ -697,6 +697,12 @@
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const array = this.recordInfo.recordData
             if(this.storehouse_id == 0){
               this.$message.error("仓库不能为空!")
@@ -736,12 +742,7 @@
               }
               this.recordInfo.recordData[i].warehousing_count = this.recordInfo.recordData[i].warehousing_count.toString()
             }
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
+        
             const params = {
               'stockIn': this.recordInfo.recordData
             }
@@ -765,8 +766,8 @@
                 this.warehousing_info_id  = info.id
                 for(let i=0;i<list.length;i++){
                   for(let j=0;j<dealerList.length;j++){
-                     if(list[i].dealer == dealerList[i].id){
-                        list[i].dealer = dealerList[i].dealer_name
+                     if(list[i].dealer == dealerList[j].id){
+                        list[i].dealer = dealerList[j].dealer_name
                      }
                   }
                   for(let s=0;s<manufacturerList.length;s++){

src/xt_pages/stock/stockInOrderEdit.vue

@@ -20,6 +20,7 @@
           @click="submit()"
           v-if="is_check == 2"
           class="filter-item"
+          v-loading="loading"
           >保 存</el-button
         >
         <el-button
@@ -41,7 +42,7 @@
       </div>
     </div>
 
-    <div class="app-container" v-loading="loading">
+    <div class="app-container">
       <stock-in-dialog
         ref="dialog"
         :propForm="propForm"
@@ -759,8 +760,8 @@ export default {
               var dealerList = response.data.data.dealerList
               for(let i=0;i<list.length;i++){
                 for(let j=0;j<dealerList.length;j++){
-                 if(list[i].dealer == dealerList[i].id){
-                    list[i].dealer = dealerList[i].dealer_name
+                 if(list[i].dealer == dealerList[j].id){
+                    list[i].dealer = dealerList[j].dealer_name
                   }
                 }
                 for(let s=0;s<manufacturerList.length;s++){

src/xt_pages/stock/stockNewQuery.vue

@@ -10,13 +10,13 @@
               <GoodNewQuery></GoodNewQuery>
             </el-tab-pane>
             <el-tab-pane label="进销存查询" name="second">
-               <PurchaseStockQuery></PurchaseStockQuery>
+               <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
            </el-tab-pane>
             <el-tab-pane label="有效期查询" name="third">
-                <expiryDateQuery></expiryDateQuery>
+                <expiryDateQuery ref="mychildone"></expiryDateQuery>
             </el-tab-pane>
             <el-tab-pane label="患者查询" name="fourth">
-                <patientQuery></patientQuery>
+                <patientQuery ref="mychildtwo"></patientQuery>
             </el-tab-pane>
         </el-tabs>
      </div>
@@ -51,8 +51,16 @@ export default {
     };
   },
   methods:{
-    handleClick(){
-        
+    handleClick(val){
+      if(val.name == "second"){
+         this.$refs.mychild.open();
+      }
+      if(val.name == "third"){
+        this.$refs.mychildone.open()
+      }
+      if(val.name =="fourth"){
+       this.$refs.mychildtwo.open()
+      }
     }
   }
 };

src/xt_pages/stock/stockOutOrder.vue

@@ -249,6 +249,7 @@
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266',
           }"
+          :cell-class-name="cellStyle"
         >
           <el-table-column label="耗材名称" align="center">
             <template slot-scope="scope">
@@ -278,100 +279,113 @@
               <span>{{scope.row.stock_count}}</span>
             </template>
           </el-table-column> -->
-
+       
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.is_sys == 0"
-                >{{ scope.row.count }}{{ scope.row.packing_unit }}</span
-              >
-              <span v-if="scope.row.is_sys == 1"
-                >{{ getOutStockCount(scope.row.good_id)
-                }}{{ scope.row.packing_unit }}</span
-              >
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)}}
+                  </td>
+               </tr>
+             
             </template>
           </el-table-column>
-          <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
+          <el-table-column label="批次" align="center">
             <template slot-scope="scope">
-              {{ getXuserName(scope.row.admin_user_id) }}
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{getNumber(scope.row.child,item.warehousing_id)}}
+                  </td>
+               </tr>
+             
             </template>
           </el-table-column>
-          <!-- <el-table-column label="进货价" align="center" v-if="is_sys== 0">
+          <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
-              <span>{{scope.row.buy_price}}</span>
+            
+              <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{ getXuserName(scope.row.admin_user_id) }} 
+                  </td>
+               </tr>
             </template>
-          </el-table-column> -->
+          </el-table-column>
+      
           <el-table-column label="出货价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{ scope.row.price }}</span>
-              <span v-if="scope.row.price == 0">{{
-                scope.row.packing_price
-              }}</span>
+          
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{getAllStockCountPrice(scope.row.child,item.warehousing_id)}}
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.is_sys == 0">
-                <span v-if="scope.row.price > 0">
-                  {{ (scope.row.count * scope.row.price).toFixed(2) }}</span
-                >
-                <span v-if="scope.row.price == 0">
-                  {{
-                    (scope.row.count * scope.row.packing_price).toFixed(2)
-                  }}</span
-                >
-              </span>
-              <span v-if="scope.row.is_sys == 1">
-                <span v-if="scope.row.price > 0">
-                  {{
-                    (
-                      getOutStockCount(scope.row.good_id) * scope.row.price
-                    ).toFixed(2)
-                  }}</span
-                >
-                <span v-if="scope.row.price == 0">
-                  {{
-                    (
-                      getOutStockCount(scope.row.good_id) *
-                      scope.row.packing_price
-                    ).toFixed(2)
-                  }}</span
-                >
-              </span>
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{(getAllStockCount(scope.row.child,item.warehousing_id) * getAllStockCountPrice(scope.row.child,item.warehousing_id)).toFixed(2)}}
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
             <template slot-scope="scope">
-              {{ getManufactuerName(scope.row.manufacturer) }}
+                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getManufactuerNameSix(scope.row.child,item.warehousing_id)}} 
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="经销商" align="center">
             <template slot-scope="scope">
-              {{ getDealerName(scope.row.dealer) }}
+                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getDealerNameSix(scope.row.child,item.warehousing_id)}} 
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="生产日期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.product_date, "{y}-{m}-{d}") }}
+              <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                     {{getProductDate(scope.row.child,item.warehousing_id)}}
+                  </td>
+               </tr>
+            
             </template>
           </el-table-column>
           <el-table-column label="有效期" align="center">
             <template slot-scope="scope">
-              {{ getTime(scope.row.expiry_date, "{y}-{m}-{d}") }}
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getExpiryDate(scope.row.child,item.warehousing_id)}}
+                  </td>
+               </tr>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="批准文号" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.license_number}}
-            </template>
-          </el-table-column> -->
+         
           <el-table-column label="注册编码" align="center">
             <template slot-scope="scope">
-              {{ scope.row.register_number }}
+             
+               <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                   {{getRegisterNumber(scope.row.child,item.warehousing_id)}}
+                  </td>
+               </tr>
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center">
             <template slot-scope="scope">
-              {{ scope.row.remark }}
+                <tr style="background: none" v-for="(item,index) in scope.row.childOne" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                   {{getRemark(scope.row.child,item.warehousing_id)}}
+                  </td>
+               </tr>
+             
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
@@ -542,7 +556,7 @@
     >
       <span>
         <div class="filter-container">
-          <span style="font-size: 18px; color: #606266">商品使用明细</span>
+          <span style="font-size: 18px; color: #606266">耗材使用明细</span>
         </div>
 
         <el-row :gutter="12" style="margin-top: 10px">
@@ -583,7 +597,7 @@
               </template>
               <template slot-scope="scope">
                 <span
-                  >{{ scope.row.ctime | parseTime("{y}-{m}-{d} {h}:{i}") }}
+                  >{{ scope.row.ctime | parseTime("{y}-{m}-{d}") }}
                 </span>
               </template>
             </el-table-column>
@@ -825,7 +839,7 @@
                 </template>
                 <template slot-scope="scope">
                   <span v-if="scope.row.is_total == 0"
-                    >{{ scope.row.count }}{{ scope.row.packing_unit }}</span
+                    >{{ scope.row.count - scope.row.cancel_count}}{{ scope.row.packing_unit }}</span
                   >
                   <span v-if="scope.row.is_total == 1"
                     >{{ scope.row.total }}
@@ -838,7 +852,7 @@
                 </template>
                 <template slot-scope="scope">
                   <span
-                    >{{ scope.row.ctime | parseTime("{y}-{m}-{d} {h}:{i}") }}
+                    >{{ scope.row.ctime | parseTime("{y}-{m}-{d}") }}
                   </span>
                 </template>
               </el-table-column>
@@ -1022,6 +1036,8 @@ export default {
        {id:2,name:"未审核"},
       ],
       check_id: 0,
+      flowList:[],
+      cancelInfoList:[],
     };
   },
   methods: {
@@ -1382,20 +1398,29 @@ export default {
         if (response.data.state == 1) {
           this.tableShow = true;
           var list = response.data.data.list;
-
+          this.flowList = response.data.data.stockFlowList
+          this.stockFlowListGroup = response.data.data.stockFlowListGroup
+          var cancelInfolist = response.data.data.cancelInfolist
+          this.cancelInfoList = cancelInfolist
+          console.log("退库数据2333333333333333333333",cancelInfolist)
           this.tableList = [];
           for (let i = 0; i < list.length; i++) {
-            // if(list[i].dealer == 0){
-            //   list[i].dealer = ""
-            // }
-            // if(list[i].manufacturer == 0){
-            //   list[i].manufacturer = ""
-            // }
-            // list[i].good_name = list[i].info.good_name
-            // list[i].specification_name = list[i].info.specification_name
-            // list[i].packing_unit = list[i].info.packing_unit
+            list[i].child= []
+            list[i].childOne = []
+            for(let z=0;z<this.stockFlowListGroup.length;z++){
+              if(list[i].good_id == this.stockFlowListGroup[z].good_id){
+                 list[i].childOne.push(this.stockFlowListGroup[z])
+              }
+            }
+            for(let j=0;j<this.flowList.length;j++){
+              if(list[i].good_id == this.flowList[j].good_id){
+                list[i].child.push(this.flowList[j])
+              }
+            }
+         
             this.tableList.push(list[i]);
           }
+          console.log("hhhhhhwode ",this.tableList)
         }
       });
     },
@@ -1584,7 +1609,7 @@ export default {
       });
     },
     getTime(val, temp) {
-      if (val != 0) {
+      if (val > 0) {
         return uParseTime(val, temp);
       } else {
         return "";
@@ -1814,12 +1839,27 @@ export default {
           var stockflowlist = response.data.data.stockFlowList;
 
           this.stockFlowList = stockflowlist;
-
+            
+          var cancelInfo = response.data.data.cancelInfo
+          console.log("cancelInfowowoowowowowowowo",cancelInfo)
+          for(let i=0;i<this.stockFlowList.length;i++){
+            this.stockFlowList[i].cancel_count = 0
+            for(let j=0;j<cancelInfo.length;j++){
+              if(this.stockFlowList[i].patient_id == cancelInfo[j].patient_id){
+                 this.stockFlowList[i].cancel_count  = cancelInfo[j].count
+              }
+            }
+          }
           for (let i = 0; i < this.stockFlowList.length; i++) {
             var obj = this.stockFlowList[i];
             obj["is_total"] = 0;
             this.userList.push(obj);
-            total = total + this.stockFlowList[i].count;
+            if(this.stockFlowList[i].is_sys == 1){
+              total = total + this.stockFlowList[i].count - this.stockFlowList[i].cancel_count;
+            }else{
+              total = total + this.stockFlowList[i].count;
+            }
+            
           }
           this.userList.push({
             is_total: 1,
@@ -2038,6 +2078,178 @@ export default {
     },
     changeCheckType(){
       this.GetWarehouseOut()
+    },
+    getAllStockCount(val,warehousing_id){
+      var arr=[]
+      var total_count = 0
+     if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+           if(val[i].warehousing_id == warehousing_id){
+              arr.push(val[i])
+           }
+        }
+     }
+     if(arr.length > 0) {
+       for(let j=0;j<arr.length;j++){
+          total_count +=arr[j].count
+       }
+     }
+     if(total_count > 0){
+        return total_count
+     }else{
+      return total_count
+     }
+    },
+    getAllStockCountPrice(val,warehousing_id){
+     var price = 0
+     var arr = []
+     if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+           if(val[i].warehousing_id == warehousing_id){
+              arr.push(val[i])
+           }
+        }
+     }
+     if(arr.length > 0){
+        return arr[0].price
+      }else{
+        return 0
+      }
+    },
+    getManufactuerNameSix(val,warehousing_id){
+      var manufacturer_name = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+         manufacturer_name = this.getManufactuerName(arr[0].manufacturer)
+      }
+      return manufacturer_name
+    },
+    getDealerNameSix(val,warehousing_id){
+     var dealer_name = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+         dealer_name = this.getDealerName(arr[0].xt_warehouse_info.dealer)
+      }
+      return dealer_name
+    },
+    getProductDate(val,warehousing_id){
+      var product_date = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+        product_date = this.getTime(arr[0].product_date, "{y}-{m}-{d}") 
+      }
+      return product_date
+    },
+    getExpiryDate(val,warehousing_id){
+     var expiry_date = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+        expiry_date = this.getTime(arr[0].xt_warehouse_info.expiry_date, "{y}-{m}-{d}") 
+      }
+      return expiry_date
+    },
+    getRegisterNumber(val,warehousing_id){
+      var register_number = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+        register_number = arr[0].xt_warehouse_info.register_number
+      }
+      return register_number
+    },
+    getRemark(val,warehousing_id){
+      var remark = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+        remark = arr[0].xt_warehouse_info.remark
+      }
+      return remark
+    },
+    getNumber(val,warehousing_id){
+      var number = ""
+      var arr= []
+      if(val!=null&&val.length > 0){
+        for(let i=0;i<val.length;i++){
+          if(val[i].warehousing_id == warehousing_id){
+            arr.push(val[i])
+          }
+        }
+      }
+      if(arr.length > 0){
+        number = arr[0].number
+      }
+      return number 
+    },
+    // 合并单元格样式
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      let arr = [4,5,6,7,8,9,10,11,12,13];
+      if (arr.indexOf(columnIndex) > -1) {
+        return "spanClass";
+      }
+    },
+    getCancelInfo(warehousing_id,good_id){
+    console.log("warehousing_id",warehousing_id)
+    console.log("good_ud2323322332",good_id)
+     var count =0
+     var arr = []
+     for(let i=0;i<this.cancelInfoList.length;i++){
+       if(warehousing_id == this.cancelInfoList[i].warehousing_id && good_id == this.cancelInfoList[i].good_id){
+          arr.push(this.cancelInfoList[i])
+       }
+     }
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        count += arr[i].count
+      }
+     }
+     if(count > 0){
+      return count
+     }else{
+      return 0 
+     }
+     
+     
     }
   },
 };
@@ -2108,3 +2320,50 @@ export default {
   background-color: #d0d3da;
 }
 </style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+/* 合并表格线样式 */
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+}
+.spanClass .cell tr:last-of-type td {
+  border-bottom: none;
+}
+</style>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -19,6 +19,7 @@
           type="primary"
           @click="submit()"
           class="filter-item"
+           v-loading="loading"
           >保 存</el-button
         >
         <el-button
@@ -29,14 +30,7 @@
           v-show="showCheck"
           >审核</el-button
         >
-        <!-- <el-button
-          size="small"
-          type="primary"
-          @click="toReturnCheck()"
-          class="filter-item"
-          v-show="showReturnCheck"
-          >反审核</el-button
-        > -->
+
       </div>
     </div>
 
@@ -433,6 +427,7 @@ export default {
       warehouseOut:{},
       warehouseOut_id:0,
       is_check:0,
+      loading:false,
     };
   },
   methods: {
@@ -651,6 +646,7 @@ export default {
       this.$router.go(-1);
     },
     submit() {
+      this.loading = true
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
@@ -743,6 +739,7 @@ export default {
               return false;
             } else {
                var msg = response.data.data.msg
+               this.loading = false
                var good_name = response.data.data.good_name
                var specification_name = response.data.data.specification_name
                var storehose_name = response.data.data.storehose_name

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -7,7 +7,7 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item" v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0">保 存</el-button>
+        <el-button size="small" type="primary"   v-loading="loading" @click="submit()" class="filter-item" v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0">保 存</el-button>
        <el-button size="small" type="primary" @click="toCheck()" v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0"  class="filter-item">审 核</el-button>
        <el-button size="small" type="primary" @click="toReturnCheck()" v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"  class="filter-item">反 审 核</el-button>
       </div>
@@ -401,6 +401,7 @@
         doctorList:[],
         showCheck:false,
         showReturnCheck:false,
+        loading:false,
       }
     },
     methods: {
@@ -632,7 +633,7 @@
         this.$router.go(-1)
       },
        submit() {
-
+        this.loading = true
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -708,6 +709,7 @@
                 loading.close()
                 return false
               } else {
+                this.loading = false
                 if(response.data.data.msg == 1){
                   this.$message.success('保存成功')
                   // this.$router.back(-1)

src/xt_pages/user/dialysisSolution.vue

@@ -3,10 +3,7 @@
     <patient-sidebar :id="patientID" defaultActive="2-1"></patient-sidebar>
     <div class="patient-app-container app-container">
       <div class="Total">
-        <!-- <div class="plan" >透析计划</div> -->
-        <!-- <table-title title="长期透析处方"></table-title> -->
         <div class="sum">
-          <!-- <span>透析总频率:<el-input :value="totalrate" disabled style="width:180px"></el-input></span> -->
           <el-button
             type="primary"
             size="small"
@@ -42,7 +39,7 @@
           min-width="50"
         >
           <template slot-scope="scope">
-            {{ modeOptions[scope.row.mode_id]?modeOptions[scope.row.mode_id].name:'' }}
+            {{modeOptions[scope.row.mode_id]?modeOptions[scope.row.mode_id].name:''}}
           </template>
         </el-table-column>
         <el-table-column
@@ -56,25 +53,7 @@
             {{ scope.row.dialysis_duration_minute }} 分钟
           </template>
         </el-table-column>
-        <!-- <el-table-column
-          prop="period"
-          label="频率"
-          align="center"
-          min-width="50">
-          <template slot-scope="scope" >
-              <span v-if="scope.row.parent_id === 0" >{{scope.row.period}}{{scope.row.times}}</span>
-              <span v-else >--</span>
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column
-          prop="name"
-          label="处方名"
-          align="center"
-          min-width="50">
-          <template slot-scope="scope" >
-              <span >{{scope.row.name}}{{scope.row.sub_name}}</span>
-          </template>
-        </el-table-column> -->
+      
         <el-table-column
           prop="doctor"
           label="医生"
@@ -107,17 +86,13 @@
             <span>{{ scope.row.updated_time | parseTime("{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column
-           prop="state"
-           label="状态"
-           align="center"
-           min-width="40">
-           <template slot-scope="scope" >
-               <span v-if="scope.row.initiate_mode==1">启用</span>
-               <span v-else-if="scope.row.initiate_mode==2">停用</span>
-               <span v-else>未知</span>
-             </template>
-        </el-table-column> -->
+
+        <el-table-column  align="center" label="状态" width="60">
+          <template slot-scope="scope">
+            <span v-if="scope.row.solution_status == 1">生效</span>
+            <span v-if="scope.row.solution_status == 2">失效</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" min-width="140">
           <template slot-scope="scope">
             <el-tooltip
@@ -133,19 +108,22 @@
                 @click="openEdit(scope.$index, scope.row)"
               ></el-button>
             </el-tooltip>
-            <!--   <el-button
-                 size="mini"
-                 type="primary"
-                 @click="openChildEdit(scope.$index, scope.row)" v-else>编辑</el-button>
-
-               <el-button
-                 size="mini"
-                 type="success"
-                 @click="openNewChild(scope.$index, scope.row)" v-if="scope.row.parent_id===0">新增</el-button>
-               <el-button
-                 size="mini"
-                 type="danger"
-                 @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
+
+
+             <el-tooltip
+              class="item"
+              effect="dark"
+              content="查看更多"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                @click="toClick(scope.row)">
+                查看更多
+              </el-button>
+            </el-tooltip>
+         
           </template>
         </el-table-column>
       </el-table>
@@ -162,8 +140,99 @@
         :total="total"
       >
       </el-pagination>
+      
+      <div v-show="startShow">
+        <el-row :gutter="20">
+          <el-col :span="6"><div class="grid-content bg-purple">透析模式:{{modeOptions[current_solution.mode_id]?modeOptions[current_solution.mode_id].name:''}}</div></el-col>
+        </el-row>
+         <el-row :gutter="20">
+          <el-col :span="6"><div class="grid-content bg-purple">透析时长:{{current_solution.dialysis_duration_hour}}小时{{current_solution.dialysis_duration_minute}}分钟</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">血流量(ml/min):{{current_solution.blood_flow_volume}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">透析液配方:{{getDialysateFormulation(current_solution.dialysate_formulation)}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">抗凝剂:{{getAnticoagulant(current_solution.anticoagulant)}}</div></el-col>
+        </el-row>
+
+         <el-row :gutter="20">
+          <el-col :span="6"><div class="grid-content bg-purple">首剂:
+            <span v-if="current_solution.anticoagulant == 6">(iu)</span>
+            <span v-if="current_solution.anticoagulant == 7">(iu)</span>
+            <span v-if="current_solution.anticoagulant == 5">(mg)</span>
+            <span v-if="current_solution.anticoagulant == 4">(mg)</span>
+            <span v-if="current_solution.anticoagulant == 3">(iu)</span>
+            <span v-if="current_solution.anticoagulant == 2">(mg)</span>
+            <span v-if="current_solution.anticoagulant == 1">(mg)</span>
+            {{current_solution.anticoagulant_shouji}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">维持:
+              <span v-if="current_solution.anticoagulant == 7">(iu/h)</span>
+              <span v-if="current_solution.anticoagulant == 6">(iu/h)</span>
+              <span v-if="current_solution.anticoagulant == 5">(ml/h)</span>
+              <span v-if="current_solution.anticoagulant == 4">(mg/h)</span>
+              <span v-if="current_solution.anticoagulant == 3">(iu/h)</span>
+              <span v-if="current_solution.anticoagulant == 2">(mg/h)</span>
+              <span v-if="current_solution.anticoagulant == 1">(mg/h)</span>
+            {{current_solution.anticoagulant_weichi}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">总量:
+            <span v-if="current_solution.anticoagulant == 5">(mg)</span>
+            <span v-if="current_solution.anticoagulant == 6">(iu)</span>
+            <span v-if="current_solution.anticoagulant == 7">(iu)</span>
+            <span v-if="current_solution.anticoagulant == 4">(mg)</span>
+            <span v-if="current_solution.anticoagulant == 3">(iu)</span>
+            <span v-if="current_solution.anticoagulant == 2">(mg)</span>
+            <span v-if="current_solution.anticoagulant == 1">(mg)</span>
+            {{current_solution.anticoagulant_zongliang}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">钾(mmol/L):{{current_solution.kalium}}</div></el-col>
+        </el-row>
+
+       <el-row :gutter="20">
+          <el-col :span="6"><div class="grid-content bg-purple">钠(mmol/L):{{current_solution.sodium}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">钙:(mmol/L){{current_solution.calcium}}</div></el-col>
+          <el-col :span="6"><div class="grid-content bg-purple">透析器/灌流器:{{current_solution.dialyzer_perfusion_apparatus}}</div></el-col>
+        </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">透析器:{{current_solution.dialysis_dialyszers}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">灌流器:{{current_solution.dialysis_irrigation}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">碳酸氢盐(mmol/L):{{current_solution.bicarbonate}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">葡萄糖(mmol/L):{{current_solution.glucose}}</div></el-col>
+         </el-row>
+
+            <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">透析液流量(ml/min):{{current_solution.dialysate_flow}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">透析液温度(℃):{{current_solution.dialysate_temperature}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">电导度(mS/cm):{{current_solution.conductivity}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">体液过多症状:{{getBodyFluid(current_solution.body_fluid)}}</div></el-col>
+         </el-row>
+
+           <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">体液过多其他症状:{{current_solution.body_fluid_other}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">透析前使用特殊药物:{{current_solution.special_medicine}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">使用其他特殊药物:{{current_solution.special_medicine_other}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">血管通路:{{getBloodAccess(current_solution.blood_access)}}</div></el-col>
+         </el-row>
+
+           <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">血浆分离器:{{current_solution.plasma_separator}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">透析管路:{{getHemodialysisPipelines(current_solution.hemodialysis_pipelines)}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">透析管路支数:{{current_solution.hemodialysis_pipelines_count}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">穿刺针:{{current_solution.puncture_needle}}</div></el-col>
+         </el-row>
+
+           <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">穿刺针支数:{{current_solution.puncture_needle_count}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">促红素:{{current_solution.epo_count}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">促红素支数:{{current_solution.epo_count}}</div></el-col>
+            <el-col :span="6"><div class="grid-content bg-purple">最大超滤率(ml/h):{{current_solution.max_ultrafiltration_rate}}</div></el-col>
+         </el-row>
+           <el-row :gutter="20">
+            <el-col :span="6"><div class="grid-content bg-purple">备注:{{current_solution.remark}}</div></el-col>
+         </el-row>
+      </div>
+
     </div>
 
+   
+
+
     <el-dialog
       :title="isEdit ? '编辑透析处方' : '新增透析处方'"
       :visible.sync="dialogVisible"
@@ -537,25 +606,6 @@
               </el-select>
             </el-form-item>
 
-            <!-- <el-form-item
-              label="置换方式："
-              v-if="
-                isShows('置换液')   && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
-              "
-            >
-              <el-select
-                v-model="addPlan.displace_liqui_part"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option
-                  v-for="(option, index) in displace_liqui_part_option"
-                  :key="index"
-                  :label="option.name"
-                  :value="option.id"
-                ></el-option>
-              </el-select>
-            </el-form-item> -->
           </el-col>
 
           <el-col :span="8" v-if="isShows('置换液总量')  && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
@@ -579,8 +629,6 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
-          <el-row :gutter="20" > -->
           <el-col :span="8" v-if="isShows('实际超滤量')">
             <el-form-item label="实际超滤量(L)">
               <el-input v-model="addPlan.ultrafiltration"></el-input>
@@ -729,7 +777,117 @@
       v-on:dialog-comfirm="innerDialogComfirm"
       v-on:dialog-cancle="innerDialogCancle">
     </multi-select-box>
+     
+
+
+
+    <el-dialog
+      :visible.sync="startDialogVisible"
+      width="1010px"
+    >
+      <el-table
+        ref="solutionTable"
+        :data="tableList"
+        border
+        fit
+        highlight-current-row
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :row-style="{ color: '#303133' }"
+        style="width: 100%"
+      >
+        <el-table-column type="index" align="center" label="序号" width="60">
+        </el-table-column>
+        <el-table-column
+          prop="mode_name"
+          align="center"
+          label="透析模式"
+          min-width="50"
+        >
+          <template slot-scope="scope">
+            {{modeOptions[scope.row.mode_id]?modeOptions[scope.row.mode_id].name:''}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="dialysis_duration"
+          align="center"
+          label="透析时长"
+          min-width="50"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.dialysis_duration_hour }} 小时
+            {{ scope.row.dialysis_duration_minute }} 分钟
+          </template>
+        </el-table-column>
+      
+        <el-table-column
+          prop="doctor"
+          label="医生"
+          align="center"
+          min-width="110"
+        >
+          <template slot-scope="scope">
+            <span>{{ getAdminUserName(scope.row.registrars_id) }}</span>
+          </template>
+        </el-table-column>
 
+        <el-table-column
+          prop="created_time"
+          align="center"
+          label="创建日期"
+          min-width="60"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.created_time | parseTime("{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="updated_time"
+          align="center"
+          label="更新日期"
+          min-width="60"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.updated_time | parseTime("{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column  align="center" label="状态" width="60">
+          <template slot-scope="scope">
+            <span v-if="scope.row.solution_status == 1">生效</span>
+            <span v-if="scope.row.solution_status == 2">失效</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        align="right"
+        @size-change="handleSizeChangeOne"
+        @current-change="handleCurrentChangeOne"
+        :current-page="pageOne"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalOne"
+      >
+      </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="startDialogVisible = false"
+          >取消</el-button
+        >
+        <el-button
+          type="primary"
+          @click="startDialogVisible = false"
+         
+          >确定</el-button
+        >
+      </span>
+    </el-dialog>
 
   </div>
 </template>
@@ -745,7 +903,8 @@ import {
   editChildPatientDialysisSolution,
   editDialysisSolutionDetail,
   editPatientDialysisSolution,
-  fetchPatientDialysisSolutions
+  findePatientDialysisLongSolutions,
+  getDialysisSolutionDetailList
 } from '@/api/patient'
 
 import { getSystemPrescription } from '@/api/config'
@@ -1031,6 +1190,12 @@ export default {
       {id:2,name:"无"}
      ],
      oxygenShow:false,
+     startDialogVisible:false,
+     tableList:[],
+     totalOne:0,
+     pageOne:1,
+     limitOne:10,
+     startShow:false,
     }
   },
   watch: {
@@ -1196,6 +1361,8 @@ export default {
     },
 
     tableCurrentChange(current) {
+      console.log("current",current)
+      this.startShow = true
       if (typeof current === 'undefined' || current == null) {
         this.current_solution = {
           id: 0,
@@ -1320,18 +1487,7 @@ export default {
               duration: 2000
             })
             this.tableData.splice(index, 1)
-            // if (row.parent_id>0) {
-            //   this.tableData.splice(index,1);
-            // }else {
-            //     var resetTableData = this.tableData;
-            //     this.tableData = [];
-            //     var that = this;
-            //     resetTableData.forEach(function(item, itemindex){
-            //         if (item.id != row.id && item.parent_id != row.id) {
-            //             that.tableData.push(item);
-            //         }
-            //     });
-            // }
+           
           }
         })
       })
@@ -1511,7 +1667,7 @@ export default {
               // this.tableData[this.current_index].updated_time = response.data.data.solution.updated_time;
 
               this.current_index = -1
-              this.fetchPatientDialysisSolutions()
+              this.FindePatientDialysisLongSolutions()
               return false
             }
           })
@@ -1550,7 +1706,7 @@ export default {
               }
               this.total += 1
               // this.$refs[formName].resetFields()
-              this.fetchPatientDialysisSolutions()
+              this.FindePatientDialysisLongSolutions()
               return false
             }
           })
@@ -1562,11 +1718,23 @@ export default {
     },
     handleSizeChange(val) {
       this.queryParams.limit = val
-      this.fetchPatientDialysisSolutions()
+      this.FindePatientDialysisLongSolutions()
+    },
+    handleCurrentChange(val) {
+      this.queryParams.page = val
+      this.FindePatientDialysisLongSolutions()
+    },
+   handleSizeChangeOne(val) {
+      this.queryParams.limit = val
+      this.FindePatientDialysisLongSolutions()
     },
     handleCurrentChange(val) {
       this.queryParams.page = val
-      this.fetchPatientDialysisSolutions()
+      this.FindePatientDialysisLongSolutions()
+    },
+     handleCurrentChangeOne(val) {
+      this.queryParams.page = val
+      this.FindePatientDialysisLongSolutions()
     },
     openEdit(index, row) {
       console.log("ro2333333",row)
@@ -1874,8 +2042,8 @@ export default {
         }
       })
     },
-    fetchPatientDialysisSolutions() {
-      fetchPatientDialysisSolutions(this.queryParams).then(response => {
+    FindePatientDialysisLongSolutions() {
+      findePatientDialysisLongSolutions(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.tableData = response.data.data.solutions
           this.total = response.data.data.total
@@ -1964,12 +2132,10 @@ export default {
       ) {
         return false
       }
-      // this.current_model = this.modeOptions[thismode];
       this.addPlan.mode_name = this.modeOptions[thismode].name
       const params = {
         id: thismode
       }
-
       getSystemPrescription(params).then(response => {
         if (response.data.state == 1) {
            var prescription =   response.data.data.prescription
@@ -2153,6 +2319,103 @@ export default {
       this.addPlan.oxygen_time = ""
      }
     },
+    toClick(val){
+      var params = {
+        mode_id:val.mode_id,
+        patient_id:val.patient_id,
+        page:this.pageOne,
+        limit:this.limitOne,
+      }
+      getDialysisSolutionDetailList(params).then(response=>{
+        if(response.data.state == 1){
+          this.startDialogVisible = true
+          var list = response.data.data.list
+          this.totalOne = response.data.data.total
+          this.tableList = list
+        }
+      })
+    },
+
+    //修改
+    getDialysateFormulation(id){
+      var name = ""
+      for(let i=0;i<this.dialysate_formulation.length;i++){
+        if(id == this.dialysate_formulation[i].id){
+          name = this.dialysate_formulation[i].name
+        }
+      }
+      return name
+    },
+    getAnticoagulant(id){
+      var name = ""
+      if(id == 1){
+         name = "无肝素"
+      }
+      if(id == 2){
+        name = "普通肝素"
+      }
+      if(id == 3){
+        name = "低分子肝素"
+      }
+      if(id == 4){
+        name = "阿加曲班"
+      }
+      if(id == 5){
+         name ="枸橼酸钠"
+      }
+      if(id == 6){
+        name = "低分子肝素钙"
+      }
+      if(id == 7){
+        name = "低分子肝素钠"
+      }
+      if(id ==8){
+        name = "依诺肝素"
+      }
+      if(id ==9){
+        name = "达肝素"
+      }
+      if(id ==10){
+        name = "体外抗凝"
+      }
+      if(id ==11){
+        name = "那曲肝素"
+      }
+      if(id ==12){
+        name = "无抗凝剂"
+      }
+     if(id ==13){
+        name = "那曲肝素钙"
+      }
+      return name
+    },
+    getBodyFluid(id){
+     var name = ""
+     for(let i=0;i<this.body_fluid_option.length;i++){
+       if(id == this.body_fluid_option[i].id){
+          name = this.body_fluid_option[i].name
+       }
+     }
+     return name
+    },
+    getBloodAccess(id){
+      var name = ""
+      for(let i=0;i<this.blood_access_option.length;i++){
+        if(id == this.blood_access_option[i].id){
+           name = this.blood_access_option[i].name
+        }
+      }
+      return name
+    },
+    getHemodialysisPipelines(id){
+      var name = ""
+      for(let i=0;i<this.hemodialysisPipelinesOptions.length;i++){
+        if(id == this.hemodialysisPipelinesOptions[i].id){
+            name = this.hemodialysisPipelinesOptions[i].name
+        }
+      }
+      return name
+    }
   },
   created() {
     const id = this.$route.params && this.$route.params.id
@@ -2170,7 +2433,7 @@ export default {
 
     this.GetDeviceData()
     this.fetchAllAdminUsers()
-    this.fetchPatientDialysisSolutions()
+    this.FindePatientDialysisLongSolutions()
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set
     this.replacementWays = this.$store.getters.replacement_ways

src/xt_pages/workforce/components/template_table.vue

@@ -31,6 +31,7 @@
         }"
         :row-style="{ color: '#303133' }"
         style="width: 100%"
+        
         border
       >
         <el-table-column label="姓名" width="120">
@@ -95,7 +96,11 @@
     <div id="table_data">
       <el-table :height="tableContainHeight" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="table"
                 :data="opera_device_numbers" :span-method="spanMethod"
-                row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick">
+                show-summary
+                :summary-method="getSummaries"
+                row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick"
+                sum-text="总数"
+                >
         <el-table-column label="分区" width="80" align="center" fixed
                          style="width: 100px; background-color: red; display: block;">
           <template slot-scope="scope">
@@ -301,8 +306,8 @@
     },
     watch: {
       'device_numbers': function() {
-        console.log("中国人民2333232333323322332",this.device_numbers)
         this.opera_device_numbers = this.makeDeviceNumbers(this.device_numbers)
+
         this.origin_device_numbers = this.makeDeviceNumbers(this.device_numbers)
       },
       'template.items': function() {
@@ -462,24 +467,32 @@
       //     }
       // },
       makeDeviceNumbers: function(device_numbers) {
-        
+        console.log("device_numbers",device_numbers)
+        var arr = []
+        for(let i=0;i<device_numbers.length;i++){
+          arr.push(device_numbers[i])
+        }
+        arr.sort(this.arraySort('sort'))
+        console.log("Arr2332232332",arr)
         var maked_device_numbers = []
         var weekdays = [1, 2, 3, 4, 5, 6, 7] // 周一-周日
         var time_types = [1, 2, 3] // 上下晚
-        for (let index = 0; index < device_numbers.length; index++) {
-          const device_number = device_numbers[index]
+        for (let index = 0; index < arr.length; index++) {
+          const device_number = arr[index]
           if(device_number.zone!=null){
             var zone = {
               id: device_number.zone.id,
               name: device_number.zone.name,
-              type: device_number.zone.type
+              type: device_number.zone.type,
+              sort:device_number.sort
             }
             var device = {
               id: device_number.id,
               number: device_number.number,
               group_id: device_number.group_id,
               zone_id: device_number.zone_id,
-              zone: zone
+              zone: zone,
+              sort:device_number.sort
             }
           }
          
@@ -503,8 +516,8 @@
 
           maked_device_numbers.push(device)
         }
-
-        console.log(maked_device_numbers)
+        maked_device_numbers.sort(this.arraySort('sort'))
+        console.log("数据源23232233223232322323我",maked_device_numbers)
         return maked_device_numbers
       },
       spanMethod({ row, column, rowIndex, columnIndex }) {
@@ -770,7 +783,62 @@
           this.saving = false
           this.is_editing = false
         })
+      },
+     getSummaries(param) {
+      
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0 || index === 25) {
+          sums[index] = "总数";
+          return;
+        }
+        if (index === 1 || index === 24) {
+          sums[index] = data.length;
+          return;
+        }
+
+        const values = data.map(item => item[column.property]);
+
+        if (index === 23) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index];
+          return;
+        }
+
+        sums[index] = values.reduce((prev, curr) => {
+          if (typeof curr["treat_mode_id"] === "undefined") {
+            return prev;
+          }
+          const value = Number(curr["treat_mode_id"]);
+          if (!isNaN(value) && value > 0) {
+            return prev + 1;
+          } else {
+            return prev;
+          }
+        }, 0);
+        sums[index];
+      });
+      this.$nextTick(() => {
+        this.$refs.table.doLayout();
+      });
+
+      return sums;
+    },
+    arraySort(property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
       }
+     }
     }
   }
 </script>