From f0408ce6a563c9635f16cf281cb6a9508e2bf57a Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 7 Mar 2025 14:37:27 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supermarketerp/common.ts              | 18 +++++++++
 src/api/supermarketerp/smErpCgBack.ts         | 40 -------------------
 src/api/supermarketerp/smErpCgDd.ts           |  9 -----
 ...gInventory.ts => smErpInventoryRecords.ts} |  8 ----
 .../purchaseManagement/smErpCgBack/form.vue   |  5 +--
 .../purchaseManagement/smErpCgBack/index.vue  |  2 +-
 .../purchaseManagement/smErpCgDd/form.vue     |  3 +-
 .../smErpCgInventory/form.vue                 |  5 +--
 .../smErpCgInventory/index.vue                |  2 +-
 .../retailManagement/smErpRetailBack/form.vue |  5 +--
 .../smErpRetailBack/index.vue                 |  2 +-
 .../smErpRetailDelivery/form.vue              |  5 +--
 .../smErpRetailDelivery/index.vue             |  2 +-
 .../smErpInventoryWarning/index.vue           |  7 ++--
 14 files changed, 35 insertions(+), 78 deletions(-)
 delete mode 100644 src/api/supermarketerp/smErpCgBack.ts
 rename src/api/supermarketerp/{smErpCgInventory.ts => smErpInventoryRecords.ts} (82%)

diff --git a/src/api/supermarketerp/common.ts b/src/api/supermarketerp/common.ts
index aa14def..0591f93 100644
--- a/src/api/supermarketerp/common.ts
+++ b/src/api/supermarketerp/common.ts
@@ -31,6 +31,24 @@ export function getErpSpuSimpleAll() {
 	})
 }
 
+// 采购申请单分页查询
+export function getCgsqPage(query?: Object) {
+	return request({
+		url: "/supermarket/smErpCgDd/cgsq/page",
+		method: "get",
+		params: query,
+	})
+}
+
+// 采购订单分页查询
+export function getCgddPage(params?: Object) {
+	return request({
+		url: "/supermarket/smErpInventoryRecords/cgdd/page",
+		method: "get",
+		params,
+	})
+}
+
 // 获取出入库订单列表
 export function getCgInventoryPage(params?: Object) {
 	return request({
diff --git a/src/api/supermarketerp/smErpCgBack.ts b/src/api/supermarketerp/smErpCgBack.ts
deleted file mode 100644
index 06d448b..0000000
--- a/src/api/supermarketerp/smErpCgBack.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from "/@/utils/request"
-
-export function fetchList(query?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack/page",
-		method: "get",
-		params: query,
-	})
-}
-
-export function addObj(obj?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack",
-		method: "post",
-		data: obj,
-	})
-}
-
-export function getObj(id?: string) {
-	return request({
-		url: "/supermarket/smErpCgBack/" + id,
-		method: "get",
-	})
-}
-
-export function delObjs(ids?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack",
-		method: "delete",
-		data: ids,
-	})
-}
-
-export function putObj(obj?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack",
-		method: "put",
-		data: obj,
-	})
-}
diff --git a/src/api/supermarketerp/smErpCgDd.ts b/src/api/supermarketerp/smErpCgDd.ts
index 7ea5c4f..480f205 100644
--- a/src/api/supermarketerp/smErpCgDd.ts
+++ b/src/api/supermarketerp/smErpCgDd.ts
@@ -38,12 +38,3 @@ export function putObj(obj?: Object) {
 		data: obj,
 	})
 }
-
-// 采购申请单分页查询
-export function getCgsqPage(query?: Object) {
-	return request({
-		url: "/supermarket/smErpCgDd/cgsq/page",
-		method: "get",
-		params: query,
-	})
-}
diff --git a/src/api/supermarketerp/smErpCgInventory.ts b/src/api/supermarketerp/smErpInventoryRecords.ts
similarity index 82%
rename from src/api/supermarketerp/smErpCgInventory.ts
rename to src/api/supermarketerp/smErpInventoryRecords.ts
index f1657a9..0b1a17c 100644
--- a/src/api/supermarketerp/smErpCgInventory.ts
+++ b/src/api/supermarketerp/smErpInventoryRecords.ts
@@ -38,11 +38,3 @@ export function putObj(obj?: Object) {
 		data: obj,
 	})
 }
