Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/store/modules/globalConfig.js

         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
-      }
+      },
+      18: {
+        id: 18,
+        name: '贝米肝素钠注射液',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
     },
     anticoagulants_set: {
       type: 2

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         }) .catch(function(error) {
           this.newLoading = false
         })
-
       } else {
-        var that = this
-        axios.get('http://127.0.0.1:9532/api/upload/get', {
-          params: form,
-          headers: {
-            'Permission': 5
-          }
-        })
-          .then(function(response) {
+        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111")) {
+          upload(form).then(response => {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-
-              that.loadingtwo = false
-              that.$refs.charge.hide()
-
+              this.$message.error(response.data.msg)
+              this.loadingtwo = false
+              this.newLoading = false
+              this.$refs.charge.hide()
               return false
             } else {
-              if (response.data.data.failed_code == -10) {
+              this.$refs.charge.hide()
+              this.radio = 2
+              this.changeRadioAndPatient(2)
+              this.loadingtwo = false
+              this.state = '已收费'
+              this.$message({ message: '收费成功', type: 'success' })
+              this.$refs.charge.hide()
+              this.loadingtwo = false
+              this.newLoading = false
+            }
+          }) .catch(function(error) {
+            this.newLoading = false
+          })
+        }else{
 
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
-                  that.$refs.charge.hide()
-                  that.changeRadioAndPatient(1)
-                  that.newLoading = false
-                }).catch(() => {
-                  that.$refs.charge.hide()
-                  that.changeRadioAndPatient(1)
-                  that.newLoading = false
-                })
+          var that = this
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
+            params: form,
+            headers: {
+              'Permission': 5
+            }
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
 
-              } else {
-                that.radio = 2
-                that.changeRadioAndPatient(2)
-                that.$refs.charge.hide()
-                that.loadingtwo = false
-                that.state = '已收费'
-                that.$message({ message: '收费成功', type: 'success', duration: 5000 })
                 that.loadingtwo = false
-                that.cal_one = this.cal_one - 1
-                that.cal_two = this.cal_two + 1
-                that.patientTableData.splice(this.current_index, 1)
-                that.newLoading = false
+                that.$refs.charge.hide()
+
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+                    that.$refs.charge.hide()
+                    that.changeRadioAndPatient(1)
+                    that.newLoading = false
+                  }).catch(() => {
+                    that.$refs.charge.hide()
+                    that.changeRadioAndPatient(1)
+                    that.newLoading = false
+                  })
+
+                } else {
+                  that.radio = 2
+                  that.changeRadioAndPatient(2)
+                  that.$refs.charge.hide()
+                  that.loadingtwo = false
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success', duration: 5000 })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
+                  that.patientTableData.splice(this.current_index, 1)
+                  that.newLoading = false
+                }
               }
