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

src/api/financialSupervision.info/financialSupervision.js

@@ -113,12 +113,30 @@ export default {
         return request(`priceApproval/getApprovalThreeRKMX/${orgId}`, {}, 'get')
     },
 
-
     // 添加财务监管-省级储备粮清算管理-轮换费用利息补贴清算表
     fsrpcostinterestsettleAddd(data) {
-        return request('/financialSupervision/fsrpcostinterestsettle/add', data, 'post')
+        return request('/fsrpcostinterestsettle/add', data, 'post')
+    },
+
+    // 获取销售收入上报分页  
+    fsSaleRevenuePage(data) {
+        return request('/fsSaleRevenue/page', data, 'get')
+    },
+
+    // 编辑销售收入上报 
+    fsSaleRevenueEdit(data) {
+        return request('/fsSaleRevenue/edit', data, 'post')
+    },
+
+    // 销售收入上报详情 
+    fsSaleRevenueDetail(data) {
+        return request('fsSaleRevenue/detail', data, 'get')
     },
 
+    // 三账一致性-出库明细
+    getOutStorageDetailedBy(contractNumber) {
+        return request(`/fsSaleRevenue/getOutStorageDetailed/${contractNumber}`, {}, 'get')
+    },
 }
 
 

src/views/Arevenue/ARSales/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 销售收入上报 -->
 	<div class="pricemoitorrecord">
 		<a-card :bordered="false">
 			<a-space class="search">
@@ -6,39 +7,25 @@
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						企业名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
+					<a-input style="width: 220px" v-model:value="SearchFormDel.dwmc" placeholder="请输入" />
 				</div>
 				<div class="silt-title">
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						库区名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
-					<!-- <a-select style="width: 220px" v-model:value="SearchFormDel.unitName">
-						<a-select-option :value="1">1</a-select-option>
-					</a-select> -->
+					<a-input style="width: 220px" v-model:value="SearchFormDel.orgName" placeholder="请输入" />
 				</div>
 				<div class="btnBox">
 					<a-button type="primary" class="primarySele" @click="Search"> 查询 </a-button>
 					<a-button class="primarySele snowy-buttom-left" @click="onReset"> 重置 </a-button>
-					<a-button type="primary" class="primarySele" @click="onView('add', {})"> 新增 </a-button>
 				</div>
 			</a-space>
 		</a-card>
-
 		<div class="list" style="margin-top: 10px">
 			<a-table :dataSource="tableData" :pagination="pagination" :columns="tableColumns">
 				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'creditLevel'">
-						<div v-if="record.creditLevel == '1'">一级</div>
-						<div v-if="record.creditLevel == '2'">二级</div>
-						<div v-if="record.creditLevel == '3'">三级</div>
-					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
-						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
-						<a-popconfirm title="确定要删除吗？" @confirm="onView('del', record)">
-							<a-button type="link">删除</a-button>
-						</a-popconfirm>
 					</template>
 				</template>
 			</a-table>
@@ -46,74 +33,74 @@
 	</div>
 </template>
 <script setup name="sharing">
-	import { listPagination } from '@/hook/listlistPagination.js'
-	import { reactive, ref } from 'vue'
-	import business from '@/api/basic.info/verifyQuery.js'
-	import { useRouter } from 'vue-router'
-	import { defineComponent } from 'vue'
-	const formRef = ref(null)
-	const router = useRouter()
-	const tableColumns = [
-		{
-			title: '序号',
-			dataIndex: 'Index',
-			align: 'center',
-			customRender: ({ text, record, index }) => {
-				return `${index + 1}`
-			}
-		},
-		{ title: '企业名称', align: 'center', dataIndex: 'unitName' },
-		{ title: '库区名称', align: 'center', dataIndex: 'dwdm' },
-		{ title: '结算金额', align: 'center', dataIndex: 'fddbr' },
-		{ title: '结算时间', align: 'center', dataIndex: 'creditLevel' },
-		{ title: '合同编号', align: 'center', dataIndex: 'updateTime' },
-		{ title: '操作', align: 'center', key: '操作' }
-	]
+import { listPagination } from '@/hook/listlistPagination.js'
+import { useRouter } from 'vue-router'
+import financialSupervisionApi from '@/api/financialSupervision.info/financialSupervision.js'
 
