Merge branch 'master' of https://gitee.com/wallot/shuili_manager

jwtech-admin-page/package.json

@@ -42,6 +42,8 @@
   "dependencies": {
     "@antv/x6": "^1.28.1",
     "@riophae/vue-treeselect": "0.4.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "core-js": "3.6.5",

jwtech-admin-page/src/views/building/projectInfo/index.vue

@@ -1032,6 +1032,10 @@ export default {
             message: "请选择项目名称",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        projectLegalUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLegalPerson: [
           {
@@ -1039,6 +1043,17 @@ export default {
             message: "请输入项目法人",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructionAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructionContent: [
+          { max: 6550, message: "字符长度最大为6550", trigger: "blur" },
+        ],
+        basin: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        fundingNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLegalPhone: [
           {
@@ -1062,6 +1077,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         provincialFunding: [
           {
@@ -1075,6 +1091,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cityLevelFunds: [
           {
@@ -1088,6 +1105,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         countyLevelFunds: [
           {
@@ -1101,6 +1119,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         townshipInvestments: [
           {
@@ -1114,6 +1133,13 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        constructionPhase: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        investmentSubject: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       //项目名称

jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue

@@ -745,6 +745,10 @@ export default {
             message: "请选择项目名称",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        projectLegalUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLegalPerson: [
           {
@@ -752,6 +756,17 @@ export default {
             message: "请输入项目法人",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructionAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructionContent: [
+          { max: 6550, message: "字符长度最大为6550", trigger: "blur" },
+        ],
+        basin: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        fundingNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLegalPhone: [
           {
@@ -775,6 +790,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         provincialFunding: [
           {
@@ -788,6 +804,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cityLevelFunds: [
           {
@@ -801,6 +818,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         countyLevelFunds: [
           {
@@ -814,6 +832,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         townshipInvestments: [
           {
@@ -827,6 +846,13 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        constructionPhase: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        investmentSubject: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       //项目名称

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/index.vue

@@ -784,6 +784,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        contractName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructionUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        sectionName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         contractAmount: [
           { required: true, message: "请输入合同金额", trigger: "blur" },
           {
@@ -792,6 +801,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         contractDuration: [
           {
@@ -799,6 +809,7 @@ export default {
             message: "请输入正确的数字",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         paymentCycle: [
           {
@@ -806,6 +817,22 @@ export default {
             message: "请输入正确的数字",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        paymentTerms: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        projectLeader: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        projectTechnicalLeader: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        safetyProductionManager: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        qualityLeader: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       // 面包屑，路由信息

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/acceptancePage.vue

@@ -348,7 +348,17 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        acceptanceAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        acceptanceExpert: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        acceptanceOpinions: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       acceptanceMsg: {},
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/alterPage.vue

@@ -201,7 +201,7 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="124px">
         <el-form-item label="变更原因" prop="changeReason">
           <el-input v-model="form.changeReason" placeholder="请输入变更原因" />
         </el-form-item>
@@ -383,7 +383,36 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        changeReason: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changeContent: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changeApplicationInfo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changeApprovalInfo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        contractChangeInfo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changePerson: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changePersonPhone: [
+          {
+            required: true,
+            type: "string",
+            pattern:
+              /^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\d{8}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur",
+          },
+        ],
+      },
       alterMsg: {},
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/basePage.vue

@@ -239,6 +239,15 @@ export default {
       loading: false,
       form: {},
       rules: {
+        contractName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructionUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        sectionName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         contractAmount: [
           { required: true, message: "请输入合同金额", trigger: "blur" },
           {
@@ -247,6 +256,38 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        contractDuration: [
+          {
+            pattern: /^(\-|\+)?\d+?$/,
+            message: "请输入正确的数字",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        paymentCycle: [
+          {
+            pattern: /^(\-|\+)?\d+?$/,
+            message: "请输入正确的数字",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        paymentTerms: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        projectLeader: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        projectTechnicalLeader: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        safetyProductionManager: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        qualityLeader: [
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       //项目名称

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/examinePage.vue

@@ -364,7 +364,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        applicant: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        approver: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        approvalOpinion: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       examineMsg: {},
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/contract/options/subcontractPage.vue

@@ -423,6 +423,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        subcontractingAgreement: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        subcontractName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        subcontractingType: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         subcontractingAmount: [
           { required: true, message: "请输入分包金额", trigger: "blur" },
           {
@@ -431,6 +440,14 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        contractingCompany: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        work: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        jobDetails: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       subMsg: {},

jwtech-admin-page/src/views/building/projectInfo/projectProcess/designChangeInformation.vue

@@ -457,7 +457,20 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        changeReason: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changeApplicant: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        changeContent: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        approvalOpinions: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       designMsg: {},
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/firmInfo.vue

@@ -586,6 +586,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        enterpriseName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        enterprisePerson: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        duties: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        socialCreditCode: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         enterprisePhone: [
           {
             pattern:

jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue

@@ -105,6 +105,7 @@
         :lazy="true"
       >
         <supervisionAndManagement
+          v-if="activeName === 'supervisionAndManagement'"
           :proNo="formData.proNo"
           :proCode="formData.proCode"
         />

jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue

@@ -485,6 +485,17 @@ export default {
       },
       // 表单校验
       rules: {
+        paymentTerms: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        paymentPeriods: [
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数,不包含0",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
         timeScope: [
           { required: true, message: "请选择时间范围", trigger: "blur" },
         ],
@@ -493,10 +504,35 @@ export default {
         ],
         payableAmount: [
           { required: true, message: "请输入应付金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidinAmount: [
-          { required: true, message: "请输入已付金额", trigger: "blur" },
+          { required: true, message: "请输入实付金额", trigger: "blur" },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        temporaryWithholding: [
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
+        auditor: [{ max: 255, message: "字符长度最大为255", trigger: "blur" }],
+        agent: [{ max: 255, message: "字符长度最大为255", trigger: "blur" }],
       },
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/sourceFunds.vue

@@ -464,7 +464,78 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        centralArrangedFunds: [
+          {
+            required: true,
+            message: "请输入中央资金",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        provincialFunding: [
+          {
+            required: true,
+            message: "请输入省级资金",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        cityLevelFunds: [
+          {
+            required: true,
+            message: "请输入地市级资金",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        countyLevelFunds: [
+          {
+            required: true,
+            message: "请输入县级资金",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        townshipInvestments: [
+          {
+            required: true,
+            message: "请输入乡镇及群众自筹和其他投资",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue

@@ -312,6 +312,7 @@ export default {
             message: "考勤年月天数为正整数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       peasantWorkers: [],

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue

@@ -9,7 +9,7 @@
     >
       <el-form-item label="收取方式" prop="incomeExpenditureMethods">
         <el-select
-          v-model="queryParams.data.incomeExpenditureMethods"
+          v-model="queryParams.cv.value"
           placeholder="请选择收取方式"
           clearable
           size="small"
@@ -674,7 +674,7 @@ export default {
           differentiatedDepositAmount: null,
           amountPayable: null,
           paidAmount: null,
-          incomeExpenditureMethods: [],
+          incomeExpenditureMethods: null,
           depositBankSalaryDeposit: null,
           salaryDepositBankAccount: null,
           cashAmount: null,
@@ -701,12 +701,13 @@ export default {
           proNo: null,
           owerDept: null,
         },
+        cv: {},
         // 排序方式
         params: {
           // 按哪个字段排序
           orderBy: "create_time",
           // desc降序，升序asc
-          sort: "desc",
+          sortBy: "desc",
         },
       },
       // 表单参数
@@ -720,12 +721,35 @@ export default {
             trigger: "blur",
           },
         ],
+        depositBankSalaryDeposit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         salaryDepositBankAccount: [
           {
             required: true,
             message: "请输入工资保证金银行账户",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        guaranteeBankName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        bankGuaranteeLetterNo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        guaranteeCompanyName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        guaranteeCompanyLetterNo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+
+        insuranceCompanyName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        insuranceNo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         differentiatedDepositAmount: [
           {
@@ -734,6 +758,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         amountPayable: [
           {
@@ -742,6 +767,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidAmount: [
           {
@@ -750,6 +776,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cashAmount: [
           {
@@ -758,6 +785,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         bankGuaranteeLetterAmount: [
           {
@@ -766,6 +794,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         guaranteeCompanyAmount: [
           {
@@ -774,6 +803,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         insuranceAmount: [
           {
@@ -782,6 +812,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         otherAmount: [
           {
@@ -790,6 +821,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
     };
@@ -819,10 +851,16 @@ export default {
     },
     // 收取方式字典翻译
     incomeExpenditureMethodsFormat(row, column) {
-      return this.selectDictLabel(
+      if (row.incomeExpenditureMethods?.length > 0) {
-        this.incomeExpenditureMethodsOptions,
+        let res = "";
-        row.incomeExpenditureMethods
+        row.incomeExpenditureMethods.forEach((item) => {
-      );
+          res =
+            res +
+            "、" +
+            this.selectDictLabel(this.incomeExpenditureMethodsOptions, item);
+        });
+        return res.substr(1);
+      }
     },
     /** 查询工资保证金账户管理列表 */
     getList() {
@@ -919,11 +957,21 @@ export default {
           owerDept: null,
           remark: null,
         },
+        cv: {},
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.cv.name = "incomeExpenditureMethods";
+      this.queryParams.cv.type = "like";
       this.queryParams.pageNum = 1;
       this.getList();
     },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue

@@ -457,6 +457,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        bankSerialNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        idNo: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        bankSerialNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        salaryPayableMethods: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         monthlySalaryPayable: [
           {
             pattern:
@@ -464,6 +474,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         monthlySalaryDeduct: [
           {
@@ -472,6 +483,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         monthlySalaryCurrent: [
           {
@@ -480,6 +492,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       peasantWorkers: [],

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue

@@ -371,7 +371,17 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        socialCreditCode: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        idNo: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        name: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        nation: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        nativePlace: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       // 施工单位
       firmInfo: [],
       firmInfoQuery: {

jwtech-admin-page/src/views/building/projectInfo/projectProcess/preparationForConstruction.vue

@@ -241,6 +241,7 @@
         <el-form
           ref="form"
           :model="form"
+          :rules="rules"
           label-width="110px"
           label-position="top"
         >
@@ -609,7 +610,23 @@ export default {
       form: {},
       preMsg: {},
       // 表单校验
-      rules: {},
+      rules: {
+        approvalOpinion1: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+        approvalOpinion2: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+        approvalOpinion3: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+        approvalOpinion4: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+        approvalOpinion5: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+      },
       // 请求头
       headers: {
         jianwei: "jwtech " + getToken(),
@@ -625,6 +642,10 @@ export default {
     this.getList();
   },
   methods: {
+    // 表单重置
+    reset() {
+      this.resetForm("form");
+    },
     getList() {
       this.loading = true;
       this.queryParams.data.proNo = this.proNo;
@@ -640,6 +661,7 @@ export default {
       });
     },
     handleUpdate() {
+      this.reset();
       this.form = { ...this.preMsg };
       if (this.form.workCommencementOrder1) {
         this.fileList1 = JSON.parse(this.form.workCommencementOrder1);

jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue

@@ -994,7 +994,14 @@ export default {
       form: {},
       projectAcceptanceMsg: {},
       // 表单校验
-      rules: {},
+      rules: {
+        contractResult: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        acceptanceResults: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       // 附件
       fileList1: [],
       fileList2: [],

jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectLegalPersonEvaluation.vue

@@ -510,7 +510,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        stagedPaymentResults: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       evalData: [],
       // 扣分数据
       evalForm: {

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/EngineeringQualitySupervisionAndInspection.vue

@@ -317,7 +317,20 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        inspectContent: [
+          { max: 2950, message: "字符长度最大为2950", trigger: "blur" },
+        ],
+        inspectUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        inspectPerson: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        rectificationContent: [
+          { max: 2950, message: "字符长度最大为2950", trigger: "blur" },
+        ],
+      },
       // 现在检查意见
       fileList: [],
       // 请求头

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/components/viewReport.vue

@@ -290,15 +290,18 @@ export default {
       rules: {
         reportAttachmentName: [
           { required: true, message: "请输入检测报告名称", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         rectificationTime: [
           { required: true, message: "请选择整改时间", trigger: "blur" },
         ],
         rectificationPerson: [
           { required: true, message: "请输入整改提交人", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         rectificationContent: [
           { required: true, message: "请输入整改内容", trigger: "blur" },
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
       },
       editOpen: false,

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityEvaluation.vue

@@ -29,7 +29,7 @@
     </div>
     <div class="footerForm">
       <el-row :gutter="15">
-        <el-form ref="form" :model="form">
+        <el-form ref="form" :model="form" :rules="rules">
           <el-col :span="8">
             <el-form-item
               label="项目是否完成评定"
@@ -109,6 +109,11 @@ export default {
   data() {
     return {
       form: {},
+      rules: {
+        // investmentSubject: [
+        //   { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        // ],
+      },
       qualityLevelOptions: [],
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/engineeringQualityInspection.vue

@@ -666,10 +666,19 @@ export default {
       form: {},
       reportForm: {},
       // 表单校验
-      rules: {},
+      rules: {
+        section: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        qualitySupervisionAgency: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        supervisionResult: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
+      },
       reportRules: {
         reportAttachmentName: [
           { required: true, message: "请输入检测报告名称", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         reportAttachment: [
           // { required: true, message: "请上传检测报告", trigger: "change" },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/segmentProject.vue

@@ -379,18 +379,24 @@ export default {
         ],
         divisionalWork: [
           { required: true, message: "请输入分部工程名称", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         divisionalWorkCode: [
           { required: true, message: "请输入分部工程编号", trigger: "blur" },
           {
-            pattern:
+            pattern: /[\\u4e00-\\u9fa5]$/,
-              /[\\u4e00-\\u9fa5]$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         unitNumber: [
           { required: true, message: "请输入单元工程数量", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d*|0$/,
+            message: "请输入正整数,不包含0",
+            trigger: "blur",
+          },
         ],
       },
       // 是否字典

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/itemDivision/components/unitProject.vue

@@ -210,18 +210,20 @@ export default {
       rules: {
         belongsSection: [
           { required: true, message: "请选择所属标段", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         unitProjectName: [
           { required: true, message: "请输入单位工程名称", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         unitProjectCode: [
           { required: true, message: "请输入单位工程编号", trigger: "blur" },
           {
-            pattern:
+            pattern: /[\\u4e00-\\u9fa5]$/,
-              /[\\u4e00-\\u9fa5]$/,
             message: "编号不得出现中文",
             trigger: "blur",
           },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
     };

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/options/safetyRecord.vue

@@ -409,7 +409,21 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        content: [
+          { max: 2950, message: "字符长度最大为2950", trigger: "blur" },
+        ],
+        remark: [{ max: 2950, message: "字符长度最大为2950", trigger: "blur" }],
+        approvalUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        approvalOpinionNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        filingsUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       fileList1: [],
       fileList2: [],
       fileList3: [],

jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement.vue

@@ -585,6 +585,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         monthlyInvestmentBenefit: [
           { required: true, message: "请输入月度投资效益", trigger: "blur" },
@@ -594,6 +595,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       scheduleMsg: {},

jwtech-admin-page/src/views/building/projectInfo/projectProcess/supervisionAndManagement/options/record.vue

@@ -300,7 +300,17 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        meetingLocation: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        participants: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        meetingContents: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
       fileList: [],
       // 请求头
       headers: {

jwtech-admin-page/src/views/building/projectInfo/projectProcess/supervisionAndManagement/options/supervision.vue

@@ -11,18 +11,21 @@
         <el-input
           v-model="form.supervisionPersonnel"
           placeholder="请输入监理人员"
+          readonly
         />
       </el-form-item>
       <el-form-item label="监理人员角色" prop="supervisionPersonnelRole">
         <el-input
           v-model="form.supervisionPersonnelRole"
           placeholder="请输入监理人员角色"
+          readonly
         />
       </el-form-item>
       <el-form-item label="监理联系电话" prop="supervisionContactNumber">
         <el-input
           v-model="form.supervisionContactNumber"
           placeholder="请输入监理联系电话"
+          readonly
         />
       </el-form-item>
     </el-form>
@@ -42,6 +45,7 @@ import {
   updatePerson,
   exportPerson,
 } from "@/api/build/supPerson";
+import { listInfo } from "@/api/build/enteInfo";
 
 export default {
   name: "Person",
@@ -72,7 +76,25 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        constructionControlUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        supervisionPersonnel: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        supervisionPersonnelRole: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        supervisionContactNumber: [
+          {
+            pattern:
+              /^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\d{8}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   created() {
@@ -82,12 +104,34 @@ export default {
     /** 查询监理人员管理列表 */
     getList() {
       this.loading = true;
-      this.queryParams.data.proNo = this.proNo;
+      // this.queryParams.data.proNo = this.proNo;
-      this.queryParams.data.proCode = this.proCode;
+      // this.queryParams.data.proCode = this.proCode;
-      listPerson(this.queryParams).then((response) => {
+      // listPerson(this.queryParams).then((response) => {
-        if (response.records[0]) this.form = response.records[0];
+      //   if (response.records[0]) this.form = response.records[0];
-        this.loading = false;
+      // if (!this.form.id) {
+      listInfo({
+        data: {
+          proCode: this.proCode,
+          proNo: this.proNo,
+        },
+      }).then((response) => {
+        const data = response.data.enterpriseInfoList.filter(
+          (res) => res.enterpriseType == "2"
+        )[0];
+        this.$set(this.form, "constructionControlUnit", data.enterpriseName);
+        this.$set(this.form, "supervisionPersonnel", data.enterprisePerson);
+        this.$set(this.form, "supervisionPersonnelRole", data.duties);
+        this.$set(this.form, "supervisionContactNumber", data.enterprisePhone);
+        // console.log(77777, data, data.enterpriseName);
+        // this.form.constructionControlUnit = data.enterpriseName;
+        // this.form.supervisionPersonnel = data.enterprisePerson;
+        // this.form.supervisionPersonnelRole = data.duties;
+        // this.form.supervisionContactNumber = data.enterprisePhone;
+        // console.log(999999, this.form);
       });
+      // }
+      this.loading = false;
+      // });
     },
     // 取消按钮
     cancel() {},

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue

@@ -688,6 +688,16 @@ export default {
       rules: {
         enterpriseName: [
           { required: true, message: "请输入企业名称", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        investmentComposition: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        legalRepresentative: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        corporateIdNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         // score: [
         //   { required: true, message: "请输入信用分数", trigger: "blur" },
@@ -705,6 +715,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidRegisteredCapital: [
           {
@@ -713,6 +724,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         officePhone: [
           {
@@ -752,6 +764,29 @@ export default {
             trigger: "blur",
           },
         ],
+        contacts: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        unitSecurityNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        unifiedSocialCreditCode: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        creditCodeIssuingAuthority: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        registeredAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        safetyProductionLicense: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        licenseIssuingAuthority: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        remark: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        businessScope: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
       },
       // 面包屑，路由信息
       routeList: [

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue

@@ -364,6 +364,16 @@ export default {
       rules: {
         enterpriseName: [
           { required: true, message: "请输入企业名称", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        investmentComposition: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        legalRepresentative: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        corporateIdNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         // score: [
         //   { required: true, message: "请输入信用分数", trigger: "blur" },
@@ -381,6 +391,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidRegisteredCapital: [
           {
@@ -389,6 +400,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         officePhone: [
           {
@@ -428,6 +440,29 @@ export default {
             trigger: "blur",
           },
         ],
+        contacts: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        unitSecurityNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        unifiedSocialCreditCode: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        creditCodeIssuingAuthority: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        registeredAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        safetyProductionLicense: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        licenseIssuingAuthority: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        remark: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        businessScope: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
+        ],
       },
       // 面包屑，路由信息
       routeList: [

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue

@@ -407,6 +407,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        badBehavior: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         bonusPoints: [
           { required: true, message: "请输入扣分值", trigger: "blur" },
           {
@@ -415,6 +418,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       // 请求头

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/certificate.vue

@@ -367,7 +367,18 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        certificateNo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        certificateName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        certificateSpeciality: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        issuedBy: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+      },
       personOptions: [],
       // 请求头
       headers: {

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/engineerAward.vue

@@ -330,7 +330,28 @@ export default {
         jianwei: "jwtech " + getToken(),
       },
       // 表单校验
-      rules: {},
+      rules: {
+        awardsName: [
+          {
+            required: true,
+            message: "请输入奖项名称",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        qualificationCategory: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardsLevel: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardAwardingUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardsLetter: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue

@@ -645,6 +645,18 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        goodBehavior: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        commendationLevel: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        authority: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardAnnouncementWebsite: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         bonusPoints: [
           { required: true, message: "请输入加分值", trigger: "blur" },
           {
@@ -653,6 +665,7 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       // 请求头

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personAward.vue

@@ -337,7 +337,29 @@ export default {
         jianwei: "jwtech " + getToken(),
       },
       // 表单校验
-      rules: {},
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "请输入姓名",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        idNo: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        awardsName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardsLevel: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardAwardingUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardsLetter: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personInfo.vue

@@ -291,11 +291,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        name: [
-        idNo: [{ required: true, message: "请输入身份证", trigger: "blur" }],
+          { required: true, message: "请输入姓名", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        idNo: [
+          { required: true, message: "请输入身份证", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
         personType: [
           { required: true, message: "请选择人员类型", trigger: "blur" },
         ],
+        appointmentLetterNumber: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        issuedBy: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
       },
       pageNum: 1,
       pageSize: 10,

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue

@@ -324,7 +324,16 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        professionalCategory: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        level: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        certificateNo: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        issuedBy: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+      },
       // 子资质类别
       parentOption: [],
       // 请求头

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue

@@ -176,7 +176,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        dynamicCreditScore: [
+          {
+            pattern: /^[1-9]\d*$/,
+            message: "请输入正整数,不包含0",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   created() {

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/unitAward.vue

@@ -313,7 +313,25 @@ export default {
       },
       fileList: [],
       // 表单校验
-      rules: {},
+      rules: {
+        awardsName: [
+          {
+            required: true,
+            message: "请输入奖项名称",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardsLevel: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardAwardingUnit: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        awardsLetter: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue

@@ -596,7 +596,38 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        projectName: [
+          {
+            required: true,
+            message: "请输入项目名称",
+            trigger: "blur",
+          },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        constructingUnits: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        projectLeader: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        contractPrice: [
+          {
+            pattern:
+              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+            message: "请输入数字,可保留两位小数",
+            trigger: "blur",
+          },
+          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+        ],
+        projectAwardSituation: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        qualityAssessmentResults: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+        ],
+        remark: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+      },
       // 请求头
       headers: {
         jianwei: "jwtech " + getToken(),

jwtech-admin-page/src/views/project/bid/options/candidatePage.vue

@@ -341,12 +341,28 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="评标情况" prop="evaluationSituation">
-              <el-input
+              <!-- <el-input
                 v-model="publicityForm.evaluationSituation"
                 placeholder="请输入评标情况"
-              />
+              /> -->
+              <div style="border: 1px solid #ccc">
+                <Toolbar
+                  style="border-bottom: 1px solid #ccc"
+                  :editor="editor"
+                  :defaultConfig="toolbarConfig"
+                  :mode="mode"
+                />
+                <Editor
+                  style="height: 300px; overflow-y: hidden"
+                  v-model="publicityForm.evaluationSituation"
+                  :default-value="333"
+                  :defaultConfig="editorConfig"
+                  :mode="mode"
+                  @onCreated="onCreated"
+                />
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -646,6 +662,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 评标情况 </template>
+            <!-- <div v-html="infoMsg.evaluationSituation"></div> -->
             {{ this.infoMsg.evaluationSituation }}
           </el-descriptions-item>
           <el-descriptions-item>
@@ -790,12 +807,19 @@ import {
 import { listProposal } from "@/api/earlyStage/proposal";
 import { getToken } from "@/utils/auth";
 import { getFileStream } from "@/api/system/upload";
+import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 
 export default {
   name: "BidWinning",
   props: ["proNo"],
+  components: { Editor, Toolbar },
   data() {
     return {
+      editor: null,
+      toolbarConfig: {},
+      editorConfig: { placeholder: "请输入评标情况" },
+      mode: "default", // or 'simple'
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -985,6 +1009,11 @@ export default {
   created() {
     this.getList();
   },
+  // beforeDestroy() {
+  //   const editor = this.editor;
+  //   if (editor == null) return;
+  //   editor.destroy(); // 组件销毁时，及时销毁编辑器
+  // },
   // 父组件  利用axios请求得到的值  传送到子组件，要监听，否则初始渲染时为空
   watch: {
     proNo: function (n, o) {
@@ -993,6 +1022,9 @@ export default {
     },
   },
   methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+    },
     chooseProject(data) {
       // console.log(444, data);
       this.publicityForm.projectCode = data.projectCode;
@@ -1028,7 +1060,7 @@ export default {
         lotName: null,
         noticeName: null,
         bidOpenDate: null,
-        evaluationSituation: null,
+        evaluationSituation: "",
         tendererName: null,
         officeAddress: null,
         bidderContacts: null,
@@ -1328,6 +1360,7 @@ export default {
   }
 }
 </style>
+<style src="@wangeditor/editor/dist/css/style.css"></style>
 <!-- <style lang="scss" scoped>
 ::v-deep {
   .el-dialog {

jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java

@@ -15,6 +15,7 @@ import com.kms.common.utils.BaseEntityUtils;
 
 
 import com.kms.common.utils.UserUtils;
+import com.kms.earlyStage.domain.SpecialProjectInfo;
 import com.kms.earlyStage.domain.SpecialProjectProposal;
 import com.kms.earlyStage.service.SpecialProjectProposalService;
 import com.kms.system.domain.SysXzqh;
@@ -72,62 +73,9 @@ public class SpecialProjectFeasibilityController extends BaseController
     @ApiOperation("可行性研究报告列表")
     public IPage list(@RequestBody SearchParam<SpecialProjectFeasibility> sp)
     {
-        SpecialProjectFeasibility planInfo = sp.getData();
+        IPage<SpecialProjectFeasibility> specialProjectInfoIPage = specialProjectFeasibilityService.selectPage(sp);
-        String adcd = planInfo.getAdcd();
+
-        SysUser sysUser = UserUtils.getUser();
+        return specialProjectInfoIPage;
-        if (sysUser.getUserName().equals("admin")) {
-            if (planInfo != null && planInfo.getAdcd() != null) {
-                String infoAdcd = planInfo.getAdcd();
-                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
-                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
-                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-                if (xzqh.getLayer()==1) {
-                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
-
-                } else if (xzqh.getLayer()==2) {
-                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
-
-                }else {
-                    infoAdcd = xzqh.getXzqhdm();
-                }
-                return specialProjectFeasibilityService.selectPage(sp,infoAdcd);
-            }else {
-                return specialProjectFeasibilityService.selectPage(sp,null);
-            }
-        }else if (adcd == null) {
-            SysUser user = UserUtils.getUser();
-            String deptId = user.getDeptId();
-            SysDept sysDept = sysDeptService.get(deptId);
-            String xzqhId = sysDept.getXzqhId();
-            SysXzqh xzqh = sysXzqhService.getById(xzqhId);
-            String substring = "";
-            if (xzqh.getLayer()==1) {
-                substring = xzqh.getXzqhdm().substring(0, 2);
-
-            } else if (xzqh.getLayer()==2) {
-                substring = xzqh.getXzqhdm().substring(0, 4);
-
-            }else {
-                substring = xzqh.getXzqhdm();
-            }
-
-            return specialProjectFeasibilityService.selectPage(sp,substring);
-        }else {
-            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
-            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
-
-            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
-            if (xzqh.getLayer()==1) {
-                adcd = xzqh.getXzqhdm().substring(0, 2);
-
-            } else if (xzqh.getLayer()==2) {
-                adcd = xzqh.getXzqhdm().substring(0, 4);
-
-            }else {
-                adcd = xzqh.getXzqhdm();
-            }
-            return specialProjectFeasibilityService.selectPage(sp, adcd);
-        }
 
     }
 

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java

@@ -1,6 +1,8 @@
 package com.kms.earlyStage.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,4 +116,9 @@ public class SpecialProjectProposal extends BaseEntity
 
     private String adcd;
 
+
+    //查询字段 0：列表，1：其它
+    @TableField(exist = false)
+    private String getList;
+
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/ProjectBidResultMapper.java

@@ -22,4 +22,6 @@ public interface ProjectBidResultMapper extends BaseMapper<ProjectBidResult> {
                                    @Param("orderBy") String orderBy,
                                    @Param("pageNum") int pageNum,
                                    @Param("pageSize") int pageSize);
+
+    List<ProjectBidResult> getListByProNo();
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java

@@ -24,4 +24,13 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper<SpecialProje
                                      @Param("orderBy") String orderBy,
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);
+
+    List<SpecialProjectFeasibility> getByUserPro(@Param("userId") String userId,
+                                                 @Param("userType") String userType,
+                                                 @Param("id") String id,
+                                                 @Param("projectName") String projectName,
+                                                 @Param("adcd") String adcd,
+                                                 @Param("orderBy") String orderBy,
+                                                 @Param("pageNum") int pageNum,
+                                                 @Param("pageSize") int pageSize);
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/ProjectBidResultService.java

@@ -1,9 +1,13 @@
 package com.kms.earlyStage.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
+import com.kms.system.domain.SysUserPro;
+import com.kms.system.mapper.SysUserProMapper;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +30,25 @@ public class ProjectBidResultService extends BaseService<ProjectBidResultMapper,
     @Autowired
     private ProjectBidResultMapper projectBidResultMapper;
 
+    @Autowired
+    private SysUserProMapper sysUserProMapper;
+
     public IPage selectPage(SearchParam<ProjectBidResult> sp) {
+
+        if (ObjectUtil.isNull(sp.getData())) {
+
+            List<ProjectBidResult> list = projectBidResultMapper.getListByProNo();
+
+            Page<ProjectBidResult> page = new Page<>();
+
+            page.setRecords(list);
+            page.setTotal(list.size());
+
+
+            return page;
+        }
+
+
         ProjectBidResult data = sp.getData();
 
         Map<String, Object> params = sp.getParams();

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java

@@ -1,11 +1,16 @@
 package com.kms.earlyStage.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
+import com.jianwei.common.core.domain.entity.SysUser;
+import com.kms.common.utils.UserUtils;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import com.kms.earlyStage.domain.SpecialProjectProposal;
+import com.kms.system.service.SysXzqhService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
@@ -27,19 +32,33 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
     @Autowired
     private SpecialProjectFeasibilityMapper specialProjectFeasibilityMapper;
 
+    @Autowired
+    private SysXzqhService sysXzqhService;
+
+
+    public IPage selectPage(SearchParam<SpecialProjectFeasibility> sp) {
+        SysUser sysUser = UserUtils.getUser();
 
-    public IPage selectPage(SearchParam<SpecialProjectFeasibility> sp, String adcd) {
         SpecialProjectFeasibility data = sp.getData();
 
         Map<String, Object> params = sp.getParams();
-        List<SpecialProjectInfo> list = specialProjectFeasibilityMapper.getXzqh(data.getId(),data.getProjectName(),
+        ConditionView cv = sp.getCv();
-                data.getProjectType(),adcd,(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+
+        assert sysUser != null;
+        List<SpecialProjectFeasibility> list = null;
 
-        Page<SpecialProjectInfo> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
 
+        if (ObjectUtil.isNull(params)) {
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
+        }else {
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+        }
 
+        Page<SpecialProjectFeasibility> page = new Page<>();
+        page.setRecords(list);
+        page.setTotal(list.size());
         return page;
 
     }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

@@ -55,7 +55,7 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
         assert sysUser != null;
         List<SpecialProjectProposal> list = null;
 
-        if (ObjectUtil.isNull(data.getProjectCode())) {
+        if (ObjectUtil.isNull(data.getGetList())) {
             return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
         }
 

jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidResultMapper.xml

@@ -44,4 +44,11 @@
     </select>
 
 
+    <select id="getListByProNo" resultMap="ProjectBidResult">
+        SELECT *
+        FROM bs_slgc_qqjd_pro_bid_result br
+        WHERE br.PRO_NO not in (SELECT PRO_NO FROM sys_user_pro);
+    </select>
+
+
 </mapper>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

@@ -44,4 +44,35 @@
         </where>
         order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
+    <select id="getByUserPro" resultMap="SpecialProjectFeasibility">
+        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+        <include refid="SpecialProjectInfo"/>
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+                <if test="projectName!=null and projectName!=''">
+                    and project_name like concat('%',#{projectName},'%')
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        </if>
+        <if test="userType==00">
+            <where>
+                <if test="projectName!=null and projectName!=''">
+                    and project_name like concat('%',#{projectName},'%')
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        </if>
+    </select>
 </mapper>