合并分支 'yp-dev' 到 'pre'

src/views/exportControl/v2.0EntityList/components/dataStatistics/index.vue

@@ -1220,7 +1220,7 @@ onMounted(() => {
 	width: 1601px;
 	margin: 0 auto;
 	padding-top: 16px;
-	padding-bottom: 50px;
+	// padding-bottom: 50px;
 
 	.nav {
 		width: 100%;

src/views/exportControl/v2.0EntityList/index.vue

@@ -236,7 +236,7 @@ const headerNavList = ref([
 		width: 100%;
 		height: auto;
 		min-height: calc(100% - 148px);
-		background-color: #f7f8f9;
+		// background-color: #f7f8f9;
 	}
 }
 </style>

src/views/finance/entityList/components/sanctionsOverview/components/listPage/index.vue

@@ -5,6 +5,9 @@
 				<el-input v-model="searchKeyword" class="search-input" placeholder="搜索实体" :suffix-icon="Search" />
 				<div class="filters">
 					<el-checkbox v-model="onlyChina" label="只看中国实体" />
+					<el-select v-model="order" placeholder="请选择排序方式" style="width: 160px">
+						<el-option v-for="item in orderOptions" :value="item.value" :key="item.value" :label="item.name" />
+					</el-select>
 				</div>
 			</div>
 			<div class="main">
@@ -242,6 +245,11 @@ import { useGotoCompanyPages } from "@/router/modules/company";
 const gotoCompanyPages = useGotoCompanyPages();
 const router = useRouter();
 
+const order = ref("asc");
+const orderOptions = ref([
+	{ name: "正序", value: "asc" },
+	{ name: "倒序", value: "desc" }
+]);
 // 跳转公司详情页
 const handleCompClick = item => {
 	console.log("item", item);
@@ -258,7 +266,7 @@ const handleCompClick = item => {
 };
 
 const searchKeyword = ref("");
-const onlyChina = ref(false);
+const onlyChina = ref(true);
 const sanctionTime = ref("");
 
 const currentPage = ref(1);
@@ -461,7 +469,8 @@ const getExportControlListApi = async () => {
 		endDate,
 		keyword: searchKeyword.value || undefined,
 		pageNum: currentPage.value,
-		pageSize: pageSize.value
+		pageSize: pageSize.value,
+		sortOrder: order.value
 	};
 
 	try {
@@ -485,7 +494,12 @@ const getExportControlListApi = async () => {
 	}
 };
 
-watch(onlyChina, () => {
+// watch(onlyChina, () => {
+// 	currentPage.value = 1;
+// 	getExportControlListApi();
+// });
+
+watch([onlyChina, order], () => {
 	currentPage.value = 1;
 	getExportControlListApi();
 });
@@ -515,11 +529,6 @@ watch(customDateRange, () => {
 </script>
 
 <style scoped lang="scss">
-* {
-	margin: 0;
-	padding: 0;
-}
-
 .list-page {
 	width: 1601px;
 	padding-bottom: 50px;
@@ -554,7 +563,7 @@ watch(customDateRange, () => {
 
 		.filters {
 			display: flex;
-			align-items: center;
+			// align-items: center;
 
 			.el-checkbox {
 				margin-right: 20px;

src/views/finance/singleSanction/components/sanctionsOverview/index.vue

@@ -16,18 +16,10 @@
 								<div class="label">发布时间：</div>
 								<div class="value">{{ formattedData.postDate }}</div>
 							</div>
-							<!-- <div class="info-row">
-								<div class="label">生效时间：</div>
-								<div class="value">{{ formattedData.effectiveDate }}</div>
-							</div> -->
 							<div class="info-row">
 								<div class="label">发布文件：</div>
 								<div class="value">{{ formattedData.fileCode }}</div>
 							</div>
-							<!-- <div class="info-row">
-								<div class="label">案卷号：</div>
-								<div class="value">{{ formattedData.administrativeOrderId }}</div>
-							</div> -->
 							<div class="info-row">
 								<div class="label">发布人：</div>
 								<div class="value link">