Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/warehousePrint.html

@@ -298,7 +298,7 @@
         printBig() {}
       },
       mounted() {
-        console.log(API_CONFIG,1111111111)
+        // console.log(API_CONFIG,1111111111)
         // var ippath=API_CONFIG.devServer.proxy['/pb'].target
 
         this.company = localStorage.getItem("ws-pf_compName")

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -78,7 +78,7 @@
                   <ws-input v-model="weighingList.moveTaskNo" placeholder="自动获取，不可编辑" maxlength="100" size="small"
                     disabled />
                 </ws-form-item>
-                <ws-form-item v-if="tpyeNo == 1" label="已完成量（吨）" span="1" prop="tips">
+                <ws-form-item  label="已完成量（吨）" span="1" prop="tips">
                     <ws-input v-model="weighingList.donecount" placeholder="自动获取，不可编辑" maxlength="100" disabled
                           size="small" />
                           <!-- {{}} -->

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" format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss" 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" format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss" 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>
@@ -264,7 +264,7 @@
         <div class="print-type-checkbox">
           <el-form ref="form" label-width="110px">
             <el-form-item label="起始日期">
-              <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择起始日期" v-model="parameter.startDate">
+              <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择起始日期"   v-model="parameter.startDate">
               </el-date-picker>
             </el-form-item>
             <el-form-item label="截止日期">
@@ -338,6 +338,7 @@
       return {
         rules:{},
         options:[],
+        StartDate:'',
         compId: localStorage.getItem('ws-pf_compId'),
         deptBudgetList:{},
         dateTime:'',
@@ -367,6 +368,7 @@
           startDate:'',
           endDate:'',
         },
+        EndDate:'',
         isShowPrintType: false, //打印
         headerText: '',
         typeList:[],
@@ -423,22 +425,28 @@
         }
         
       },
-       //导出、打印
+       //导出、打印EndDate
       outData(index) {
         if (index == 1) {
           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
+          }
+          debugger
+          var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
+          this.StartDate =pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00'
+          // this.StartDate = new Date(pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00')
+          this.$set(this.parameter,'printStartDate',this.StartDate)
+          // parameter.printStartDate
+          this.EndDate = '' + year + '-' + month + '-' + strDate+' 00:00:00'
+          this.$set(this.parameter,'printEndDate',this.EndDate)
         }
-        // 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();
         this.isShowPrintType = true
         
@@ -449,10 +457,12 @@
         this.isShowPrintType = false
       },
       async submitClick() {
+        
         if (!this.parameter.radio && this.headerText == '打印记录') {
           this.$message.error('请选择打印的类型')
           return
         }
+        debugger
         if (!this.parameter.printStartDate) {
           this.$message.error('请选择打印的起始日期')
           return
@@ -468,6 +478,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 +650,9 @@
         if (this.parameter.warehouseName == '全部仓库') {
           this.parameter.warehouseName = ''
         }
+        if(this.parameter.binNumber == "全部仓位"){
+          this.parameter.binNumber = ""
+        }
         const {
           data
         } = await exportHistoricalInventory({