diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue index 1b825c0c..e937e959 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue @@ -189,7 +189,6 @@ v-model="form.qualificationCategory" placeholder="请选择资质类别" style="width: 100%" - disabled > - + @@ -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" }, { diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue index adde058a..a8357d74 100644 --- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue +++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue @@ -251,7 +251,7 @@ :close-on-click-modal="false" > - + @@ -347,7 +347,7 @@ - + @@ -364,54 +364,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + - + + - + @@ -425,9 +442,9 @@ - + - {{ this.creditMsg.enterpriseReportDate }} + {{ this.creditMsg.createTime }} @@ -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("审核通过成功"); diff --git a/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue b/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue index ce041288..637fa6a0 100644 --- a/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue +++ b/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue @@ -10,7 +10,20 @@ @keyup.enter.native="handleQuery" /> - + + + 待审核 + + 已审核 + + 搜索 重置 @@ -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; }); diff --git a/jwtech-pc-page/src/views/summarizedInformation/index.vue b/jwtech-pc-page/src/views/summarizedInformation/index.vue index 588e9dc3..42494236 100644 --- a/jwtech-pc-page/src/views/summarizedInformation/index.vue +++ b/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 { diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java index 0814b48b..d39d85f4 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java +++ b/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;