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 b6dc0090..c595eea7 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
@@ -18,9 +18,16 @@
         fixed
       />
       <el-table-column
-        label="水行政主管部门"
+        label="是否省项目"
         align="left"
-        prop="administrativeUnit"
+        prop="remark"
+        min-width="120"
+      />
+      <el-table-column
+        label="申报管理区划"
+        align="left"
+        prop="declarationManagementZones"
+        :formatter="formatDeclarationManagementZones"
         min-width="120"
       />
       <el-table-column
@@ -30,77 +37,67 @@
         min-width="120"
       />
       <el-table-column
-        label="资质类别"
+        label="资质类型"
         align="left"
         prop="qualificationCategory"
         :formatter="qualificationCategoryFormat"
         min-width="120"
       />
       <el-table-column
-        label="状态"
+        label="良好行为"
         align="left"
-        prop="status"
+        prop="behavior"
         min-width="120"
-        :formatter="statusFormat"
       />
       <el-table-column
-        label="申报管理区划"
+        label="认定/颁奖单位"
         align="left"
-        prop="declarationManagementZones"
-        :formatter="formatDeclarationManagementZones"
+        prop="authority"
         min-width="120"
       />
       <el-table-column
-        label="良好行为"
+        label="加分值"
         align="left"
-        prop="behavior"
-        :formatter="behaviorFormat"
+        prop="bonusPoints"
         min-width="120"
       />
       <el-table-column
-        label="表彰等级"
+        label="有效期（年）"
         align="left"
-        prop="commendationLevel"
-        :formatter="commendationLevelFormat"
+        prop="validity"
         min-width="120"
       />
       <el-table-column
-        label="颁发机构"
+        label="企业填报日期"
         align="left"
-        prop="authority"
+        prop="enterpriseReportDate"
         min-width="120"
-        :formatter="authorityFormat"
       />
       <el-table-column
-        label="加分值"
+        label="加分开始时间"
         align="left"
-        prop="bonusPoints"
+        prop="bonusPointBegin"
         min-width="120"
       />
+
       <el-table-column
-        label="有效期至"
+        label="加分有效期至"
         align="left"
         prop="validityPeriod"
         min-width="120"
       />
-      <!--      <el-table-column-->
-      <!--        label="获奖公示网址"-->
-      <!--        align="left"-->
-      <!--        prop="awardAnnouncementWebsite"-->
-      <!--        min-width="120"-->
-      <!--      />-->
-      <!--      <el-table-column-->
-      <!--        label="评价日期"-->
-      <!--        align="left"-->
-      <!--        prop="evaluationDate"-->
-      <!--        min-width="120"-->
-      <!--      />-->
-      <!--      <el-table-column-->
-      <!--        label="重合同守信用情况"-->
-      <!--        align="left"-->
-      <!--        prop="trustworthyPerformance"-->
-      <!--        min-width="140"-->
-      <!--      />-->
+      <el-table-column
+        label="状态"
+        align="left"
+        prop="status"
+        min-width="120"
+      />
+      <el-table-column
+        label="水行政主管部门"
+        align="left"
+        prop="#"
+        min-width="120"
+      />
       <el-table-column
         label="附件"
         align="left"
@@ -152,7 +149,8 @@
             icon="el-icon-edit-outline"
             @click="handleExamine(scope.row)"
             v-hasPermi="['enterpriseMange:credit:examine']"
-            >审核</el-button
+          >审核
+          </el-button
           >
           <!-- ===================状态按钮===================== -->
           <el-button
@@ -162,7 +160,8 @@
             icon="el-icon-position"
             @click="handleReport(scope.row)"
             v-hasPermi="['enterprise:credit:report']"
-            >上报</el-button
+          >上报
+          </el-button
           >
           <el-button
             v-if="scope.row.status == '2'"
@@ -171,7 +170,8 @@
             icon="el-icon-position"
             @click="handleReport(scope.row)"
             v-hasPermi="['enterprise:credit:report']"
-            >重新上报</el-button
+          >重新上报
+          </el-button
           >
           <el-button
             v-if="scope.row.status == '1'"
