From e419805e0ca188c5a6aba1ee817c37d86301d3da Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Wed, 10 Jan 2024 18:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=9B=91=E7=9D=A3=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BC=81=E4=B8=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jwtech-admin-page/.gitignore                  |  1 +
 .../investment/options/purposeFunds.vue       | 57 +++++++-------
 .../enterpriseInformation/index.vue           | 37 ++++++++++
 .../options/basePage.vue                      | 28 +++++++
 .../components/qualification_child.vue        |  1 +
 .../components/qualification_parent.vue       |  7 +-
 .../options/performanceRecord.vue             | 74 ++++++++++++++++++-
 .../options/qualification.vue                 |  4 +-
 8 files changed, 176 insertions(+), 33 deletions(-)

diff --git a/jwtech-admin-page/.gitignore b/jwtech-admin-page/.gitignore
index 78a752d8..875f6973 100644
--- a/jwtech-admin-page/.gitignore
+++ b/jwtech-admin-page/.gitignore
@@ -18,6 +18,7 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+*.zip
 
 package-lock.json
 yarn.lock
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
index 0b07a232..35b97b29 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/investment/options/purposeFunds.vue
@@ -70,13 +70,13 @@
     <el-table ref="refTable" v-loading="loading" :data="contractsList">
       <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
       <el-table-column type="expand" prop="children" fixed>
-        <template slot-scope="scope">
+        <template slot-scope="props">
           <!-- <el-table
             @selection-change="handleSelectionChange"
-            :data="scope.row.children"
+            :data="props.row.children"
             border
           > -->
-          <el-table :data="scope.row.children" border>
+          <el-table :data="props.row.children" border>
             <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
             <el-table-column
               label="序号"
@@ -86,53 +86,58 @@
             />
             <el-table-column
               label="支付期数"
-              min-width="60"
+              width="175"
               align="center"
               prop="paymentPeriods"
             />
             <el-table-column
               label="起始年月"
-              min-width="70"
+              width="175"
               align="center"
               prop="timeScope"
             />
             <el-table-column
               label="支付时间"
-              min-width="45"
+              width="175"
               align="center"
               prop="paymentTime"
             />
             <el-table-column
               label="本期应付金额(万元)"
-              min-width="70"
+              width="175"
               align="center"
               prop="payableAmount"
             />
             <el-table-column
               label="本期实付金额(万元)"
-              min-width="60"
-              align="left"
+              width="175"
+              align="center"
               prop="paidinAmount"
             />
             <el-table-column
               label="本期暂扣款(万元)"
-              min-width="60"
-              align="left"
+              width="175"
+              align="center"
               prop="temporaryWithholding"
             />
             <el-table-column
               label="合同支付票据"
-              min-width="80"
-              align="left"
+              width="175"
+              align="center"
               prop="paymentBill"
             />
-            <el-table-column label="操作" min-width="55" align="left">
-              <template slot-scope="scope">
+            <el-table-column
+              label="操作"
+              width="180"
+              align="center"
+              fixed="right"
+            >
+              <template slot-scope="props">
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
+                  @click="handleUpdate(props.row)"
                   v-hasPermi="['build:sourceFunds:edit']"
                   >修改
                 </el-button>
@@ -140,7 +145,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
+                  @click="handleDelete(props.row)"
                   v-hasPermi="['build:sourceFunds:remove']"
                   >删除
                 </el-button>
@@ -162,19 +167,19 @@
         label="合同名称"
         align="center"
         prop="contractName"
-        min-width="120"
+        width="175"
       />
       <el-table-column
         label="合同工期"
         align="center"
         prop="contractDuration"
-        min-width="120"
+        width="175"
       />
       <el-table-column
         label="开工时间"
         align="center"
         prop="commencementTime"
-        min-width="120"
+        width="175"
       >
       </el-table-column>
 
@@ -182,34 +187,34 @@
         label="合同金额(万元)"
         align="center"
         prop="contractAmount"
-        min-width="120"
+        width="175"
       />
       <el-table-column
         label="应付款金额单位(万元)"
         align="center"
         prop="payableAmountUnit"
-        min-width="150"
+        width="175"
       />
 
       <el-table-column
         label="实际支付(万元)"
         align="center"
         prop="actualPayment"
-        min-width="150"
+        width="175"
       />
 
       <el-table-column
         label="合同支付完成率"
         align="center"
         prop="payRate"
