|
|
@@ -14,7 +14,9 @@
|
|
|
<el-option label="中班" value="2"></el-option>
|
|
|
<el-option label="晚班" value="3"></el-option>
|
|
|
</el-select>
|
|
|
-
|
|
|
+ <el-button type="primary" class="btn" @click="onclick">
|
|
|
+ 查询
|
|
|
+ </el-button>
|
|
|
<!-- <el-button type="primary" class="btn" @click="onreserved">
|
|
|
预留
|
|
|
</el-button> -->
|
|
|
@@ -67,7 +69,7 @@ export default {
|
|
|
this.$message({
|
|
|
type: "success",
|
|
|
message: "删除成功!",
|
|
|
- });
|
|
|
+ });
|
|
|
this.$router.go(0);
|
|
|
} else {
|
|
|
this.$message({
|
|
|
@@ -106,7 +108,7 @@ export default {
|
|
|
onclick(){
|
|
|
let startTime = null;
|
|
|
let endTime = null;
|
|
|
-
|
|
|
+
|
|
|
// 判断用户有没有班次，有班次则提供默认时间
|
|
|
if(this.region!=null){
|
|
|
let date =null;
|
|
|
@@ -121,10 +123,10 @@ export default {
|
|
|
if(this.startTime!=null){
|
|
|
date = this.startTime;
|
|
|
// 判断当前开始时间是标准时间还是字符串时间
|
|
|
-
|
|
|
+
|
|
|
year = date.getFullYear(); // 年
|
|
|
month = date.getMonth() + 1; // 月
|
|
|
- day = date.getDate(); // 日
|
|
|
+ day = date.getDate(); // 日
|
|
|
}
|
|
|
if(this.endTime!=null){
|
|
|
date2 = this.endTime;
|
|
|
@@ -152,7 +154,7 @@ export default {
|
|
|
// 将结束时间加一
|
|
|
day =parseInt(day) + 1;
|
|
|
this.endTime = year+"-"+month+"-"+day+" "+"00:00:00";
|
|
|
-
|
|
|
+
|
|
|
}else if(this.region == 1){
|
|
|
this.startTime = year+"-"+month+"-"+day+" "+"07:30:00";
|
|
|
this.endTime = year+"-"+month+"-"+day+" "+"15:30:00";
|
|
|
@@ -189,7 +191,7 @@ export default {
|
|
|
endTime = sjTime(this.endTime);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// console.log(startTime)
|
|
|
// console.log(endTime)
|
|
|
if (startTime && endTime) {
|
|
|
@@ -197,9 +199,9 @@ export default {
|
|
|
// if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
|
|
|
this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=450&warehouseId="+1+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
|
|
|
// }else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
|
|
|
- // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
|
|
|
+ // this.options.requestUrl = "/api/v1/wms/getWmsInboundResults?apiId=371&orderType=13&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
|
|
|
// }else{
|
|
|
- // this.options.requestUrl = '/api/v1/wms/getWmsInboundResults?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
|
|
|
+ // this.options.requestUrl = '/api/v1/wms/getWmsInboundResults?apiId=371&userId=' + getCookie("orgCode") +"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
|
|
|
// }
|
|
|
} else {
|
|
|
this.startTime = null;
|
|
|
@@ -250,9 +252,9 @@ export default {
|
|
|
console.log("res.data"+res.data)
|
|
|
if (res.data >= 1) {
|
|
|
//改变查询条件
|
|
|
- this.$refs.table.setDataRequestQuery({
|
|
|
-
|
|
|
- });
|
|
|
+ this.$refs.table.setDataRequestQuery({
|
|
|
+
|
|
|
+ });
|
|
|
this.$router.go(0);
|
|
|
}
|
|
|
});
|
|
|
@@ -288,4 +290,4 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
hejiahui