市场监督完善

jwtech-admin-page/src/api/enterprise/qualifications.js

@@ -23,6 +23,14 @@ export function getParentQualifications(enterpriseId) {
     method: 'get'
   })
 }
+// 查询父级企业资质列表
+export function listParentQualifications(enterpriseId) {
+  return request({
+    url: '/enterprise/qualifications/listByEid/' + enterpriseId,
+    method: 'get'
+  })
+}
+
 
 // 新增企业资质
 export function addQualifications(data) {

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

@@ -191,16 +191,18 @@
             <el-input v-model="form.email" placeholder="请输入电子邮箱" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="24">
           <el-form-item label="经营范围" prop="businessScope">
             <el-input
               v-model="form.businessScope"
               placeholder="请输入经营范围"
+              type="textarea"
+              rows="4"
             />
           </el-form-item>
         </el-col>

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

@@ -231,10 +231,23 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="110px">
           <el-col :span="12">
             <el-form-item label="项目名称" prop="projectName">
-              <el-input
+              <!-- <el-input
                 v-model="form.projectName"
                 placeholder="请输入项目名称"
-              />
+              /> -->
+              <el-select
+                v-model="form.projectName"
+                placeholder="请选择项目名称"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in projectNameOption"
+                  :key="dict.id"
+                  :label="dict.projectName"
+                  :value="dict.projectName"
+                  @click.native="chooseProjectName(dict)"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -551,6 +564,7 @@ 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";
@@ -648,6 +662,7 @@ export default {
       creditMsg: {},
       remark: "",
       processList: [],
+      projectNameOption: [],
     };
   },
   created() {
@@ -661,6 +676,9 @@ export default {
     });
   },
   methods: {
+    chooseProjectName(data) {
+      this.form.recordId = data.id;
+    },
     download(filename, name) {
       let a = document.createElement("a");
       a.href = "/static/" + filename;
@@ -849,6 +867,11 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      listPerformanceRecord({ data: { enterpriseId: this.enterpriseId } }).then(
+        (response) => {
+          this.projectNameOption = response.records;
+        }
+      );
       this.open = true;
       this.title = "添加良好行为加分申报";
     },

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

@@ -520,6 +520,7 @@ export default {
               }
             });
           }
+          this.$emit("parentGetList");
         }
       });
     },
@@ -537,6 +538,7 @@ export default {
           })
           .then(() => {
             this.getList();
+            this.$emit("parentGetList");
             this.msgSuccess("删除成功");
           })
           .catch(function () {});

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

@@ -24,6 +24,13 @@
         min-width="120"
         :resizable="false"
       />
+      <el-table-column
+        label="子资质数量"
+        align="center"
+        prop="number"
+        min-width="120"
+        :resizable="false"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -103,6 +110,7 @@
 import {
   listQualifications,
   getQualifications,
+  listParentQualifications,
   delQualifications,
   addQualifications,
   updateQualifications,
@@ -180,12 +188,19 @@ export default {
     /** 查询企业资质列表 */
     getList() {
       this.loading = true;
-      this.queryParams.data.enterpriseId = this.enterpriseId;
+      // this.queryParams.data.enterpriseId = this.enterpriseId;
-      listQualifications(this.queryParams).then((response) => {
+      // listQualifications(this.queryParams).then((response) => {
-        this.qualificationsList = response.records.filter(
+      //   this.qualificationsList = response.records.filter(
-          (item) => !item.parentId
+      //     (item) => !item.parentId
-        );
+      //   );
-        this.total = this.qualificationsList.length;
+      //   this.total = this.qualificationsList.length;
+      //   console.log("this.qualificationsList", this.qualificationsList);
+      //   this.loading = false;
+      // });
+      listParentQualifications(this.enterpriseId).then((response) => {
+        // console.log(response);
+        this.qualificationsList = response.data;
+        this.total = response.data.length;
         this.loading = false;
       });
     },

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

@@ -270,10 +270,10 @@
                 style="width: 100%"
               >
                 <el-option
-                  v-for="dict in qualificationCategoryOptions"
+                  v-for="dict in parentOption"
-                  :key="dict.dictValue"
+                  :key="dict.id"
-                  :label="dict.dictLabel"
+                  :label="qualificationCategoryFormat(dict)"
-                  :value="dict.dictValue"
+                  :value="dict.qualificationCategory"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -511,6 +511,8 @@ import {
   updatePerformanceRecord,
   exportPerformanceRecord,
 } from "@/api/enterprise/performanceRecord";
+import { getParentQualifications } from "@/api/enterprise/qualifications";
+
 import { getToken } from "@/utils/auth";
 import { getFileStream } from "@/api/system/upload";
 
@@ -585,6 +587,7 @@ export default {
       },
       fileList: [],
       performanceRecordMsg: {},
+      parentOption: [],
     };
   },
   created() {
@@ -720,12 +723,18 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      getParentQualifications(this.enterpriseId).then((response) => {
+        this.parentOption = response.data;
+      });
       this.open = true;
       this.title = "添加工程业绩记录";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      getParentQualifications(this.enterpriseId).then((response) => {
+        this.parentOption = response.data;
+      });
       const id = row.id || this.ids;
       getPerformanceRecord(id).then((response) => {
         this.form = response.data;

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

@@ -20,7 +20,11 @@
         添加
       </span>
     </div>
-    <qualificationChild ref="qualificationChild" :enterpriseId="enterpriseId" />
+    <qualificationChild
+      ref="qualificationChild"
+      :enterpriseId="enterpriseId"
+      @parentGetList="parentGetList"
+    />
   </div>
 </template>
 
@@ -46,6 +50,10 @@ export default {
       if (key == 0) this.$refs.qualificationParent.handleAdd();
       if (key == 1) this.$refs.qualificationChild.handleAdd();
     },
+    parentGetList() {
+      console.log(4555646);
+      this.$refs.qualificationParent.getList();
+    },
   },
 };
 </script>