From de4e4813f32b1971bf8cd07f9170181943db66f3 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 10 Mar 2025 15:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E6=8A=A5=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketerp/report/delivery/index.vue  | 35 +++++++---------
 .../report/deliverySummary/index.vue          | 40 +++++++------------
 .../report/warehousing/index.vue              | 35 +++++++---------
 .../report/warehousingSummary/index.vue       | 40 +++++++------------
 4 files changed, 56 insertions(+), 94 deletions(-)

diff --git a/src/views/supermarketerp/report/delivery/index.vue b/src/views/supermarketerp/report/delivery/index.vue
index 4b95308..022e332 100644
--- a/src/views/supermarketerp/report/delivery/index.vue
+++ b/src/views/supermarketerp/report/delivery/index.vue
@@ -3,12 +3,12 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" :inline="true" ref="queryRef" @keyup.enter="getDataList">
-					<el-form-item label="关键字" prop="key">
-						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
+					<el-form-item label="单据编号" prop="key">
+						<el-input placeholder="单据编号" v-model.trim="state.queryForm.key" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-date-picker
-							v-modeltrim="state.queryForm.inventoryDate"
+							v-model="state.queryForm.inventoryDate"
 							format="YYYY-MM-DD"
 							value-format="YYYY-MM-DD"
 							type="date"
@@ -25,7 +25,6 @@
 				<div class="mb8" style="width: 100%">
 					<right-toolbar
 						v-model:showSearch="showSearch"
-						:export="''"
 						@exportExcel="exportExcel"
 						class="ml10 mr20"
 						style="float: right"
@@ -41,24 +40,18 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 			>
-				<!-- <el-table-column type="selection" width="40" align="center" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
-				<el-table-column prop="productName" label="商品名" show-overflow-tooltip min-width="160" />
-				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
-				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
-				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
-				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
-				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="picUrl" label="商品图" show-overflow-tooltip>
-					<template #default="scope">
-						<preview-image :src="scope.row.picUrl" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
+				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip min-width="180" />
+				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip min-width="160" />
+				<el-table-column prop="productName" label="商品名称" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="unitPrice" label="单价" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="quantity" label="数量" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="totalAmount" label="总金额(元)" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="unit" label="单位" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="spec" label="规格" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
diff --git a/src/views/supermarketerp/report/deliverySummary/index.vue b/src/views/supermarketerp/report/deliverySummary/index.vue
index 8534fa5..e6ee0d9 100644
--- a/src/views/supermarketerp/report/deliverySummary/index.vue
+++ b/src/views/supermarketerp/report/deliverySummary/index.vue
@@ -1,14 +1,14 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-row v-show="showSearch">
+			<!-- <el-row v-show="showSearch">
 				<el-form :model="state.queryForm" :inline="true" ref="queryRef" @keyup.enter="getDataList">
-					<el-form-item label="关键字" prop="key">
-						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
+					<el-form-item label="单据编号" prop="key">
+						<el-input placeholder="单据编号" v-model.trim="state.queryForm.key" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-date-picker
-							v-modeltrim="state.queryForm.inventoryDate"
+							v-model="state.queryForm.inventoryDate"
 							format="YYYY-MM-DD"
 							value-format="YYYY-MM-DD"
 							type="date"
@@ -20,19 +20,18 @@
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-form>
-			</el-row>
-			<el-row>
+			</el-row> -->
+			<!-- <el-row>
 				<div class="mb8" style="width: 100%">
 					<right-toolbar
 						v-model:showSearch="showSearch"
-						:export="''"
 						@exportExcel="exportExcel"
 						class="ml10 mr20"
 						style="float: right"
 						@queryTable="getDataList"
 					/>
 				</div>
-			</el-row>
+			</el-row> -->
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
@@ -41,24 +40,13 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 			>
-				<!-- <el-table-column type="selection" width="40" align="center" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
-				<el-table-column prop="productName" label="商品名" show-overflow-tooltip min-width="160" />
-				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
-				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
-				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
-				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
-				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="picUrl" label="商品图" show-overflow-tooltip>
-					<template #default="scope">
-						<preview-image :src="scope.row.picUrl" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
+				<el-table-column prop="productName" label="商品名称" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="180" />
+				<el-table-column prop="inventoryNum" label="入库数量" show-overflow-tooltip min-width="160" />
+				<el-table-column prop="inventoryPrice" label="入库价格(元)" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="spec" label="规格" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="unit" label="单位" show-overflow-tooltip min-width="100" />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
@@ -70,7 +58,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { getInventoryPageSum } from "/@/api/supermarketerp/report"
 
 const queryRef = ref()
