GaoYuPeng vor 3 Jahren
Ursprung
Commit
f2679bdd84

+ 2 - 1
shanXiPlatform/src/views/reservesManagement/grainCheck/allGrain/index.vue

@@ -26,7 +26,8 @@
26 26
                 range-separator="至"
27 27
                 start-placeholder="开始日期"
28 28
                 end-placeholder="结束日期"
29
-                value-format="yyyy-MM-dd hh:mm:ss"
29
+                :default-time="['00:00:00', '23:59:59']"
30
+                value-format="yyyy-MM-dd HH:mm:ss"
30 31
               >
31 32
               </el-date-picker>
32 33
             </div>

+ 1 - 1
shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -260,7 +260,7 @@ export default {
260 260
       // console.log(userinfo.depotId)
261 261
       // console.log('121111........')
262 262
       let condition = {
263
-        houseId: this.houseId,
263
+        houseId: /* (this.houseId ==null || this.houseId ==undefined)?  */ this.houseId ,
264 264
         depotId: this.depotId
265 265
       }
266 266
       // console.log(JSON.stringify(condition),'1111')