jiangbiao преди 3 години
родител
ревизия
c3f3943017

+ 8 - 10
ui/src/views/components/PlantProgList/index.vue

@@ -690,9 +690,7 @@ export default {
       var reviewFrequency=this.form.reviewFrequency;
       if (this.form.reviewdate!= null&&reviewFrequency!= null){
         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 nextedit = new Date(nexteditdate);
       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() {
@@ -1077,7 +1075,7 @@ export default {
       })
       }
 
-     
+
 
 
 

+ 2 - 0
ui/src/views/ehs/environapproval/index.vue

@@ -563,6 +563,7 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
+import dayjs from "dayjs";
 
 
 export default {
@@ -831,6 +832,7 @@ export default {
     handleStaff(val){
       let year = val.substring(0,4)
       this.getReviewer(year)
+      this.form.nextreviewdate=dayjs(new Date(this.form.reviewdate)).add(1,'year').subtract(1,'day').format("YYYY-MM-DD");
     },
      /** 查询部门下拉树结构 */
      getTreeselect() {

+ 2 - 0
ui/src/views/ehs/fireapproval/index.vue

@@ -453,6 +453,7 @@ import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
+import dayjs from "dayjs";
 
 
 
@@ -687,6 +688,7 @@ export default {
     handleStaff(val){
       let year = val.substring(0,4)
       this.getReviewer(year)
+      this.form.nextreviewdate=dayjs(new Date(this.form.reviewdate)).add(1,'year').subtract(1,'day').format("YYYY-MM-DD");
     },
      /** 查询部门下拉树结构 */
      getTreeselect() {

+ 4 - 0
ui/src/views/ehs/healthapproval/index.vue

@@ -432,6 +432,7 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import dayjs from "dayjs";
 
 
 export default {
@@ -439,6 +440,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      staffmgrQueryParams:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -620,6 +622,8 @@ export default {
     handleStaff(val){
       let year = val.substring(0,4)
       this.getReviewer(year)
+      this.form.nextreviewdate=dayjs(new Date(this.form.reviewdate)).add(1,'year').subtract(1,'day').format("YYYY-MM-DD");
+   alert(this.form.nextreviewdate)
     },
     // 证书有效期是否永久字典翻译
     isPermanentFormat(row, column) {

+ 2 - 0
ui/src/views/ehs/safetyapproval/index.vue

@@ -458,6 +458,7 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import dayjs from "dayjs";
 
 
 export default {
@@ -702,6 +703,7 @@ export default {
     handleStaff(val){
       let year = val.substring(0,4)
       this.getReviewer(year)
+      this.form.nextreviewdate=dayjs(new Date(this.form.reviewdate)).add(1,'year').subtract(1,'day').format("YYYY-MM-DD");
     },
     // 装置字典翻译
     plantCodeFormat(row, column) {