修改项目登记的验证

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-15 15:42:43
+ * @LastEditTime: 2024-07-16 11:06:07
 -->
 <template>
   <div class="project-wrapper">
     <!-- 项目登记 -->
     <h2 style="text-align: center" id="scrollToMe">项目登记</h2>
-    <el-form ref="projectAdd" :model="addForm" :rules="rules" label-width="110px" :disabled="disabled">
+    <el-form ref="projectAdd" :model="addForm" :rules="rules" label-width="130px" :disabled="disabled">
       <el-form-item label="项目编号：" prop="projectNumber">
         <el-input v-model="addForm.projectNumber"></el-input>
       </el-form-item><el-form-item label="项目名称：" prop="projectName">
@@ -144,7 +144,8 @@ export default {
       addForm: {
         registerTime: undefined,
         projectRegistrant: "",
-        projectLevel: "0"
+        projectLevel: "0",
+        taskDocument:''
       },
       chooseContractInfo: {
         contractCode: '',
@@ -153,8 +154,19 @@ export default {
       contractCode: "",
       contractNumber: "",
       rules: {
-        projectNumber: [{ required: true, message: "请输入项目编号", trigger: "blur" }],
+        projectNumber: [
+          { required: true, message: "请输入项目编号", trigger: "blur" },
+          { pattern: /^[0-9A-Z]+$/, message: '只能输入数字和大写字母', trigger: 'blur' }
+        ],
         projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
+        projectSource: [{ required: true, message: "请选择项目来源", trigger: "change" }],
+        projectType: [{ required: true, message: "请输入项目类型", trigger: "blur" }],
+        projectLevel: [{ required: true, message: "请选择项目级别", trigger: "change" }],
+        partyAId: [{ required: true, message: "请选择甲方单位", trigger: "change" }],
+        contactPerson: [{ required: true, message: "请输入联系人", trigger: "blur" }],
+        telephone: [{ required: true, message: "请输入联系人联系方式", trigger: "blur" }],
+        projectRequest: [{ required: true, message: "请输入资料提交要求", trigger: "blur" }],
+        taskDocument: [{ required: true, message: "请上传任务书", trigger: "blur" }]
       },
       workList: [
         {
@@ -242,13 +254,13 @@ export default {
     },
     setContract(val) {
       this.chooseContractInfo = val;
-      if(val.partyAId){
+      if (val.partyAId) {
         this.addForm.partyAId = val.partyAId
       }
       this.openContract = false;
     },
     // 暂存
-    async save() {
+    save() {
       // 新增项目数据
       if (this.formTotal == 0) {
         this.$refs['projectAdd'].validate((vaild) => {
@@ -286,14 +298,20 @@ export default {
       this.$set(this.taskForm.variables, "approval", approvalId);
       this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
       this.save()
-      const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit('goBack');
-        });
+      this.$refs['projectAdd'].validate((vaild) => {
+        if (vaild) {
+          console.log(vaild);
+          const params = { taskId: this.taskForm.taskId };
+          getNextFlowNode(params).then(res => {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack');
+            });
+          })
+        }
       })
+
     },
     // 查询业主单位列表
     getPartyAList() {

oa-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-08 15:03:19
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-16 09:50:08
 -->
 
 <template>
@@ -91,6 +91,11 @@
         </div>
       </el-col> -->
     </el-row>
+
+    <el-dialog title="" :visible.sync="noticeOpen" width="65%" append-to-body>
+      <h2 class="text-center">{{ clickNotice.noticeTitle }}</h2>
+      <div v-html="clickNotice.noticeContent"></div>
+    </el-dialog>
   </div>
 </template>
 
@@ -118,6 +123,7 @@ export default {
   },
   data() {
     return {
+      noticeOpen:false,
       times: new Date(),
       user: {
         dept: {}
@@ -127,6 +133,7 @@ export default {
       projectData: [],
       noticeList: [],// 公告表格数据
       noticeTotal: 0,
+      clickNotice:{},
       noticeLoading: true,
       noticeQueryParams: {
         pageNum: 1,
@@ -295,6 +302,8 @@ export default {
     },
     handleRowClick(row){
       console.log(row);
+      this.clickNotice = row;
+      this.noticeOpen = true;
     }
   }
 }