Merge remote-tracking branch 'origin/master'

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

@@ -22,7 +22,12 @@
         align="left"
         prop="remark"
         min-width="120"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.remark">是</span>
+          <span v-else>否</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="申报管理区划"
         align="left"
@@ -85,13 +90,23 @@
         align="left"
         prop="validityPeriod"
         min-width="120"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == '3'">
+            {{addYearsToDate(scope.row.bonusPointBegin,scope.row.validity)}}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="状态"
         align="left"
         prop="status"
         min-width="120"
-      />
+      >
+        <template slot-scope="scope">
+          {{statusFormat(scope.row)}}
+        </template>
+      </el-table-column>
       <el-table-column
         label="水行政主管部门"
         align="left"
@@ -264,7 +279,7 @@
       @close="handleClose"
     >
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+      <el-form ref="form1" :model="form" :rules="rules" label-width="140px">
         <el-row :gutter="15">
           <el-col :span="12">
             <el-form-item label="是否是水利项目" prop="isWaterCon">
@@ -963,9 +978,11 @@ import {getFileStream} from "@/api/system/upload";
 import {getAreasData} from "@/api/areas/index";
 import {regionData, codeToText, TextToCode} from "element-china-area-data";
 import {listInfo} from "@/api/build/projectInfo";
+import Template from "@/views/message/options/template/index.vue";
 
 export default {
   name: "newGoodCredit",
+  components: {Template},
   props: ["enterpriseId"],
   data() {
     return {
@@ -1049,7 +1066,36 @@ export default {
       },
       isOptions: [],
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        validity: null,
+        publishUnit: null,
+        isWaterCon: null,
+        fillOnYear: null,
+        enterpriseId: null,
+        projectName: null,
+        qualificationCategory: null,
+        declarationManagementZones: null,
+        behavior: null,
+        goodBehavior: null,
+        commendationLevel: null,
+        authority: null,
+        bonusPoints: null,
+        validityPeriod: null,
+        awardAnnouncementWebsite: null,
+        evaluationDate: null,
+        trustworthyPerformance: null,
+        attachment: null,
+        status: null,
+        type: null,
+        badBehavior: null,
+        createUid: null,
+        updateUid: null,
+        createTime: null,
+        updateTime: null,
+        owerDept: null,
+        remark: null,
+      },
       disabled: false,
       fillOnYearDisabled: false,
       remakeDisable: false,
@@ -1378,6 +1424,14 @@ export default {
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
     },
+    addYearsToDate(dateString, yearsString) {
+      const [year, month, day] = dateString.split('-');
+      const newYear = Number(year) + Number(yearsString);
+
+      const newDateString = `${newYear}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+      return newDateString;
+    },
+
     // 取消按钮
     cancel() {
       this.open = false;
@@ -1605,7 +1659,8 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      console.log("111",this.form)
+      this.$refs["form1"].validate((valid) => {
         if (valid) {
           this.form.enterpriseId = this.enterpriseId;
           this.form.attachment = JSON.stringify(this.fileList);
@@ -1622,6 +1677,7 @@ export default {
           } else {
             this.form.type = "1";
             this.form.status = "0";
+            console.log("222",this.form)
             addCredit(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");