Merge branch 'xinyan' into dev

src/views/price-approval/approval-review-supply/components/DataTable.vue

@@ -117,8 +117,8 @@ async function fetchList(isQuery = false) {
 	if (gridOptions && gridOptions.data?.length) {
 		if (is_superuser.value) {
 			await gridRef.value.loadColumn(SupplyCheckColumns_Special);
-		} else if (!roleKey.value.includes('price.manage')) {
-			await gridRef.value.loadColumn(SupplyCheckColumns_Regular);
+		} else if (roleKey.value.includes('price.manage')) {
+			await gridRef.value.loadColumn(SupplyCheckColumns_Special);
 		}else {
 			await gridRef.value.loadColumn(SupplyCheckColumns_Regular);
 		}

src/views/price-approval/direct-sales/component/DataTable.vue

@@ -120,8 +120,8 @@ async function fetchList(isQuery = false) {
 	if (gridOptions && gridOptions.data?.length) {
 		if (is_superuser.value) {
 			await gridRef.value.loadColumn(DirectSalesCheckColumns_Special);
-		} else if (!roleKey.value.includes('price.manage')) {
-			await gridRef.value.loadColumn(DirectSalesCheckColumns_Regular);
+		} else if (roleKey.value.includes('price.manage')) {
+			await gridRef.value.loadColumn(DirectSalesCheckColumns_Special);
 		}else {
 			await gridRef.value.loadColumn(DirectSalesCheckColumns_Regular);
 		}