-	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ unitName: '', fddbr: '' }, business.XYDAlist, business.XYDAXdel, { sortOrder: 'ASCEND' })
-	setTimeout(() => {
-		tableData.value = [{ 1: 1 }]
-	}, 1000)
-	// 查看表单数据
-	const onView = (record, row) => {
-		switch (record) {
-			case 'add':
-				router.push('/Arevenue/ARSalesDel?add')
-				break
-			case 'del':
-				DEl(row)
-				break
-			case 'view':
-				router.push(`/Arevenue/ARSalesDel?codeLJH=${true}&id=${row.id}`)
-				break
-			case 'edit':
-				router.push(`/Arevenue/ARSalesDel?codeLJH=1&id=${row.id}`)
-				break
-			default:
-				// router.push('/business/personnelDel')
-				break
+const router = useRouter()
+const tableColumns = [
+	{
+		title: '序号',
+		dataIndex: 'Index',
+		align: 'center',
+		customRender: ({ text, record, index }) => {
+			return `${index + 1}`
 		}
+	},
+	{ title: '标题', align: 'center', dataIndex: 'unitName' },
+	{ title: '企业名称', align: 'center', dataIndex: 'dwmc' },
+	{ title: '库区名称', align: 'center', dataIndex: 'orgName' },
+	{ title: '上报时间', align: 'center', dataIndex: 'reportTime' },
+	{ title: '操作', align: 'center', key: '操作' }
+]
+
+const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
+	listPagination(
+		{ orgName: '', dwmc: '' },
+		financialSupervisionApi.fsSaleRevenuePage,
+		financialSupervisionApi.fsSaleRevenueDetail,
+		{
+			sortOrder: 'ASCEND'
+		}
+	)
+// 查看表单数据
+const onView = (record, row) => {
+	switch (record) {
+		case 'add':
+			router.push('/Arevenue/ARSalesDel?add')
+			break
+		case 'del':
+			DEl(row)
+			break
+		case 'view':
+			router.push(`/Arevenue/ARSalesDel?codeLJH=${true}&id=${row.id}`)
+			break
+		case 'edit':
+			router.push(`/Arevenue/ARSalesDel?codeLJH=1&id=${row.id}`)
+			break
+		default:
+			break
 	}
+}
 </script>
 <style lang="less" scoped>
-	.search {
-		padding-top: 20px;
-		// padding-left: 50px;
-		margin-bottom: 32px;
-		.btnBox {
-			width: 100%;
-			display: inline-block;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			.primarySele {
-				margin-left: 20px;
-				margin-right: 20px;
-			}
-		}
-	}
-	.silt-title {
+.search {
+	padding-top: 20px;
+	// padding-left: 50px;
+	margin-bottom: 32px;
+	.btnBox {
+		width: 100%;
+		display: inline-block;
 		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		.primarySele {
+			margin-left: 20px;
+			margin-right: 20px;
+		}
 	}
+}
+.silt-title {
+	display: flex;
+}
 </style>

src/views/Arevenue/Averification/form.vue

@@ -0,0 +1,180 @@
+<template>
+	<div>
+		<a-modal
+			class="btn-box"
+			v-model:visible="visible"
+			width="80%"
+			:footer="null"
+			:maskClosable="false"
+			:title="titleText"
+			@ok="isClose"
+		>
+			<a-row>
+				<a-col :span="24">
+					<a-table
+						:dataSource="crkList"
+						:row-key="(record) => record.key"
+						:pagination="false"
+						@change="onChangePage"
+						bordered
+						:columns="columns"
+					>
+						<template #summary>
+							<a-table-summary-row>
+								<a-table-summary-cell class="tc">合计</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-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-typography-text class="tc">{{ summary.totalMz }}</a-typography-text>
+								</a-table-summary-cell>
+								<a-table-summary-cell>
+									<a-typography-text class="tc">{{ summary.totalPz }}</a-typography-text>
+								</a-table-summary-cell>
+								<a-table-summary-cell>
+									<a-typography-text class="tc">{{ summary.totalKl }}</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-row>
+						</template>
+					</a-table>
+				</a-col>
+			</a-row>
+		</a-modal>
+	</div>
+</template>
+
+<script setup>
+import { message } from 'ant-design-vue'
+import financialSupervisionApi from '@/api/financialSupervision.info/financialSupervision.js'
+const columns = [
+	{
+		title: '合同编号',
+		dataIndex: 'htbh',
+		align: 'center',
+		key: 'htbh'
+	},
+	{
+		title: '仓房名称',
+		dataIndex: 'storehouseName',
+		align: 'center',
+		key: 'storehouseName'
+	},
+	{
+		title: '货位名称',
+		dataIndex: 'warehouseName',
+		align: 'center',
+		key: 'warehouseName'
+	},
+	{
+		title: '车牌号',
+		dataIndex: 'qcph',
+		align: 'center',
+		key: 'qcph'
+	},
+	{
+		title: '毛重',
+		dataIndex: 'mzzl',
+		align: 'center',
+		key: 'mzzl'
+	},
+	{
+		title: '皮重',
+		dataIndex: 'pz',
+		align: 'center',
+		key: 'pz'
+	},
+	{
+		title: '扣量',
+		dataIndex: 'bzwkl',
+		align: 'center',
+		key: 'bzwkl'
+	},
+	{
+		title: '出入库时间',
+		dataIndex: 'cpzsj',
+		align: 'center',
+		key: 'cpzsj'
+	}
+]
+const props = defineProps({
+	dataObj: {
+		type: Object,
+		default: () => {}
+	}
+})
+
+const visible = ref(false)
+const titleText = ref('')
+const formState = ref({})
+const emit = defineEmits(['isVisible'])
+const crkList = ref([])
+// 详情
+const detailData = (contractNumber) => {
+	financialSupervisionApi.getOutStorageDetailedBy(contractNumber).then((res) => {
+		crkList.value = res
+	})
+}
+
+const isClose = () => {
+	visible.value = false
+	emit('isVisible', false)
+	formState.value = {}
+}
+
+// 新增/查询/编辑控制器
+const flag = ref('')
+// 监听点击事件更新数据
+watch(
+	() => props.dataObj,
+	async (newValue, oldvalue) => {
+		formState.value = {}
+		await nextTick()
+		titleText.value = newValue.titleText
+		visible.value = newValue.visible
+		flag.value = newValue.flag
+		detailData(newValue.contractNumber)
+	},
+	{ deep: true }
+)
+
+const summary = computed(() => {
+	let totalMz = 0
+	let totalPz = 0
+	let totalKl = 0
+	crkList.value.forEach(({ mzzl, pz, bzwkl }) => {
+		totalMz += Number(mzzl)
+		totalPz += Number(pz)
+		totalKl += Number(bzwkl)
+	})
+	return { totalMz, totalPz, totalKl }
+})
+
+onMounted(() => {})
+</script>
+<style lang="less" scoped>
+.btn-box {
+	text-align: center;
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	button {
+		margin: 0 50px;
+		width: 100px;
+		border-radius: 5px;
+	}
+}
+
+.tc {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+</style>

src/views/Arevenue/Averification/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 销售收入核定 -->
 	<div class="pricemoitorrecord">
 		<a-card :bordered="false">
 			<a-space class="search">
@@ -6,21 +7,17 @@
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						企业名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
+					<a-input style="width: 220px" v-model:value="SearchFormDel.dwmc" placeholder="请输入" />
 				</div>
 				<div class="silt-title">
 					<span style="width: 70px; margin-right: 8px; text-align: right; display: block; line-height: 30px">
 						库区名称
 					</span>
-					<a-input style="width: 220px" v-model:value="SearchFormDel.unitName" placeholder="请输入" />
-					<!-- <a-select style="width: 220px" v-model:value="SearchFormDel.unitName">
-						<a-select-option :value="1">1</a-select-option>
-					</a-select> -->
+					<a-input style="width: 220px" v-model:value="SearchFormDel.orgName" placeholder="请输入" />
 				</div>
 				<div class="btnBox">
 					<a-button type="primary" class="primarySele" @click="Search"> 查询 </a-button>
 					<a-button class="primarySele snowy-buttom-left" @click="onReset"> 重置 </a-button>
-					<a-button type="primary" class="primarySele" @click="onView('add', {})"> 新增 </a-button>
 				</div>
 			</a-space>
 		</a-card>
@@ -28,17 +25,9 @@
 		<div class="list" style="margin-top: 10px">
 			<a-table :dataSource="tableData" :pagination="pagination" :columns="tableColumns">
 				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'creditLevel'">
-						<div v-if="record.creditLevel == '1'">一级</div>
-						<div v-if="record.creditLevel == '2'">二级</div>
-						<div v-if="record.creditLevel == '3'">三级</div>
-					</template>
 					<template v-if="column.key === '操作'">
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
-						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
-						<a-popconfirm title="确定要删除吗？" @confirm="onView('del', record)">
-							<a-button type="link">删除</a-button>
-						</a-popconfirm>
+						<a-button type="link" @click="onView('edit', record)">修改</a-button>
 					</template>
 				</template>
 			</a-table>
@@ -46,74 +35,72 @@
 	</div>
 </template>
 <script setup name="sharing">
-	import { listPagination } from '@/hook/listlistPagination.js'
-	import { reactive, ref } from 'vue'
-	import business from '@/api/basic.info/verifyQuery.js'
-	import { useRouter } from 'vue-router'
-	import { defineComponent } from 'vue'
-	const formRef = ref(null)
-	const router = useRouter()
-	const tableColumns = [
-		{
-			title: '序号',
-			dataIndex: 'Index',
-			align: 'center',
-			customRender: ({ text, record, index }) => {
-				return `${index + 1}`
-			}
-		},
-		{ title: '企业名称', align: 'center', dataIndex: 'unitName' },
-		{ title: '库区名称', align: 'center', dataIndex: 'dwdm' },
-		{ title: '合同编号', align: 'center', dataIndex: 'updateTime' },
-		{ title: '结算金额', align: 'center', dataIndex: 'fddbr' },
-		{ title: '结算时间', align: 'center', dataIndex: 'creditLevel' },
-		{ title: '操作', align: 'center', key: '操作' }
-	]
-
-	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ unitName: '', fddbr: '' }, business.XYDAlist, business.XYDAXdel, { sortOrder: 'ASCEND' })
-	setTimeout(() => {
-		tableData.value = [{ 1: 1 }]
-	}, 1000)
-	// 查看表单数据
-	const onView = (record, row) => {
-		switch (record) {
-			case 'add':
-				router.push('/Arevenue/AverificationDel?add')
-				break
-			case 'del':
-				DEl(row)
-				break
-			case 'view':
-				router.push(`/Arevenue/AverificationDel?codeLJH=${true}&id=${row.id}`)
-				break
-			case 'edit':
-				router.push(`/Arevenue/AverificationDel?codeLJH=1&id=${row.id}`)
-				break
-			default:
-				// router.push('/business/personnelDel')
-				break
+import { listPagination } from '@/hook/listlistPagination.js'
+import { useRouter } from 'vue-router'
+import financialSupervisionApi from '@/api/financialSupervision.info/financialSupervision.js'
+const router = useRouter()
+const tableColumns = [
+	{
+		title: '序号',
+		dataIndex: 'Index',
+		align: 'center',
+		customRender: ({ text, record, index }) => {
+			return `${index + 1}`
 		}
+	},
+	{ title: '企业名称', align: 'center', dataIndex: 'dwmc' },
+	{ title: '库区名称', align: 'center', dataIndex: 'orgName' },
+	{ title: '合同编号', align: 'center', dataIndex: 'contractNumber' },
+	{ title: '结算金额', align: 'center', dataIndex: 'moneyQuantity' },
+	{ title: '核定时间', align: 'center', dataIndex: 'updatedate' },
+	{ title: '操作', align: 'center', key: '操作' }
+]
+
+const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
+	listPagination({ orgName: '', dwmc: '' }, financialSupervisionApi.fsSaleRevenuePage, financialSupervisionApi.fsSaleRevenueDetail, {
+		sortOrder: 'ASCEND'
+	})
+// setTimeout(() => {
+// 	tableData.value = [{ 1: 1 }]
+// }, 1000)
+
+// 查看表单数据
+const onView = (record, row) => {
+	switch (record) {
+		case 'add':
+			router.push('/Arevenue/AverificationDel?add')
+			break
+		case 'del':
+			DEl(row)
+			break
+		case 'view':
+			router.push(`/Arevenue/AverificationDel?codeLJH=${true}&id=${row.id}`)
+			break
+		case 'edit':
+			router.push(`/Arevenue/AverificationDel?codeLJH=1&id=${row.id}`)
+			break
+		default:
+			break
 	}
+}
 </script>
 <style lang="less" scoped>
-	.search {
-		padding-top: 20px;
-		// padding-left: 50px;
-		margin-bottom: 32px;
-		.btnBox {
-			width: 100%;
-			display: inline-block;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			.primarySele {
-				margin-left: 20px;
-				margin-right: 20px;
-			}
-		}
-	}
-	.silt-title {
+.search {
+	padding-top: 20px;
+	margin-bottom: 32px;
+	.btnBox {
+		width: 100%;
+		display: inline-block;
 		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		.primarySele {
+			margin-left: 20px;
+			margin-right: 20px;
+		}
 	}
+}
+.silt-title {
+	display: flex;
+}
 </style>