-const showSearch = ref(true)
+// const showSearch = ref(true)
 const selectObjs = ref([]) as any
 
 const state: BasicTableProps = reactive<BasicTableProps>({
diff --git a/src/views/supermarketerp/report/warehousing/index.vue b/src/views/supermarketerp/report/warehousing/index.vue
index 9c7523f..b3286c0 100644
--- a/src/views/supermarketerp/report/warehousing/index.vue
+++ b/src/views/supermarketerp/report/warehousing/index.vue
@@ -3,12 +3,12 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" :inline="true" ref="queryRef" @keyup.enter="getDataList">
-					<el-form-item label="关键字" prop="key">
-						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
+					<el-form-item label="单据编号" prop="key">
+						<el-input placeholder="单据编号" v-model.trim="state.queryForm.key" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-date-picker
-							v-modeltrim="state.queryForm.inventoryDate"
+							v-model="state.queryForm.inventoryDate"
 							format="YYYY-MM-DD"
 							value-format="YYYY-MM-DD"
 							type="date"
@@ -25,7 +25,6 @@
 				<div class="mb8" style="width: 100%">
 					<right-toolbar
 						v-model:showSearch="showSearch"
-						:export="''"
 						@exportExcel="exportExcel"
 						class="ml10 mr20"
 						style="float: right"
@@ -41,24 +40,18 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 			>
-				<!-- <el-table-column type="selection" width="40" align="center" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
-				<el-table-column prop="productName" label="商品名" show-overflow-tooltip min-width="160" />
-				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
-				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
-				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
-				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
-				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="picUrl" label="商品图" show-overflow-tooltip>
-					<template #default="scope">
-						<preview-image :src="scope.row.picUrl" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
+				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip min-width="180" />
+				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip min-width="160" />
+				<el-table-column prop="productName" label="商品名称" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="unitPrice" label="单价" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="quantity" label="数量" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="totalAmount" label="总金额(元)" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="unit" label="单位" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="spec" label="规格" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
diff --git a/src/views/supermarketerp/report/warehousingSummary/index.vue b/src/views/supermarketerp/report/warehousingSummary/index.vue
index b97738f..28d2646 100644
--- a/src/views/supermarketerp/report/warehousingSummary/index.vue
+++ b/src/views/supermarketerp/report/warehousingSummary/index.vue
@@ -1,14 +1,14 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-row v-show="showSearch">
+			<!-- <el-row v-show="showSearch">
 				<el-form :model="state.queryForm" :inline="true" ref="queryRef" @keyup.enter="getDataList">
-					<el-form-item label="关键字" prop="key">
-						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
+					<el-form-item label="单据编号" prop="key">
+						<el-input placeholder="单据编号" v-model.trim="state.queryForm.key" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-date-picker
-							v-modeltrim="state.queryForm.inventoryDate"
+							v-model="state.queryForm.inventoryDate"
 							format="YYYY-MM-DD"
 							value-format="YYYY-MM-DD"
 							type="date"
@@ -20,19 +20,18 @@
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-form>
-			</el-row>
-			<el-row>
+			</el-row> -->
+			<!-- <el-row>
 				<div class="mb8" style="width: 100%">
 					<right-toolbar
 						v-model:showSearch="showSearch"
-						:export="''"
 						@exportExcel="exportExcel"
 						class="ml10 mr20"
 						style="float: right"
 						@queryTable="getDataList"
 					/>
 				</div>
-			</el-row>
+			</el-row> -->
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
@@ -41,24 +40,13 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 			>
-				<!-- <el-table-column type="selection" width="40" align="center" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
-				<el-table-column prop="productName" label="商品名" show-overflow-tooltip min-width="160" />
-				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
-				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
-				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
-				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
-				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="90" />
-				<el-table-column prop="picUrl" label="商品图" show-overflow-tooltip>
-					<template #default="scope">
-						<preview-image :src="scope.row.picUrl" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
+				<el-table-column prop="productName" label="商品名称" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="180" />
+				<el-table-column prop="inventoryNum" label="入库数量" show-overflow-tooltip min-width="160" />
+				<el-table-column prop="inventoryPrice" label="入库价格(元)" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="spec" label="规格" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="unit" label="单位" show-overflow-tooltip min-width="100" />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
@@ -70,7 +58,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { getInventoryPageSum } from "/@/api/supermarketerp/report"
 
 const queryRef = ref()
-const showSearch = ref(true)
+// const showSearch = ref(true)
 const selectObjs = ref([]) as any
 
 const state: BasicTableProps = reactive<BasicTableProps>({