-
-export function getCgddPage(params?: Object) {
-	return request({
-		url: "/supermarket/smErpInventoryRecords/cgdd/page",
-		method: "get",
-		params,
-	})
-}
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index 3e410da..5c70c8e 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -172,14 +172,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgBack"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
+import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { displayPrice } from "/@/utils/formatMoney"
 
 const router = useRouter()
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
index cd0f36a..81bf113 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
index f64c235..4563424 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
@@ -173,13 +173,12 @@ import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgDd"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getPlanCode, getErpSpuSimpleAll, getCgsqPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgsqPage } from "/@/api/supermarketerp/smErpCgDd"
 import { displayPrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index 0052482..37c8b6c 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -177,14 +177,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgInventory"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
+import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgddPage } from "/@/api/supermarketerp/smErpCgInventory"
 import { displayPrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index 5f0d23a..5e01356 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
index 69ab7e6..0078f55 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
@@ -201,14 +201,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgInventory"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
+import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
index f319a00..92676ac 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 
 const router = useRouter()
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 3e8bed7..7518dc7 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -201,14 +201,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgInventory"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
+import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgddPage } from "/@/api/supermarketerp/smErpCgInventory"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
index 2cee503..b701422 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/smErpInventoryWarning/index.vue b/src/views/supermarketerp/smErpInventoryWarning/index.vue
index d9ecfe9..9a93452 100644
--- a/src/views/supermarketerp/smErpInventoryWarning/index.vue
+++ b/src/views/supermarketerp/smErpInventoryWarning/index.vue
@@ -48,9 +48,8 @@
 				<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">
-					<template #default="scope">
-						<el-tag type="danger" v-if="scope.row.warnType == 1">库存不足</el-tag>
-						<el-tag type="danger" v-if="scope.row.warnType == 2">库存超额</el-tag>
+					<template #default="{ row }">
+						<dict-tag :options="sm_inventory_warning_type" :value="row.warnType" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
@@ -78,7 +77,9 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { getSmErpInventoryWarningList } from "/@/api/supermarketerp/smErpInventoryWarning"
 import { getSupermarketCategory } from "/@/api/supermarketerp/supermarketSpu"
+import { useDict } from "/@/hooks/dict"
 
+const { sm_inventory_warning_type } = useDict("sm_inventory_warning_type")
 const queryRef = ref()
 const showSearch = ref(true)
 const selectObjs = ref([]) as any

From bbe52fea77a0810f717b8cacc60299208392b24d Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 7 Mar 2025 14:40:46 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketerp/retailManagement/smErpRetailBack/form.vue    | 2 +-
 .../retailManagement/smErpRetailDelivery/form.vue               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
index 0078f55..2690eb5 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue
@@ -278,7 +278,7 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 const receiveAmountFormRules = ref({
 	receiveAmount: [
 		{ required: true, message: "不能为空", trigger: "blur" },
-		{ pattern: /^\d+(\.\d{1,1})?$/, message: "格式错误" },
+		{ pattern: /^\d+(\.\d{1,2})?$/, message: "格式错误" },
 	],
 })
 
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 7518dc7..5c0c259 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -278,7 +278,7 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 const receiveAmountFormRules = ref({
 	receiveAmount: [
 		{ required: true, message: "不能为空", trigger: "blur" },
-		{ pattern: /^\d+(\.\d{1,1})?$/, message: "格式错误" },
+		{ pattern: /^\d+(\.\d{1,2})?$/, message: "格式错误" },
 	],
 })
 

