超市相关调整

src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue

@@ -18,11 +18,11 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<!--					<el-form-item label="审批状态" prop="checkStatus">
+					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
 							<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>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -76,11 +76,11 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" 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="{ row }">
+						<dict-tag :options="check_status" :value="row.checkStatus" />
+					</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 />-->
@@ -120,7 +120,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
 const router = useRouter()
-const { erp_order_type, inventory_type, check_status } = useDict("erp_order_type", "inventory_type", "check_status")
+const { check_status } = useDict("check_status")
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)

src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue

@@ -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" />
+					</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 />

src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue

@@ -165,7 +165,9 @@ import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgPlan"
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import { formatDate } from "/@/utils/formatTime"
+import { usePurchase } from "/@/stores/purchase"
 
+const purchaseStore = usePurchase()
 const router = useRouter()
 const route = useRoute()
 const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
@@ -212,7 +214,8 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 // 初始化数据
 const getInitData = async () => {
 	baseDataForm.id = undefined
-	const id = route.query.id as string
+	// const id = route.query.id as string
+	const id = purchaseStore.smErpCgPlan.id
 	if (id) {
 		loading.value = true
 		// 获取补货申请编号 & 获取简要商品列表

src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue

@@ -14,7 +14,7 @@
 					</el-form-item>
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
-							<el-option label="请选择" value="00" />
+							<el-option v-for="(item, index) in check_status" :key="index" :label="item.label" :value="item.value" />
 						</el-select>
 					</el-form-item>
 					<el-form-item>
@@ -64,7 +64,11 @@
 				<el-table-column prop="planDate" 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 />-->
+				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
+					<template #default="{ row }">
+						<dict-tag :options="check_status" :value="row.checkStatus" />
+					</template>
+				</el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
@@ -93,7 +97,10 @@ import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgPlan"
 import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { usePurchase } from "/@/stores/purchase"
 
+const { check_status } = useDict("check_status")
 const router = useRouter()
 // 搜索变量
 const queryRef = ref()
@@ -101,6 +108,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const purchaseStore = usePurchase()
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -130,9 +138,17 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 }
 
 // 点击创建采购清单
-const handleClickCreateCgPlan = () => router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" })
+const handleClickCreateCgPlan = () => {
+	purchaseStore.setSmErpCgPlanId("")
+	purchaseStore.setSmErpCgPlanDisabled(false)
+	router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" })
+}
 // 点击编辑采购清单
-const handleClickEditCgPlan = (id: string) => router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form", query: { id } })
+const handleClickEditCgPlan = (id: string) => {
+	purchaseStore.setSmErpCgPlanId(id)
+	purchaseStore.setSmErpCgPlanDisabled(false)
+	router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" })
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {