|
@@ -690,9 +690,7 @@ export default {
|
|
var reviewFrequency=this.form.reviewFrequency;
|
|
var reviewFrequency=this.form.reviewFrequency;
|
|
if (this.form.reviewdate!= null&&reviewFrequency!= null){
|
|
if (this.form.reviewdate!= null&&reviewFrequency!= null){
|
|
var s = reviewFrequency.substring(0, reviewFrequency.indexOf("/"));
|
|
var s = reviewFrequency.substring(0, reviewFrequency.indexOf("/"));
|
|
- console.log(s);
|
|
|
|
- console.log(365/s);
|
|
|
|
- this.form.nextreviewdate = dayjs(new Date(this.form.reviewdate)).add(365/s,'day').subtract(1,'day').format("YYYY-MM-DD");
|
|
|
|
|
|
+ this.form.nextreviewdate = dayjs(new Date(this.form.reviewdate)).add(1,'year').subtract(1,'day').format("YYYY-MM-DD");
|
|
}
|
|
}
|
|
},
|
|
},
|
|
/** 查询装置程序清单列表 */
|
|
/** 查询装置程序清单列表 */
|
|
@@ -735,12 +733,12 @@ export default {
|
|
var nexteditdate = Date.parse(this.form.filedate) + (3 * 365 * 24 * 3600 * 1000)
|
|
var nexteditdate = Date.parse(this.form.filedate) + (3 * 365 * 24 * 3600 * 1000)
|
|
var nextedit = new Date(nexteditdate);
|
|
var nextedit = new Date(nexteditdate);
|
|
this.form.nexteditdate = formatDate(nextedit,'yyyy-MM-dd')
|
|
this.form.nexteditdate = formatDate(nextedit,'yyyy-MM-dd')
|
|
- var reviewdate = Date.parse(this.form.filedate) + (1 * 365 * 24 * 3600 * 1000)
|
|
|
|
- var review = new Date(reviewdate);
|
|
|
|
- this.form.reviewdate = formatDate(review,'yyyy-MM-dd')
|
|
|
|
- var nextreviewdate = Date.parse(this.form.filedate) + (2 * 365 * 24 * 3600 * 1000)
|
|
|
|
- var nextreview = new Date(nextreviewdate);
|
|
|
|
- this.form.nextreviewdate = formatDate(nextreview,'yyyy-MM-dd')
|
|
|
|
|
|
+ // var reviewdate = Date.parse(this.form.filedate) + (1 * 365 * 24 * 3600 * 1000)
|
|
|
|
+ // var review = new Date(reviewdate);
|
|
|
|
+ // this.form.reviewdate = formatDate(review,'yyyy-MM-dd')
|
|
|
|
+ // var nextreviewdate = Date.parse(this.form.filedate) + (2 * 365 * 24 * 3600 * 1000)
|
|
|
|
+ // var nextreview = new Date(nextreviewdate);
|
|
|
|
+ // this.form.nextreviewdate = formatDate(nextreview,'yyyy-MM-dd')
|
|
},
|
|
},
|
|
// 取消按钮
|
|
// 取消按钮
|
|
cancel() {
|
|
cancel() {
|
|
@@ -1077,7 +1075,7 @@ export default {
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
|