From 43854f5a99736d7b61639dee4fdcf92323376a3e Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 7 Mar 2025 14:58:49 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketerp/report/delivery/index.vue  | 101 ++++++++++++++++++
 .../report/warehousing/index.vue              |  45 ++++----
 2 files changed, 121 insertions(+), 25 deletions(-)
 create mode 100644 src/views/supermarketerp/report/delivery/index.vue

diff --git a/src/views/supermarketerp/report/delivery/index.vue b/src/views/supermarketerp/report/delivery/index.vue
new file mode 100644
index 0000000..4b95308
--- /dev/null
+++ b/src/views/supermarketerp/report/delivery/index.vue
@@ -0,0 +1,101 @@
+<template>
+	<div class="layout-padding">
+		<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>
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-date-picker
+							v-modeltrim="state.queryForm.inventoryDate"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							type="date"
+							placeholder="请输入单据日期"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</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-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				: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>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { getInventoryPage } from "/@/api/supermarketerp/report"
+
+const queryRef = ref()
+const showSearch = ref(true)
+const selectObjs = ref([]) as any
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {
+		orderType: 2,
+	},
+	pageList: getInventoryPage,
+})
+
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/supermarketerp/smErpInventoryWarning/export", Object.assign(state.queryForm, { ids: selectObjs }), "出库记录.xlsx")
+}
+</script>
diff --git a/src/views/supermarketerp/report/warehousing/index.vue b/src/views/supermarketerp/report/warehousing/index.vue
index d228de0..9c7523f 100644
--- a/src/views/supermarketerp/report/warehousing/index.vue
+++ b/src/views/supermarketerp/report/warehousing/index.vue
@@ -1,26 +1,26 @@
 <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="productName">
-						<el-input placeholder="请输入商品名" v-model.trim="state.queryForm.productName" />
+					<el-form-item label="关键字" prop="key">
+						<el-input placeholder="请输入关键字" v-model.trim="state.queryForm.key" />
 					</el-form-item>
-					<el-form-item label="预警类型" prop="warnType">
-						<el-select v-model="state.queryForm.warnType" placeholder="请选择">
-							<el-option label="库存不足" :value="1" />
-							<el-option label="库存超额" :value="2" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="条码" prop="barcode">
-						<el-input placeholder="请输入条码" v-model.trim="state.queryForm.barcode" />
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-date-picker
+							v-modeltrim="state.queryForm.inventoryDate"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							type="date"
+							placeholder="请输入单据日期"
+						/>
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-form>
-			</el-row> -->
+			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<right-toolbar
@@ -41,18 +41,13 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 			>
-				<el-table-column type="selection" width="40" align="center" fixed="left" />
+				<!-- <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">
-					<template #default="scope">
-						<el-tag type="danger" v-if="scope.row.warnType == 1">库存不足</el-tag>
-						<el-tag type="danger" v-if="scope.row.warnType == 2">库存超额</el-tag>
-					</template>
-				</el-table-column>
+				<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" />
@@ -63,7 +58,7 @@
 						<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="productCode" label="货号" show-overflow-tooltip min-width="120" /> -->
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
@@ -88,11 +83,11 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
-// const resetQuery = () => {
-// 	// 清空搜索条件
-// 	queryRef.value?.resetFields()
-// 	getDataList()
-// }
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	getDataList()
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {

From 4d10c864464925eedf478506df86cda784ba7bf7 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 7 Mar 2025 15:04:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/supermarketerp/report.ts              |   9 ++
 .../report/deliverySummary/index.vue          | 101 ++++++++++++++++++
 .../report/warehousingSummary/index.vue       | 101 ++++++++++++++++++
 3 files changed, 211 insertions(+)
 create mode 100644 src/views/supermarketerp/report/deliverySummary/index.vue
 create mode 100644 src/views/supermarketerp/report/warehousingSummary/index.vue

diff --git a/src/api/supermarketerp/report.ts b/src/api/supermarketerp/report.ts
index 79a7d8e..b287795 100644
--- a/src/api/supermarketerp/report.ts
+++ b/src/api/supermarketerp/report.ts
@@ -8,3 +8,12 @@ export function getInventoryPage(params?: object) {
 		params,
 	})
 }
