11482-【CR】【投资系统】增加审批流程-项目机会去掉一些必填

ruoyi-ui/src/views/project/investOpp/apply.vue

@@ -609,24 +609,24 @@ export default {
         "tProjectCompany.companyName": [
           { required: true, trigger: "blur", message: "请输入" },
         ],
-        "tProjectCompany.companyCode": [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
-        "tProjectCompany.startTime": [
-          { required: true, trigger: "blur", message: "请选择" },
-        ],
-        "tProjectCompany.endTime": [
-          { required: true, trigger: "blur", message: "请选择" },
-        ],
-        "tProjectCompany.registeredCapital": [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
+        // "tProjectCompany.companyCode": [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
+        // "tProjectCompany.startTime": [
+        //   { required: true, trigger: "blur", message: "请选择" },
+        // ],
+        // "tProjectCompany.endTime": [
+        //   { required: true, trigger: "blur", message: "请选择" },
+        // ],
+        // "tProjectCompany.registeredCapital": [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
         "tProjectCompany.registeredAddress": [
           { required: true, trigger: "blur", message: "请输入" },
         ],
-        "tProjectCompany.paidCapital": [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
+        // "tProjectCompany.paidCapital": [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
         "tProjectCompany.businessAddress": [
           { required: true, trigger: "blur", message: "请输入" },
         ],
@@ -851,16 +851,20 @@ export default {
             this.form.listFile = this.fileList;
             this.form.bpFile = this.fileListBP;
             this.form.otherFile = this.fileListOther;
-            this.form.tProjectCompany.registeredCapital =
-              this.form.tProjectCompany.registeredCapital
-                .replace(/[^0-9.]/g, "")
-                .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
-                .replace(/-/g, "");
-            this.form.tProjectCompany.paidCapital =
-              this.form.tProjectCompany.paidCapital
-                .replace(/[^0-9.]/g, "")
-                .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
-                .replace(/-/g, "");
+            if (this.form.tProjectCompany.registeredCapital!=null) {
+              this.form.tProjectCompany.registeredCapital =
+                this.form.tProjectCompany.registeredCapital
+                  .replace(/[^0-9.]/g, "")
+                  .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
+                  .replace(/-/g, "");
+            }
+            if (this.form.tProjectCompany.paidCapital!=null) {
+              this.form.tProjectCompany.paidCapital =
+                this.form.tProjectCompany.paidCapital
+                  .replace(/[^0-9.]/g, "")
+                  .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
+                  .replace(/-/g, "");
+            }
             this.form.investValuation = this.form.investValuation
               .replace(/[^0-9.]/g, "")
               .replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")

ruoyi-ui/src/views/project/investOpp/edit.vue

@@ -610,24 +610,24 @@ export default {
         "tProjectCompany.companyName": [
           { required: true, trigger: "blur", message: "请输入" },
         ],
-        "tProjectCompany.companyCode": [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
-        "tProjectCompany.startTime": [
-          { required: true, trigger: "blur", message: "请选择" },
-        ],
-        "tProjectCompany.endTime": [
-          { required: true, trigger: "blur", message: "请选择" },
-        ],
-        "tProjectCompany.registeredCapital": [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
+        // "tProjectCompany.companyCode": [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
+        // "tProjectCompany.startTime": [
+        //   { required: true, trigger: "blur", message: "请选择" },
+        // ],
+        // "tProjectCompany.endTime": [
+        //   { required: true, trigger: "blur", message: "请选择" },
+        // ],
+        // "tProjectCompany.registeredCapital": [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
         "tProjectCompany.registeredAddress": [
           { required: true, trigger: "blur", message: "请输入" },
         ],
-        "tProjectCompany.paidCapital": [
-          { required: true, trigger: "blur", message: "请输入" },
-        ],
+        // "tProjectCompany.paidCapital": [
+        //   { required: true, trigger: "blur", message: "请输入" },
+        // ],
         "tProjectCompany.businessAddress": [
           { required: true, trigger: "blur", message: "请输入" },
         ],
@@ -851,16 +851,20 @@ export default {
             this.form.listFile = this.fileList;
             this.form.bpFile = this.fileListBP;
             this.form.otherFile = this.fileListOther;
-            this.form.tProjectCompany.registeredCapital =
-              this.form.tProjectCompany.registeredCapital
-                .replace(/[^0-9.]/g, "")
-                .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
-                .replace(/-/g, "");
-            this.form.tProjectCompany.paidCapital =
-              this.form.tProjectCompany.paidCapital
-                .replace(/[^0-9.]/g, "")
-                .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
-                .replace(/-/g, "");
+            if (this.form.tProjectCompany.registeredCapital!=null) {
+              this.form.tProjectCompany.registeredCapital =
+                this.form.tProjectCompany.registeredCapital
+                  .replace(/[^0-9.]/g, "")
+                  .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
+                  .replace(/-/g, "");
+            }
+            if (this.form.tProjectCompany.paidCapital!=null) {
+              this.form.tProjectCompany.paidCapital =
+                this.form.tProjectCompany.paidCapital
+                  .replace(/[^0-9.]/g, "")
+                  .replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")
+                  .replace(/-/g, "");
+            }
             this.form.investValuation = this.form.investValuation
               .replace(/[^0-9.]/g, "")
               .replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")