Merge branch 'dev-2.19.0' of http://101.36.160.140:21044/province-vue-qh/province-vue-all into dev

src/style/projectManage/index.less

@@ -1,59 +1,75 @@
-.mainPage{
-	.queryBox{
-          padding: 24px;
-		  background: #fff;
-		  .ant-form{
-			.ant-row{
-				.ant-col{
+.mainPage {
+	height: calc(100vh - 160px);
+
+	.queryBox {
+		padding: 20px 0 0 0;
+		background: #fff;
+
+		.ant-form {
+			.ant-row {
+				.ant-col {
 					margin-left: 10px;
-					.addBtn{
+
+					.addBtn {
 						color: #fff;
 						background: #67C23A;
 					}
 				}
 			}
-		  }
+		}
 	}
-	.tableBox{
+
+	.tableBox {
 		margin-top: 20px;
 		background: #fff;
-		.ant-table-wrapper{
+
+		.ant-table-wrapper {
 			padding: 20px;
+
 			::v-deep(.ant-table) {
-				height: calc(100vh - 460px);
+				height: calc(100vh - 350px);
+
 				.ant-table-content {
 					overflow: auto;
-                 height: calc(100vh - 470px);
+					height: calc(100vh - 470px);
+
 					.ant-table-tbody {
-						.ant-empty{
-							height:calc(100vh - 600px);
+						.ant-empty {
+							height: calc(100vh - 600px);
 						}
-						.ant-table-cell{
-							.ant-btn{
+
+						.ant-table-cell {
+							.ant-btn {
 								color: #fff;
 								margin: 0 5px;
 							}
-							.editBtn{
+
+							.editBtn {
 								background: #E6A23C;
 							}
-							.addBtn,.approveBtn{
+
+							.addBtn,
+							.approveBtn {
 								background: #67C23A;
 							}
-							.deleteBtn{
+
+							.deleteBtn {
 								background: #F56C6C;
 							}
-							.saveStatus{
 
+							.saveStatus {}
+
+							.submitStatus {
+								font-weight: bold;
+								color: #409EFF;
 							}
-							.submitStatus{
-							   font-weight: bold;
-                               color: #409EFF;
-							}
-							.rejectStatus{
+
+							.rejectStatus {
 								color: #F56C6C;
 								font-weight: bold;
 							}
-							.passStatus{
+
+							.passStatus {
 								color: #67C23A;
 								font-weight: bold;
 							}
@@ -64,12 +80,14 @@
 			}
 		}
 	}
-	.paginationBox{
+
+	.paginationBox {
 		width: 100%;
 		height: 52px;
 		padding: 10px 10px;
 		background: #fff;
-		.ant-pagination{
+
+		.ant-pagination {
 			float: right;
 		}
 	}

src/style/queryPage.less

@@ -1,6 +1,7 @@
 .mainPage{
+	height: calc(100vh - 160px);
 	.queryBox{
-          padding: 24px;
+          padding:20px 0 0 0;
 		  background: #fff;
 		  .ant-form{
 			.ant-row{
@@ -20,10 +21,10 @@
 		.ant-table-wrapper{
 			padding: 20px;
 			::v-deep(.ant-table) {
-				height: calc(100vh - 460px);
+				height: calc(100vh - 350px);
 				.ant-table-content {
 					overflow: auto;
-                 height: calc(100vh - 470px);
+                    height: calc(100vh - 470px);
 					.ant-table-tbody {
 						.ant-empty{
 							height:calc(100vh - 600px);

src/views/RLGI/comonents/drawerModule/inventory.vue

@@ -1,9 +1,9 @@
 <template>
 	<a-drawer
 		width="100%"
+		placement="right"
 		:closable="false"
 		:style="drawerStyle"
-		placement="right"
 		:get-container="false"
 		:title="props.drawerInfo.title"
 		v-model:visible="props.drawerInfo.showDrawer"
@@ -49,9 +49,15 @@
 				</a-col>
 			</a-row>
 		</a-form>
-		<!-- :scroll="{ x: 'calc(700px + 50%)', y: true }" -->
 		<div class="statisticsTableAll">
-			<a-table size="small" bordered :dataSource="tableData" :columns="tableColumns" :pagination="false">
+			<a-table
+				bordered
+				size="small"
+				:pagination="false"
+				:dataSource="tableData"
+				:columns="tableColumns"
+				:scroll="{ x: 1500, y: 450 }"
+			>
 				<template #bodyCell="{ column, record, index }">
 					<template v-if="column.key === 'INDEX'">{{ index + 1 }}</template>
 					<template v-else>{{ record[column.key] }}</template>
@@ -85,7 +91,7 @@
 		]
 	})
 	const emit = defineEmits(['closeDrawer'])
-	const drawerStyle = ref({ position: 'absolute' })
+	const drawerStyle = ref({ position: 'absolute', height: 'calc(100vh - 160px)' })
 	const dicList = JSON.parse(localStorage.getItem('DICT_TYPE_TREE_DATA'))
 
 	const props = defineProps({
@@ -95,8 +101,8 @@
 		}
 	})
 	const tableColumns = [
-		{ title: '序号', width: 60, key: 'INDEX', align: 'center' },
-		{ title: '承储企业', align: 'center', ellipsis: true, width: 250, key: 'orgName' },
+		{ title: '序号', width: 60, key: 'INDEX', align: 'center', fixed: true },
+		{ title: '承储企业', align: 'center', ellipsis: true, width: 250, key: 'orgName', ellipsis: true, fixed: true },
 		{ title: '地方储备', align: 'center', children: getTableChildren('_地方储备', 'df') },
 		{ title: '省级储备', align: 'center', children: getTableChildren('_省级储备', 'sj') },
 		{ title: '市(州)级储备', align: 'center', children: getTableChildren('_市级储备', 'cj') },
@@ -105,29 +111,29 @@
 
 	function getTableChildren(key, prefix, width = 70) {
 		return [
-			{ title: '粮油合计', width, key: `${prefix}cbLyhj`, align: 'center', dataIndex: `${key}.a` },
-			{ title: '原粮合计', width, key: `${prefix}cbYyhj`, align: 'center', dataIndex: `${key}.a` },
+			{ title: '粮油合计', width, key: `${prefix}cbLyhj`, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
+			{ title: '原粮合计', width, key: `${prefix}cbYyhj`, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
 			{
 				title: '粮食分品种',
 				align: 'center',
 				children: [
-					{ title: '小麦', key: `${prefix}cbXmhj`, width, align: 'center', dataIndex: `${key}.a` },
+					{ title: '小麦', key: `${prefix}cbXmhj`, width, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
 					{
 						title: '面折粮',
 						align: 'center',
 						children: [
-							{ title: '', width, key: `${prefix}cbXmMzl`, align: 'center', dataIndex: `${key}.a` },
-							{ title: '面粉', width, key: `${prefix}cbXmToMf`, align: 'center', dataIndex: `${key}.a` }
+							{ title: '', width, key: `${prefix}cbXmMzl`, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
+							{ title: '面粉', width, key: `${prefix}cbXmToMf`, align: 'center', dataIndex: `${key}.a`, ellipsis: true }
 						]
 					},
-					{ title: '青稞', width, key: `${prefix}cbQkhj`, align: 'center', dataIndex: `${key}.a` },
-					{ title: '稻谷', width, key: `${prefix}cbDghj`, align: 'center', dataIndex: `${key}.a` },
+					{ title: '青稞', width, key: `${prefix}cbQkhj`, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
+					{ title: '稻谷', width, key: `${prefix}cbDghj`, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
 					{
 						title: '米折粮',
 						align: 'center',
 						children: [
-							{ title: '', width, key: `${prefix}cbDgMzl`, align: 'center', dataIndex: `${key}.a` },
-							{ title: '大米', width, key: `${prefix}cbDgToDm`, align: 'center', dataIndex: `${key}.a` }
+							{ title: '', width, key: `${prefix}cbDgMzl`, align: 'center', dataIndex: `${key}.a`, ellipsis: true },
+							{ title: '大米', width, key: `${prefix}cbDgToDm`, align: 'center', dataIndex: `${key}.a`, ellipsis: true }
 						]
 					}
 				]
@@ -181,4 +187,7 @@
 	.ant-btn {
 		margin: 0 15px;
 	}
+	.statisticsTableAll {
+		overflow: auto;
+	}
 </style>

src/views/RLGI/comonents/grainCondition/gatherAndShow.vue

@@ -6,10 +6,10 @@
 				<a-form-item>
 					<a-button @click="detection('')"><tool-outlined />粮温检测</a-button>
 				</a-form-item>
-				<a-form-item label="仓房名称" name="ckmc">
+				<a-form-item label="仓房名称" name="storehouseName">
 					<a-input v-model:value="pagination.storehouseName" placeholder="请输入仓房名称" />
 				</a-form-item>
-				<a-form-item label="检测时间" name="jcsj">
+				<a-form-item label="检测时间" name="gatherTime">
 					<a-date-picker
 						show-time
 						v-model:value="pagination.gatherTime"
@@ -19,12 +19,12 @@
 				</a-form-item>
 				<a-form-item>
 					<a-button type="primary" @click="getTableData">查询</a-button>
-					<a-button @click="resetForm">清空</a-button>
+					<a-button @click="resetForm">重置</a-button>
 				</a-form-item>
 			</a-form>
 		</div>
 		<div class="tableBox">
-			<a-table :dataSource="tableData" :columns="columns" :pagination="pagination" @change="handleTableChange">
+			<a-table :dataSource="tableData" :columns="columns" :pagination="false">
 				<template #bodyCell="{ column, record, index }">
 					<template v-if="column.key === 'index'">{{
 						pagination.size * (pagination.current - 1) + index + 1
@@ -43,6 +43,15 @@
 				</template>
 			</a-table>
 		</div>
+		<div class="paginationBox">
+			<a-pagination
+				@change="changePage"
+				:total="pagination.total"
+				:pageSize="pagination.size"
+				:current="pagination.current"
+				:show-total="(total) => `共 ${total} 条`"
+			/>
+		</div>
 		<grainCondition v-if="drawerData.showDetails" :drawerData="drawerData" @closeDrawer="closeDrawer" />
 	</div>
 </template>
@@ -71,9 +80,7 @@
 		current: 1,
 		size: 10,
 		endJysj: '',
-		orgId: orgId,
-		showTotal: (total) => `共 ${total} 条数据`, // 展示总共有几条数据
-		'show-quick-jumper': true
+		orgId: orgId
 	})
 
 	onMounted(() => {
@@ -101,6 +108,7 @@
 	// 清空搜索条件
 	function resetForm() {
 		formRef.value.resetFields()
+		getTableData()
 	}
 
 	// 检测温度
@@ -115,6 +123,12 @@
 			getTableData()
 		})
 	}
+	// 分页事件
+	function changePage(current, size) {
+		pagination.value.size = size
+		pagination.current = current
+		getTableData()
+	}
 
 	// 关闭抽屉
 	function closeDrawer() {
@@ -177,4 +191,13 @@
 			}
 		}
 	}
+	.paginationBox {
+		width: 100%;
+		height: 52px;
+		padding: 10px 10px;
+		background: #fff;
+		.ant-pagination {
+			float: right;
+		}
+	}
 </style>

src/views/emergencySupport/yjccqytj.vue

@@ -1,37 +1,41 @@
 <!-- 校验查询 -->
 <template>
 	<div class="pageBox">
-		<a-form ref="formRef" :model="pageData">
-			<a-form-item label="查询市州" name="city">
-				<a-select allowClear placeholder="请选择市州" v-model:value="pageData.city" @change="selectCity">
-					<a-select-option v-for="dic in dictList.cityList" :value="dic.id" :key="dic.name">{{
-						dic.dictLabel
-					}}</a-select-option>
-				</a-select>
-			</a-form-item>
-			<a-form-item label="查询区县" name="county">
-				<a-select placeholder="请选择区县" v-model:value="pageData.county" :disabled="!pageData.city">
-					<a-select-option v-for="dic in dictList.countyList" :value="dic.id" :key="dic.name">{{
-						dic.dictLabel
-					}}</a-select-option>
-				</a-select>
-			</a-form-item>
-			<a-form-item>
-				<a-button type="primary" @click="getTableData">查询</a-button>
-				<a-button class="reset" @click="resetForm">重置</a-button>
-			</a-form-item>
-		</a-form>
-		<a-table :columns="columns" :pagination="false" :data-source="tableData" :scroll="{ x: 1500, y: 550 }">
-			<template #bodyCell="{ column, record, index }">
-				<template v-if="column.key === 'INDEX'">{{ index + 1 }}</template>
-				<template v-if="column.key === 'dqmc'">
-					<span v-if="record.qymc">{{ record.dqmc }}</span>
-					<a-button v-else-if="record.city || record.county" type="link" @click="getNextData(record)">{{
-						record.dqmc
-					}}</a-button>
+		<div class="queryBox">
+			<a-form ref="formRef" :model="pageData">
+				<a-form-item label="查询市州" name="city">
+					<a-select allowClear placeholder="请选择市州" v-model:value="pageData.city" @change="selectCity">
+						<a-select-option v-for="dic in dictList.cityList" :value="dic.id" :key="dic.name">{{
+							dic.dictLabel
+						}}</a-select-option>
+					</a-select>
+				</a-form-item>
+				<a-form-item label="查询区县" name="county">
+					<a-select placeholder="请选择区县" v-model:value="pageData.county" :disabled="!pageData.city">
+						<a-select-option v-for="dic in dictList.countyList" :value="dic.id" :key="dic.name">{{
+							dic.dictLabel
+						}}</a-select-option>
+					</a-select>
+				</a-form-item>
+				<a-form-item>
+					<a-button type="primary" @click="getTableData">查询</a-button>
+					<a-button class="reset" @click="resetForm">重置</a-button>
+				</a-form-item>
+			</a-form>
+		</div>
+		<div class="tableBox">
+			<a-table :columns="columns" :pagination="false" :data-source="tableData" :scroll="{ x: 1500, y: 550 }">
+				<template #bodyCell="{ column, record, index }">
+					<template v-if="column.key === 'INDEX'">{{ index + 1 }}</template>
+					<template v-if="column.key === 'dqmc'">
+						<span v-if="record.qymc">{{ record.dqmc }}</span>
+						<a-button v-else-if="record.city || record.county" type="link" @click="getNextData(record)">{{
+							record.dqmc
+						}}</a-button>
+					</template>
 				</template>
-			</template>
-		</a-table>
+			</a-table>
+		</div>
 	</div>
 </template>
 <script setup name="credit">
@@ -115,21 +119,31 @@
 </script>
 <style lang="less" scoped>
 	.pageBox {
-		margin: 30px 0;
-		.ant-form {
-			padding: 15px 30px 0 30px;
-			overflow: hidden;
-			.ant-form-item {
-				width: 20%;
-				float: left;
-				margin-right: 2%;
-				.ant-btn {
-					margin-right: 15px;
-				}
-				.ant-btn-text {
-					cursor: hand;
+		.queryBox {
+			padding: 20px 0 0 0;
+			background: #fff;
+			.ant-form {
+				padding: 15px 30px 0 30px;
+				overflow: hidden;
+				.ant-form-item {
+					width: 20%;
+					float: left;
+					margin-right: 2%;
+					.ant-btn {
+						margin-right: 15px;
+					}
+					.ant-btn-text {
+						cursor: hand;
+					}
 				}
 			}
 		}
+		.tableBox {
+			margin-top: 20px;
+			background: #fff;
+			::v-deep(.ant-table) {
+				height: calc(100vh - 280px);
+			}
+		}
 	}
 </style>

src/views/projectManage/approve.vue

@@ -28,7 +28,7 @@
 			</a-form>
 		</div>
 		<div class="tableBox">
-			<a-table :columns="columns" :data-source="tableData" :pagination="false">
+			<a-table :columns="columns" :data-source="tableData" :pagination="false" :scroll="{ x: 1500, y: 520 }">
 				<template #bodyCell="{ column, record, index }">
 					<template v-if="column.dataIndex === 'index'">
 						{{ index + 1 }}
@@ -77,8 +77,7 @@
 		total: 0,
 		size: 10,
 		current: 1,
-		projectName: '',
-		showTotal: (total) => `共 ${total} 条数据` // 展示总共有几条数据
+		projectName: ''
 	})
 
 	const modalData = reactive({

src/views/projectManage/declare.vue

@@ -29,7 +29,7 @@
 			</a-form>
 		</div>
 		<div class="tableBox">
-			<a-table :columns="columns" :data-source="tableData" :pagination="false">
+			<a-table :columns="columns" :data-source="tableData" :pagination="false" :scroll="{ x: 1500, y: 520 }">
 				<template #bodyCell="{ column, record, index }">
 					<template v-if="column.dataIndex === 'index'">
 						{{ index + 1 }}
@@ -92,8 +92,7 @@
 		total: 0,
 		size: 10,
 		current: 1,
-		projectName: '',
-		showTotal: (total) => `共 ${total} 条数据` // 展示总共有几条数据
+		projectName: ''
 	})
 
 	const modalData = reactive({

src/views/projectManage/information.vue

@@ -29,7 +29,7 @@
 			</a-form>
 		</div>
 		<div class="tableBox">
-			<a-table :columns="columns" :data-source="tableData" :pagination="false">
+			<a-table :columns="columns" :data-source="tableData" :pagination="false" :scroll="{ x: 1500, y: 520 }">
 				<template #bodyCell="{ column, record, index }">
 					<template v-if="column.dataIndex === 'index'">
 						{{ index + 1 }}
@@ -82,8 +82,7 @@
 		total: 0,
 		current: 1,
 		size: 10,
-		projectName: '',
-		showTotal: (total) => `共 ${total} 条数据` // 展示总共有几条数据
+		projectName: ''
 	})
 
 	const columns = [

src/views/projectManage/supervision.vue

@@ -19,7 +19,7 @@
 			</a-form>
 		</div>
 		<div class="tableBox">
-			<a-table :columns="columns" :data-source="tableData" :pagination="false">
+			<a-table :columns="columns" :data-source="tableData" :pagination="false" :scroll="{ x: 1500, y: 520 }">
 				<template #bodyCell="{ column, record, index }">
 					<template v-if="column.dataIndex === 'index'">
 						{{ index + 1 }}
@@ -66,8 +66,7 @@
 		total: 0,
 		current: 1,
 		size: 10,
-		projectName: '',
-		showTotal: (total) => `共 ${total} 条数据` // 展示总共有几条数据
+		projectName: ''
 	})
 
 	const columns = [