@@ -179,7 +179,8 @@
             type="text"
             icon="el-icon-time"
             v-hasPermi="['enterprise:credit:report']"
-            >待审核</el-button
+          >待审核
+          </el-button
           >
           <el-button
             v-if="scope.row.status == '2'"
@@ -187,7 +188,8 @@
             type="text"
             icon="el-icon-time"
             v-hasPermi="['enterprise:credit:report']"
-            >已驳回</el-button
+          >已驳回
+          </el-button
           >
           <el-button
             v-if="scope.row.status == '3'"
@@ -196,7 +198,8 @@
             icon="el-icon-time"
             v-hasPermi="['enterprise:credit:report']"
             @click="handleReport(scope.row)"
-            >已审核</el-button
+          >已审核
+          </el-button
           >
           <el-button
             v-if="scope.row.status == '4'"
@@ -204,7 +207,8 @@
             type="text"
             icon="el-icon-time"
             v-hasPermi="['enterprise:credit:report']"
-            >已公示</el-button
+          >已公示
+          </el-button
           >
           <el-button
             v-if="scope.row.status == '5'"
@@ -212,7 +216,8 @@
             type="text"
             icon="el-icon-time"
             v-hasPermi="['enterprise:credit:report']"
-            >已发布</el-button
+          >已发布
+          </el-button
           >
 
           <!-- ===============修改按钮=========== -->
@@ -222,7 +227,8 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['enterprise:credit:edit']"
-            >修改</el-button
+          >修改
+          </el-button
           >
           <!-- ===============删除按钮=========== -->
           <el-button
@@ -231,7 +237,8 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['enterprise:credit:remove']"
-            >删除</el-button
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
@@ -254,53 +261,38 @@
       :close-on-click-modal="false"
     >
 
-        <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-          <el-row :gutter="15">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-row :gutter="15">
           <el-col :span="12">
-            <el-form-item label="水行政主管部门" prop="administrativeUnit">
-              <el-input
-                v-model="form.administrativeUnit"
-                placeholder="请输入水行政主管部门"
-              />
+            <el-form-item label="是否是水利项目" prop="isWaterCon">
+              <el-select v-model="form.isWaterCon" placeholder="请选者是否" clearable style="width: 100%" @change="isWaterConChange" :disabled="fillOnYearDisabled">
+                <el-option label="是" value="1"/>
+                <el-option label="否" value="2"/>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="项目名称" prop="projectName">
-              <el-select
-                ref="selectPro"
-                v-model="form.projectName"
-                placeholder="请输入项目名称"
-                filterable
-                clearable
-                size="small"
-                style="width: 100%"
-                remote
-                :remote-method="remoteMethod"
-                @change="handleProNameChange"
-                :loading="selectLoading"
-                @visible-change="visibleChange"
-              >
-                <el-option
-                  v-for="dict in projectNameOptions"
-                  :key="dict.projectName + dict.id"
-                  :label="dict.projectName + '[' + dict.proCode + ']'"
-                  :value="dict.projectName + '[' + dict.proCode + ']'"
-                  @click.native="getId(dict)"
-                />
+            <el-form-item label="是否在一年内获奖" prop="fillOnYear">
+              <el-select v-model="form.fillOnYear" placeholder="请选者是否" clearable style="width: 100%;" :disabled="disabled" @change="fillOnYearChange">
+                <el-option label="是" value="1"/>
+                <el-option label="否" value="2"/>
               </el-select>
             </el-form-item>
           </el-col>
-          </el-row>
-            <el-row :gutter="15">
+        </el-row>
+        <el-row :gutter="15">
           <el-col :span="12">
-            <el-form-item label="资质类型" prop="qualificationCategory">
+            <el-form-item label="是否省属项目" prop="remark">
               <el-select
-                v-model="form.qualificationCategory"
-                placeholder="请选择资质类型"
+                v-model="form.remark"
+                placeholder="请选择是否"
                 style="width: 100%"
+                :disabled="disabled ||fillOnYearDisabled"
+                @change="remarkChange"
+                clearable
               >
                 <el-option
-                  v-for="dict in qualificationCategoryOptions"
+                  v-for="dict in isOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -313,10 +305,6 @@
               label="申报管理区划"
               prop="declarationManagementZones"
             >
