From 790542915a2a97cc63b156fbe7f95d402828c718 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 24 Feb 2025 10:24:48 +0800
Subject: [PATCH] 1

---
 src/api/supermarketerp/common.ts                 |  8 +++++---
 src/views/supermarketerp/smErpCgBack/index.vue   | 16 +++++++---------
 .../smErpCgBack/smErpCgBackOption.vue            |  3 +--
 src/views/supermarketerp/smErpCgDd/index.vue     |  4 ++--
 .../supermarketerp/smErpCgDd/smErpCgDdOption.vue |  2 +-
 .../supermarketerp/smErpCgPlan/cgPlanOption.vue  |  2 +-
 src/views/supermarketerp/smErpCgPlan/index.vue   |  4 +---
 .../smErpInventoryRecords/index.vue              |  4 +---
 .../smErpInventoryRecordsOption.vue              |  2 +-
 9 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/api/supermarketerp/common.ts b/src/api/supermarketerp/common.ts
index aeb9638..115f4a2 100644
--- a/src/api/supermarketerp/common.ts
+++ b/src/api/supermarketerp/common.ts
@@ -1,8 +1,10 @@
 import request from "/@/utils/request"
 
-// type:1 获取采购计划编号
-// type:2 获取订单编号
-export function getPlanCode(params: { type: 1 | 2 | 3 }) {
+// type:1 获取补货申请编号
+// type:2 获取采购订单编号
+// type:3 获取采购入库编号
+// type:4 获取采购退货编号
+export function getPlanCode(params: { type: 1 | 2 | 3 | 4 }) {
 	return request({
 		url: "/supermarket/sm/common/getSequence",
 		method: "get",
diff --git a/src/views/supermarketerp/smErpCgBack/index.vue b/src/views/supermarketerp/smErpCgBack/index.vue
index 9227c70..544ddb0 100644
--- a/src/views/supermarketerp/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/smErpCgBack/index.vue
@@ -16,9 +16,7 @@
 						/>
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
-						<el-select v-model="state.queryForm.handlerUserId" placeholder="请选择经办人id">
-							<el-option label="请选择" value="0" />
-						</el-select>
+						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
@@ -78,14 +76,14 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
 				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
-<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
-<!--					<template #default="scope">-->
-<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
-<!--					</template>-->
-<!--				</el-table-column>-->
+				<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
+				<!--					<template #default="scope">-->
+				<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
+				<!--					</template>-->
+				<!--				</el-table-column>-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-<!--				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />-->
+				<!--				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />-->
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
 						<el-button
diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
index 1361182..e8d6443 100644
--- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
@@ -26,7 +26,6 @@
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
 
-
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
 							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
@@ -266,7 +265,7 @@ const getInitData = async () => {
 		}
 	}
 
-	// 获取货商选项 & 获取采购计划编号
+	// 获取货商选项 & 获取采购退货编号
 	const [erpSpuSimpleAll, supplierTypeOptions, planCode] = await Promise.allSettled([
 		getErpSpuSimpleAll(),
 		getSupplierTypeOptions(),
diff --git a/src/views/supermarketerp/smErpCgDd/index.vue b/src/views/supermarketerp/smErpCgDd/index.vue
index a0b5fd3..3073527 100644
--- a/src/views/supermarketerp/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/smErpCgDd/index.vue
@@ -40,14 +40,14 @@
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="code" label="编号" show-overflow-tooltip />
 				<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
-        <el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
+				<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
 				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
 				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
 					<template #default="scope">
 						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
 					</template>
 				</el-table-column>
-<!--				<el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />-->
+				<!--				<el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index 3260674..b065461 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -274,7 +274,7 @@ const getInitData = async () => {
 		}
 	}
 
-	// 获取货商选项 & 获取采购计划编号
+	// 获取货商选项 & 获取采购订单编号
 	const [erpSpuSimpleAll, supplierTypeOptions, planCode] = await Promise.allSettled([
 		getErpSpuSimpleAll(),
 		getSupplierTypeOptions(),
diff --git a/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
index 7f89124..bc388a4 100644
--- a/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
+++ b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
@@ -233,7 +233,7 @@ const getInitData = async () => {
 	const id = route.query.id as string
 	if (id) {
 		loading.value = true
-		// 获取采购计划数据 & 获取简要商品列表
+		// 获取补货申请编号 & 获取简要商品列表
 		const [cgPlanData, erpSpuSimpleAll] = await Promise.allSettled([getObj(id), getErpSpuSimpleAll()])
 			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 			.finally(() => (loading.value = false))
diff --git a/src/views/supermarketerp/smErpCgPlan/index.vue b/src/views/supermarketerp/smErpCgPlan/index.vue
index 36cc754..af9e353 100644
--- a/src/views/supermarketerp/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/smErpCgPlan/index.vue
@@ -10,9 +10,7 @@
 						<el-date-picker type="date" placeholder="请输入单据日期" v-model="state.queryForm.planDate" />
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
-						<el-select v-model="state.queryForm.handlerUserId" placeholder="请选择经办人id">
-							<el-option label="请选择" value="00" />
-						</el-select>
+						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
diff --git a/src/views/supermarketerp/smErpInventoryRecords/index.vue b/src/views/supermarketerp/smErpInventoryRecords/index.vue
index d279fab..03f8070 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/index.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/index.vue
@@ -16,9 +16,7 @@
 						/>
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
-						<el-select v-model="state.queryForm.handlerUserId" placeholder="请选择经办人id">
-							<el-option label="请选择" value="0" />
-						</el-select>
+						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
diff --git a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
index 37221f1..bf2fa09 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
@@ -269,7 +269,7 @@ const getInitData = async () => {
 		}
 	}
 
-	// 获取货商选项 & 获取采购计划编号
+	// 获取货商选项 & 获取采购入库编号
 	const [erpSpuSimpleAll, supplierTypeOptions, planCode] = await Promise.allSettled([
 		getErpSpuSimpleAll(),
 		getSupplierTypeOptions(),