Merge branch 'dev' of http://47.106.221.167:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/AssignTasks.vue

@@ -112,6 +112,19 @@ export default {
   },
   props:['reportId','isFinish','patentNo',"personId",'reportName'],
   data() {
+    const isTime = (rule, value, callback) => {
+      let a = Date.parse(new Date)
+      let b = Date.parse(value)
+      if (value) {
+        if (b<a) {
+          callback(new Error('禁止选择现在及以前时间，请重新选择'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('请选择时间'))
+      }
+    }
     return {
       isFirst:true,
       dialogVisible:false,
@@ -150,7 +163,8 @@ export default {
       },
       taskRules:{
         date: [
-            {  required: true, message: '请选择日期', trigger: 'change' }
+            // {  required: true, message: '请选择日期', trigger: 'change' }
+            {  required: true, validator:isTime, trigger: 'change' }
           ],
       },
       checkListA: [],

RMS-FrontEnd/src/views/report/components/sendCollaboration.vue

@@ -117,7 +117,20 @@ export default {
         }
       }, 100);
     };
-
+    const isTime = (rule, value, callback) => {
+      let a = Date.parse(new Date)
+      let b = Date.parse(value)
+      console.log(a,b);
+      if (value) {
+        if (b<a) {
+          callback(new Error('禁止选择现在及以前时间，请重新选择'))
+        } else {
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       witchOne:'',
       createdPersonnel: false,
@@ -168,6 +181,9 @@ export default {
       clientRules: {
         handlePersonIds: [{ required: true, validator: isCollaborator, trigger: 'change' },],
         taskName: [{ required: true, message: "请输入主题", trigger: "blur" },],
+        endTime: [
+            {  required: false, validator:isTime, trigger: 'change' }
+          ],
       },
       CreatedPersonRule: {
         name: [{ required: true, message: "请输入姓名", trigger: "blur" },],

RMS-FrontEnd/src/views/report/reportDetails/components/taskDetails.vue

@@ -46,6 +46,7 @@
 			  <el-table-column prop="createName" label="发起人" width="150" align="center"></el-table-column>
 			  <el-table-column prop="createTime" label="创建时间" sortable width="180" align="center"></el-table-column>
 			  <el-table-column prop="endTime" label="期限" sortable width="200" align="center"></el-table-column>
+			  <el-table-column prop="remark" label="备注" sortable width="200" align="center"></el-table-column>
 			  <el-table-column prop="type" label="类型" sortable width="120" align="center">
 				<template slot-scope="scope">
 					<div>

RMS-FrontEnd/src/views/task/MyInitiate.vue

@@ -78,7 +78,7 @@
     </div>
 
     <el-dialog title="编辑任务" :visible.sync="showDialog" width="600px" :close-on-click-modal="false"  @close="handleClose">
-      <el-form :model="form" ref="reportForm" label-width="120px">
+      <el-form :model="form" ref="reportForm" label-width="120px" :rules="taskRules">
             <el-form-item label="任务名称">
               <el-input v-model="form.taskName" :disabled="true" autocomplete="off" placeholder="请输入任务名称"></el-input>
             </el-form-item>
@@ -95,7 +95,7 @@
             <el-form-item label="创建时间">
               <el-input v-model="form.createTime" :disabled="true" autocomplete="off" placeholder="请输入创建时间"></el-input>
             </el-form-item>
-            <el-form-item label="期限">
+            <el-form-item label="期限" prop="endTime">
               <el-date-picker v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间" style="width:100%"> </el-date-picker>
             </el-form-item>
 
@@ -112,6 +112,20 @@
 export default {
   props:['activeName','reportType','status'],
   data() {
+    const isTime = (rule, value, callback) => {
+      let a = Date.parse(new Date)
+      let b = Date.parse(value)
+      console.log(a,b);
+      if (value) {
+        if (b<a) {
+          callback(new Error('禁止选择现在及以前时间，请重新选择'))
+        } else {
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       tableData:[],
       form:[],
@@ -128,7 +142,18 @@ export default {
       personnelList:[],
       showDialog:false,
       loading: false,
-      taskWorkRemak:0,
+      taskWorkRemak: 0,
+      // pickerOptions: {
+      //   disabledDate (time) {
+      //       //disabledDate 文档上：设置禁用状态，参数为当前日期，要求返回 Boolean
+      //       return time.getTime() < Date.now()//选当前时间之后的时间
+      //     }
+      // },
+      taskRules:{
+        endTime: [
+            {  required: false, validator:isTime, trigger: 'change' }
+          ],
+      },
     };
   },
   watch:{