-              <!-- <el-input
-                v-model="form.declarationManagementZones"
-                placeholder="请输入申报管理区划"
-              /> -->
               <el-cascader
                 :options="areasOptions"
                 v-model="form.declarationManagementZones"
@@ -325,39 +313,51 @@
                 clearable
                 size="small"
                 style="width: 100%"
+                :disabled="disabled || fillOnYearDisabled || remakeDisable"
+                @change="declarationManagementZonesChnage"
               >
               </el-cascader>
             </el-form-item>
           </el-col>
-            </el-row>
-          <el-row :gutter="15">
+        </el-row>
+        <el-row :gutter="15">
           <el-col :span="12">
-            <el-form-item label="良好行为" prop="behavior">
-              <el-select
-                v-model="form.behavior"
-                placeholder="请选择良好行为"
-                style="width: 100%"
-
-              >
-                <el-option
-                  v-for="dict in behaviorOption"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" clearable :disabled="disabled || fillOnYearDisabled"></el-input>
+              <!--              <el-select
+                              ref="selectPro"
+                              v-model="form.projectName"
+                              placeholder="请输入项目名称"
+                              filterable
+                              clearable
+                              size="small"
+                              style="width: 100%"
+                              remote
+                              :remote-method="remoteMethod"
+                              @change="handleProNameChange"
+                              :loading="selectLoading"
+                              @visible-change="visibleChange"
+                            >
+                              <el-option
+                                v-for="dict in projectNameOptions"
+                                :key="dict.projectName + dict.id"
+                                :label="dict.projectName + '[' + dict.proCode + ']'"
+                                :value="dict.projectName + '[' + dict.proCode + ']'"
+                                @click.native="getId(dict)"
+                              />
+                            </el-select>-->
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="表彰等级" prop="commendationLevel">
+            <el-form-item label="资质类型" prop="qualificationCategory">
               <el-select
-                v-model="form.commendationLevel"
-                placeholder="请选择表彰等级"
+                v-model="form.qualificationCategory"
+                placeholder="请选择资质类型"
                 style="width: 100%"
-
+                :disabled="disabled || fillOnYearDisabled"
               >
                 <el-option
-                  v-for="dict in commendationLevelOption"
+                  v-for="dict in qualificationCategoryOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -365,146 +365,51 @@
               </el-select>
             </el-form-item>
           </el-col>
-          </el-row>
-          <el-row :gutter="15">
+        </el-row>
+        <el-row :gutter="15">
           <el-col :span="12">
-            <el-form-item label="颁奖机构" prop="authority">
+            <el-form-item label="良好行为" prop="behavior">
               <el-select
-                v-model="form.authority"
-                placeholder="请选择颁奖机构"
+                v-model="form.behavior"
+                placeholder="请选择良好行为"
                 style="width: 100%"
-
+                clearable
+                @change="behaviorChange"
+                :disabled="disabled || fillOnYearDisabled"
               >
                 <el-option
-                  v-for="dict in authorityOption"
-                  :key="dict.dictValue"
+                  v-for="(dict,index) in behaviorOption"
+                  :key="index"
                   :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :value="dict.dictLabel"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="加分值" prop="bonusPoints">
-              <el-input v-model="form.bonusPoints" placeholder="请输入加分值" />
+            <el-form-item label="认定和颁奖单位" prop="authority">
+             <el-input v-model="form.authority" placeholder="根据良好行为自动输入" disabled/>
             </el-form-item>
           </el-col>
-          </el-row>
-          <el-row :gutter="15">
+        </el-row>
+        <el-row :gutter="15">
           <el-col :span="12">
-            <el-form-item label="有效期(年)" prop="validity">
-              <el-input v-model="form.validity" placeholder="请输入有效期" />
+            <el-form-item label="加分值" prop="bonusPoints">
+              <el-input v-model="form.bonusPoints" placeholder="根据良好行为自动输入" disabled/>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="审核时间" prop="evaluationDate">-->
-          <!--              <el-date-picker-->
-          <!--                clearable-->
-          <!--                size="small"-->
-          <!--                style="width: 100%"-->
-          <!--                v-model="form.evaluationDate"-->
-          <!--                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-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="isWaterCon">
-              <el-select
-                v-model="form.isWaterCon"
-                placeholder="请选择是否是"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="dict in isOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
+            <el-form-item label="加分有效期(年)" prop="validity">
+              <el-input v-model="form.validity" placeholder="根据良好行为自动输入" disabled/>
             </el-form-item>
           </el-col>
