|
@@ -1344,15 +1344,10 @@ export default {
|
|
|
if (!this.click_main || !this.click_main.MAT_NO) {
|
|
if (!this.click_main || !this.click_main.MAT_NO) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
- let startTime = "";
|
|
|
|
|
- let endTime = "";
|
|
|
|
|
- if (!this.search.times) {
|
|
|
|
|
- startTime = "";
|
|
|
|
|
- endTime = "";
|
|
|
|
|
- } else {
|
|
|
|
|
- startTime = this.search.times[0];
|
|
|
|
|
- endTime = this.search.times[1];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ let startTime = null;
|
|
|
|
|
+ let endTime = null;
|
|
|
|
|
+ startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
|
|
|
|
|
+ endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
|
|
|
let obj = {
|
|
let obj = {
|
|
|
object: {
|
|
object: {
|
|
|
matNo: this.click_main.MAT_NO,
|
|
matNo: this.click_main.MAT_NO,
|
|
@@ -1434,15 +1429,10 @@ export default {
|
|
|
if (!this.click_main2 || !this.click_main2.MAT_NO) {
|
|
if (!this.click_main2 || !this.click_main2.MAT_NO) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- let startTime = "";
|
|
|
|
|
- let endTime = "";
|
|
|
|
|
- if (!this.search.times) {
|
|
|
|
|
- startTime = "";
|
|
|
|
|
- endTime = "";
|
|
|
|
|
- } else {
|
|
|
|
|
- startTime = this.search.times[0];
|
|
|
|
|
- endTime = this.search.times[1];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ let startTime = null;
|
|
|
|
|
+ let endTime = null;
|
|
|
|
|
+ startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
|
|
|
|
|
+ endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
|
|
|
let obj = {
|
|
let obj = {
|
|
|
object: {
|
|
object: {
|
|
|
matNo: this.click_main2.MAT_NO,
|
|
matNo: this.click_main2.MAT_NO,
|