修改字段判断

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1331,8 +1331,20 @@
         })
       },
       saveAndpassTask(){
-        this.handleSubmit();
-        this.passTask();
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues => {
+          let formData = this.classifyIntoFormData(allValues)
+          if (this.isPlanType){
+            if (!formData.planType){
+              this.$message.error('请选择采购类型')
+              return
+            }else {
+              this.handleSubmit();
+              this.passTask();
+            }
+          }
+        });
       },
       // handler
       handleSubmit(e) {
@@ -1353,6 +1365,12 @@
           formData.fileId = getStringArry(formData.fileId)
           formData.materialPrice = this.materialPrice
           formData.describes = this.describes
+          // if (this.isPlanType){
+          //   if (!formData.planType){
+          //     this.$message.error('请选择采购类型')
+          //     return
+          //   }
+          // }
           if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) {
             this.$message.error('需求时间不能小于当前流程发起时间')
             return