-          </el-row>
-          <el-row :gutter="15">
+        </el-row>
+        <el-row :gutter="15">
           <el-col :span="12">
-            <el-form-item label="是否在一年内申报" prop="fillOnYear">
-              <el-select
-                v-model="form.fillOnYear"
-                placeholder="请选择是否"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="dict in isOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
+            <el-form-item label="信息公开期(年)" prop="publishUnit">
+              <el-input v-model="form.publishUnit" placeholder="根据良好行为自动输入" disabled/>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="是否省属项目" prop="remark">
-              <el-select
-                v-model="form.remark"
-                placeholder="请选择是否"
-                style="width: 100%"
-              >
-                <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-row>
-          <el-row :gutter="15">
           <el-col :span="12">
             <el-form-item label="附件" prop="attachment">
               <!-- <el-input v-model="form.attachment" placeholder="请输入附件" /> -->
@@ -523,7 +428,7 @@
                 "
                 :file-list="fileList"
               >
-                <el-button size="small" type="primary" plain>
+                <el-button size="small" type="primary" plain :disabled="disabled">
                   <i class="el-icon-upload el-icon--right"></i>
                   点击上传
                 </el-button>
@@ -533,8 +438,288 @@
               </el-upload>
             </el-form-item>
           </el-col>
+        </el-row>
+
+<!--          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="水行政主管部门" prop="administrativeUnit">
+                <el-input
+                  v-model="form.administrativeUnit"
+                  placeholder="请输入水行政主管部门"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="项目名称" prop="projectName">
+                <el-select
+                  ref="selectPro"
+                  v-model="form.projectName"
+                  placeholder="请输入项目名称"
+                  filterable
+                  clearable
+                  size="small"
+                  style="width: 100%"
+                  remote
+                  :remote-method="remoteMethod"
+                  @change="handleProNameChange"
+                  :loading="selectLoading"
+                  @visible-change="visibleChange"
+                >
+                  <el-option
+                    v-for="dict in projectNameOptions"
+                    :key="dict.projectName + dict.id"
+                    :label="dict.projectName + '[' + dict.proCode + ']'"
+                    :value="dict.projectName + '[' + dict.proCode + ']'"
+                    @click.native="getId(dict)"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
-        </el-form>
+          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="资质类型" prop="qualificationCategory">
+                <el-select
+                  v-model="form.qualificationCategory"
+                  placeholder="请选择资质类型"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="dict in qualificationCategoryOptions"
+                    :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="declarationManagementZones"
+              >
+                &lt;!&ndash; <el-input
+                  v-model="form.declarationManagementZones"
+                  placeholder="请输入申报管理区划"
+                /> &ndash;&gt;
+                <el-cascader
+                  :options="areasOptions"
+                  v-model="form.declarationManagementZones"
+                  :props="areasOptionProps"
+                  placeholder="请选择申报管理区划"
+                  clearable
+                  size="small"
+                  style="width: 100%"
+                >
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="良好行为" prop="behavior">
+                <el-select
+                  v-model="form.behavior"
+                  placeholder="请选择良好行为"
+                  style="width: 100%"
+
+                >
+                  <el-option
+                    v-for="dict in behaviorOption"
+                    :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="commendationLevel">
+                <el-select
+                  v-model="form.commendationLevel"
+                  placeholder="请选择表彰等级"
+                  style="width: 100%"
+
+                >
+                  <el-option
+                    v-for="dict in commendationLevelOption"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="颁奖机构" prop="authority">
+                <el-select
+                  v-model="form.authority"
+                  placeholder="请选择颁奖机构"
+                  style="width: 100%"
+
+                >
+                  <el-option
+                    v-for="dict in authorityOption"
+                    :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="bonusPoints">
+                <el-input v-model="form.bonusPoints" placeholder="请输入加分值"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="有效期(年)" prop="validity">
+                <el-input v-model="form.validity" placeholder="请输入有效期"/>
+              </el-form-item>
+            </el-col>
+            &lt;!&ndash;          <el-col :span="12">&ndash;&gt;
+            &lt;!&ndash;            <el-form-item label="审核时间" prop="evaluationDate">&ndash;&gt;
+            &lt;!&ndash;              <el-date-picker&ndash;&gt;
+            &lt;!&ndash;                clearable&ndash;&gt;
+            &lt;!&ndash;                size="small"&ndash;&gt;
+            &lt;!&ndash;                style="width: 100%"&ndash;&gt;
+            &lt;!&ndash;                v-model="form.evaluationDate"&ndash;&gt;
+            &lt;!&ndash;                type="date"&ndash;&gt;
+            &lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;
+            &lt;!&ndash;                placeholder="选择审核日期"&ndash;&gt;
+            &lt;!&ndash;              >&ndash;&gt;
+            &lt;!&ndash;              </el-date-picker>&ndash;&gt;
+            &lt;!&ndash;            </el-form-item>&ndash;&gt;
+            &lt;!&ndash;          </el-col>&ndash;&gt;
+            &lt;!&ndash;          <el-col :span="12">&ndash;&gt;
+            &lt;!&ndash;                        <el-form-item label="企业填报日期" prop="enterpriseReportDate">&ndash;&gt;
+            &lt;!&ndash;                          <el-date-picker&ndash;&gt;
+            &lt;!&ndash;                            clearable&ndash;&gt;
+            &lt;!&ndash;                            size="small"&ndash;&gt;
+            &lt;!&ndash;                            style="width: 100%"&ndash;&gt;
+            &lt;!&ndash;                            v-model="form.enterpriseReportDate"&ndash;&gt;
+            &lt;!&ndash;                            type="date"&ndash;&gt;
+            &lt;!&ndash;                            value-format="yyyy-MM-dd"&ndash;&gt;
+            &lt;!&ndash;                            placeholder="选择企业填报日期"&ndash;&gt;
+            &lt;!&ndash;                          >&ndash;&gt;
+            &lt;!&ndash;                          </el-date-picker>&ndash;&gt;
+            &lt;!&ndash;                        </el-form-item>&ndash;&gt;
+            &lt;!&ndash;                      </el-col>&ndash;&gt;
+            &lt;!&ndash;            <el-col :span="12">&ndash;&gt;
+            &lt;!&ndash;              <el-form-item label="加分开始时间" prop="bonusPointBegin">&ndash;&gt;
+            &lt;!&ndash;                <el-date-picker&ndash;&gt;
+            &lt;!&ndash;                  clearable&ndash;&gt;
+            &lt;!&ndash;                  size="small"&ndash;&gt;
+            &lt;!&ndash;                  style="width: 100%"&ndash;&gt;
+            &lt;!&ndash;                  v-model="form.bonusPointBegin"&ndash;&gt;
+            &lt;!&ndash;                  type="date"&ndash;&gt;
+            &lt;!&ndash;                  value-format="yyyy-MM-dd"&ndash;&gt;
+            &lt;!&ndash;                  placeholder="选择加分开始时间"&ndash;&gt;
+            &lt;!&ndash;                >&ndash;&gt;
+            &lt;!&ndash;                </el-date-picker>&ndash;&gt;
+            &lt;!&ndash;              </el-form-item>&ndash;&gt;
+            &lt;!&ndash;            </el-col>&ndash;&gt;
+            &lt;!&ndash;          <el-col :span="12">&ndash;&gt;
+            &lt;!&ndash;            <el-form-item label="加分有效期至" prop="validityPeriod">&ndash;&gt;
+            &lt;!&ndash;              <el-date-picker&ndash;&gt;
+            &lt;!&ndash;                clearable&ndash;&gt;
+            &lt;!&ndash;                size="small"&ndash;&gt;
+            &lt;!&ndash;                style="width: 100%"&ndash;&gt;
+            &lt;!&ndash;                v-model="form.validityPeriod"&ndash;&gt;
+            &lt;!&ndash;                type="date"&ndash;&gt;
+            &lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;
+            &lt;!&ndash;                placeholder="选择有效期至"&ndash;&gt;
+            &lt;!&ndash;              >&ndash;&gt;
+            &lt;!&ndash;              </el-date-picker>&ndash;&gt;
+            &lt;!&ndash;            </el-form-item>&ndash;&gt;
+            &lt;!&ndash;          </el-col>&ndash;&gt;
+            <el-col :span="12">
+              <el-form-item label="是否是水利工程" prop="isWaterCon">
+                <el-select
+                  v-model="form.isWaterCon"
+                  placeholder="请选择是否是"
+                  style="width: 100%"
+                >
+                  <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-row>
+          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="是否在一年内申报" prop="fillOnYear">
+                <el-select
+                  v-model="form.fillOnYear"
+                  placeholder="请选择是否"
+                  style="width: 100%"
+                >
+                  <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="remark">
+                <el-select
+                  v-model="form.remark"
+                  placeholder="请选择是否"
+                  style="width: 100%"
+                >
+                  <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-row>
+          <el-row :gutter="15">
+            <el-col :span="12">
+              <el-form-item label="附件" prop="attachment">
+                &lt;!&ndash; <el-input v-model="form.attachment" placeholder="请输入附件" /> &ndash;&gt;
+                <el-upload
+                  class="upload-demo"
+                  action="thinking/common/upload"
+                  :headers="headers"
+                  :before-upload="(file) => $fileBeforeUpload(file, 'fileList')"
+                  :on-preview="handlePreview"
+                  :on-remove="(file) => handleRemove(file, 'fileList')"
+                  :before-remove="beforeRemove"
+                  multiple
+                  :on-exceed="handleExceed"
+                  :on-success="
+                  (_, fileList) => submitUpload(fileList, 'fileList')
+                "
+                  :file-list="fileList"
+                >
+                  <el-button size="small" type="primary" plain>
+                    <i class="el-icon-upload el-icon&#45;&#45;right"></i>
+                    点击上传
+                  </el-button>
+                  <div slot="tip" class="el-upload__tip">
+                    支持jpg/png/pdf/word/excel文件等，不超过200M
+                  </div>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>-->
+      </el-form>
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -567,69 +752,69 @@
           :contentStyle="{ minWidth: '350px' }"
         >
           <el-descriptions-item>
