From 1f41304cc5bed6e11cd6d67e414e114f776514ba Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Tue, 9 Jan 2024 15:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../investment/options/purposeFunds.vue       | 44 +++++++++++--------
 .../options/components/engineerAward.vue      |  2 +-
 .../options/components/goodCredit.vue         | 24 +++++++---
 .../options/components/personAward.vue        |  2 +-
 .../components/qualification_child.vue        |  2 +-
 .../components/qualification_parent.vue       |  2 +-
 .../options/components/unitAward.vue          |  2 +-
 7 files changed, 48 insertions(+), 30 deletions(-)

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 d4060f3c..0b07a232 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
@@ -31,7 +31,7 @@
         </el-button>
       </el-form-item>
     </el-form>
-
+    <!-- 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -59,25 +59,25 @@
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-    </el-row>
+    </el-row> -->
 
-    <el-table
+    <!-- <el-table
       ref="refTable"
       v-loading="loading"
       :data="contractsList"
       @selection-change="handleSelectionChangeContract"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-    >
-      <el-table-column type="expand" prop="children">
-        <template slot-scope="props">
-          <el-table
+    > -->
+    <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">
+          <!-- <el-table
             @selection-change="handleSelectionChange"
-            :data="props.row.children"
-            stripe
+            :data="scope.row.children"
             border
-          >
-            <el-table-column type="selection" width="55" align="center" fixed />
+          > -->
+          <el-table :data="scope.row.children" border>
+            <!-- <el-table-column type="selection" width="55" align="center" fixed /> -->
             <el-table-column
               label="序号"
               type="index"
@@ -150,8 +150,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column type="selection" width="55" align="center" fixed />
-      <el-table-column label="序号" type="index" width="50" align="center" />
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center"
+        fixed
+      />
+
       <el-table-column
         label="合同名称"
         align="center"
@@ -415,9 +421,7 @@ export default {
       },
       expands: [],
       flag: "",
-      getRowKeys(row) {
-        return row.id;
-      },
+
       //支付记录数据
       infoList: [],
       // 遮罩层
@@ -487,6 +491,9 @@ export default {
   //   },
   // },
   methods: {
+    getRowKeys(row) {
+      return row.id;
+    },
     getList() {
       if (this.proNo && this.proCode) {
         this.queryParams.data.proNo = this.proNo;
@@ -671,6 +678,7 @@ export default {
     },
     expandChange(row, expandedRows) {
       let that = this;
+      console.log(4444, row, expandedRows);
       if (expandedRows.length > 1) {
         that.expands = [];
         if (row) {
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/engineerAward.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/engineerAward.vue
index 793f8854..a7044dc4 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/engineerAward.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/engineerAward.vue
@@ -357,7 +357,7 @@ export default {
           }
         });
         // this.behaviorList = response.records;
-        this.total = response.total;
+        this.total = this.engineerAwardList.length;
         this.loading = false;
       });
     },
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue
index f35872d0..9954767b 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue
@@ -1,12 +1,14 @@
 <template>
   <div class="app-container">
-    <el-button
-      type="text"
-      icon="el-icon-download"
-      @click="download('standard.xls', '良好行为认定标准.xls')"
-    >
-      良好行为认定标准.xls
-    </el-button>
+    <div class="topFile">
+      <el-button
+        type="text"
+        icon="el-icon-download"
+        @click="download('standard.xls', '良好行为认定标准.xls')"
+      >
+        良好行为认定标准.xls
+      </el-button>
+    </div>
     <el-table v-loading="loading" :data="creditList">
       <el-table-column
         label="序号"
@@ -1042,6 +1044,14 @@ export default {
 //     margin-top: 10vh !important;
 //  }
 // }
+.topFile {
+  width: 100%;
+  background: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #f0f0f0;
+}
 .process ::v-deep {
   .el-dialog {
     height: 500px;
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personAward.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personAward.vue
index f1cb5293..45d41132 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personAward.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/personAward.vue
@@ -364,7 +364,7 @@ export default {
           }
         });
         // this.behaviorList = response.records;
-        this.total = response.total;
+        this.total = this.engineerAwardList.length;
         this.loading = false;
       });
     },
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 6e22d538..4ab10887 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
@@ -384,7 +384,7 @@ export default {
       listQualifications(this.queryParams).then((response) => {
         let list = response.records.filter((item) => item.parentId);
         this.getSpanArr(list);
-        this.total = response.total;
+        this.total = list.length;
         this.loading = false;
       });
     },
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 0dcf5411..8c03f8c1 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
@@ -185,7 +185,7 @@ export default {
         this.qualificationsList = response.records.filter(
           (item) => !item.parentId
         );
-        this.total = response.total;
+        this.total = this.qualificationsList.length;
         this.loading = false;
       });
     },
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/unitAward.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/unitAward.vue
index d5698b79..616f851e 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/unitAward.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/unitAward.vue
@@ -340,7 +340,7 @@ export default {
           }
         });
         // this.behaviorList = response.records;
-        this.total = response.total;
+        this.total = this.behaviorList.length;
         this.loading = false;
       });
     },