yangchengfei 4 months ago
parent
commit
5507f21923

+ 1 - 1
src/views/Arevenue/Averification/form.vue

@@ -25,7 +25,7 @@
25
 								<a-table-summary-cell>
25
 								<a-table-summary-cell>
26
 									<a-typography-text class="tc"></a-typography-text>
26
 									<a-typography-text class="tc"></a-typography-text>
27
 								</a-table-summary-cell>
27
 								</a-table-summary-cell>
28
-								<a-table-summary-cell> <a-typography-text class="tc"></a-typography-text> </a-table-summary-cell
28
+								<a-table-summary-cell></a-table-summary-cell
29
 								><a-table-summary-cell>
29
 								><a-table-summary-cell>
30
 									<a-typography-text class="tc"></a-typography-text>
30
 									<a-typography-text class="tc"></a-typography-text>
31
 								</a-table-summary-cell>
31
 								</a-table-summary-cell>

+ 3 - 10
src/views/financialSupervision/ProvincialReserveGrainClearingManagement/SafeCostGrainSubsidyClear/index.vue

@@ -27,14 +27,7 @@
27
 		<div style="display: flex; justify-content: end; margin-right: 120px">
27
 		<div style="display: flex; justify-content: end; margin-right: 120px">
28
 			<span>单位:万公斤、万元</span>
28
 			<span>单位:万公斤、万元</span>
29
 		</div>
29
 		</div>
30
-		<a-table
31
-			id="table"
32
-			:columns="columns"
33
-			:data-source="data"
34
-			bordered
35
-			:pagination="false"
36
-			style="width: 150%; overflow-x: auto; scrollbar-width: none; -ms-overflow-style: none"
37
-		>
30
+		<a-table id="table" :columns="columns" :data-source="data" bordered :pagination="false" :scroll="{ x: 0, y: 500 }">
38
 			<template #bodyCell="{ column, text, record }">
31
 			<template #bodyCell="{ column, text, record }">
39
 				<template v-if="['age', 'building', 'street', 'companyAddress'].includes(column.dataIndex)">
32
 				<template v-if="['age', 'building', 'street', 'companyAddress'].includes(column.dataIndex)">
40
 					<div>
33
 					<div>
@@ -127,8 +120,8 @@ const flag = ref('1')
127
 const columns = [
120
 const columns = [
128
 	{
121
 	{
129
 		title: '承储企业',
122
 		title: '承储企业',
130
-		dataIndex: 'orgId',
131
-		key: 'orgId',
123
+		dataIndex: 'orgName',
124
+		key: 'orgName',
132
 		width: 300,
125
 		width: 300,
133
 		align: 'center',
126
 		align: 'center',
134
 		fixed: 'left'
127
 		fixed: 'left'

+ 1 - 1
src/views/financialSupervision/ProvincialReserveGrainClearingManagement/interestSubsidysettlem/index.vue

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

+ 7 - 6
src/views/financialSupervision/ProvincialReserveGrainClearingManagement/liquidationInterestSubsidy/index.vue

@@ -1,5 +1,5 @@
1
 <template>
1
 <template>
2
-	<!-- 费用利息补贴清算表 -->
2
+	<!-- 轮换费用利息补贴清算表 -->
3
 	<div>
3
 	<div>
4
 		<a-space class="header" ref="tableElem">
4
 		<a-space class="header" ref="tableElem">
5
 			<div class="input-box">
5
 			<div class="input-box">
@@ -35,6 +35,7 @@
35
 			bordered
35
 			bordered
36
 			:pagination="false"
36
 			:pagination="false"
37
 			:row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)"
37
 			:row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)"
38
+			:scroll="{  y: 500 }"
38
 		>
39
 		>
39
 			<template #bodyCell="{ column, record }">
40
 			<template #bodyCell="{ column, record }">
40
 				<template v-if="column.key === 'totalAllocation'">
41
 				<template v-if="column.key === 'totalAllocation'">
@@ -76,16 +77,16 @@
76
 				<a-table-summary-row>
77
 				<a-table-summary-row>
77
 					<a-table-summary-cell class="tc">合计</a-table-summary-cell>
78
 					<a-table-summary-cell class="tc">合计</a-table-summary-cell>
78
 					<a-table-summary-cell>
79
 					<a-table-summary-cell>
79
-						<a-typography-text class="tc">{{ totals.totalAverageInventory }}</a-typography-text>
80
+						<a-typography-text class="tc">{{ totals.totalAverageInventory.toFixed(2) }}</a-typography-text>
80
 					</a-table-summary-cell>
81
 					</a-table-summary-cell>
81
 					<a-table-summary-cell>
82
 					<a-table-summary-cell>
82
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventory }}</a-typography-text>
83
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventory.toFixed(2) }}</a-typography-text>
83
 					</a-table-summary-cell>
