需归模块完善

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

@@ -189,7 +189,6 @@
                 v-model="form.qualificationCategory"
                 placeholder="请选择资质类别"
                 style="width: 100%"
-                disabled
               >
                 <el-option
                   v-for="dict in parentOption"
@@ -218,7 +217,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="扣分有效期(月)" prop="bonusPoints">
+            <el-form-item label="扣分有效期(月)" prop="validity">
               <el-input v-model="form.validity" placeholder="请输入扣分有效期" />
             </el-form-item>
           </el-col>
@@ -496,11 +495,32 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        administrativeUnit: [
+          { required: true, message: "请填写行政单位", trigger: "blur" },
+        ],
+        pointsDeductionBasis: [
+          { required: true, message: "请填写扣分依据", trigger: "blur" },
+        ],
+        qualificationCategory: [
+          { required: true, message: "请选择资质类型", trigger: "blur" },
+        ],
+        behavior: [
+          { required: true, message: "请填写不良行为", trigger: "blur" },
+        ],
+        commendationLevel: [
+          { required: true, message: "请填写等级", trigger: "blur" },
+        ],
+        validity: [
+          { required: true, message: "请填写扣分有效期", trigger: "blur" },
+        ],
+        timeScope: [
+          { required: true, message: "请填写扣分有效期", trigger: "blur" },
+        ],
         projectName: [
           { required: true, message: "请选择项目名称", trigger: "blur" },
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        behavior: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        // behavior: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         bonusPoints: [
           { required: true, message: "请输入扣分值", trigger: "blur" },
           {

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

@@ -251,7 +251,7 @@
       :close-on-click-modal="false"
     >
       <el-row :gutter="15">
-        <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="140px">
           <el-col :span="12">
             <el-form-item label="水行政主管部门" prop="administrativeUnit">
               <el-input v-model="form.administrativeUnit" placeholder="请输入水行政主管部门" />
@@ -347,7 +347,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效期(年)" prop="bonusPoints">
+            <el-form-item label="有效期(年)" prop="validity">
               <el-input v-model="form.validity" placeholder="请输入有效期" />
             </el-form-item>
           </el-col>
@@ -364,54 +364,71 @@
 <!--              >-->
 <!--              </el-date-picker>-->
 <!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--                        <el-form-item label="企业填报日期" prop="enterpriseReportDate">-->
+<!--                          <el-date-picker-->
+<!--                            clearable-->
+<!--                            size="small"-->
+<!--                            style="width: 100%"-->
+<!--                            v-model="form.enterpriseReportDate"-->
+<!--                            type="date"-->
+<!--                            value-format="yyyy-MM-dd"-->
+<!--                            placeholder="选择企业填报日期"-->
+<!--                          >-->
+<!--                          </el-date-picker>-->
+<!--                        </el-form-item>-->
+<!--                      </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="加分开始时间" prop="bonusPointBegin">-->
+<!--                <el-date-picker-->
+<!--                  clearable-->
+<!--                  size="small"-->
+<!--                  style="width: 100%"-->
+<!--                  v-model="form.bonusPointBegin"-->
+<!--                  type="date"-->
+<!--                  value-format="yyyy-MM-dd"-->
+<!--                  placeholder="选择加分开始时间"-->
+<!--                >-->
+<!--                </el-date-picker>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="加分有效期至" prop="validityPeriod">-->
+<!--              <el-date-picker-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                style="width: 100%"-->
+<!--                v-model="form.validityPeriod"-->
+<!--                type="date"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                placeholder="选择有效期至"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="12">
-                        <el-form-item label="企业填报日期" prop="enterpriseReportDate">
+            <el-form-item label="是否是水利工程" prop="isWaterCon">
-                          <el-date-picker
+              <el-select
-                            clearable
+                v-model="form.isWaterCon"
-                            size="small"
+                placeholder="请选择是否是"
-                            style="width: 100%"
-                            v-model="form.enterpriseReportDate"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择企业填报日期"
-                          >
-                          </el-date-picker>
-                        </el-form-item>
-                      </el-col>
-            <el-col :span="12">
-              <el-form-item label="加分开始时间" prop="bonusPointBegin">
-                <el-date-picker
-                  clearable
-                  size="small"
-                  style="width: 100%"
-                  v-model="form.bonusPointBegin"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择加分开始时间"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          <el-col :span="12">
-            <el-form-item label="加分有效期至" prop="validityPeriod">
-              <el-date-picker
-                clearable
-                size="small"
                 style="width: 100%"
-                v-model="form.validityPeriod"
+
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择有效期至"
               >
-              </el-date-picker>
+                <el-option
+                  v-for="dict in isOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否是水利工程" prop="qualificationCategory">
+            <el-form-item label="是否在一年内申报" prop="fillOnYear">
               <el-select
-                v-model="form.isWaterCon"
+                v-model="form.fillOnYear"
-                placeholder="请选择是否是"
+                placeholder="请选择是否"
                 style="width: 100%"
 
               >
@@ -425,9 +442,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否在一年内申报" prop="fillOnYear">
+            <el-form-item label="是否省属项目" prop="provinceBelong">
               <el-select
-                v-model="form.isWaterCon"
+                v-model="form.provinceBelong"
                 placeholder="请选择是否"
                 style="width: 100%"
 
@@ -539,7 +556,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 企业填报日期 </template>
-            {{ this.creditMsg.enterpriseReportDate }}
+            {{ this.creditMsg.createTime }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 加分开始时间 </template>
@@ -794,15 +811,39 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        administrativeUnit: [
+          { required: true, message: "请填写水行政主管部门", trigger: "blur" },
+        ],
+        isWaterCon: [
+          { required: true, message: "请选择是否", trigger: "blur" },
+        ],
+        provinceBelong:[
+          { required: true, message: "请选择是否", trigger: "blur" },
+        ],
+        fillOnYear: [
+          { required: true, message: "请选择是否", trigger: "blur" },
+        ],
         projectName: [
           { required: true, message: "请选择项目名称", trigger: "blur" },
         ],
-        behavior: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
+        qualificationCategory: [
+          { required: true, message: "请选择资质类型", trigger: "blur" },
+        ],
+        declarationManagementZones: [
+          { required: true, message: "请选择申报区划", trigger: "blur" },
+        ],
+        behavior: [
+          { required: true, message: "请填写良好行为", trigger: "blur" },
+        ],
         commendationLevel: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { required: true, message: "请填写表彰等级", trigger: "blur" },
+        ],
+        validity: [
+          { required: true, message: "请填写有效期", trigger: "blur" },
         ],
+
         authority: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          { required: true, message: "请填写颁奖机构", trigger: "blur" },
         ],
         awardAnnouncementWebsite: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
@@ -1156,6 +1197,11 @@ export default {
     // 通过审核
     passExamine() {
       this.creditMsg.status = "3";
+      this.creditMsg.bonusPointBegin=Date.now()
+      // const currentDate = new Date(Date.now());
+      // currentDate.setFullYear(currentDate.getFullYear() + this.creditMsg.validity);
+      // const date=currentDate.getTime()
+      // this.creditMsg.validityPeriod=date
       updateCredit(this.creditMsg).then((response) => {
         if (response.code === 200) {
           this.msgSuccess("审核通过成功");

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

@@ -10,7 +10,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="状态" prop="isUse">
+        <el-select
+          v-model="queryParams.data.type"
+          placeholder="选择状态"
+          clearable
+          size="small"
+          style="width: 100%"
+          @change="handleQuery"
+        >
+          <el-option label="待审核" :value="3">待审核</el-option>
+          <!-- 第二个选项，值为 4，显示文本为 '已审核' -->
+          <el-option label="已审核" :value="4">已审核</el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -642,6 +655,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      isMajorProjectOptions:[],
+
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -697,7 +712,7 @@ export default {
           awardAnnouncementWebsite: null,
           attachment: null,
           status: null,
-          type: null,
+          type: 4,
           badBehavior: null,
           createUid: null,
           updateUid: null,
@@ -752,6 +767,7 @@ export default {
     };
   },
   created() {
+
     listInfo(this.proQueryParams).then((response) => {
       this.projectNameOptions = response.records;
     });

jwtech-pc-page/src/views/summarizedInformation/index.vue

@@ -72,7 +72,9 @@ export default {
           type: "like",
           value: ""
         },
-        data: {},
+        data: {
+          textType:0
+        },
         pageNum: 1,
         pageSize: 10
       },
@@ -220,7 +222,7 @@ export default {
       /deep/.el-form {
         display: flex;
         align-items: center;
-        
+
         .el-form-item {
           margin-right: 20px;
           &.btn-row {

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

@@ -81,7 +81,7 @@ public class BsSgcYxjdDynamicCredit extends BaseEntity
     /** 有效期（年） */
     @Excel(name = "有效期", readConverterExp = "年=")
     @ApiModelProperty("有效期")
-    @JsonFormat(pattern = "yyyy",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date validityPeriod;
 
     /** 获奖公示网址 */
@@ -137,6 +137,9 @@ public class BsSgcYxjdDynamicCredit extends BaseEntity
     @ApiModelProperty("是否在这一年填报")
     private String fillOnYear;
 
+    @ApiModelProperty("是否属于省属项目")
+    private String provinceBelong;
+
     @ApiModelProperty("企业填报时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private String enterpriseReportDate;