From 7c2e2f9d61d42e4b470aefc473912e7a8cc8140d Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 3 Jul 2023 10:16:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/LayoutClassic/index.vue           | 12 ++---
 .../components/transformInfo.vue              | 49 ++++++++-----------
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/layouts/LayoutClassic/index.vue b/src/layouts/LayoutClassic/index.vue
index f36e05d..fb120d0 100644
--- a/src/layouts/LayoutClassic/index.vue
+++ b/src/layouts/LayoutClassic/index.vue
@@ -1,13 +1,13 @@
 <!-- 经典布局 -->
 <template>
 	<el-container class="layout">
-		<el-container class="classic-main">
+		<!-- <el-container class="classic-main">
 			<Main />
-		</el-container>
-		<!-- <el-header>
+		</el-container> -->
+		<el-header>
 			<div class="header-lf">
 				<div @click="goHome" class="logo flx-center">
-					<img src="@/assets/images/login/china.png" style="margin: 0 15px" alt="logo" />
+					<!-- <img src="@/assets/images/login/china.png" style="margin: 0 15px" alt="logo" /> -->
 					<span>数字化政务监管平台</span>
 					<span v-if="moduleTitle" style="margin: 0 20px">|</span>
 					<span class="title">{{ moduleTitle }}</span>
@@ -18,7 +18,7 @@
 		</el-header>
 		<el-container class="classic-content">
 			<el-aside>
-				<div class="menu" :style="{ width: isCollapse ? '65px' : '210px' }">  根据屏幕自动收缩
+				<!-- <div class="menu" :style="{ width: isCollapse ? '65px' : '210px' }">  根据屏幕自动收缩 -->
 				<div class="menu">
 					<el-scrollbar>
 						<el-menu
@@ -39,7 +39,7 @@
 			<el-container class="classic-main">
 				<Main />
 			</el-container>
-		</el-container> -->
+		</el-container>
 	</el-container>
 </template>
 
diff --git a/src/views/hz-project/progressManagement/payManagement/components/transformInfo.vue b/src/views/hz-project/progressManagement/payManagement/components/transformInfo.vue
index b2ef7c4..d1d8dbd 100644
--- a/src/views/hz-project/progressManagement/payManagement/components/transformInfo.vue
+++ b/src/views/hz-project/progressManagement/payManagement/components/transformInfo.vue
@@ -12,14 +12,14 @@
 		</template>
 		<div class="detail-table">
 			<!-- <div class="content-title">整改/复查记录</div> -->
+			<!-- :span-method="arraySpanMethod" -->
 			<div class="table">
 				<el-table
 					:data="recordData"
 					class="el-table"
-					:span-method="arraySpanMethod"
 					:row-style="{ height: '40px' }"
-					:header-cell-style="{ textAlign: 'left', height: '40px' }"
-					:cell-style="{ textAlign: 'left', height: '40px' }"
+					:header-cell-style="{ textAlign: 'center', height: '40px' }"
+					:cell-style="{ textAlign: 'center', height: '40px' }"
 				>
 					<el-table-column prop="id" label="序号"> </el-table-column>
 					<el-table-column prop="reportContent" label="汇报内容"> </el-table-column>
@@ -55,33 +55,26 @@
 				:header-cell-style="{ textAlign: 'center', height: '40px' }"
 				:cell-style="{ textAlign: 'center', height: '40px' }"
 			>
-				<el-table-column prop="createByName" label="创建人" />
-				<el-table-column prop="questionDesc" label="隐患问题" />
-				<el-table-column label="隐患照片">
-					<template #default="scope">
-						<el-image
-							v-if="scope.row.image && scope.row.image.length > 0"
-							style="width: 38px; height: 28px"
-							:src="scope.row.image[0].url"
-							fit="fill"
-						></el-image>
-					</template>
+				<el-table-column prop="createByName" label="项目名称" />
+				<el-table-column prop="questionDesc" label="单位" />
+				<el-table-column label="合同">
+					<el-table-column prop="province" label="工程量" width="120"> </el-table-column>
+					<el-table-column prop="city" label="单价(元)" width="120"> </el-table-column>
+					<el-table-column prop="address" label="金额(元)"> </el-table-column>
 				</el-table-column>
-				<el-table-column prop="state" label="整改状态">
-					<template #default="scope">
-						<span>{{
-							scope.row.state == 1
-								? "待整改"
-								: scope.row.state == 2
-								? "待审核"
-								: scope.row.state == 3
-								? "已闭合"
-								: scope.row.state == 4
-								? "已驳回"
-								: ""
-						}}</span>
-					</template>
+				<el-table-column label="至上期末完成">
+					<el-table-column prop="province" label="工程量" width="120"> </el-table-column>
+					<el-table-column prop="address" label="金额(元)"> </el-table-column>
 				</el-table-column>
+				<el-table-column label="本期完成">
+					<el-table-column prop="province" label="工程量" width="120"> </el-table-column>
+					<el-table-column prop="address" label="金额(元)"> </el-table-column>
+				</el-table-column>
+				<el-table-column label="截至本期末累计完成">
+					<el-table-column prop="province" label="工程量" width="120"> </el-table-column>
+					<el-table-column prop="address" label="金额(元)"> </el-table-column>
+				</el-table-column>
+				<el-table-column prop="state" label="备注"> </el-table-column>
 				<el-table-column align="center" width="300" label="操作">
 					<template #default="scope">
 						<el-button type="primary" link @click="handleEditItem(scope.row)">