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

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

@@ -1073,11 +1073,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         provincialFunding: [
           {
@@ -1087,11 +1086,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cityLevelFunds: [
           {
@@ -1101,11 +1099,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         countyLevelFunds: [
           {
@@ -1115,11 +1112,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         townshipInvestments: [
           {
@@ -1129,11 +1125,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         constructionPhase: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },

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

@@ -786,11 +786,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         provincialFunding: [
           {
@@ -800,11 +799,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cityLevelFunds: [
           {
@@ -814,11 +812,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         countyLevelFunds: [
           {
@@ -828,11 +825,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         townshipInvestments: [
           {
@@ -842,11 +838,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         constructionPhase: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },

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

@@ -62,7 +62,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['build:info:add']"
+          v-hasPermi="['build:contraction:add']"
           >新增</el-button
         >
       </el-col>
@@ -797,11 +797,10 @@ export default {
           { required: true, message: "请输入合同金额", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         contractDuration: [
           {
@@ -820,19 +819,19 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         paymentTerms: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLeader: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectTechnicalLeader: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         safetyProductionManager: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         qualityLeader: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       // 面包屑，路由信息

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

@@ -252,11 +252,10 @@ export default {
           { required: true, message: "请输入合同金额", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         contractDuration: [
           {
@@ -275,19 +274,19 @@ export default {
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         paymentTerms: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLeader: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectTechnicalLeader: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         safetyProductionManager: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         qualityLeader: [
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       //项目名称

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

@@ -436,11 +436,10 @@ export default {
           { required: true, message: "请输入分包金额", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         contractingCompany: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },

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

@@ -31,7 +31,7 @@
         </el-button>
       </el-form-item>
     </el-form>
-    <!-- 
+    <!--
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -238,7 +238,7 @@
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['build:sourceFunds:edit']"
+            v-hasPermi="['build:sourceFunds:pay']"
             >资金支付
           </el-button>
           <!--          <el-button
@@ -490,11 +490,10 @@ export default {
         ],
         paymentPeriods: [
           {
-            pattern: /^[1-9]\d*$/,
-            message: "请输入正整数,不包含0",
+            pattern: /^[1-9][0-9]{0,8}$/,
+            message: "请输入1-9位正整数,不包含0",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         timeScope: [
           { required: true, message: "请选择时间范围", trigger: "blur" },
@@ -506,30 +505,27 @@ export default {
           { required: true, message: "请输入应付金额", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidinAmount: [
           { required: true, message: "请输入实付金额", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             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: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             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

@@ -473,11 +473,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         provincialFunding: [
           {
@@ -487,11 +486,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cityLevelFunds: [
           {
@@ -501,11 +499,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         countyLevelFunds: [
           {
@@ -515,11 +512,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         townshipInvestments: [
           {
@@ -529,11 +525,10 @@ export default {
           },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
     };

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

@@ -223,7 +223,7 @@
         </el-form-item>
         <el-form-item label="考勤所属年月考勤天数" prop="attendanceDay">
           <el-input
-            v-model.number="form.attendanceDay"
+            v-model="form.attendanceDay"
             placeholder="请输入考勤所属年月考勤天数"
           >
             <template slot="append">天</template>
@@ -306,13 +306,11 @@ export default {
         ],
         attendanceDay: [
           { required: true, message: "请输入考勤年月天数", trigger: "blur" },
-
           {
-            pattern: /^[+]{0,1}(\d+)$/,
-            message: "考勤年月天数为正整数",
+            pattern: /(^[1-9][0-9]{0,8}$)|((^(0){1}$))/,
+            message: "请输入1-9位正整数,包含0",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       peasantWorkers: [],

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

@@ -754,74 +754,66 @@ export default {
         differentiatedDepositAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         amountPayable: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         cashAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         bankGuaranteeLetterAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         guaranteeCompanyAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         insuranceAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         otherAmount: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
     };

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

@@ -470,29 +470,26 @@ export default {
         monthlySalaryPayable: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         monthlySalaryDeduct: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         monthlySalaryCurrent: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       peasantWorkers: [],

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

@@ -154,6 +154,7 @@
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
+              v-if="scope.row.isOk==0"
               v-hasPermi="['build:attachment:edit']"
               >整改</el-button
             >

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

@@ -162,7 +162,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdateReport(scope.row)"
-            v-hasPermi="['build:supervision:edit']"
+            v-hasPermi="['build:supervision:upload']"
             >上传检测报告</el-button
           >
           <el-button

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

@@ -581,21 +581,19 @@ export default {
           { required: true, message: "请输入月度工作完成量", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         monthlyInvestmentBenefit: [
           { required: true, message: "请输入月度投资效益", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       scheduleMsg: {},

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

@@ -715,16 +715,14 @@ export default {
             message: "请输入数字,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidRegisteredCapital: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         officePhone: [
           {

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

@@ -387,20 +387,18 @@ export default {
         registeredCapital: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         paidRegisteredCapital: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         officePhone: [
           {

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

@@ -414,11 +414,10 @@ export default {
           { required: true, message: "请输入扣分值", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       // 请求头

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

@@ -661,11 +661,10 @@ export default {
           { required: true, message: "请输入加分值", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
       },
       // 请求头

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

@@ -614,11 +614,10 @@ export default {
         contractPrice: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
-          { max: 10, message: "字符长度最大为10", trigger: "blur" },
         ],
         projectAwardSituation: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },

jwtech-admin-page/src/views/project/bid/index.vue

@@ -15,13 +15,13 @@
         <!-- 搜索条件 -->
         <el-form
           :model="queryParams"
-          ref="queryForm"
+          ref="proQueryParams"
           :inline="true"
           label-width="68px"
         >
           <el-form-item label="项目名称" prop="projectName">
             <el-input
-              v-model="queryParams.cv.value"
+              v-model="proQueryParams.data.projectName"
               placeholder="请输入项目名称"
               clearable
               size="small"
@@ -55,7 +55,7 @@
           <el-form-item label="行政区划" prop="adcd">
             <el-cascader
               :options="areasOptions"
-              v-model="queryParams.data.adcd"
+              v-model="proQueryParams.data.adcd"
               :props="areasOptionProps"
               placeholder="请选择行政区划"
               clearable
@@ -108,9 +108,9 @@
         min-width="120"
       />
       <el-table-column
-        label="项目编号"
+        label="项目编码"
         align="center"
-        prop="proNo"
+        prop="projectCode"
         min-width="180"
       />
       <el-table-column
@@ -207,6 +207,7 @@ import {
   updateProjectinfo,
   exportProjectinfo,
 } from "@/api/earlyStage/projectinfo";
+import { listProDesign } from "@/api/earlyStage/preDesign";
 import { getAreasData } from "@/api/areas";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 
@@ -254,6 +255,36 @@ export default {
           sort: "desc",
         },
       },
+      proQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          projectName: null,
+          constructionNature: null,
+          constructionLocation: null,
+          projectUnitName: null,
+          briefIntroduction: null,
+          projectLandSituation: null,
+          designEstimateReport: null,
+          relatedAttachment: null,
+          projectCode: null,
+          proNo: null,
+          createUid: null,
+          createTime: null,
+          updateUid: null,
+          updateTime: null,
+          owerDept: null,
+        },
+        cv: {},
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sort: "desc",
+        },
+      },
       // 面包屑，路由信息
       routeList: [
         {
@@ -337,7 +368,13 @@ export default {
     /** 查询项目前期背景信息列表 */
     getList() {
       this.loading = true;
-      listProjectinfo(this.queryParams).then((response) => {
+      // listProjectinfo(this.queryParams).then((response) => {
+      //   this.projectinfoList = response.records;
+      //   this.total = response.total;
+      //   this.loading = false;
+      // });
+      listProDesign(this.proQueryParams).then((response) => {
+        console.log(111, response);
         this.projectinfoList = response.records;
         this.total = response.total;
         this.loading = false;
@@ -349,22 +386,21 @@ export default {
     },
     // 查询表单重置
     resetQueryForm() {
-      this.queryParams = {
+      this.proQueryParams = {
         pageNum: 1,
         pageSize: 10,
+        ids: null,
         data: {
-          id: null,
+          adcd: null,
           projectName: null,
-          projectType: null,
-          overview: null,
-          compilingUnit: null,
-          startYear: null,
-          endYear: null,
-          amount: null,
-          compilingUnitNature: null,
-          compilingUnitAddress: null,
-          compilingUnitLegalPerson: null,
-          projectReport: null,
+          constructionNature: null,
+          constructionLocation: null,
+          projectUnitName: null,
+          briefIntroduction: null,
+          projectLandSituation: null,
+          designEstimateReport: null,
+          relatedAttachment: null,
+          projectCode: null,
           proNo: null,
           createUid: null,
           createTime: null,
@@ -372,12 +408,7 @@ export default {
           updateTime: null,
           owerDept: null,
         },
-        // 模糊查询
-        cv: {
-          type: null,
-          name: null,
-          value: null,
-        },
+        cv: {},
         // 排序方式
         params: {
           // 按哪个字段排序
@@ -386,7 +417,7 @@ export default {
           sort: "desc",
         },
       };
-      this.resetForm("queryForm");
+      this.resetForm("proQueryParams");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -409,24 +440,25 @@ export default {
     /** 查看招投标信息 */
     handleUpdate(row) {
       // this.reset();
+      console.log(555, row);
       const id = row.id || this.ids;
-      getProjectinfo(id).then((response) => {
-        this.routeList.push({
-          path: "/project/bid/options",
-          routeName: "招标计划",
-          isEdit: true,
-        });
+      // getProjectinfo(id).then((response) => {
+      this.routeList.push({
+        path: "/project/bid/options",
+        routeName: "招标计划",
+        isEdit: true,
+      });
 
-        // 存储面包屑信息
-        this.$store.commit("setRouteList", JSON.stringify(this.routeList));
-        // 存储项目基础信息
-        // this.$store.commit("setBaseFormData", JSON.stringify(response.data));
-        // 跳转到选项卡页面
-        this.$router.push({
-          // path: "/project/special/options",
-          path: "/project/bid/options?baseDataId=" + response.data.id,
-        });
+      // 存储面包屑信息
+      this.$store.commit("setRouteList", JSON.stringify(this.routeList));
+      // 存储项目基础信息
+      // this.$store.commit("setBaseFormData", JSON.stringify(response.data));
+      // 跳转到选项卡页面
+      this.$router.push({
+        // path: "/project/special/options",
+        path: "/project/bid/options?baseDataId=" + id,
       });
+      // });
     },
     /** 删除按钮操作 */
     handleDelete(row) {

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

@@ -217,11 +217,12 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-form-item label="招标项目名称" prop="bidProjectName">
-          <!-- <el-input
+          <el-input
             v-model="form.bidProjectName"
             placeholder="请输入招标项目名称"
-          /> -->
-          <el-select
+            readonly
+          />
+          <!-- <el-select
             v-model="form.bidProjectName"
             placeholder="招标项目名称"
             filterable
@@ -236,7 +237,7 @@
               :value="dict.projectName + '[' + dict.projectCode + ']'"
               @click.native="chooseProject(dict)"
             />
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item label="资格预审文件获取开始时间" prop="fileGainTime">
           <el-date-picker
@@ -371,7 +372,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "BidPrequ",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
   data() {
     return {
       // 遮罩层
@@ -529,6 +530,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.form.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加资格预审公告";
     },
@@ -569,6 +572,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
+            this.form.projectCode = this.projectCode;
             addBidPrequ(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");

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

@@ -386,15 +386,16 @@
       @close="close"
       :close-on-click-modal="false"
     >
-      <el-row :gutter="15">
+      <el-row :gutter="15" v-if="open">
         <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item label="招标项目名称" prop="bidProjectName">
-              <!-- <el-input
+              <el-input
                 v-model="form.bidProjectName"
                 placeholder="请输入招标项目名称"
-              /> -->
-              <el-select
+                readonly
+              />
+              <!-- <el-select
                 v-model="form.bidProjectName"
                 placeholder="招标项目名称"
                 filterable
@@ -409,7 +410,7 @@
                   :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="chooseProject(dict)"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -502,12 +503,27 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="招标内容" prop="bidContent">
-              <el-input
+              <!-- <el-input
                 type="textarea"
                 :rows="4"
                 v-model="form.bidContent"
                 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="form.bidContent"
+                  :defaultConfig="editorConfig"
+                  :mode="mode"
+                  @onCreated="onCreated"
+                />
+              </div>
             </el-form-item>
           </el-col>
 
@@ -522,6 +538,21 @@
                 v-model="form.bidCapabilityRequirements"
                 placeholder="请输入投标资格能力要求"
               />
+              <!-- <div style="border: 1px solid #ccc">
+                <Toolbar
+                  style="border-bottom: 1px solid #ccc"
+                  :editor="editor2"
+                  :defaultConfig="toolbarConfig"
+                  :mode="mode"
+                />
+                <Editor
+                  style="height: 300px; overflow-y: hidden"
+                  v-model="form.bidCapabilityRequirements"
+                  :defaultConfig="editorConfig2"
+                  :mode="mode"
+                  @onCreated="onCreated"
+                />
+              </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -851,11 +882,17 @@
           </el-descriptions-item>
           <el-descriptions-item span="2">
             <template slot="label"> 招标内容 </template>
-            {{ this.tenderMsg.bidContent }}
+            <div class="fuwenben" v-html="tenderMsg.bidContent"></div>
+            <!-- {{ this.tenderMsg.bidContent }} -->
           </el-descriptions-item>
           <el-descriptions-item span="2">
             <template slot="label"> 投标资格能力要求 </template>
-            {{ this.tenderMsg.bidCapabilityRequirements }}
+            <div
+              class="fuwenben"
+              v-html="tenderMsg.bidCapabilityRequirements"
+            ></div>
+
+            <!-- {{ this.tenderMsg.bidCapabilityRequirements }} -->
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 是否接受联合体投标 </template>
@@ -976,12 +1013,54 @@ 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: "BidNotice",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
+  components: { Editor, Toolbar },
   data() {
     return {
+      editor: null,
+      editor2: null,
+      toolbarConfig: {
+        toolbarKeys: [
+          // 一些常用的菜单 key
+          "bold", // 加粗
+          "italic", // 斜体
+          "through", // 删除线
+          "underline", // 下划线
+          "bulletedList", // 无序列表
+          "numberedList", // 有序列表
+          "color", // 文字颜色
+          "fontSize", // 字体大小
+          "lineHeight", // 行高
+          "uploadImage", // 上传图片
+          "delIndent", // 缩进
+          "indent", // 增进
+          "deleteImage", //删除图片
+          "divider", // 分割线
+          "justifyCenter", // 居中对齐
+          "justifyJustify", // 两端对齐
+          "justifyLeft", // 左对齐
+          "justifyRight", // 右对齐
+          "undo", // 撤销
+          "redo", // 重做
+          "clearStyle", // 清除格式
+        ],
+      },
+      editorConfig: {
+        placeholder: "请输入招标内容",
+        // MENU_CONF: {
+        //   uploadImage: {
+        //     server: "thinking/common/upload",
+        //     headers: { jianwei: "jwtech " + getToken() },
+        //   },
+        // },
+      },
+      editorConfig2: { placeholder: "请输入投标资格能力要求" },
+      mode: "default", // or 'simple'
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1069,42 +1148,38 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        lotName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
+        lotName: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         noticeNature: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         reviewQualificationMethod: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidProjectLocation: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         fundingSource: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         fundingSourceConstitute: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
         ],
         deliveryTime: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
-            pattern: /^[1-9]\d*$/,
-            message: "请输入正整数,不包含0",
+            pattern: /^[1-9][0-9]{0,8}$/,
+            message: "请输入1-9位正整数,不包含0",
             trigger: "blur",
           },
         ],
         maxPriceBid: [
           // { required: true, message: "请输入最高投标限价", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
@@ -1133,55 +1208,55 @@ export default {
           },
         ],
         bidScope: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         bidContent: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         bidCapabilityRequirements: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         gainBidFileMethod: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidDeliveryFileMethod: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidOpeningMethod: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidTimeLocation: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         announcementReleaseMedia: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         tendererName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         officeAddress: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidderContacts: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         biddingAgency: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         agencyOfficeAddress: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidAgencyContacts: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         tenderingSupervisionAgency: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         releaseResponsiblePerson: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         otherLawContents: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
       },
       // 附件
@@ -1213,6 +1288,10 @@ export default {
     },
   },
   methods: {
+    onCreated(editor) {
+      this.editor = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+      this.editor2 = Object.seal(editor); // 一定要用 Object.seal() ，否则会报错
+    },
     chooseProject(data) {
       // console.log(444, data);
       this.form.projectCode = data.projectCode;
@@ -1391,6 +1470,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加招标公告";
     },
@@ -1430,6 +1511,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
+            this.form.projectCode = this.projectCode;
             addBidNotice(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
@@ -1552,5 +1634,24 @@ export default {
   .el-dialog {
     margin-top: 2vh !important;
   }
+  .fuwenben {
+    table {
+      border-top: 1px solid #ccc;
+      border-left: 1px solid #ccc;
+      border-collapse: collapse;
+      border-spacing: 0;
+    }
+    table td,
+    table th {
+      border-bottom: 1px solid #ccc;
+      border-right: 1px solid #ccc;
+      padding: 3px 5px;
+    }
+    table th {
+      border-bottom: 2px solid #ccc;
+      text-align: center;
+    }
+  }
 }
 </style>
+<style src="@wangeditor/editor/dist/css/style.css"></style>

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

@@ -261,13 +261,14 @@
           :rules="baseRules"
           label-width="110px"
         >
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="招标项目名称" prop="bidProjectName">
-              <!-- <el-input
+              <el-input
                 v-model="baseForm.bidProjectName"
                 placeholder="请输入招标项目名称"
-              /> -->
-              <el-select
+                readonly
+              />
+              <!-- <el-select
                 v-model="baseForm.bidProjectName"
                 placeholder="招标项目名称"
                 filterable
@@ -282,7 +283,7 @@
                   :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="chooseProject(dict)"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -347,7 +348,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item
               label="招标人统一社会信用代码"
               prop="socialCreditCode"
@@ -1027,7 +1028,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "BidInfo",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
   data() {
     return {
       // 遮罩层
@@ -1128,43 +1129,43 @@ export default {
       // },
       // 表单校验
       baseRules: {
-        bidNature:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidNature: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        bidPlanName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidPlanName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        bidPlanPerson:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidPlanPerson: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        tendererName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        tendererName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        socialCreditCode:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        socialCreditCode: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        remarkf:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        remark: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
         ],
       },
       detailsRules: {
-        bidContent:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidContent: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        estimatedContractPrice:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        estimatedContractPrice: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        bidConstructionLocation:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidConstructionLocation: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        bidRegulator:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidRegulator: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        projectOverview:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        projectOverview: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         estimatedContractPrice: [
           // { required: true, message: "请输入预估发包价", trigger: "blur" },
@@ -1361,6 +1362,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.baseForm.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加招标计划基本信息";
     },
@@ -1411,6 +1414,8 @@ export default {
             } else {
               this.baseForm.proNo = this.proNo;
               this.detailsForm.proNo = this.proNo;
+              this.baseForm.projectCode = this.projectCode;
+              this.detailsForm.projectCode = this.projectCode;
               addBidInfoVO({
                 specialProjectBidInfo: this.baseForm,
                 projectBidDetails: this.detailsForm,

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

@@ -28,9 +28,9 @@
           ></el-button>
         </el-input>
       </el-form-item> -->
-      <el-form-item label="招标项目编码" prop="projectCode" label-width="96px">
+      <el-form-item label="招标项目编码" prop="proCode" label-width="96px">
         <el-input
-          v-model="queryParams.data.projectCode"
+          v-model="queryParams.data.proCode"
           placeholder="请输入项目编码"
           clearable
           size="small"
@@ -238,13 +238,14 @@
     >
       <el-row :gutter="15">
         <el-form ref="form" :model="form" :rules="rules" label-width="128px">
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="招标项目名称" prop="bidProjectName">
-              <!-- <el-input
+              <el-input
                 v-model="form.bidProjectName"
                 placeholder="请输入招标项目名称"
-              /> -->
-              <el-select
+                readonly
+              />
+              <!-- <el-select
                 v-model="form.bidProjectName"
                 placeholder="招标项目名称"
                 filterable
@@ -259,7 +260,7 @@
                   :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="chooseProject(dict)"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -478,7 +479,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "ContractFile",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
   data() {
     return {
       // 遮罩层
@@ -536,20 +537,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        loftName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        nature:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        isDelay:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        bidOpenMethod:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        loftName: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        nature: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        isDelay: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        bidOpenMethod: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        filePulish:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        filePulish: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
@@ -683,6 +678,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加招标文件";
     },
@@ -722,6 +719,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
+            this.form.proCode = this.projectCode;
             addContractFile(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");

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

@@ -280,7 +280,7 @@
     >
       <!-- 公示基本信息表 -->
       <el-divider content-position="left"> 公示基本信息表 </el-divider>
-      <el-row :gutter="15">
+      <el-row :gutter="15" v-if="open">
         <el-form
           ref="publicityForm"
           :model="publicityForm"
@@ -289,11 +289,12 @@
         >
           <el-col :span="12">
             <el-form-item label="招标项目名称" prop="bidProjectName">
-              <!-- <el-input
+              <el-input
                 v-model="publicityForm.bidProjectName"
                 placeholder="请输入招标项目名称"
-              /> -->
-              <el-select
+                readonly
+              />
+              <!-- <el-select
                 v-model="publicityForm.bidProjectName"
                 placeholder="请输入招标项目名称"
                 filterable
@@ -308,7 +309,7 @@
                   :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="chooseProject(dict)"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -357,7 +358,6 @@
                 <Editor
                   style="height: 300px; overflow-y: hidden"
                   v-model="publicityForm.evaluationSituation"
-                  :default-value="333"
                   :defaultConfig="editorConfig"
                   :mode="mode"
                   @onCreated="onCreated"
@@ -660,10 +660,11 @@
             <template slot="label"> 开标日期 </template>
             {{ this.infoMsg.bidOpenDate }}
           </el-descriptions-item>
-          <el-descriptions-item>
+          <el-descriptions-item span="2">
             <template slot="label"> 评标情况 </template>
-            <!-- <div v-html="infoMsg.evaluationSituation"></div> -->
-            {{ this.infoMsg.evaluationSituation }}
+            <div class="fuwenben" v-html="infoMsg.evaluationSituation"></div>
+            <!-- <div v-pre>{{ this.infoMsg.evaluationSituation }}</div> -->
+            <!-- {{ this.infoMsg.evaluationSituation }} -->
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 招标人 </template>
@@ -806,18 +807,71 @@ import {
 } from "@/api/earlyStage/bidWinningVO";
 import { listProposal } from "@/api/earlyStage/proposal";
 import { getToken } from "@/utils/auth";
-import { getFileStream } from "@/api/system/upload";
+import { getFileStream, previewFile } from "@/api/system/upload";
 import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
 
 export default {
   name: "BidWinning",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
   components: { Editor, Toolbar },
   data() {
     return {
       editor: null,
-      toolbarConfig: {},
-      editorConfig: { placeholder: "请输入评标情况" },
+      toolbarConfig: {
+        toolbarKeys: [
+          // 一些常用的菜单 key
+          "bold", // 加粗
+          "italic", // 斜体
+          "through", // 删除线
+          "underline", // 下划线
+          "bulletedList", // 无序列表
+          "numberedList", // 有序列表
+          "color", // 文字颜色
+          "fontSize", // 字体大小
+          "lineHeight", // 行高
+          "uploadImage", // 上传图片
+          "delIndent", // 缩进
+          "indent", // 增进
+          "deleteImage", //删除图片
+          "divider", // 分割线
+          "justifyCenter", // 居中对齐
+          "justifyJustify", // 两端对齐
+          "justifyLeft", // 左对齐
+          "justifyRight", // 右对齐
+          "undo", // 撤销
+          "redo", // 重做
+          "clearStyle", // 清除格式
+        ],
+      },
+      editorConfig: {
+        placeholder: "请输入评标情况",
+        MENU_CONF: {
+          uploadImage: {
+            server: "thinking/common/upload",
+            headers: { jianwei: "jwtech " + getToken() },
+            "tenant-id": "1",
+            fieldName: "file", // 这里有个坑，如果返回的响应结果是没有上传文件，跟这里关系很大
+            customInsert(res, insertFn) {
+              console.log("上传图片", res);
+              if (res.code == 200) {
+                // const url = window.URL.createObjectURL(
+                //   new Blob([res.url], {
+                //     type: "image/jpeg;charset=utf-8",
+                //     headers: { jianwei: "jwtech " + getToken() },
+                //   })
+                // );
+                // previewFile({ url: res.url, responseType: "blob" }).then(
+                //   (item) => {
+                //     console.log(4444, item);
+                //   }
+                // );
+                // console.log(6666, url);
+                insertFn(res.url);
+              }
+            },
+          },
+        },
+      },
       mode: "default", // or 'simple'
 
       // 遮罩层
@@ -892,29 +946,27 @@ export default {
       candidateForm: {},
       // 表单校验
       rules: {
-        lotName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        lotName: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        noticeName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        noticeName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        evaluationSituation: [
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
-        evaluationSituation:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        tendererName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        tendererName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        officeAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        officeAddress:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidderContacts: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        bidderContacts:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        tenderingSupervisionDept: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        tenderingSupervisionDept:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        deptAddress:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        deptAddress: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
@@ -937,58 +989,53 @@ export default {
         ],
       },
       candidateRules: {
-        winningCandidateName:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        winningCandidateCode:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        winningCandidateName: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        quality:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        winningCandidateCode: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        evaluationSituation:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        quality: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        evaluationSituation: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        bidCapabilityConditions:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        bidCapabilityConditions: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        projectLeaderQualification:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        projectLeaderQualification: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        projectLeader:[
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+        projectLeader: [
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidQuotation: [
           // { required: true, message: "请输入投标报价", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
         deliveryTime: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
-            pattern: /^[1-9]\d*$/,
-            message: "请输入正整数,不包含0",
+            pattern: /^[1-9][0-9]{0,8}$/,
+            message: "请输入1-9位正整数,不包含0",
             trigger: "blur",
           },
         ],
         ranking: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
-            pattern: /^[1-9]\d*$/,
-            message: "请输入正整数,不包含0",
+            pattern: /^[1-9][0-9]{0,8}$/,
+            message: "请输入1-9位正整数,不包含0",
             trigger: "blur",
           },
         ],
         rate: [
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
@@ -1177,6 +1224,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.publicityForm.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加中标候选人公示基本信息";
     },
@@ -1228,6 +1277,8 @@ export default {
             } else {
               this.publicityForm.proNo = this.proNo;
               this.candidateForm.proNo = this.proNo;
+              this.publicityForm.projectCode = this.projectCode;
+              this.publicityForm.projectCode = this.projectCode;
               addBidWinningVO({
                 projectBidWining: this.publicityForm,
                 projectBidWinner: this.candidateForm,
@@ -1358,6 +1409,24 @@ export default {
   .el-dialog {
     margin-top: 2vh !important;
   }
+  .fuwenben {
+    table {
+      border-top: 1px solid #ccc;
+      border-left: 1px solid #ccc;
+      border-collapse: collapse;
+      border-spacing: 0;
+    }
+    table td,
+    table th {
+      border-bottom: 1px solid #ccc;
+      border-right: 1px solid #ccc;
+      padding: 3px 5px;
+    }
+    table th {
+      border-bottom: 2px solid #ccc;
+      text-align: center;
+    }
+  }
 }
 </style>
 <style src="@wangeditor/editor/dist/css/style.css"></style>

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

@@ -31,6 +31,8 @@
       <el-tab-pane label="招标计划" name="bidBasePage" :lazy="true">
         <bidBasePage
           :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
+          :projectName="formData.projectName"
           :formData="formData"
           ref="bidBasePage"
         />
@@ -41,7 +43,11 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <PreQualificationPage :proNo="formData.proNo" />
+        <PreQualificationPage
+          :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
+          :projectName="formData.projectName"
+        />
       </el-tab-pane>
       <el-tab-pane
         label="招标公告"
@@ -51,6 +57,7 @@
       >
         <TenderAnnouncementPage
           :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
           :projectName="formData.projectName"
         />
       </el-tab-pane>
@@ -62,6 +69,7 @@
       >
         <biddingFile
           :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
           :projectName="formData.projectName"
         />
       </el-tab-pane>
@@ -72,7 +80,11 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <candidatePage :proNo="formData.proNo" />
+        <candidatePage
+          :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
+          :projectName="formData.projectName"
+        />
       </el-tab-pane>
       <el-tab-pane
         label="中标结果"
@@ -80,7 +92,11 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <winningResultPage :proNo="formData.proNo" />
+        <winningResultPage
+          :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
+          :projectName="formData.projectName"
+        />
       </el-tab-pane>
       <el-tab-pane
         label="项目合同"
@@ -88,7 +104,11 @@
         :disabled="!routeList[1].isEdit"
         :lazy="true"
       >
-        <projectContract :proNo="formData.proNo" />
+        <projectContract
+          :proNo="formData.proNo"
+          :projectCode="formData.projectCode"
+          :projectName="formData.projectName"
+        />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -110,6 +130,7 @@ import {
   exportBidInfo,
 } from "@/api/earlyStage/bidInfo";
 import { getProjectinfo } from "@/api/earlyStage/projectinfo";
+import { getProDesign } from "@/api/earlyStage/preDesign";
 
 export default {
   components: {
@@ -152,9 +173,10 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询专题项目前期背景信息列表 */
+    /** 查询初步设计信息列表 */
     getList() {
-      getProjectinfo(this.$route.query.baseDataId).then((response) => {
+      // getProjectinfo(this.$route.query.baseDataId).then((response) => {
+      getProDesign(this.$route.query.baseDataId).then((response) => {
         this.formData = response.data;
         // console.log(this.formData);
         // listBidInfo(this.queryParams).then((response) => {

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

@@ -323,7 +323,12 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="150px">
           <el-col :span="12">
             <el-form-item label="招标项目名称" prop="bidProjectName">
-              <el-select
+              <el-input
+                v-model="form.bidProjectName"
+                placeholder="请输入招标项目名称"
+                readonly
+              />
+              <!-- <el-select
                 v-model="form.bidProjectName"
                 placeholder="请输入招标项目名称"
                 filterable
@@ -338,7 +343,7 @@
                   :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="chooseProject(dict)"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -460,14 +465,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="质量要求" prop="qualityRequirement">
-              <el-input
-                v-model="form.qualityRequirement"
-                placeholder="请输入质量要求"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="合同签署时间" prop="contractSignTime">
               <el-date-picker
@@ -482,19 +479,31 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
+            <el-form-item label="质量要求" prop="qualityRequirement">
+              <el-input
+                v-model="form.qualityRequirement"
+                placeholder="请输入质量要求"
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
             <el-form-item label="合同主要内容" prop="contractContent">
               <el-input
                 v-model="form.contractContent"
                 placeholder="请输入合同主要内容"
+                type="textarea"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="其他内容" prop="otherContent">
               <el-input
                 v-model="form.otherContent"
                 placeholder="请输入其他内容"
+                type="textarea"
               />
             </el-form-item>
           </el-col>
@@ -717,7 +726,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "FulfillingNotice",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
   data() {
     return {
       // 遮罩层
@@ -784,65 +793,59 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        loftName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        nature: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
+        loftName: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        nature: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         filePulish: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         contractName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         biderName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         biderCode: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         biderWinName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         biderWinCode: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         contractSignParty: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         contractUnitFirst: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         contractUnit: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         qualityRequirement: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         contractContent: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         otherContent: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
         ],
         contractPeriod: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
-            pattern: /^[1-9]\d*$/,
-            message: "请输入正整数,不包含0",
+            pattern: /^[1-9][0-9]{0,8}$/,
+            message: "请输入1-9位正整数,不包含0",
             trigger: "blur",
           },
         ],
         contractAmount: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
@@ -997,6 +1000,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加项目合同及履行公示详情";
     },
@@ -1035,6 +1040,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
+            this.form.proCode = this.projectCode;
             addFulfillingNotice(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");

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

@@ -256,11 +256,12 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="130px">
           <el-col :span="24">
             <el-form-item label="招标项目名称" prop="bidProjectName">
-              <!-- <el-input
+              <el-input
                 v-model="form.bidProjectName"
                 placeholder="请输入招标项目名称"
-              /> -->
-              <el-select
+                readonly
+              />
+              <!-- <el-select
                 v-model="form.bidProjectName"
                 placeholder="招标项目名称"
                 filterable
@@ -275,7 +276,7 @@
                   :value="dict.projectName + '[' + dict.projectCode + ']'"
                   @click.native="chooseProject(dict)"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -532,7 +533,7 @@ import { getFileStream } from "@/api/system/upload";
 
 export default {
   name: "BidResult",
-  props: ["proNo"],
+  props: ["proNo", "projectCode", "projectName"],
   data() {
     return {
       // 遮罩层
@@ -601,51 +602,46 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        lotName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
+        lotName: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         tendererName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         biddingAgency: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         successfulBidder: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidProjectName: [
           { required: true, message: "请选择招标项目名称", trigger: "blur" },
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         bidWinningPrice: [
           // { required: true, message: "请输入中标价", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
         deliveryTime: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
-            pattern: /^[1-9]\d*$/,
-            message: "请输入正整数,不包含0",
+            pattern: /^[1-9][0-9]{0,8}$/,
+            message: "请输入1-9位正整数,不包含0",
             trigger: "blur",
           },
         ],
         rate: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
         projectLeader: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       // 项目建议书的项目，同一个项目，有不同的项目编码
@@ -796,6 +792,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.form.bidProjectName =
+        this.projectName + "[" + this.projectCode + "]";
       this.open = true;
       this.title = "添加中标结果";
     },
@@ -834,6 +832,7 @@ export default {
             });
           } else {
             this.form.proNo = this.proNo;
+            this.form.projectCode = this.projectCode;
             addBidResult(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");

jwtech-admin-page/src/views/project/plan/options/ImplementationPage.vue

@@ -92,7 +92,7 @@
         align="center"
         fixed
       />
-      <!-- 
+      <!--
       <el-table-column
         label="项目名称"
         align="center"
@@ -221,6 +221,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['earlyStage:planImpleInfo:view']"
             >查看</el-button
           >
           <el-button
@@ -624,26 +625,26 @@ export default {
       // 表单校验
       rules: {
         projectName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectLeader: [
           { required: true, message: "请输入项目负责人", trigger: "blur" },
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 50, message: "字符长度最大为50", trigger: "blur" },
         ],
         projectProgressArrange: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 190, message: "字符长度最大为190", trigger: "blur" },
         ],
         planningName: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 90, message: "字符长度最大为90", trigger: "blur" },
         ],
         planningFundProgressArrange: [
-        { max: 10, message: "数字范围为1-10位", trigger: "blur" },
+          { max: 190, message: "字符长度最大为190", trigger: "blur" },
         ],
         investmentProgressArrange: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 190, message: "字符长度最大为190", trigger: "blur" },
         ],
         completedPlanningUnit: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 90, message: "字符长度最大为90", trigger: "blur" },
         ],
       },
       viewTitle: "",

jwtech-admin-page/src/views/project/plan/options/planBasePage.vue

@@ -146,14 +146,12 @@ export default {
       rules: {
         planName: [
           { required: true, message: "请输入计划名称", trigger: "blur" },
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         department: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        content: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
+        content: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         relatedProjects: [
           {
             required: true,
@@ -166,11 +164,10 @@ export default {
         ],
         investment: [
           // { required: true, message: "请输入投资计划", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],

jwtech-admin-page/src/views/project/preDesign/index.vue

@@ -601,17 +601,17 @@ export default {
         ],
         projectUnitName: [
           { required: true, message: "请输入项目单位名称", trigger: "blur" },
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         constructionLocation: [
           { required: true, message: "请输入项目单位名称", trigger: "blur" },
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         briefIntroduction: [
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
         projectLandSituation: [
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 65500, message: "字符长度最大为65500", trigger: "blur" },
         ],
       },
       // 初步设计概算报告
@@ -787,8 +787,8 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.cv.name = "projectName";
-      this.queryParams.cv.type = "like";
+      // this.queryParams.cv.name = "projectName";
+      // this.queryParams.cv.type = "like";
       this.queryParams.pageNum = 1;
       this.getList();
     },

jwtech-admin-page/src/views/project/proposal/index.vue

@@ -16,7 +16,7 @@
         <el-form :model="queryParams" :inline="true" label-width="68px">
           <el-form-item label="项目名称" prop="projectName">
             <el-input
-              v-model="queryParams.cv.value"
+              v-model="queryParams.data.projectName"
               placeholder="请输入项目名称"
               clearable
               size="small"
@@ -706,33 +706,30 @@ export default {
         ],
         projectName: [
           { required: true, message: "请输入项目名称", trigger: "blur" },
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectInvestmentEstimate: [
           { required: true, message: "请输入投资概算", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
         projectCode: [
           { required: true, message: "请输入项目编码", trigger: "blur" },
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         approvalOpinion: [
           { required: true, message: "请输入批复意见", trigger: "blur" },
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectType: [
           { required: true, message: "请选择规划类型", trigger: "blur" },
         ],
         adcd: [{ required: true, message: "请选择行政区划", trigger: "blur" }],
-        content: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
+        content: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
       },
       // 面包屑，路由信息
       routeList: [
@@ -750,6 +747,7 @@ export default {
         data: {
           projectName: null,
           projectType: null,
+          getList: 1,
         },
         // 排序方式
         params: {
@@ -874,8 +872,8 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.cv.name = "projectName";
-      this.queryParams.cv.type = "like";
+      // this.queryParams.cv.name = "projectName";
+      // this.queryParams.cv.type = "like";
       this.queryParams.pageNum = 1;
       this.getList();
     },

jwtech-admin-page/src/views/project/report/index.vue

@@ -721,27 +721,24 @@ export default {
       // 表单校验
       rules: {
         compilingUnit: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectName: [
           { required: true, message: "请输入项目名称", trigger: "blur" },
         ],
         projectInvestmentEstimate: [
           { required: true, message: "请输入投资概算", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
         approvalOpinion: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
-        ],
-        content: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
+        content: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
       },
       projectType: "",
       proNo: "",
@@ -926,8 +923,8 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.cv.name = "projectName";
-      this.queryParams.cv.type = "like";
+      // this.queryParams.cv.name = "projectName";
+      // this.queryParams.cv.type = "like";
       this.queryParams.pageNum = 1;
       this.getList();
     },

jwtech-admin-page/src/views/project/special/index.vue

@@ -215,6 +215,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['system:projectinfo:view']"
             >查看</el-button
           >
           <el-button

jwtech-admin-page/src/views/project/special/options/ContractPage.vue

@@ -166,6 +166,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['earlyStage:contract:view']"
             >查看</el-button
           >
           <el-button
@@ -401,15 +402,14 @@ export default {
       rules: {
         contractName: [
           { required: true, message: "请输入合同名称", trigger: "blur" },
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         contractAmount: [
           { required: true, message: "请输入合同金额", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],

jwtech-admin-page/src/views/project/special/options/ImplementationPage.vue

@@ -240,6 +240,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['earlyStage:planImpleInfo:view']"
             >查看</el-button
           >
           <el-button

jwtech-admin-page/src/views/project/special/options/basePage.vue

@@ -231,7 +231,7 @@ export default {
       rules: {
         projectName: [
           { required: true, message: "请输入规划名称", trigger: "blur" },
-          {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         projectType: [
           { required: true, message: "请选择规划类型", trigger: "blur" },
@@ -240,27 +240,26 @@ export default {
           { required: true, message: "请选择规划所属区域", trigger: "blur" },
         ],
         compilingUnit: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         amount: [
           { required: true, message: "请输入规划金额", trigger: "blur" },
-          { max: 10, message: "数字范围为1-10位", trigger: "blur" },
           // { type: "number", message: "请输入数字", trigger: "blur" },
           {
             pattern:
-              /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-            message: "请输入数字,可保留两位小数",
+              /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
+            message: "请输入数字,整数7位,可保留两位小数",
             trigger: "blur",
           },
         ],
         compilingUnitNature: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         compilingUnitAddress: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
         compilingUnitLegalPerson: [
-        {max:250,message:"字符长度最大为250",trigger:"blur"}
+          { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
       },
       // 请求头

jwtech-admin-page/src/views/project/special/options/documentPage.vue

@@ -175,6 +175,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['earlyStage:document:view']"
             >查看</el-button
           >
           <el-button

jwtech-admin-page/src/views/project/special/options/resultsPage.vue

@@ -181,6 +181,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['earlyStage:result:view']"
             >查看</el-button
           >
           <el-button
@@ -189,7 +190,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:user:remove']"
+            v-hasPermi="['earlyStage:gain:edit']"
             >编辑
           </el-button>
           <el-button
@@ -197,7 +198,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:user:resetPwd']"
+            v-hasPermi="['earlyStage:gain:remove']"
             >删除
           </el-button>
         </template>

jwtech-admin-page/src/views/project/special/options/taskPage.vue

@@ -247,6 +247,7 @@
             type="text"
             icon="el-icon-view"
             @click="viewInfo(scope.row)"
+            v-hasPermi="['earlyStage:approval:view']"
             >查看</el-button
           >
           <el-button

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

@@ -29,6 +29,7 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper<SpecialProje
                                                  @Param("userType") String userType,
                                                  @Param("id") String id,
                                                  @Param("projectName") String projectName,
+                                                 @Param("projectCode") String projectCode,
                                                  @Param("adcd") String adcd,
                                                  @Param("orderBy") String orderBy,
                                                  @Param("pageNum") int pageNum,

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

@@ -49,10 +49,10 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
 
 
         if (ObjectUtil.isNull(params)) {
-            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
                     sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
         }else {
-            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
+            list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
                     sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
         }
 

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

@@ -1,8 +1,10 @@
 package com.kms.earlyStage.service;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.ConditionView;
 import com.jianwei.common.core.domain.SearchParam;
@@ -56,7 +58,11 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
         List<SpecialProjectProposal> list = null;
 
         if (ObjectUtil.isNull(data.getGetList())) {
-            return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
+            LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName())
+                    .like(data.getProjectCode() != null, SpecialProjectProposal::getProjectCode, data.getProjectCode())
+                    .likeRight(data.getAdcd() != null, SpecialProjectProposal::getAdcd, sysXzqhService.getSubString(sp.getData().getAdcd()));
+
+            return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
         }
 
 

jwtech-system/src/main/java/com/kms/enterprise/domain/dto/CreditDto.java

@@ -17,4 +17,6 @@ public class CreditDto implements Serializable {
 
     private String adcd;
 
+    private String legalRepresentative;
+
 }

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@@ -86,11 +86,17 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
                 dto.setAdcd("44");
                 List<CreditDto> page = bsSgcYxjdQualificationsMapper.listThree(dto.getPageNum(), dto.getPageSize(), dto.getQualificationCategory(),
                         dto.getEnterpriseName(), dto.getAdcd());
-                return AjaxResult.success(page);
+                Page<CreditDto> creditDtoPage = new Page<>();
+                creditDtoPage.setRecords(page);
+                creditDtoPage.setTotal(page.size());
+                return AjaxResult.success(creditDtoPage);
             } else {
                 List<CreditDto> page = bsSgcYxjdQualificationsMapper.listTwo(dto.getPageNum(), dto.getPageSize(), dto.getQualificationCategory(),
                         dto.getEnterpriseName(), dto.getAdcd());
-                return AjaxResult.success(page);
+                Page<CreditDto> creditDtoPage = new Page<>();
+                creditDtoPage.setRecords(page);
+                creditDtoPage.setTotal(page.size());
+                return AjaxResult.success(creditDtoPage);
             }
 
         }

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

@@ -19,7 +19,7 @@
         <result property="bidProjectName" column="project_name"/>
         <result property="proCode" column="pro_code"/>
         <result property="contractName" column="contract_name"/>
-        <result property="biderWinName" column="bid_win_name"/>
+        <result property="biderWinName" column="bider_win_name"/>
         <result property="contractAmount" column="contract_amount"/>
         <result property="contractPeriod" column="contract_period"/>
         <result property="contractSignTime" column="contract_sign_time"/>

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

@@ -14,7 +14,7 @@
                pf.PROJECT_INVESTMENT_ESTIMATE,
                pf.APPROVAL_OPINION,
                pf.create_time
-        from bs_slgc_qqjd_spe_pro_fea pf left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=pf.pro_no and pp.project_code=pf.project_code
+        from  bs_slgc_qqjd_spe_pro_fea pf left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=pf.pro_no and pp.project_code=pf.project_code
     </sql>
 
     <resultMap id="SpecialProjectFeasibility" type="SpecialProjectFeasibility">
@@ -59,7 +59,10 @@
                     AND user_id=#{userId})
                 </if>
                 <if test="projectName!=null and projectName!=''">
-                    and project_name like concat('%',#{projectName},'%')
+                    and pp.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="projectCode!=null and projectCode!=''">
+                    and pp.project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
@@ -68,7 +71,10 @@
         <if test="userType==00">
             <where>
                 <if test="projectName!=null and projectName!=''">
-                    and project_name like concat('%',#{projectName},'%')
+                    and pp.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="projectCode!=null and projectCode!=''">
+                    and pp.project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>

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

@@ -14,7 +14,8 @@
                da.PROJECT_UNIT_NAME,
                da.BRIEF_INTRODUCTION,
                da.PROJECT_LAND_SITUATION,
-               da.project_code
+               da.project_code,
+               da.create_time
         from bs_sgc_qqjd_spe_pro_des_app da left join bs_slgc_qqjd_spe_pro_proposal pp on pp.pro_no=da.pro_no and pp.project_code=da.project_code
     </sql>
 
@@ -29,6 +30,7 @@
         <result property="briefIntroduction" column="BRIEF_INTRODUCTION"/>
         <result property="projectLandSituation" column="PROJECT_LAND_SITUATION"/>
         <result property="projectCode" column="project_code"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
 

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

@@ -81,7 +81,7 @@
                     and project_name like concat('%',#{projectName},'%')
                 </if>
                 <if test="projectCode!=null and projectCode!=''">
-                    and project_code=#{projectCode}
+                    and project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
@@ -93,7 +93,7 @@
                     and project_name like concat('%',#{projectName},'%')
                 </if>
                 <if test="projectCode!=null and projectCode!=''">
-                    and project_code=#{projectCode}
+                    and project_code like concat('%',#{projectCode},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdCertificateInfoMapper.xml

@@ -20,7 +20,7 @@
             <if test="adcd!=null and adcd!='' and adcd != '省外'">
                 ei.adcd =#{adcd}
             </if>
-            <if test="adcd!=null and adcd!='' and adcd = '省外'">
+            <if test="adcd!=null and adcd!='' and adcd == '省外'">
                 AND left(ei.adcd,2)&lt;> '44'
             </if>
             <if test="name!=null and name!=''">

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml

@@ -106,7 +106,7 @@
             <if test="adcd!=null and adcd!='' and adcd != '省外'">
                 adcd =#{adcd}
             </if>
-            <if test="adcd!=null and adcd!='' and adcd = '省外'">
+            <if test="adcd!=null and adcd!='' and adcd == '省外'">
                 AND left(adcd,2)&lt;> '44'
             </if>
             <if test="enterpriseName!=null and enterpriseName!=''">
@@ -115,7 +115,7 @@
             <if test="qualificationCategory!=null and qualificationCategory!=''">
                 and dc.qualification_category=#{qualificationCategory}
             </if>
-            and type="1" and status ="5"
+            and dc.type="1" and dc.status ="5"
         </where>
         order by dc.create_time desc limit #{pageNum},#{pageSize};
     </select>

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEngineerPerformanceRecordMapper.xml

@@ -25,7 +25,7 @@
             <if test="adcd!=null and adcd!='' and adcd!='省外'">
                 and adcd =#{adcd}
             </if>
-            <if test="adcd!=null and adcd!='' and adcd = '省外'">
+            <if test="adcd!=null and adcd!='' and adcd == '省外'">
                 AND left(adcd,2)&lt;> '44'
             </if>
             <if test="contractPrice!=null and contractPrice!=''">

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdMarketBehaviorMapper.xml

@@ -19,7 +19,7 @@
             <if test="adcd!=null and adcd!='' and adcd!='省外'">
                 and adcd =#{adcd}
             </if>
-            <if test="adcd!=null and adcd!='' and adcd = '省外'">
+            <if test="adcd!=null and adcd!='' and adcd == '省外'">
                 AND left(adcd,2)&lt;> '44'
             </if>
             <if test="name!=null and name!=''">

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdPersonnelInfoMapper.xml

@@ -15,18 +15,23 @@
         from bs_sgc_yxjd_personnel_info pi
                  left join bs_sgc_yxjd_enterprise_info ei on pi.enterprise_id = ei.id
         <where>
+
             <if test="adcd!=null and adcd!='' and adcd != '省外'">
                 adcd =#{adcd}
             </if>
-            <if test="adcd!=null and adcd!='' and adcd = '省外'">
+
+            <if test="adcd!=null and adcd!='' and adcd == '省外'">
                 AND  left(adcd,2)&lt;> '44'
             </if>
+
             <if test="enterpriseName!=null and enterpriseName!=''">
                 and enterprise_name like concat('%',#{enterpriseName},'%')
             </if>
+
             <if test="name!=null and name!=''">
                 and `name` like concat('%',#{name},'%')
             </if>
+
         </where>
         order by pi.create_time desc limit #{pageNum},#{pageSize};
     </select>

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdQualificationsMapper.xml

@@ -9,6 +9,7 @@
         <result property="enterpriseName"     column="enterprise_name"     />
         <result property="qualificationCategory"   column="qualification_category"   />
         <result property="dynamicCreditScore"    column="dynamic_credit_score"    />
+        <result property="legalRepresentative" column="legal_representative"/>
     </resultMap>
 
     <resultMap id="BsSgcYxjdQualificationsDto" type="BsSgcYxjdQualificationsDto">
@@ -24,7 +25,8 @@
             enterprise_id,
             enterprise_name,
             qualification_category,
-            dynamic_credit_score
+            dynamic_credit_score,
+            legal_representative
         FROM
             bs_sgc_yxjd_qualifications q
                 LEFT JOIN bs_sgc_yxjd_enterprise_info i ON q.enterprise_id = i.id
@@ -40,7 +42,7 @@
         SET @num := 0, @type := '';
 
         SELECT enterprise_id,enterprise_name,ADCD,dynamic_credit_score,
-               qualification_category
+               qualification_category,legal_representative
         FROM bs_sgc_yxjd_enterprise_info fo LEFT JOIN (SELECT qualification_category, dynamic_credit_score,enterprise_id
         FROM (
         SELECT qualification_category, dynamic_credit_score,enterprise_id,
@@ -57,7 +59,7 @@
         enterprise_name,
         ADCD,
         dynamic_credit_score,
-        qualification_category
+        qualification_category,legal_representative
         FROM
         bs_sgc_yxjd_qualifications q
         LEFT JOIN bs_sgc_yxjd_enterprise_info i ON q.enterprise_id = i.id
@@ -69,8 +71,11 @@
             <if test="adcd!=null and adcd !=''">
                 AND adcd =#{adcd}
             </if>
+            <if test="qualificationCategory!=null and qualificationCategory!=''">
+                AND q.qualification_category = #{qualificationCategory}
+            </if>
         </where>
-        AND q.qualification_category = #{qualificationCategory}
+
         ORDER BY
         CAST( dynamic_credit_score AS UNSIGNED ) DESC LIMIT #{pageNum},#{pageSize};
     </select>
@@ -81,7 +86,7 @@
         enterprise_name,
         ADCD,
         dynamic_credit_score,
-        qualification_category
+        qualification_category,legal_representative
         FROM
         bs_sgc_yxjd_qualifications q
         LEFT JOIN bs_sgc_yxjd_enterprise_info i ON q.enterprise_id = i.id
@@ -93,8 +98,10 @@
             <if test="adcd!=null and adcd !=''">
                 AND left(i.adcd,2)&lt;> #{adcd}
             </if>
+            <if test="qualificationCategory!=null and qualificationCategory!=''">
+                AND q.qualification_category = #{qualificationCategory}
+            </if>
         </where>
-        AND q.qualification_category = #{qualificationCategory}
         ORDER BY
         CAST( dynamic_credit_score AS UNSIGNED ) DESC LIMIT #{pageNum},#{pageSize};
     </select>
@@ -114,7 +121,7 @@
             <if test="adcd!=null and adcd!='' and adcd!='省外'">
                 and adcd =#{adcd}
             </if>
-            <if test="adcd!=null and adcd!='' and adcd = '省外'">
+            <if test="adcd!=null and adcd!='' and adcd == '省外'">
                 AND left(adcd,2)&lt;> '44'
             </if>
             <if test="level !=null and level!=''">