+
+// 分页获取出入库汇总 orderType: 1入库 2出库
+export function getInventoryPageSum(params?: object) {
+	return request({
+		url: "/supermarket/smErpInventoryRecords/inventoryTypeSum/page",
+		method: "get",
+		params,
+	})
+}
diff --git a/src/views/supermarketerp/report/deliverySummary/index.vue b/src/views/supermarketerp/report/deliverySummary/index.vue
new file mode 100644
index 0000000..8534fa5
--- /dev/null
+++ b/src/views/supermarketerp/report/deliverySummary/index.vue
@@ -0,0 +1,101 @@
+<template>
+	<div class="layout-padding">
+		<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>
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-date-picker
+							v-modeltrim="state.queryForm.inventoryDate"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							type="date"
+							placeholder="请输入单据日期"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</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-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				: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>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { getInventoryPageSum } from "/@/api/supermarketerp/report"
+
+const queryRef = ref()
+const showSearch = ref(true)
+const selectObjs = ref([]) as any
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {
+		orderType: 2,
+	},
+	pageList: getInventoryPageSum,
+})
+
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/supermarketerp/smErpInventoryWarning/export", Object.assign(state.queryForm, { ids: selectObjs }), "出库汇总.xlsx")
+}
+</script>
diff --git a/src/views/supermarketerp/report/warehousingSummary/index.vue b/src/views/supermarketerp/report/warehousingSummary/index.vue
new file mode 100644
index 0000000..b97738f
--- /dev/null
+++ b/src/views/supermarketerp/report/warehousingSummary/index.vue
@@ -0,0 +1,101 @@
+<template>
+	<div class="layout-padding">
+		<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>
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-date-picker
+							v-modeltrim="state.queryForm.inventoryDate"
+							format="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
+							type="date"
+							placeholder="请输入单据日期"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</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-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				: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>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { getInventoryPageSum } from "/@/api/supermarketerp/report"
+
+const queryRef = ref()
+const showSearch = ref(true)
+const selectObjs = ref([]) as any
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {
+		orderType: 1,
+	},
+	pageList: getInventoryPageSum,
+})
+
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/supermarketerp/smErpInventoryWarning/export", Object.assign(state.queryForm, { ids: selectObjs }), "入库汇总.xlsx")
+}
+</script>

From 3499ec6dbbb8d8d4be5de30fa67282f4991dffa1 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 7 Mar 2025 17:20:54 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wallet/wallet-type.ts                 | 58 +++++++++++--------
 src/components/Select/SelectWalletType.vue    |  4 +-
 .../components/linkCodeDialog.vue             | 26 ++++-----
 .../components/auxiliaryCode.vue              | 28 +++++++--
 .../supermarketerp/supermarketSpu/form.vue    | 40 ++++++-------
 5 files changed, 85 insertions(+), 71 deletions(-)

diff --git a/src/api/wallet/wallet-type.ts b/src/api/wallet/wallet-type.ts
index e96fd1b..37e1b1a 100644
--- a/src/api/wallet/wallet-type.ts
+++ b/src/api/wallet/wallet-type.ts
@@ -1,41 +1,49 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/wallet/walletType/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/wallet/walletType/page",
+		method: "get",
+		params: query,
+	})
+}
+
+// 获取钱包类型下拉列表
+export function getWalletTypeSimple(query?: Object) {
+	return request({
+		url: "/wallet/walletType/list",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/wallet/walletType',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/wallet/walletType",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/wallet/walletType/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/wallet/walletType/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/wallet/walletType',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/wallet/walletType",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/wallet/walletType',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/wallet/walletType",
+		method: "put",
+		data: obj,
+	})
 }
