From d4e933961f11948a12ffd75bc7f0b3da6808ac85 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 26 Feb 2025 14:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/supermarketerp/smErpCgBack/index.vue |  8 +++++---
 .../smErpCgBack/smErpCgBackOption.vue          |  2 +-
 .../smErpCgDd/smErpCgDdOption.vue              |  6 +++++-
 .../smErpInventoryRecords/index.vue            | 18 ++++++++++--------
 .../smErpInventoryRecordsOption.vue            | 10 +++++++---
 .../supermarketerp/smErpRetailBack/index.vue   |  8 +++++---
 .../smErpRetailBack/smErpRetailBackOption.vue  |  8 ++++++--
 .../smErpRetailDelivery/index.vue              |  8 +++++---
 .../smErpRetailDeliveryOption.vue              |  8 ++++++--
 9 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/views/supermarketerp/smErpCgBack/index.vue b/src/views/supermarketerp/smErpCgBack/index.vue
index 544ddb0..cc24a7f 100644
--- a/src/views/supermarketerp/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/smErpCgBack/index.vue
@@ -11,8 +11,8 @@
 							type="date"
 							placeholder="请输入单据日期"
 							v-model="state.queryForm.inventoryDate"
-							fomat="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
+							fomat="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -129,7 +129,9 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		inventoryType: "4",
+	},
 	pageList: fetchList,
 })
 
diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
index 982cc17..7e1547f 100644
--- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
@@ -212,7 +212,7 @@ const baseDataForm = reactive<any>({
 	remark: "",
 	orderType: "2",
 	totalAmount: "",
-  inventoryType: "4",
+	inventoryType: "4",
 })
 const state = reactive<{
 	editableTableData: any[]
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index 0644326..3c3bd5a 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -26,7 +26,9 @@
 					</el-form-item>
 
 					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
+						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
+						</el-select>
 					</el-form-item>
 
 					<el-form-item label="货商" prop="supplierId">
@@ -193,6 +195,7 @@ import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
 import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
 
 const router = useRouter()
 const route = useRoute()
@@ -202,6 +205,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref
 const baseDataFormRef = ref() // 基本数据表单ref
 const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
 const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
+const { check_status } = useDict("check_status")
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
 	id: "",
diff --git a/src/views/supermarketerp/smErpInventoryRecords/index.vue b/src/views/supermarketerp/smErpInventoryRecords/index.vue
index 72a8161..87fb1c8 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/index.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/index.vue
@@ -11,8 +11,8 @@
 							type="date"
 							placeholder="请输入单据日期"
 							v-model="state.queryForm.inventoryDate"
-							fomat="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
+							fomat="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -76,11 +76,11 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
 				<el-table-column prop="handlerUserName" 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 />
@@ -129,7 +129,9 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		inventoryType: "3",
+	},
 	pageList: fetchList,
 })
 
diff --git a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
index cb4ece9..a415218 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
@@ -27,7 +27,9 @@
 					</el-form-item>
 
 					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model.trim="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
+						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
+						</el-select>
 					</el-form-item>
 
 					<el-form-item label="货商" prop="supplierId">
@@ -194,6 +196,7 @@ import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCgCodeDialog from "/@/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue"
 import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
 
 const router = useRouter()
 const route = useRoute()
@@ -203,6 +206,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref
 const baseDataFormRef = ref() // 基本数据表单ref
 const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
 const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
+const { check_status } = useDict("check_status")
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
 	id: "",
@@ -214,7 +218,7 @@ const baseDataForm = reactive<any>({
 	checkTime: "",
 	supplierId: "",
 	remark: "",
-  inventoryType: "3",
+	inventoryType: "3",
 	orderType: "1",
 	totalAmount: "",
 })
@@ -289,7 +293,7 @@ const handleClickLinkCode = () => linkCgCodeDialogRef.value.openLinkCodeDialog()
 const getSelectedCgPlan = (selectionRows: any) => {
 	console.log("被选择的关联数据", selectionRows)
 
-	baseDataForm.linkCode = selectionRows.planCode
+	baseDataForm.linkCode = selectionRows.code
 	state.editableTableData = selectionRows.items
 	state.erpSpuItemsMemo = selectionRows.items
 	state.linkCgCodeDialogVisible = false
diff --git a/src/views/supermarketerp/smErpRetailBack/index.vue b/src/views/supermarketerp/smErpRetailBack/index.vue
index 316789b..b7fc6b2 100644
--- a/src/views/supermarketerp/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/smErpRetailBack/index.vue
@@ -11,8 +11,8 @@
 							type="date"
 							placeholder="请输入单据日期"
 							v-model="state.queryForm.inventoryDate"
-							fomat="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
+							fomat="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -129,7 +129,9 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		inventoryType: "6",
+	},
 	pageList: fetchList,
 })
 
diff --git a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
index 11b23e4..829e1a4 100644
--- a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
+++ b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue
@@ -27,7 +27,9 @@
 					</el-form-item>
 
 					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model.trim="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
+						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
+						</el-select>
 					</el-form-item>
 
 					<el-form-item label="货商" prop="supplierId">
@@ -219,6 +221,7 @@ import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
 
 const router = useRouter()
 const route = useRoute()
@@ -228,6 +231,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref
 const baseDataFormRef = ref() // 基本数据表单ref
 const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
 const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
+const { check_status } = useDict("check_status")
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
 	id: "",
@@ -242,7 +246,7 @@ const baseDataForm = reactive<any>({
 	orderType: "1",
 	totalAmount: "",
 	memberNumber: "",
-  inventoryType: "6",
+	inventoryType: "6",
 })
 const state = reactive<{
 	editableTableData: any[]
diff --git a/src/views/supermarketerp/smErpRetailDelivery/index.vue b/src/views/supermarketerp/smErpRetailDelivery/index.vue
index d1e18ea..238d269 100644
--- a/src/views/supermarketerp/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/smErpRetailDelivery/index.vue
@@ -11,8 +11,8 @@
 							type="date"
 							placeholder="请输入单据日期"
 							v-model="state.queryForm.inventoryDate"
-							fomat="yyyy-MM-dd"
-							value-format="yyyy-MM-dd"
+							fomat="YYYY-MM-DD"
+							value-format="YYYY-MM-DD"
 						/>
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -129,7 +129,9 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		inventoryType: "5",
+	},
 	pageList: fetchList,
 })
 
diff --git a/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue b/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue
index 7c251ae..dfeccf4 100644
--- a/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue
+++ b/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue
@@ -27,7 +27,9 @@
 					</el-form-item>
 
 					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model.trim="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
+						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
+							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
+						</el-select>
 					</el-form-item>
 
 					<el-form-item label="货商" prop="supplierId">
@@ -219,6 +221,7 @@ import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCgCodeDialog from "/@/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
 
 const router = useRouter()
 const route = useRoute()
@@ -228,6 +231,7 @@ const linkCgCodeDialogRef = ref() // 关联采购申请单对话框ref
 const baseDataFormRef = ref() // 基本数据表单ref
 const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
 const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
+const { check_status } = useDict("check_status")
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
 	id: "",
@@ -242,7 +246,7 @@ const baseDataForm = reactive<any>({
 	orderType: "2",
 	totalAmount: "",
 	memberNumber: "",
-  inventoryType: "5",
+	inventoryType: "5",
 })
 const state = reactive<{
 	editableTableData: any[]