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

src/router/modules/selfPreparedMedicine.js

@@ -37,6 +37,14 @@ export default {
         component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
         name: 'selfPreparedMedicineInfo',
         meta: { title: 'selfPreparedMedicineInfo', noCache: true }
-    }
+    },
+    {
+      path: '/stock/stockprint',
+      component: () => import('@/xt_pages/stock/stockPrint'),
+      name: 'stockqueryprint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockprint', noCache: true }
+     },
   ]
 }

src/xt_pages/data/components/additionDialog.vue

@@ -66,10 +66,6 @@
           name: [
             { required: true, message: '请输入费用名称', trigger: 'blur' }
           ],
-          code: [
-            { required: true, message: '请输入国家编码', trigger: 'blur' }
-          ]
-
         }
       }
     },

src/xt_pages/data/components/addtion.vue

@@ -184,9 +184,9 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.Dialog.formValue.class_name =
+            this.Dialog.formValue.name =
               response.data.data.addition.name
-            this.Dialog.formValue.content_code =
+            this.Dialog.formValue.code =
               response.data.data.addition.code
             this.Dialog.formValue.price =
               response.data.data.addition.price

src/xt_pages/data/specialDictionary.vue

@@ -25,12 +25,10 @@
           <!--<supplier></supplier>-->
           <dealer></dealer>
         </el-tab-pane>
-
         <el-tab-pane label="疾病类型" name="7">
-          <!--<manufacturer></manufacturer>-->
-          <diagnosis></diagnosis>
-        </el-tab-pane>
-
+        <!--<manufacturer></manufacturer>-->
+        <diagnosis></diagnosis>
+      </el-tab-pane>
         <!--<el-tab-pane label="医疗类别" name="8">-->
           <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
           <!--<diagnosis></diagnosis>-->
@@ -42,6 +40,11 @@
         <el-tab-pane label="配置项字典" name="9">
           <configure></configure>
         </el-tab-pane>
+
+        <el-tab-pane label="诊断信息" name="10">
+          <diagnosis></diagnosis>
+        </el-tab-pane>
+
       </el-tabs>
     </div>
   </div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -67,7 +67,7 @@
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
                   <div class="tabsBox">
-                    <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
+                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
                     <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" @tab-click="tabclickEvent">
                       <el-tab-pane
                         v-for="(item, index) in prescriptions"

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -674,10 +674,16 @@
           this.order_status = '已退费'
         }
 
+        console.log(info)
+
+
         if(info.id > 0){
+          console.log("!Q!!!!")
+
           this.doctorValue = info.doctor_id
           this.departmentValue = info.department
         }else{
+          console.log("------")
           this.doctorValue = ''
           this.departmentValue = ''
 
@@ -714,7 +720,7 @@
           return false
         }
       },
-      open(index) {
+      open(index,isLoading) {
         if (this.curPrescriptions.order_status == 2) {
           this.$message.error('当前处方已经结算,无法保存')
           return
@@ -773,8 +779,10 @@
           let data = {
             'prescriptions': this.prescriptions
           }
+          isLoading = true
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
+              this.$emit("change")
               this.$message.success('保存成功')
             }
           })

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -11,7 +11,7 @@
       <el-button v-if="activeName == 'second'" @click="open(2)" type="primary">打印</el-button>
     </div>
     <el-tabs v-model="activeName">
-      
+
       <el-tab-pane label="处方详情" name="first">
         <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
           <el-tab-pane
@@ -42,7 +42,7 @@
             <span style="width:240px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
             <!-- <span style="width:180px;">疾病名称：{{case_history.diagnostic}}</span>
             <span style="width:180px;">症状：{{case_history.diagnostic}}</span> -->
-            
+
 
           </div>
         </div>
@@ -156,7 +156,7 @@ import moment from 'moment';
 
           //  /outpatientDoctorStation/print?record=2020-12-11&prescription_id=157&ids=157,159&patient_id=1064
         }else if(index == 2){
-           var record_date = this.format(this.case_history.sick_date)    
+           var record_date = this.format(this.case_history.sick_date)
           this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
         }
       },
@@ -214,9 +214,9 @@ import moment from 'moment';
             this.patientInfo = response.data.data.order.patient
             this.hisPatientInfo = response.data.data.order.his_patient
             this.case_history = response.data.data.order.case_history
-            console.log("历史详情",this.case_history)
+            // console.log("历史详情",this.case_history)
             this.order = response.data.data.order
-            console.log('this.order',this.order)
+            // console.log('this.order',this.order)
 
 
             this.prescriptions = []
@@ -287,13 +287,13 @@ import moment from 'moment';
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
-            var doctor =  response.data.data.doctor 
+            var doctor =  response.data.data.doctor
             this.doctorList = doctor
              var department = response.data.data.department
              console.log("department",department)
              this.departmentList = department
             }