-            }
-          })
-          .catch(function(error) {
-            that.newLoading = false
-          })
+            })
+            .catch(function(error) {
+              that.newLoading = false
+            })
+
+        }
+
+
+
       }
     },
     chargeCancel() {
         this.treatVisible = true
         // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
       } else if (index == 4) {//收费
+
         var ids = []
         for (let i = 0; i < prescriptions.length; i++) {
           ids.push(prescriptions[i].id)
             this.pwd = ''
           } else {
             if (this.activeName == 'first') {
+
+
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             } else {
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

       }
 
       this.state1 = info.sick_type
-      if (this.state1 == 0 || this.state1 == '') {
-        this.state1 = ''
-        for (let i = 0; i < this.sick.length; i++) {
-          this.state1 = this.sick[0].id
-        }
-      }
+      // if (this.state1 == 0 || this.state1 == '') {
+      //   this.state1 = ''
+      //   for (let i = 0; i < this.sick.length; i++) {
+      //     this.state1 = this.sick[0].id
+      //
+      //   }
+      // }
 
       if (this.departmentValue == '' || this.departmentValue == 0) {
         if (department.length > 0) {
         this.state1 = 662
       }
 
+      //
+      // if (this.org_id == 10598 || this.org_id == 0) {
+      //   this.state1 = 662
+      // }
+
+
       if (info.id > 0) {
         this.doctorValue = info.doctor_id
         this.departmentValue = info.departments
         console.log('hhahahahah', this.patient_diagnose)
       }
 
+      console.log('--------', info.sick_type)
       this.state1 = info.sick_type
       if (this.state1 == 0 || this.state1 == '') {
         this.state1 = ''
         this.state1 = 607
       }
 
+      if (this.org_id == 10598 || this.org_id == 0) {
+        this.state1 = 693
+      }
+
       if (this.departmentValue == '' || this.departmentValue == 0) {
         if (department.length > 0) {
           this.departmentValue = department[0].id

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

           this.case_history.physical_examination = this.case_history.physical_examination
           this.case_history.special_inspection = this.case_history.special_inspection
           this.case_history.lab_apparatus = this.case_history.lab_apparatus
-    
+
           //处方相关
           this.prescriptionList = response.data.data.prescription
 
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
-                    } else if(this.org_id == 10206 ){
+                    } else if(this.org_id == 10206 || this.org_id == 10598){
                       preTime = this.record_date + ' ' + '6:00'
                     } else {
                       preTime = this.record_date + ' ' + '7:00'
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0) {
+                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
-                    } else if(this.org_id == 10206  ) {
+                    } else if(this.org_id == 10206  || this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
                     } else {
                       preTime = this.record_date + ' ' + '7:00'
 
                 if(nowTime.split(" ")[0] != this.record_date){
                   if(this.schedule.schedule_type == 1){
-                    if(this.org_id == 10206  || this.org_id == 0) {
+                    if(this.org_id == 10206  || this.org_id == 0 ||  this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
                     }else {
                       preTime = this.record_date + ' ' + '7:00'
               if(nowTime.split(" ")[0] != this.record_date){
                 // preTime = this.record_date
                 if(this.schedule.schedule_type == 1){
-                  if(this.org_id == 10206  || this.org_id == 0) {
+                  if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                     preTime = this.record_date+ ' ' + '6:00'
                   }else {
                     preTime = this.record_date + ' ' + '7:00'
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206 ){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0) {
+                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
                       // preTime = nowTime
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
                       var preTime = nowTime
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
                     // preTime = nowTime
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
                     var preTime = nowTime
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
                 } else {
                   if(nowTime.split(" ")[0] != this.record_date){
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0) {
+                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
 
                             preTime = this.record_date + ' ' + '6:00'
 
                         // preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0) {
+                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date+ ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
 
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
                         preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0) {
+                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
                         if (this.schedule.schedule_type == 1) {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
-                          } else if(this.org_id == 10206){
+                          } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
                           } else {
                             preTime = this.record_date + ' ' + '7:00'
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
-                          if(this.org_id == 10206  || this.org_id == 0) {
+                          if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                             preTime = this.record_date+ ' ' + '6:00'
                           }else {
                             preTime = this.record_date + ' ' + '7:00'
                   } else {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
-                        if(this.org_id == 10206  || this.org_id == 0) {
+                        if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
                           preTime = this.record_date+ ' ' + '6:00'
                         }else {
                           preTime = this.record_date + ' ' + '7:00'

src/xt_pages/outpatientTool/components/gather.vue

           <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
         </el-popover> -->
+        <el-button size="small" type="primary" @click="query">查询</el-button>
+
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
     </div>
     },
     changeDate() {
       // console.log(this.chargeDate)
-      this.getSummaryDetailList()
+      // this.getSummaryDetailList()
     },changeTimeItem(){
-      this.getSummaryDetailList()
+      // this.getSummaryDetailList()
     },
     changeItem() {
       this.new_item_type = this.item_type
       }else if(this.item_type == 5){
         this.new_item_type = -200
       }
-      this.getSummaryDetailList()
+      // this.getSummaryDetailList()
     }, uniquepid(arr) {
       const res = new Map()
       return arr.filter((arr) => !res.has(arr.p_id) && res.set(arr.p_id, 1))
     },
     searchAction() {
       this.item_type = '0'
-      this.getSummaryDetailList()
+      // this.getSummaryDetailList()
     },
     getSummaryDetailList() {
       this.gather_loading = true
       })
 
       return sums
+    },query(){
+      this.getSummaryDetailList()
+
     }, export_detail() {
 
       let list = []

src/xt_pages/stock/drugs/drugInventory.vue

           <drug-damaged ref="childOne"></drug-damaged>
         </el-tab-pane>
 
-        <!-- <el-tab-pane label="盘点记录表" name="seven">
+        <!-- <el-tab-pane label="盘点日志表" name="seven">
             <inventory-record ref="childSeven"></inventory-record>
          </el-tab-pane> -->
       </el-tabs>

src/xt_pages/stock/stockInventory.vue

                 <stockDamaged ref="childOne"></stockDamaged>
             </el-tab-pane>
 
-            <el-tab-pane label="盘点记录表" name="seven">
+            <el-tab-pane label="盘点日志表" name="seven">
                 <inventory-record ref="childSeven"></inventory-record>
             </el-tab-pane>
         </el-tabs>

src/xt_pages/stock/stockInventoryModePrint.vue

+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+
+                <table class="printTable" border="0" cellspacing="0" align="center">
+                    <thead class="print_head">
+                        <tr><td colspan="11">{{org_name}}</td></tr>
+                        <tr><td colspan="11">耗材盘点</td></tr>
+                    </thead>
+                    <tbody class="print_body">
+                    <tr>
+                        <td align="center">耗材名称</td>
+                        <td align="center">规格</td>
+                     
+                        <td align="center">本月入库数量</td>
+                        <td align="center">本月出库数量</td>
+                        <td align="center">本月剩余库存</td>
+                        <td align="center">批号</td>
+                        <td align="center">生产日期</td> 
+                        <td align="center">有效日期</td>
+                        <td align="center">生产厂商</td>
+                        <td align="center">盘点数量</td>
+                       
+                    </tr>
+
+                    <tr v-for="(item,index) in tableList" :key="index">
+                        <td align="center">{{ item.good_name }}</td>
+                        <td align="center">{{ item.specification_name }}</td>
+                        <td align="center">{{ getInCount(item.good_id) }}</td>
+                        <td align="center">{{ getOutCount(item.good_id) }}</td> 
+                        <td align="center">{{ getSumCount(item.good_id) }}</td>
+                        <td align="center">
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ it.number }}
+                                    </td>
+                              </tr>
+                            </table>
+                        </td>
+                       
+                        <td align="center">
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ getTime(it.product_date) }}
+                                    </td>
+                              </tr>
+                            </table>
+                        </td>
+                        <td align="center">
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ getTime(it.expiry_date) }}
+                                    </td>
+                              </tr>
+                            </table>
+                        </td>
+                        <td align="center">
+
+                            <table
+                                class="ware_table"
+                                style="width: 100%; border-collapse: collapse"
+                                >
+                                <tr
+                                    v-for="(it, i) in item.child"
+                                    :key="i"
+                                    style="width: 100%"
+                                >
+                                    <td
+                                    :style="[
+                                        {
+                                        border:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '',
+                                        },
+                                        {
+                                        borderStyle:
+                                            i === item.child.length - 1
+                                            ? 'initial'
+                                            : 'hidden',
+                                        },
+                                        {
+                                        borderBottom:
+                                            i === item.child.length - 1
+                                            ? 'none'
+                                            : '1px solid',
+                                        },
+                                    ]"
+                                    >
+                                    {{ getManufacturerName(it.manufacturer) }}
+                                    </td>
+                              </tr>
+                            </table>
+
+                        </td>
+                        <td align="center">
+
+                            
+                        </td>
+                       
+                    </tr>
+                   
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import print from "print-js"; 
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+const moment = require('moment');
+import { uParseTime } from '@/utils/tools'
+import { getStockInventroyModePrintList } from  "@/api/stock"
+  export default {
+    components:{
+        BreadCrumb
+    },
+     data(){
+       return{
+        crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '耗材模版打印' },
+          ],
+          tableList:[],
+          org_name: this.$store.getters.xt_user.org.org_name,
+          start_time:"",
+          end_time:"",
+          manufacturerList:[],
+          infoList:[],
+          outinfo:[],
+          flowProList:[],
+          flowNoProList:[],
+          goodInfo:[]
+       }
+     },
+     methods:{
+        printAction: function() {
+            const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
+            printJS({ 
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+          
+          var params = {
+            start_time:this.$route.query.start_time,
+            end_time:this.$route.query.end_time,
+          }
+          console.log("params-------",params)
+          getStockInventroyModePrintList(params).then(response=>{
+              if(response.data.state == 1){
+                 var list  =  response.data.data.list
+
+                 console.log("list===============",list)
+
+                if(list!=null && list.length > 0){
+                  let dataInfo = {}
+                  list.forEach((item, index) => {
+                  let { good_id } = item
+                  if (!dataInfo[good_id]) {
+                    dataInfo[good_id] = {
+                      good_id:item.good_id,
+                      child: [],
+                      count:0,
+                      specification_name:item.specification_name,
+                      good_name:item.good_name,
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+                
+                for(let i=0;i<arr.length;i++){
+                   for(let j=0;j<list.length;j++){
+                       if(arr[i].good_id == list[j].good_id){
+                          arr[i].child.push(list[j])
+                       }
+                   }
+                }
+                
+                this.tableList = arr
+                console.log("arr--------------",arr)
+                }
+                 var manufacturerList = response.data.data.manufacturerList
+                 this.manufacturerList = manufacturerList
+
+                 this.infoList = response.data.data.infoList
+
+                 this.outinfo = response.data.data.outinfo
+
+                 this.flowNoProList = response.data.data.flowNoProList
+
+                 this.flowProList = response.data.data.flowProList
+
+                 this.goodInfo = response.data.data.goodInfo
+              }
+          })
+        },
+        getManufacturerName(id){
+           var manufacturer_name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+             if(id == this.manufacturerList[i].id){
+                 manufacturer_name = this.manufacturerList[i].manufacturer_name
+             }
+           }
+           return manufacturer_name
+        },
+        
+        getInCount(good_id){
+          
+          var newArr =[]
+          var total_count =0
+          var newArrOne = []
+          var total_count_one  = 0
+          var total =0
+          for(let i=0;i<this.infoList.length;i++){
+            if(good_id == this.infoList[i].good_id){
+               newArr.push(this.infoList[i])
+            }
+          }
+          if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+                total_count += parseInt(newArr[i].warehousing_count)
+            }
+          }
+
+          for(let i=0;i<this.flowProList.length;i++){
+            if(good_id == this.flowProList[i].good_id){
+               newArrOne.push(this.flowProList[i])
+            }
+          }
+          if(newArrOne!=null){
+            for(let i=0;i<newArrOne.length;i++){
+               total_count_one += newArrOne[i].count
+            }
+          }
+          total = total_count + total_count_one
+          return total
+        },
+        getOutCount(good_id){
+
+          var newArr =[]
+          var newArrOne = []
+          var total_count =0
+          var total_count_one  = 0
+          var total = 0
+          for(let i=0;i<this.outinfo.length;i++){
+            if(good_id == this.outinfo[i].good_id){
+               newArr.push(this.outinfo[i])
+            }
+          }
+          if(newArr!=null){
+            for(let i=0;i<newArr.length;i++){
+              total_count += parseInt(newArr[i].count)
+            }
+          }
+
+          for(let i=0;i<this.flowNoProList.length;i++){
+            if(good_id == this.flowNoProList[i].good_id){
+               newArrOne.push(this.flowNoProList[i])
+            }
+          }
+          if(newArrOne!=null){
+            for(let i=0;i<newArrOne.length;i++){
+               total_count_one += newArrOne[i].count
+            }
+          }
+
+
+          total = total_count + total_count_one
+          return total
+        },
+        getSumCount(good_id){
+          var sum_count = 0
+          for(let i=0;i<this.goodInfo.length;i++){
+             if(good_id == this.goodInfo[i].id){
+                sum_count = this.goodInfo[i].sum_count
+             }
+          }
+          return sum_count
+        }
+
+        
+     },
+     created(){
+        
+        this.getlist()
+     }
+
+  } 
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.printTitle{font-size: 22px;text-align: center;}
+.flex{display: flex;justify-content: space-between;}
+.tableTitle{display: flex;border-top:1px solid #000;border-bottom: 1px solid #000;padding: 10px 0;}
+.tableTr{display: flex;border-bottom: 1px dashed #000;padding: 10px 0;}
+.tableBottom{display: flex;border-bottom: 1px solid #000;padding: 10px 0;}
+.printTable{width:100%;border-collapse: collapse;}
+.printTable td{padding:5px;}
+.print_head{border: none;display: table-header-group;}
+.print_head tr td{text-align: center;border: none;}
+.print_body tr td{border:1px solid}
+</style>