84
 					</a-table-summary-cell>
84
 					<a-table-summary-cell>
85
 					<a-table-summary-cell>
85
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryPhysical }}</a-typography-text>
86
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryPhysical.toFixed(2) }}</a-typography-text>
86
 					</a-table-summary-cell>
87
 					</a-table-summary-cell>
87
 					<a-table-summary-cell>
88
 					<a-table-summary-cell>
88
-						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryEmpty }}</a-typography-text>
89
+						<a-typography-text class="tc">{{ totals.totalAverageRawGrainInventoryEmpty.toFixed(2) }}</a-typography-text>
89
 					</a-table-summary-cell>
90
 					</a-table-summary-cell>
90
 					<a-table-summary-cell>
91
 					<a-table-summary-cell>
91
 						<a-typography-text class="tc"></a-typography-text>
92
 						<a-typography-text class="tc"></a-typography-text>
@@ -146,7 +147,7 @@ const columns = [
146
 				align: 'center'
147
 				align: 'center'
147
 			},
148
 			},
148
 			{
149
 			{
149
-				title: '利息费用',
150
+				title: '利息费用应拨数',
150
 				dataIndex: 'interestCostAllocation',
151
 				dataIndex: 'interestCostAllocation',
151
 				key: 'interestCostAllocation',
152
 				key: 'interestCostAllocation',
152
 				width: 200,
153
 				width: 200,

+ 16 - 4
src/views/finishedProduct/warehouseFiling/form.vue

@@ -9,7 +9,7 @@
9
 			:maskClosable="false"
9
 			:maskClosable="false"
10
 			:title="titleText"
10
 			:title="titleText"
11
 		>
11
 		>
12
-			<a-form>
12
+			<a-form style="height: 500px; overflow-y: auto">
13
 				<a-row>
13
 				<a-row>
14
 					<a-col :span="8"
14
 					<a-col :span="8"
15
 						><a-form-item label="所属粮仓名称">
15
 						><a-form-item label="所属粮仓名称">
@@ -502,7 +502,7 @@
502
 					<a-col :span="3" class=""> </a-col>
502
 					<a-col :span="3" class=""> </a-col>
503
 				</a-row>
503
 				</a-row>
504
 			</a-form>
504
 			</a-form>
505
-			<div class="btn-box">
505
+			<div class="btn-box1">
506
 				<a-button @click="isClose">关闭</a-button>
506
 				<a-button @click="isClose">关闭</a-button>
507
 			</div>
507
 			</div>
508
 		</a-modal>
508
 		</a-modal>
@@ -599,7 +599,20 @@ watch(
599
 	margin-top: 10px;
599
 	margin-top: 10px;
600
 	text-align: center;
600
 	text-align: center;
601
 }
601
 }
602
-
602
+.btn-box1 {
603
+	position: absolute;
604
+	margin-top: 10px;
605
+	text-align: center;
606
+	bottom: 20px;
607
+	width: 96%;
608
+	background: rgba(190, 190, 190, 0.2);
609
+}
610
+// ::v-deep .btn-box1 {
611
+// 	margin-top: 10px;
612
+// 	text-align: center;
613
+// 	height: 600px !important;
614
+// 	overflow-y: auto !important;
615
+// }
603
 .int-box {
616
 .int-box {
604
 	width: 80% !important;
617
 	width: 80% !important;
605
 }
618
 }
@@ -610,7 +623,6 @@ watch(
610
 .read-the-docs {
623
 .read-the-docs {
611
 	color: #888;
624
 	color: #888;
612
 }
625
 }
613
-
614
 .bp1 {
626
 .bp1 {
615
 	border: 1px solid #999;
627
 	border: 1px solid #999;
616
 	box-sizing: border-box;
628
 	box-sizing: border-box;