-
diff --git a/src/components/Select/SelectWalletType.vue b/src/components/Select/SelectWalletType.vue
index c3b194d..3fa1119 100644
--- a/src/components/Select/SelectWalletType.vue
+++ b/src/components/Select/SelectWalletType.vue
@@ -26,8 +26,8 @@
 
 <script setup lang="ts" name="select-wallet-type">
 import { reactive } from "vue"
-import * as walletTypeApi from "/@/api/wallet/wallet-type"
 import { useDict } from "/@/hooks/dict"
+import { getWalletTypeSimple } from "/@/api/wallet/wallet-type"
 
 const selectId = defineModel()
 
@@ -67,7 +67,7 @@ async function getOptions() {
 		const _pa = {
 			...queryForm,
 		}
-		const { data } = await walletTypeApi.fetchList(_pa)
+		const { data } = await getWalletTypeSimple(_pa)
 		state.options = data.records ?? []
 
 		const { wallet_type } = useDict("wallet_type")
diff --git a/src/views/supermarketerp/components/linkCodeDialog.vue b/src/views/supermarketerp/components/linkCodeDialog.vue
index b9a5169..dc85d97 100644
--- a/src/views/supermarketerp/components/linkCodeDialog.vue
+++ b/src/views/supermarketerp/components/linkCodeDialog.vue
@@ -11,18 +11,17 @@
 			:data="linkCodeTableData"
 			@radio-change="radioChangeEvent"
 		>
-			<vxe-column type="radio" width="60" align="center"></vxe-column>
-<!--			<vxe-column field="id" title="id" align="center" width="200"></vxe-column>-->
-			<vxe-column field="planCode" title="编号" align="center" width="200"></vxe-column>
-			<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
-      <vxe-column field="productName" title="商品名称" align="center" width="200"></vxe-column>
-			<vxe-column field="handlerUserName" title="经办人" align="center" width="100"></vxe-column>
-<!--			<vxe-column field="checkStatus" title="审批状态" align="center" width="100">-->
-<!--				<template #default="{ row }">-->
-<!--					<dict-tag :options="check_status" :value="row.checkStatus" />-->
-<!--				</template>-->
-<!--			</vxe-column>-->
-			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
+			<vxe-column type="radio" width="60" align="center" />
+			<vxe-column field="planCode" title="编号" align="center" width="200" />
+			<vxe-column field="planDate" title="单据日期" align="center" width="200" />
+			<vxe-column field="productName" title="商品名称" align="center" width="200" />
+			<vxe-column field="handlerUserName" title="经办人" align="center" width="100" />
+			<!--			<vxe-column field="checkStatus" title="审批状态" align="center" width="100">-->
+			<!--				<template #default="{ row }">-->
+			<!--					<dict-tag :options="check_status" :value="row.checkStatus" />-->
+			<!--				</template>-->
+			<!--			</vxe-column>-->
+			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100" />
 		</vxe-table>
 		<!-- <pagination
 			@size-change="sizeChangeHandle"
@@ -40,7 +39,6 @@
 			:data="currRadioRowItems"
 		>
 			<vxe-column type="checkbox" width="60" align="center"></vxe-column>
-<!--			<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>-->
 			<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
 			<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
 			<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
@@ -61,9 +59,7 @@
 <script setup lang="ts" name="linkCgCodeDialog">
 import { ref } from "vue"
 import { VxeTableEvents } from "vxe-table"
-import { useDict } from "/@/hooks/dict"
 
-const { check_status } = useDict("check_status")
 const linkCodeDialogVisible = defineModel()
 const emit = defineEmits(["getSelectedLinkCode"])
 const props = withDefaults(
diff --git a/src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
index 51580da..5a4bb3a 100644
--- a/src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
@@ -33,20 +33,23 @@
 			<vxe-column field="unit" title="单位" :edit-render="{}">
 				<template #edit="{ row }">
 					<el-select v-model="row.unitId">
-						<div v-for="item in smErpUnitEntityList">
+						<div v-for="item in computedSmErpUnitEntityList">
 							<el-option :label="item.unit" :value="item.id" />
 						</div>
 					</el-select>
 				</template>
 				<template #default="{ row }">
-					<span v-if="row.unitId">{{ smErpUnitEntityList?.find((item) => item.id === row.unitId)?.unit }}</span>
+					<span v-if="row.unitId">{{ computedSmErpUnitEntityList?.find((item: rowVU) => item.id === row.unitId)?.unit }}</span>
 					<span v-else style="color: #c0c4cf">请选择</span>
 				</template>
 			</vxe-column>
-			<vxe-column field="barCode" title="条码">
-				<template #default="{ row }">
-					{{ smErpUnitEntityList?.find((item) => item.id == row.unitId)?.barCode }}
+			<vxe-column field="barCode" title="辅助条码" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<template #edit="{ row }">
+					<el-input v-model.trim="row.barCode" />
 				</template>
+				<!-- <template #default="{ row }">
+					{{ computedSmErpUnitEntityList?.find((item) => item.id == row.unitId)?.barCode }}
+				</template> -->
 			</vxe-column>
 		</vxe-table>
 	</div>
@@ -55,7 +58,7 @@
 <script setup lang="ts">
 import { nanoid } from "nanoid"
 import { useMessage } from "/@/hooks/message"
-import { rowVU } from "./packageUnit.vue"
+import { type rowVU } from "./packageUnit.vue"
 
 export interface rowVC {
 	id: string
@@ -109,6 +112,19 @@ const pushEvent = () => {
 	})
 }
 
+// 包装单位行删除时清除辅助条码中选择该包装单位的行
+watch(
+	() => props.smErpUnitEntityList?.length,
+	() => {
+		auxiliaryCodeList.value = auxiliaryCodeList.value.filter((codeItem: rowVC) =>
+			props.smErpUnitEntityList?.some((item: rowVU) => codeItem.unitId === item.id),
+		)
+	},
+)
+
+// 计算辅助条码中可选择的包装单位下拉菜单
+const computedSmErpUnitEntityList = computed(() => props.smErpUnitEntityList?.filter((item: rowVU) => item.unit))
+
 // 删除选中的行
 const removeSelectRowEvent = () => {
 	const $table = editableTableRef.value
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 0dd863e..09bd184 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -25,7 +25,7 @@
 			<el-button @click="visible = false">取消</el-button>
 			<el-button v-if="currentTabPaneIndex != 0" type="primary" @click="currentTabPaneIndex--" :disabled="loading">上一步</el-button>
 			<el-button v-if="currentTabPaneIndex != 3" type="primary" @click="currentTabPaneIndex++">下一步</el-button>
-			<el-button v-if="currentTabPaneIndex == 3" type="primary" @click="onSubmit" :disabled="loading">确 认</el-button>
+			<el-button v-if="currentTabPaneIndex == 3" type="primary" @click="onSubmit" :disabled="loading">提 交</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -34,7 +34,7 @@
 import baseInfo from "./components/baseInfo.vue"
 import packageUnit, { type rowVU } from "./components/packageUnit.vue"
 import productInventory from "./components/productInventory.vue"
-import auxiliaryCode, { rowVC } from "./components/auxiliaryCode.vue"
+import auxiliaryCode, { type rowVC } from "./components/auxiliaryCode.vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
 import { TabPaneName } from "element-plus"
 import { useMessage } from "/@/hooks/message"
@@ -161,10 +161,10 @@ const resetForm = () => {
 // tab栏切换
 const handleTabChange = (name: TabPaneName) => (currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name))
 
-// 整理包装单位列表
-const usePackageUnitList = () => {
+// 计算包装单位列表
+const usePackageUnitList = computed(() => {
 	const curRadioRowUnit = packageUnitRef.value.getRadioEvent()
-	return form.smErpUnitEntityList.map((item: rowVU) => {
+	return [...form.smErpUnitEntityList].map((item: rowVU) => {
 		if (item.id === curRadioRowUnit.id) {
 			item.isBase = true
 		} else {
@@ -180,23 +180,23 @@ const usePackageUnitList = () => {
 		}
 		return item
 	})
-}
+})
 
-// 整理辅助条码列表
-const useAuxiliaryCode = () => {
+// 计算辅助条码列表
+const useAuxiliaryCode = computed(() => {
 	return form.smErpAuxiliaryCodeEntityList
 		.filter((item: rowVC) => item.unitId)
 		.map((item: rowVC) => {
-			const curAuxiliaryCodeItem = form.smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)
-			if (curAuxiliaryCodeItem.barCode) item.barCode = curAuxiliaryCodeItem.barCode
+			// const curAuxiliaryCodeItem = form.smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)
+			// if (curAuxiliaryCodeItem.barCode) item.barCode = curAuxiliaryCodeItem.barCode
 			if (item.isNew) {
 				item.id = ""
-				if (curAuxiliaryCodeItem.isNew) item.unitId = ""
+				// if (curAuxiliaryCodeItem.isNew) item.unitId = ""
 				delete item.isNew
 			}
 			return item
 		})
-}
+})
 
 // 提交
 const onSubmit = async () => {
@@ -210,23 +210,17 @@ const onSubmit = async () => {
 	// if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码")
 	// if (!(await auxiliaryCodeRef.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
 
-	const handleAuxiliaryCode = useAuxiliaryCode()
-	const handlePackageUnit = usePackageUnitList()
-	console.log("提交的数据", {
-		...form,
-		grossMargin: storePrice(form.grossMargin),
-		smErpUnitEntityList: handlePackageUnit,
-		smErpAuxiliaryCodeEntityList: handleAuxiliaryCode,
-	})
-
 	try {
 		loading.value = true
 		const _pa = {
 			...form,
 			grossMargin: storePrice(form.grossMargin),
-			smErpUnitEntityList: handlePackageUnit,
-			smErpAuxiliaryCodeEntityList: handleAuxiliaryCode,
+			smErpUnitEntityList: usePackageUnitList.value,
+			smErpAuxiliaryCodeEntityList: useAuxiliaryCode.value,
 		}
+
+		console.log("提交的数据", _pa)
+
 		const res = form.id ? await putObj(_pa) : await addObj(_pa)
 		if (res.code === 0) {
 			useMessage().success(form.id ? "修改成功" : "添加成功")

From b3c83e1bdf02a6bb28095064160edcdced794c17 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 7 Mar 2025 17:54:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DraggableDepTree/index.vue | 12 +++++++++++-
 src/views/admin/system/user/index.vue     |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/DraggableDepTree/index.vue b/src/components/DraggableDepTree/index.vue
index 6259ff7..3c56300 100644
--- a/src/components/DraggableDepTree/index.vue
+++ b/src/components/DraggableDepTree/index.vue
@@ -50,7 +50,16 @@
 						show-checkbox
 						@node-click="handleNodeClick"
 						@check="handleCheck"
-					/>
+					>
+						<template #default="{ node, data }">
+							<el-tooltip v-if="data.isLock" effect="dark" :content="$t('sysuser.noDataScopeTip')" placement="right">
+								<span>
+									{{ node.label }}
+									<SvgIcon name="ele-Lock" />
+								</span>
+							</el-tooltip>
+						</template>
+					</el-tree>
 				</div>
 
 				<!-- 底部区域 -->
@@ -115,6 +124,7 @@ const props = withDefaults(
 				label: "name",
 				children: "children",
 				value: "id",
+				disabled: "isLock",
 			}
 		},
 		nodeClickable: true,
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index ef8f843..69acc19 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -187,7 +187,6 @@
 <script lang="ts" name="systemUser" setup>
 import { delObj, pageList, putObj } from "/@/api/admin/user"
 import { putGlobalFace } from "/@/api/admin/userFace"
-import { deptTree } from "/@/api/admin/dept"
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useI18n } from "vue-i18n"