优化

RMS-FrontEnd/src/views/report/FTO/FTOPage/product.vue

@@ -45,7 +45,7 @@
                         <el-form-item label="检索策略：">
                             <el-input type="textarea" v-model="product.searchPolicy" placeholder="请输入检索策略"></el-input>
                         </el-form-item>
-                        <el-form-item label="检索截止日期：">
+                        <el-form-item label="检索截止日期：" prop="deadLine">
                             <el-date-picker
                                 style="width:100%"
                                     v-model="product.deadLine"
@@ -71,7 +71,20 @@
 
 export default{
     props:['reportId'],
-    data() {
+  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 {
             file:[],
             dialogImageUrl:[],
@@ -81,7 +94,10 @@ export default{
             productRules:{
                 productName: [{ required: true, message: '请输入标的专利/产品', trigger: 'blur' },],
                 productDescription: [{ required: true, message: '请输入调查标的说明', trigger: 'blur' },],
-                surveyArea: [{ required: true, message: '请输入调查区域', trigger: 'blur' },],
+              surveyArea: [{ required: true, message: '请输入调查区域', trigger: 'blur' },],
+              deadLine: [
+                  {  required: false, validator:isTime, trigger: 'change' }
+                ],
             },
             Already:[],
         }

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

@@ -288,25 +288,30 @@ export default {
     },
     //保存任务
     submitTask(){
-      console.log(this.queryParams.reportId)
-      var a = {
-          taskType:this.taskType,
-          taskName:this.form.name,
-          reportId:this.queryParams.reportId,
-          endTime:this.form.date,
-          remark:this.form.remark,
-          assigns:this.checkList,
-        }
-        if(this.params){
-          a.patentVO = this.params
-        }
-        this.$api.addAssTask(a).then(response=>{
-          if(response.code == 200){
-            this.taskInformation = false
-            this.dialogVisible = true
-            // this.$emit('addTask',true)
+      this.$refs.form.validate((valid) => {
+          if (valid) {
+            var a = {
+                taskType:this.taskType,
+                taskName:this.form.name,
+                reportId:this.queryParams.reportId,
+                endTime:this.form.date,
+                remark:this.form.remark,
+                assigns:this.checkList,
+              }
+              if(this.params){
+                a.patentVO = this.params
+              }
+       
+            this.$api.addAssTask(a).then(response=>{
+              if(response.code == 200){
+                this.taskInformation = false
+                this.dialogVisible = true
+                // this.$emit('addTask',true)
+              }
+            })
           }
         })
+        
     },
     out(){
       this.timer = setInterval(() => {

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

@@ -161,6 +161,19 @@ export default {
       
       }
     }
+    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 {
       customColors: [
         {color: '#f56c6c', percentage: 20},
@@ -199,7 +212,7 @@ export default {
       TaskRules:{
         taskName:[{ required: true, message: '请输入任务名称', trigger: 'blur' },],
         personnelId: [{ required: true, message: '请选择审核人', trigger: 'change' },],
-        endTime: [{ required: true, message: '请选择日期', trigger: 'change' } ],
+        endTime: [{  required: true, validator:isTime, trigger: 'change' } ],
       },
       // 控制弹出框显示隐藏
       showDialog: false,