|
@@ -1565,7 +1565,7 @@ export class HushijiandanComponent implements OnInit {
|
1565
|
1565
|
confirm() {
|
1566
|
1566
|
if (this.confirmYuyue) {
|
1567
|
1567
|
this.confirmPostData.workOrder.yyTime =
|
1568
|
|
- format(new Date(this.yyTime), "yyyy-MM-dd HH:mm") + ":00";
|
|
1568
|
+ format(parse(this.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()), "yyyy-MM-dd HH:mm") + ":00";
|
1569
|
1569
|
}
|
1570
|
1570
|
if (!this.confirmYuyue) {
|
1571
|
1571
|
this.confirmPostData.workOrder.platform = 2;
|
|
@@ -1982,19 +1982,24 @@ export class HushijiandanComponent implements OnInit {
|
1982
|
1982
|
) {
|
1983
|
1983
|
return;
|
1984
|
1984
|
}
|
|
1985
|
+ console.log(this.yyDateZy, this.yyTimeZy, this.yyDate, this.yyTime, flag);
|
1985
|
1986
|
if (flag) {
|
1986
|
1987
|
//转运
|
|
1988
|
+ let yyDateZy = (typeof this.yyDateZy === 'object') ? new Date(this.yyDateZy) : parse(this.yyDateZy, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
1989
|
+ let yyTimeZy = (typeof this.yyTimeZy === 'object') ? new Date(this.yyTimeZy) : parse(this.yyTimeZy, 'yyyy-MM-dd HH:mm:ss', new Date());
|
1987
|
1990
|
this.yyTimeZy =
|
1988
|
|
- format(new Date(this.yyDateZy), "yyyy-MM-dd") +
|
|
1991
|
+ format(yyDateZy, "yyyy-MM-dd") +
|
1989
|
1992
|
" " +
|
1990
|
|
- format(new Date(this.yyTimeZy), "HH:mm") +
|
|
1993
|
+ format(yyTimeZy, "HH:mm") +
|
1991
|
1994
|
":00";
|
1992
|
1995
|
} else {
|
1993
|
1996
|
//陪检
|
|
1997
|
+ let yyDate = (typeof this.yyDate === 'object') ? new Date(this.yyDate) : parse(this.yyDate, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
1998
|
+ let yyTime = (typeof this.yyTime === 'object') ? new Date(this.yyTime) : parse(this.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date());
|
1994
|
1999
|
this.yyTime =
|
1995
|
|
- format(new Date(this.yyDate), "yyyy-MM-dd") +
|
|
2000
|
+ format(yyDate, "yyyy-MM-dd") +
|
1996
|
2001
|
" " +
|
1997
|
|
- format(new Date(this.yyTime), "HH:mm") +
|
|
2002
|
+ format(yyTime, "HH:mm") +
|
1998
|
2003
|
":00";
|
1999
|
2004
|
}
|
2000
|
2005
|
var that = this;
|
|
@@ -2097,14 +2102,14 @@ export class HushijiandanComponent implements OnInit {
|
2097
|
2102
|
// 添加预约时间
|
2098
|
2103
|
if (yuyue) {
|
2099
|
2104
|
postData.workOrder.yyTime =
|
2100
|
|
- format(new Date(this.yyTime), "yyyy-MM-dd HH:mm") + ":00";
|
|
2105
|
+ format(parse(this.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()), "yyyy-MM-dd HH:mm") + ":00";
|
2101
|
2106
|
}
|
2102
|
2107
|
} else {
|
2103
|
2108
|
delete postData.workOrder["checkList"];
|
2104
|
2109
|
// 添加预约时间
|
2105
|
2110
|
if (yuyue) {
|
2106
|
2111
|
postData.workOrder.yyTime =
|
2107
|
|
- format(new Date(this.yyTimeZy), "yyyy-MM-dd HH:mm") + ":00";
|
|
2112
|
+ format(parse(this.yyTimeZy, 'yyyy-MM-dd HH:mm:ss', new Date()), "yyyy-MM-dd HH:mm") + ":00";
|
2108
|
2113
|
}
|
2109
|
2114
|
}
|
2110
|
2115
|
if (that.checkedShowMsg.status != 200) {
|