-         })   
+         })
       },
       getDepartMent(id){
          var name = ""

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -8,51 +8,6 @@
     >
         <div>
             <el-tabs v-model="activeName">
-                <!-- <el-tab-pane label="历史病历" name="first">
-                    <div style="display:flex;align-items: center;margin-bottom:10px;">
-                        <el-input size="small" v-model.trim="search_input" class="filter-item" style="width:140px;"/>
-                        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
-                        <span>日期：</span>
-                        <el-date-picker
-                        size="small"
-                        style="width:140px;margin:0 10px;"
-                        v-model="value1"
-                        type="date"
-                        placeholder="选择日期">
-                        </el-date-picker>
-                        <el-date-picker
-                        style="width:140px;"
-                        size="small"
-                        v-model="value1"
-                        type="date"
-                        placeholder="选择日期">
-                        </el-date-picker>
-                    </div>
-                    <el-table :data="tableData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                        <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
-                        <el-table-column align="center" prop="name" label="病历编号">
-                            <template slot-scope="scope">{{ scope.row.id }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="名称">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="创建人">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="创建日期">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="模板说明">
-                            <template slot-scope="scope">{{ scope.row.date }}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" label="操作" width='200'>
-                            <template slot-scope="scope">
-                                <el-button type="primary" size="mini">调用</el-button>
-                                <el-button type="primary" size="mini" @click="toHistoryDetail">详情</el-button>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                </el-tab-pane> -->
                 <el-tab-pane label="病历模板" name="first">
                     <div style="display:flex;align-items: center;margin-bottom:10px;">
                         <el-input size="small"  v-model.trim="search_input" class="filter-item" style="width:140px;"/>
@@ -77,7 +32,7 @@
                     </div>
                     <el-table :data="tempalateData" border height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                         <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
-                        <el-table-column align="center" prop="name" label="病历编号">
+                        <el-table-column align="center" prop="name" width="60" label="病历编号">
                             <template slot-scope="scope">{{ scope.row.id }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="名称">
@@ -134,6 +89,7 @@ export default {
             search_input:"",
             start_time:"",
             end_time:"",
+            mode_status:0,
         }
     },
     methods:{
@@ -146,8 +102,9 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show() {
-            // this.clear()
+        show(id) {
+            this.mode_status = id
+            this.getlist()
             this.visible = true
         },
         hide() {
@@ -161,7 +118,6 @@ export default {
             this.$refs.recordTemplateDetail.show(id)
         },
         totemplateDetailTwo(id){
-        console.log("id0---",id)
          this.$emit('func',id)
          this.visible = false
         },
@@ -179,9 +135,6 @@ export default {
               var template =  response.data.data.template
               console.log("templagte",template)
               this.tempalateData = template
-            //   var history =  response.data.data.history
-            //   console.log("history",history)
-            //   this.tableData = history
             }
           })
         },
@@ -199,9 +152,10 @@ export default {
       },
     },
     created(){
-       console.log("99999999999999999")
        this.getlist()
-    }
+    },
+   
+    
 }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/saveRecordTemplate.vue

@@ -7,10 +7,6 @@
         class="recordDialog"
     >
         <el-form class="recordForm" :model="form"  ref="form" label-width="80px">
-            <!-- <el-form-item label="模板类别:" prop="name" style="width:100%;">
-                <el-radio v-model="mode_type" label="1">私人模板</el-radio>
-                <el-radio v-model="mode_type" label="2">公共模板</el-radio>
-            </el-form-item> -->
             <el-form-item label="模板名称: " prop="name" style="width:100%;">
                 <el-input v-model="template_name" placeholder=""></el-input>
             </el-form-item>
@@ -58,7 +54,8 @@ export default {
             start_time:"",
             user_name:"",
             template_name:"",
-            template_remark:""
+            template_remark:"",
+            mode_status:0,
         }
      },
     
