Merge remote-tracking branch 'origin/dev' into dev

src/views/Arevenue/Averification/form.vue

@@ -25,7 +25,7 @@
 								<a-table-summary-cell>
 									<a-typography-text class="tc"></a-typography-text>
 								</a-table-summary-cell>
-								<a-table-summary-cell> <a-typography-text class="tc"></a-typography-text> </a-table-summary-cell
+								<a-table-summary-cell></a-table-summary-cell
 								><a-table-summary-cell>
 									<a-typography-text class="tc"></a-typography-text>
 								</a-table-summary-cell>

src/views/financialSupervision/ProvincialReserveGrainClearingManagement/SafeCostGrainSubsidyClear/index.vue

@@ -27,14 +27,7 @@
 		<div style="display: flex; justify-content: end; margin-right: 120px">
 			<span>单位：万公斤、万元</span>
 		</div>
-		<a-table
-			id="table"
-			:columns="columns"
-			:data-source="data"
-			bordered
-			:pagination="false"
-			style="width: 150%; overflow-x: auto; scrollbar-width: none; -ms-overflow-style: none"
-		>
+		<a-table id="table" :columns="columns" :data-source="data" bordered :pagination="false" :scroll="{ x: 0, y: 500 }">
 			<template #bodyCell="{ column, text, record }">
 				<template v-if="['age', 'building', 'street', 'companyAddress'].includes(column.dataIndex)">
 					<div>
@@ -127,8 +120,8 @@ const flag = ref('1')
 const columns = [
 	{
 		title: '承储企业',
-		dataIndex: 'orgId',
-		key: 'orgId',
+		dataIndex: 'orgName',
+		key: 'orgName',
 		width: 300,
 		align: 'center',
 		fixed: 'left'

src/views/financialSupervision/ProvincialReserveGrainClearingManagement/interestSubsidysettlem/index.vue

@@ -28,7 +28,7 @@
 		<div style="display: flex; justify-content: end; margin-right: 120px">
 			<span>单位：万公斤、万元</span>
 		</div>
-		<a-table :columns="columns" :data-source="data" bordered :pagination="false" id="table">
+		<a-table :columns="columns" :data-source="data" bordered :pagination="false" id="table" :scroll="{ y: 500 }">
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.key === 'interestAllocated'">
 					<a-input autocomplete="off" v-model:value="record.interestAllocated" v-if="flag === 2" />

src/views/financialSupervision/ProvincialReserveGrainClearingManagement/liquidationInterestSubsidy/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<!-- 费用利息补贴清算表 -->
+	<!-- 轮换费用利息补贴清算表 -->
 	<div>
 		<a-space class="header" ref="tableElem">
 			<div class="input-box">
@@ -35,6 +35,7 @@
 			bordered
 			:pagination="false"
 			:row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)"
+			:scroll="{  y: 500 }"
 		>
 			<template #bodyCell="{ column, record }">
 				<template v-if="column.key === 'totalAllocation'">
@@ -76,16 +77,16 @@
 				<a-table-summary-row>
 					<a-table-summary-cell class="tc">合计</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageInventory }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageInventory.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventory }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventory.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryPhysical }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryPhysical.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryEmpty }}</a-typography-text>
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryEmpty.toFixed(2) }}</a-typography-text>
 					</a-table-summary-cell>
 					<a-table-summary-cell>
 						<a-typography-text class="tc"></a-typography-text>
@@ -146,7 +147,7 @@ const columns = [
 				align: 'center'
 			},
 			{
-				title: '利息费用',
+				title: '利息费用应拨数',
 				dataIndex: 'interestCostAllocation',
 				key: 'interestCostAllocation',
 				width: 200,

src/views/finishedProduct/warehouseFiling/form.vue

@@ -9,7 +9,7 @@
 			:maskClosable="false"
 			:title="titleText"
 		>
-			<a-form>
+			<a-form style="height: 500px; overflow-y: auto">
 				<a-row>
 					<a-col :span="8"
 						><a-form-item label="所属粮仓名称">
@@ -502,7 +502,7 @@
 					<a-col :span="3" class=""> </a-col>
 				</a-row>
 			</a-form>
-			<div class="btn-box">
+			<div class="btn-box1">
 				<a-button @click="isClose">关闭</a-button>
 			</div>
 		</a-modal>
@@ -599,7 +599,20 @@ watch(
 	margin-top: 10px;
 	text-align: center;
 }
-
+.btn-box1 {
+	position: absolute;
+	margin-top: 10px;
+	text-align: center;
+	bottom: 20px;
+	width: 96%;
+	background: rgba(190, 190, 190, 0.2);
+}
+// ::v-deep .btn-box1 {
+// 	margin-top: 10px;
+// 	text-align: center;
+// 	height: 600px !important;
+// 	overflow-y: auto !important;
+// }
 .int-box {
 	width: 80% !important;
 }
@@ -610,7 +623,6 @@ watch(
 .read-the-docs {
 	color: #888;
 }
-
 .bp1 {
 	border: 1px solid #999;
 	box-sizing: border-box;