更新

src/views/warehousenew/warehouseManagementList.vue

@@ -222,11 +222,11 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="起始日期">
-              <el-date-picker type="datetime" @change="startDataChange" placeholder="请选择起始日期" v-model="parameter.PrintStartDate"  default-time="12:00:00"></el-date-picker>
+              <el-date-picker type="datetime" @change="startDataChange" placeholder="请选择起始日期" v-model="parameter.PrintStartDate"  default-time="00:00:00"></el-date-picker>
               <!-- <el-date-picker v-model="value3" type="datetime" placeholder="选择日期时间" default-time="12:00:00"></el-date-picker> -->
             </el-form-item>
             <el-form-item label="截止日期">
-              <el-date-picker type="datetime" @change="endDataChange" placeholder="请选择截止日期" v-model="parameter.printEndDate"  default-time="12:00:00">
+              <el-date-picker type="datetime" @change="endDataChange" placeholder="请选择截止日期" v-model="parameter.printEndDate"  default-time="00:00:00">
               </el-date-picker>
             </el-form-item>
               <!-- <el-form-item label="截止日期1">
@@ -241,7 +241,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="仓库类型" span="1" prop="warehouseName">
-              <el-select v-model="parameter.binNumber" placeholder="请选择仓库类型" filterable clearable>
+              <el-select v-model="parameter.binNumber" placeholder="请选择仓库类型" filterable clearable >
                 <el-option v-for="item in typeList" :key="item.id" :label="item.binNumber" :value="item.binNumber" />
               </el-select>
             </el-form-item>
@@ -429,14 +429,18 @@
           this.headerText = '导出记录'
         } else if (index == 2) {
           this.headerText = '打印记录'
+          // let date = new Date()
+          // var year = date.getFullYear();
+          // var month = date.getMonth() + 1;
+          // var strDate = date.getDate()
+          // if(strDate<10){ 
+          //    strDate = "0"+strDate
+          // }
+          // var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
+          // this.parameter.PrintStartDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())
+          // this.parameter.printEndDate = '' + year + '-' + month + '-' + strDate
         }
-        // let date = new Date()
-        // var year = date.getFullYear();
-        // var month = date.getMonth() + 1;
-        // var strDate = date.getDate()
-        // var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
-        // this.parameter.startDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + pastdate.getDate()
-        // // this.parameter.endDate = '' + year + '-' + month + '-' + strDate
+       
         // this.parameter.endDate = Date.now()
         // this.parameter.endDate1 = Date.now()
         this.$forceUpdate();
@@ -449,6 +453,7 @@
         this.isShowPrintType = false
       },
       async submitClick() {
+        
         if (!this.parameter.radio && this.headerText == '打印记录') {
           this.$message.error('请选择打印的类型')
           return
@@ -468,6 +473,9 @@
          if(this.parameter.warehouseName == '全部仓库'){
           this.parameter.warehouseName = ''
         }
+        if(this.parameter.binNumber == "全部仓位"){
+          this.parameter.binNumber = ""
+        }
         // let enddate = new Date(this.parameter.endDate).toLocaleString()//将截止时间的时间戳转为时间
         // this.parameter.endDate = enddate.split(' ')[0].replace('/' ,'-').replace('/','-')
         this.parameter.warehouseName = this.parameter.warehouseName.replace('（临）','')
@@ -637,6 +645,9 @@
         if (this.parameter.warehouseName == '全部仓库') {
           this.parameter.warehouseName = ''
         }
+        if(this.parameter.binNumber == "全部仓位"){
+          this.parameter.binNumber = ""
+        }
         const {
           data
         } = await exportHistoricalInventory({