-            <template slot="label"> 项目名称 </template>
+            <template slot="label"> 项目名称</template>
             {{ this.creditMsg.projectName }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 资质类别 </template>
+            <template slot="label"> 资质类别</template>
             {{ qualificationCategoryFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 状态 </template>
+            <template slot="label"> 状态</template>
             {{ statusFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 申报管理区划 </template>
+            <template slot="label"> 申报管理区划</template>
             {{ this.creditMsg.declarationManagementZones }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 良好行为 </template>
+            <template slot="label"> 良好行为</template>
             {{ behaviorFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 表彰等级 </template>
+            <template slot="label"> 表彰等级</template>
             {{ commendationLevelFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 颁发机构 </template>
+            <template slot="label"> 颁发机构</template>
             {{ authorityFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 加分值 </template>
+            <template slot="label"> 加分值</template>
             {{ this.creditMsg.bonusPoints }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 有效期(年) </template>
+            <template slot="label"> 有效期(年)</template>
             {{ this.creditMsg.validity }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 企业填报日期 </template>
+            <template slot="label"> 企业填报日期</template>
             {{ this.creditMsg.createTime }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 加分开始时间 </template>
+            <template slot="label"> 加分开始时间</template>
             {{ this.creditMsg.bonusPointBegin }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 加分有效期至 </template>
+            <template slot="label"> 加分有效期至</template>
             {{ this.creditMsg.validityPeriod }}
           </el-descriptions-item>
 
           <el-descriptions-item>
-            <template slot="label"> 是否水利工程 </template>
+            <template slot="label"> 是否水利工程</template>
             {{ isFormat(this.creditMsg.isWaterCon) }}
           </el-descriptions-item>
 
           <el-descriptions-item>
-            <template slot="label"> 是否在一年内填报 </template>
+            <template slot="label"> 是否在一年内填报</template>
             {{ isFormat(this.creditMsg.fillOnYear) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 是否省属项目 </template>
+            <template slot="label"> 是否省属项目</template>
             {{ isFormat(this.creditMsg.remark) }}
           </el-descriptions-item>
           <el-descriptions-item>
-            <template slot="label"> 附件 </template>
+            <template slot="label"> 附件</template>
             <template v-if="this.creditMsg.attachment">
               <div
                 v-for="(item, index) in JSON.parse(this.creditMsg.attachment)"
@@ -647,7 +832,7 @@
           </el-descriptions-item>
 
           <el-descriptions-item v-if="this.creditMsg.status == '2'">
-            <template slot="label"> 驳回意见 </template>
+            <template slot="label"> 驳回意见</template>
             {{ this.creditMsg.remark }}
           </el-descriptions-item>
         </el-descriptions>
@@ -659,14 +844,16 @@
           @click="passExamine"
           v-hasPermi="['enterpriseMange:credit:passExamine']"
           v-if="creditMsg.status == '1'"
-          >通过审核</el-button
+        >通过审核
+        </el-button
         >
         <el-button
           type="primary"
           @click="publicity"
           v-hasPermi="['enterpriseMange:credit:passExamine']"
           v-if="creditMsg.status == '3'"
-          >公示信息</el-button
+        >公示信息
+        </el-button
         >
         <!-- 驳回按钮 -->
         <el-popover
@@ -707,7 +894,8 @@
           type="primary"
           @click="upExamine"
           v-hasPermi="['enterpriseMange:credit:upExamine']"
-          >上 报</el-button
+        >上 报
+        </el-button
         >
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -765,13 +953,13 @@ import {
   updateCredit,
   exportCredit,
 } from "@/api/enterprise/credit";
-import { listPerformanceRecord } from "@/api/enterprise/performanceRecord";
-import { listApproval } from "@/api/enterprise/approval";
-import { getToken } from "@/utils/auth";
-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 {listPerformanceRecord} from "@/api/enterprise/performanceRecord";
+import {listApproval} from "@/api/enterprise/approval";
+import {getToken} from "@/utils/auth";
+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";
 
 export default {
   name: "newGoodCredit",
@@ -859,47 +1047,54 @@ export default {
       isOptions: [],
       // 表单参数
       form: {},
+      disabled: false,
+      fillOnYearDisabled: false,
+      remakeDisable: false,
+      behavior: "",
       // 表单校验
       rules: {
         administrativeUnit: [
-          { required: true, message: "请填写水行政主管部门", trigger: "blur" },
+          {required: true, message: "请填写水行政主管部门", trigger: "blur"},
         ],
         isWaterCon: [
-          { required: true, message: "请选择是否", trigger: "blur" },
+          {required: true, message: "请选择是否", trigger: "blur"},
         ],
         remark: [
-          { required: true, message: "请选择是否", trigger: "blur" },
+          {required: true, message: "请选择是否", trigger: "blur"},
         ],
         fillOnYear: [
-          { required: true, message: "请选择是否", trigger: "blur" },
+          {required: true, message: "请选择是否", trigger: "blur"},
         ],
         projectName: [
-          { required: true, message: "请选择项目名称", trigger: "blur" },
+          {required: true, message: "请选择项目名称", trigger: "blur"},
         ],
         qualificationCategory: [
-          { required: true, message: "请选择资质类型", trigger: "blur" },
+          {required: true, message: "请选择资质类型", trigger: "blur"},
         ],
         declarationManagementZones: [
-          { required: true, message: "请选择申报区划", trigger: "blur" },
+          {required: true, message: "请选择申报区划", trigger: "blur"},
         ],
         behavior: [
-          { required: true, message: "请填写良好行为", trigger: "blur" },
+          {required: true, message: "请填写良好行为", trigger: "blur"},
         ],
         commendationLevel: [
-          { required: true, message: "请填写表彰等级", trigger: "blur" },
+          {required: true, message: "请填写表彰等级", trigger: "blur"},
         ],
         validity: [
-          { required: true, message: "请填写有效期", trigger: "blur" },
+          {required: true, message: "请填写有效期", trigger: "blur"},
+        ],
+        publishUnit: [
+          {required: true, message: "请填写有效期", trigger: "blur"},
         ],
 
         authority: [
-          { required: true, message: "请填写颁奖机构", trigger: "blur" },
+          {required: true, message: "请填写颁奖机构", trigger: "blur"},
         ],
         awardAnnouncementWebsite: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
+          {max: 250, message: "字符长度最大为250", trigger: "blur"},
         ],
         bonusPoints: [
-          { required: true, message: "请输入加分值", trigger: "blur" },
+          {required: true, message: "请输入加分值", trigger: "blur"},
           {
             pattern:
               /(^[1-9]([0-9]{0,6})?(\.[0-9]{1,2})?$|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$))/,
@@ -919,9 +1114,9 @@ export default {
       remark: "",
       processList: [],
       projectNameOption: [],
-      behaviorOption:[],
-      commendationLevelOption:[],
-      authorityOption:[],
+      behaviorOption: [],
+      commendationLevelOption: [],
+      authorityOption: [],
     };
   },
   created() {
@@ -948,13 +1143,65 @@ export default {
     this.getDicts("review_status").then((response) => {
       this.statusOptions = response.data;
     });
-    listPerformanceRecord({ data: { enterpriseId: this.enterpriseId } }).then(
+    listPerformanceRecord({data: {enterpriseId: this.enterpriseId}}).then(
       (response) => {
         this.projectNameOption = response.records;
       }
     );
   },
   methods: {
+    remarkChange(val){
+      console.log("val",val)
+      if (val == '1'){
+        this.form.declarationManagementZones = '440000';
+        this.remakeDisable = true;
+      }else {
+        this.form.declarationManagementZones = '';
+        this.remakeDisable = false;
+      }
+    },
+    declarationManagementZonesChnage(val){
+      console.log("1",val)
+    },
+    isWaterConChange(val){
+      console.log('val',val)
+      if (val == '2'){
+        this.disabled = true;
+      }else {
+        this.disabled = false;
+      }
+    },
+    fillOnYearChange(val){
+      console.log('val',val)
+      if (val == '2'){
+        this.fillOnYearDisabled = true;
+      }else {
+        this.fillOnYearDisabled = false;
+      }
+    },
+
+    behaviorChange(val){
+      console.log('333',val)
+      this.behaviorOption.forEach((item, index) => {
+        if (item.dictLabel === val){
+          console.log("item",item.dictValue)
+          const validJsonString = item.dictValue.replace(/'/g, '"');
+          const data = JSON.parse(validJsonString);
+          this.form.authority = data['authority'];
+          this.form.bonusPoints = data['bonusPoints'];
+          this.form.validity = data['validity'];
+          this.form.publishUnit = data['publishUnit'];
+          console.log("form",this.form)
+        }
+      })
+
+
+
+
+
+
+
+    },
     authorityFormat(row, column) {
       return this.selectDictLabel(this.authorityOption, row.authority);
     },
@@ -1036,7 +1283,7 @@ export default {
     },
     openAuditProcess(row) {
       listApproval({
-        data: { creditId: row.id }, // 排序方式
+        data: {creditId: row.id}, // 排序方式
         params: {
           // 按哪个字段排序
           orderBy: "create_time",
@@ -1390,7 +1637,8 @@ export default {
             this.getList();
             this.msgSuccess("删除成功");
           })
-          .catch(function () {});
+          .catch(function () {
+          });
       } else {
         this.$message.warning("请选择要删除的数据！！");
       }
@@ -1424,7 +1672,7 @@ export default {
     // 点击预览的文件进行下载
     handlePreview(file) {
       // console.log(file);
-      getFileStream({ fileName: file.fileName }).then((res) => {
+      getFileStream({fileName: file.fileName}).then((res) => {
         const blob = new Blob([res], {
           // type类型后端返回来的数据中会有，根据自己实际进行修改
           // 表格下载为 application/xlsx，压缩包为 application/zip等，
@@ -1467,6 +1715,7 @@ export default {
   align-items: center;
   border: 1px solid #f0f0f0;
 }
+
 .process ::v-deep {
   .el-dialog {
     height: 500px;