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

src/views/PGSMSP/lqyfw/grainAnalysis.vue

@@ -17,7 +17,7 @@
 					<a-col :span="6">
 						<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-col>
 				</a-row>

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

@@ -17,6 +17,38 @@
 				<template #icon><close-outlined /></template>
 			</a-button>
 		</template>
+		<a-form ref="formRef" :model="searchData">
+			<a-row>
+				<a-col :span="4">
+					<a-form-item label="地区" name="cityId">
+						<a-select v-model:value="searchData.cityId" placeholder="请选择地区">
+							<a-select-option v-for="item in pageDicList.regionList" :value="item.id" :key="item.id">{{
+								item.name
+							}}</a-select-option>
+						</a-select>
+					</a-form-item>
+				</a-col>
+				<a-col :span="4">
+					<a-form-item label="粮食性质" name="lsxz">
+						<a-select v-model:value="searchData.lsxz" placeholder="请选择地区">
+							<a-select-option v-for="item in pageDicList.grainProperty" :value="item.value" :key="item.value">{{
+								item.label
+							}}</a-select-option>
+						</a-select>
+					</a-form-item>
+				</a-col>
+				<a-col :span="1">
+					<a-form-item>
+						<a-button type="primary" @click="getTableData">查询</a-button>
+					</a-form-item>
+				</a-col>
+				<a-col :span="6">
+					<a-form-item>
+						<a-button @click="resetForm">重置</a-button>
+					</a-form-item>
+				</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">
@@ -32,9 +64,29 @@
 	import { ref } from 'vue'
 	import api from '@/api/RLGI/system.js'
 
+	const formRef = ref()
 	const tableData = ref([])
+	const searchData = ref({})
+	const pageDicList = ref({
+		regionList: [],
+		grainProperty: [
+			{
+				value: '6877',
+				label: '省级'
+			},
+			{
+				value: '6878',
+				label: '市级'
+			},
+			{
+				value: '6879',
+				label: '县级'
+			}
+		]
+	})
 	const emit = defineEmits(['closeDrawer'])
 	const drawerStyle = ref({ position: 'absolute' })
+	const dicList = JSON.parse(localStorage.getItem('DICT_TYPE_TREE_DATA'))
 
 	const props = defineProps({
 		drawerInfo: {
@@ -44,7 +96,7 @@
 	})
 	const tableColumns = [
 		{ title: '序号', width: 60, key: 'INDEX', align: 'center' },
-		{ title: '承储企业', ellipsis: true, width: 250, key: 'orgName' },
+		{ title: '承储企业', align: 'center', ellipsis: true, width: 250, key: 'orgName' },
 		{ title: '地方储备', align: 'center', children: getTableChildren('_地方储备', 'df') },
 		{ title: '省级储备', align: 'center', children: getTableChildren('_省级储备', 'sj') },
 		{ title: '市(州)级储备', align: 'center', children: getTableChildren('_市级储备', 'cj') },
@@ -84,13 +136,28 @@
 		]
 	}
 	onMounted(() => {
+		getDicList()
 		getTableData()
 	})
 	function getTableData() {
-		api.getCrkKcswDatas().then((res) => {
+		api.getCrkKcswDatas(searchData.value).then((res) => {
 			tableData.value = res
 		})
 	}
+
+	// 获取字典
+	function getDicList() {
+		dicList.map((item) => {
+			if (item.dictValue == 'xzqh') {
+				item.children.map((el) => {
+					if (el.name == '青海省') {
+						pageDicList.value.regionList = el.children
+						// pageDicList.value.regionList.unshift(el)
+					}
+				})
+			}
+		})
+	}
 	// 全屏显示
 	function fullScreen() {
 		if (drawerStyle.value) {
@@ -99,7 +166,19 @@
 			drawerStyle.value = { position: 'absolute' }
 		}
 	}
+	function resetForm() {
+		formRef.value.resetFields()
+		getTableData()
+	}
 	function onClose() {
 		emit('closeDrawer')
 	}
 </script>
+<style scoped lang="less">
+	.ant-form-item {
+		margin-left: 10px;
+	}
+	.ant-btn {
+		margin: 0 15px;
+	}
+</style>