@@ -74,7 +71,7 @@ export default {
         },
         show(obj) {
          console.log("obj",obj)
-         this.chief_conplain= obj.chief_conplain
+         this.chief_conplain= obj.chief_conplaint
          this.past_history = obj.past_history
          this.history_of_present_illness = obj.history_of_present_illness
          this.personal_history = obj.personal_history
@@ -101,10 +98,13 @@ export default {
              diagnostic:this.diagnostic,
             }
          console.log("params",params)
+       
           SaveHisPatientCaseHistoryTemplate(params).then(response=>{
               if(response.data.state == 1){
+                 this.mode_status = 1
                  this.$message.success("保存成功")
                  this.visible = false
+                
               }
           })   
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -45,7 +45,7 @@
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
-            <el-button size="small" ref="button_one" @click="open(1)" type="primary">保存</el-button>
+            <el-button size="small" ref="button_one" @click="open(1)" type="primary" v-loading="saveLoading">保存</el-button>
             <el-popover
               placement="bottom"
               width="200"
@@ -69,7 +69,7 @@
         <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
-                          v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                          v-if="titleType == '电子处方'" style="flex:1;" v-on:change="changeTab"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
                     :hisPatientInfo="hisPatientInfo"   v-if="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
@@ -142,6 +142,7 @@
     data() {
       return {
         tableHeight:'',
+        saveloading:false,
         fullHeight: document.documentElement.clientHeight,
         prescriptions: [
           {
@@ -182,6 +183,8 @@
         selecting_schs: [],
         index:0,
         admin_info:{},
+        saveLoading:false,
+
       }
     },
     methods: {
@@ -208,11 +211,40 @@
         }
 
 
+      },changeTab(){
+        this.saveLoading = false
+
+        this.radio = 2
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio
+        }
+        this.patientTableData = []
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+            this.cal_one = response.data.data.total_one
+            this.cal_two =  response.data.data.total_two
+            this.admin_info =  response.data.data.info
+           for (let i = 0; i< this.patientTableData.length; i++){
+             if(this.patientTableData[i].patients.id == this.patientid){
+               this.$refs.tab.setCurrentRow(this.patientTableData[i])
+               this.getPatientInfo(this.patientTableData[i])
+
+             }
+           }
+
+
+          }
+        })
+
       },
       change(val) {
         this.getList()
-
-
       },
       getList() {
         let params = {
@@ -240,6 +272,7 @@
             }
 
             this.prescriptionList = response.data.data.list.prescription
+
             this.patientid = this.patientTableData[0].patient_id
 
           }
@@ -394,7 +427,7 @@
 
 
       },
-      
+
       choosePatient(val) {
         let isShowDailog = false
         for (let i = 0; i < this.prescriptions.length; i++){
@@ -403,7 +436,7 @@
           }
         }
         if(isShowDailog){
-          
+
           this.patientTableData.map((item,index) => {
             if(item.patient_id == this.oldCurrentRow.patient_id){
               this.$refs.tab.setCurrentRow(this.patientTableData[index])
@@ -558,18 +591,17 @@
           this.oldCurrentRow = currentRow
           return
         }
-        
-        
+
+
       },
       open(index) {
-        console.log("index0999999",this.prescriptions)
          if(this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0){
            this.$message.error("请先开处方")
            return
           }
         this.index = index
         if (index == 1) {
-          this.$refs.prescriptions.open(1)
+          this.$refs.prescriptions.open(1,this.saveLoading)
         } else if (index == 2) {
 
           this.getPrescriptionList(this.patientid)
@@ -588,7 +620,6 @@
       },
 
       opentwo(index) {
-        console.log("index",index)
         if (index == 1) {
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
@@ -598,7 +629,9 @@
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
         } else if (index == 3) {
-          this.$refs.medicalRecord.show()
+           var mode_status =   this.$refs.saveRecordTemplate.mode_status
+           console.log("数据返回",mode_status)
+          this.$refs.medicalRecord.show(mode_status)
         } else if (index == 4) {
           this.$refs.saveRecordTemplate.show(this.case_history)
         }
@@ -703,7 +736,8 @@
             that.timer = false
           },400)
         }
-      }
+      },
+
     }
   }
 </script>

src/xt_pages/stock/stockPrint.vue