-        min-width="120"
+        width="175"
       />
 
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        min-width="180"
+        width="180"
         fixed="right"
       >
         <template slot-scope="scope">
@@ -567,7 +572,7 @@ export default {
     // 关闭弹窗
     close() {
       this.reset();
-      this.getList();
+      // this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
index 2862c791..44e12aee 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
@@ -133,6 +133,13 @@
         :formatter="formatAdcd"
         min-width="120"
       />
+      <el-table-column
+        label="企业类型"
+        align="center"
+        prop="enterpriseType"
+        :formatter="enterpriseTypeFormat"
+        min-width="120"
+      />
       <el-table-column
         label="成立日期"
         align="center"
@@ -359,6 +366,22 @@
               </el-cascader>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="企业类型" prop="enterpriseType">
+              <!-- <el-input
+                v-model="form.enterpriseType"
+                placeholder="请输入企业类型"
+              /> -->
+              <el-radio-group v-model="form.enterpriseType">
+                <el-radio
+                  v-for="dict in enterpriseTypeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  >{{ dict.dictLabel.replace("资质", "") }}</el-radio
+                >
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="成立日期" prop="establishmentDate">
               <el-date-picker
@@ -743,13 +766,25 @@ export default {
       },
       fileList1: [],
       fileList2: [],
+      // 企业资质字典
+      enterpriseTypeOptions: [],
     };
   },
   created() {
     this.getTreeData();
     this.getList();
+    this.getDicts("qualification_type").then((response) => {
+      this.enterpriseTypeOptions = response.data;
+    });
   },
   methods: {
+    // 资质类别字典翻译
+    enterpriseTypeFormat(row, column) {
+      return this.selectDictLabel(
+        this.enterpriseTypeOptions,
+        row.enterpriseType
+      ).replace("资质", "");
+    },
     formatAdcd(row) {
       if (row.adcd) {
         let provinceCode = row.adcd.slice(0, 2);
@@ -820,6 +855,7 @@ export default {
         enterpriseName: null,
         investmentComposition: null,
         adcd: null,
+        enterpriseType: null,
         establishmentDate: null,
         legalRepresentative: null,
         corporateIdNumber: null,
@@ -861,6 +897,7 @@ export default {
           enterpriseName: null,
           investmentComposition: null,
           adcd: null,
+          enterpriseType: null,
           establishmentDate: null,
           legalRepresentative: null,
           corporateIdNumber: null,
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
index 7d1cc05e..49f8cc72 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
@@ -47,6 +47,22 @@
             </el-cascader>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="企业类型" prop="enterpriseType">
+            <!-- <el-input
+                v-model="form.enterpriseType"
+                placeholder="请输入企业类型"
+              /> -->
+            <el-radio-group v-model="form.enterpriseType">
+              <el-radio
+                v-for="dict in enterpriseTypeOptions"
+                :key="dict.dictValue"
+                :label="dict.dictValue"
+                >{{ dict.dictLabel.replace("资质", "") }}</el-radio
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="成立日期" prop="establishmentDate">
             <el-date-picker
@@ -426,13 +442,25 @@ export default {
       },
       fileList1: [],
       fileList2: [],
+      // 企业资质字典
+      enterpriseTypeOptions: [],
     };
   },
   created() {
     this.getTreeData();
     this.getList();
+    this.getDicts("qualification_type").then((response) => {
+      this.enterpriseTypeOptions = response.data;
+    });
   },
   methods: {
+    // 资质类别字典翻译
+    enterpriseTypeFormat(row, column) {
+      return this.selectDictLabel(
+        this.enterpriseTypeOptions,
+        row.enterpriseType
+      ).replace("资质", "");
+    },
     handleAdd(key) {
       if (key == 0) this.$refs.managementSystem.handleAdd();
       if (key == 1) this.$refs.SubCompany.handleAdd();
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue
index bff1862c..e12dc2a3 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_child.vue
@@ -20,6 +20,7 @@
         type="index"
         width="100"
         align="center"
+        fixed
         :resizable="false"
       />
       <el-table-column
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue
index 10fe5d51..5e56fb30 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/qualification_parent.vue
@@ -116,6 +116,7 @@ import {
   updateQualifications,
   exportQualifications,
 } from "@/api/enterprise/qualifications";
+import { getEnterpriseInfo } from "@/api/enterprise/enterpriseInfo";
 
 export default {
   name: "Qualifications",
@@ -223,7 +224,7 @@ export default {
         enterpriseId: null,
         parentId: null,
         qualificationCategory: null,
-        dynamicCreditScore: null,
+        dynamicCreditScore: 100,
         professionalCategory: null,
         level: null,
         certificateNo: null,
@@ -289,6 +290,10 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      getEnterpriseInfo(this.$route.query.baseDataId).then((response) => {
+        this.form.qualificationCategory = response.data.enterpriseType;
+      });
+
       this.open = true;
       this.title = "添加企业资质";
     },
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
index ea6e373d..4b8915ff 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/performanceRecord.vue
@@ -296,10 +296,20 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目所在地" prop="projectLocation">
-              <el-input
+              <!-- <el-input
                 v-model="form.projectLocation"
                 placeholder="请输入项目所在地"
-              />
+              /> -->
+              <el-cascader
+                :options="areasOptions"
+                v-model="form.projectLocation"
+                :props="areasOptionProps"
+                placeholder="请选择项目所在地"
+                clearable
+                size="small"
+                style="width: 100%"
+              >
+              </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -447,7 +457,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 项目所在地 </template>
-            {{ this.performanceRecordMsg.projectLocation }}
+            {{ formatProjectLocation(this.performanceRecordMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 项目状态 </template>
@@ -512,7 +522,8 @@ import {
   exportPerformanceRecord,
 } from "@/api/enterprise/performanceRecord";
 import { getParentQualifications } from "@/api/enterprise/qualifications";
-
+import { getAreasData } from "@/api/areas/index";
+import { regionData, codeToText, TextToCode } from "element-china-area-data";
 import { getToken } from "@/utils/auth";
 import { getFileStream } from "@/api/system/upload";
 
@@ -521,6 +532,11 @@ export default {
   props: ["enterpriseId"],
   data() {
     return {
+      areasOptionProps: {
+        emitPath: false, //value返回最后一级的
+        checkStrictly: true, //选择任意一级
+      },
+      areasOptions: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -591,6 +607,7 @@ export default {
     };
   },
   created() {
+    this.getTreeData();
     this.getList();
     this.getDicts("qualification_type").then((response) => {
       this.qualificationCategoryOptions = response.data;
@@ -600,6 +617,55 @@ export default {
     });
   },
   methods: {
+    formatProjectLocation(row) {
+      if (row.projectLocation) {
+        let provinceCode = row.projectLocation.slice(0, 2);
+        let cityCode = row.projectLocation.slice(2, 4);
+        let areaCode = row.projectLocation.slice(4, 6);
+        if (areaCode != "00") {
+          return (
+            codeToText[provinceCode] +
+            "-" +
+            codeToText[provinceCode + cityCode] +
+            "-" +
+            codeToText[provinceCode + cityCode + areaCode]
+          );
+        } else if (cityCode != "00") {
+          return (
+            codeToText[provinceCode] + "-" + codeToText[provinceCode + cityCode]
+          );
+        } else {
+          return codeToText[provinceCode];
+        }
+      }
+    },
+    getTreeData() {
+      getAreasData().then((items) => {
+        // console.log("getAreasData", items.data);
+        let res = [];
+        let getChildren = (res, pid) => {
+          for (const i of items.data) {
+            if (i.parentid === pid) {
+              const newItem = {
+                label: i.name,
+                value: i.id,
+              };
+              if (i.layer != 3) newItem.children = [];
+              res.push(newItem);
+              getChildren(newItem.children, newItem.value);
+            }
+          }
+        };
+        getChildren(res, items.data[0].parentid);
+        // console.log("areasOptions", res);
+        this.areasOptions = res;
+        // 当不是admin时，默认行政区域
+        // if (this.$userProfile.createUid != "admin") {
+        //   this.queryParams.data.adcd = this.areasOptions[0].value;
+        // }
+        // return res;
+      });
+    },
     /** 查询工程业绩记录列表 */
     getList() {
       this.loading = true;
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue
index 43bb51e6..4d9bceed 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/qualification.vue
@@ -12,9 +12,9 @@
       ref="qualificationParent"
       :enterpriseId="enterpriseId"
     />
-    <!-- 子企业资质 -->
+    <!-- 企业子资质 -->
     <div class="listTitle">
-      <span>子企业资质</span>
+      <span>企业子资质</span>
       <span class="addBtn" @click="handleAdd('1')">
         <i class="el-icon-plus"></i>
         添加