@@ -0,0 +1,241 @@
+<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">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <span class="main_title">自备药查询表</span>
+                    </div>
+                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
+                      打印时间：{{time_now}}
+                    </div>
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <td width="60">商品编码</td>
+                                    <td width="80">耗材名称</td>
+                                    <td width="80">耗材类型</td>
+                                    <td width="80">规格型号</td>
+                                    <td width="80">入库数量</td>
+                                    <td width="80">入库退货</td>
+                                    <td width="80">实际入库</td>
+                                    <td width="80">出库数量</td>
+                                    <td width="80">出库退库</td>
+                                    <td width="80">实际出库</td>
+                                    <td width="80">剩余库存</td>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
+                                    <td>{{item.good_code}}</td>
+                                    <td>{{item.good_name}}</td>
+                                    <td>{{item.type.type_name}}</td>
+                                    <td>{{item.specification_name}}</td>
+                                    <td>{{stockInCount(item)}}</td>
+                                    <td>{{salesReturnCount(item)}}</td>
+                                    <td> {{ stockInCount(item) - salesReturnCount(item) }}</td>
+                                    <td>{{ stockOutCount(item) }}</td>
+                                    <td>{{cancelStockCount(item) }}</td>
+                                    <td>{{ stockOutCount(item) - cancelStockCount(item)}}</td>
+                                    <td>{{stockInCount(item) -salesReturnCount(item) -stockOutCount(item) +cancelStockCount(item)}}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getAllStockQueryList } from "@/api/stock";
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '自备药查询' },
+            { path: false, name: '自备药打印' },
+          ],
+          start_time:"",
+          end_time:"",
+          drug_name:"",
+          drug_spec:"",
+          keyword:"",
+          tableData:[],
+          time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+          type_name:"",
+          limit:20,
+          page:1,
+          WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+         },
+        }
+    },
+    methods:{
+      printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+      getlist(){
+         const Params = {
+            page: this.page,
+            limit: this.limit,
+            keyword: this.keywords,
+            start_time:this.start_time,
+            end_time:this.end_time,
+            type_name:this.type_name,
+        };
+         this.WarehouseInfo.loading = true;
+         this.WarehouseInfo.warehouseInfoDate = [];
+         getAllStockQueryList(Params).then(response => {
+           if (response.data.state == 0) {
+            this.WarehouseInfo.loading = false;
+            this.$message.error(response.data.msg);
+            return false;
+          } else {
+            this.WarehouseInfo.loading = false;
+            this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate.push( response.data.data.list[i]);
+          }
+         }
+            console.log("打印数据源头",this.WarehouseInfo.warehouseInfoDate)
+          });
+      },
+       stockInCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_warehousing_info.length; i++) {
+        total = total + row.query_warehousing_info[i].warehousing_count;
+      }
+      return total;
+    },
+    salesReturnCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_sales_return_info.length; i++) {
+        total = total + row.query_sales_return_info[i].count;
+      }
+      return total;
+    },
+    stockOutCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_warehouseout_info.length; i++) {
+        total = total + row.query_warehouseout_info[i].count;
+      }
+      return total;
+    },
+    cancelStockCount: function(row) {
+      let total = 0;
+      for (let i = 0; i < row.query_cancel_stock_info.length; i++) {
+        total = total + row.query_cancel_stock_info[i].count;
+      }
+      return total;
+    },
+    },
+    created(){
+      var starttime =  this.$route.query.start_time
+      this.start_time = starttime
+      var endtime =  this.$route.query.end_time
+      this.end_time = endtime
+      var type_name = this.$route.query.type_name
+      this.type_name = type_name
+      var keyword = this.$route.query.keyword
+      this.keyword = keyword
+
+      this.getlist()
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+      
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+            white-space: pre-line;
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/stock/stockQuery.vue

@@ -6,34 +6,41 @@
     <div class="app-container ">
       <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
         <div>
-          <el-select v-model="value" style="width:140px;margin-right:10px;" placeholder="请选择">
+          <el-select v-model="type_name" style="width:140px;margin-right:10px;" placeholder="请选择"
+          @change="changeTypeName">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item in goodType"
+              :key="item.id"
+              :label="item.type_name"
+              :value="item.id">
             </el-option>
           </el-select>
-          <el-time-select
-            style="width:140px;"
-            v-model="value"
-            :picker-options="{
-              start: '08:30',
-              step: '00:15',
-              end: '18:30'
-            }"
-            placeholder="选择时间">
-          </el-time-select>-
-          <el-time-select
-            style="width:140px;"
-            v-model="value"
-            :picker-options="{
-              start: '08:30',
-              step: '00:15',
-              end: '18:30'
-            }"
-            placeholder="选择时间">
-          </el-time-select>
+          <el-date-picker
+            size="small"
+            v-model="start_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="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_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="endTimeChange"
+          ></el-date-picker>
           <el-input
             size="small"
             style="width: 200px;margin-left:10px;"
@@ -52,7 +59,7 @@
         </div>
         <div>
           <el-button size="small" type="primary" @click="exportList">导出</el-button>
-          <el-button size="small" type="primary">打印</el-button>
+          <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         </div>
       </div>
       
@@ -198,7 +205,8 @@ export default {
         warehouseInfoDate: []
       },
       options:[],
-      value:""
+      value:"",
+      type_name:""
     };
   },
   methods: {
@@ -207,8 +215,12 @@ export default {
       const Params = {
         page: this.page,
         limit: this.limit,
-        keyword: this.keywords
+        keyword: this.keywords,
+        start_time:this.start_time,
+        end_time:this.end_time,
+        type_name:this.type_name,
       };
+      console.log("params-----",Params)
       this.WarehouseInfo.loading = true;
       this.WarehouseInfo.warehouseInfoDate = [];
       getAllStockQueryList(Params).then(response => {
@@ -256,6 +268,7 @@ export default {
           for (let i = 0; i < response.data.data.goodType.length; i++) {
             this.goodType.push(response.data.data.goodType[i]);
           }
+          console.log("商品类型",this.goodType)
         }
       });
     },
@@ -343,7 +356,14 @@ export default {
        },
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
-     },
+      },
+      changeTypeName(){
+       this.GetAllStockQuery()
+      },
+      toPrint(){
+        this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
+        
+      }
   }
 };
 </script>