From 52ed054889b4fe1d8b3d3ce1dfedb456c9c3d941 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 30 Jul 2025 18:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E5=87=BA=E5=BA=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smErpRetailDelivery/form.vue              |  14 +-
 .../smErpRetailDelivery/index.vue             | 144 ++++++------------
 2 files changed, 57 insertions(+), 101 deletions(-)

diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 6885796..5f4174a 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -132,10 +132,10 @@
 						<vxe-column field="totalAmount" title="累计总金额">
 							<template #default="{ row }">
 								<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
-									{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+									{{ displayPrice(row.quantity * parseFloat(row.retailPrice)) }}
 								</span>
 								<span v-if="row.unitId && row.quantity && row.erpUnitVos">
-									{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+									{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.retailPrice) * row.quantity) }}
 								</span>
 							</template>
 						</vxe-column>
@@ -200,12 +200,12 @@ const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/
 
 const props = withDefaults(
 	defineProps<{
-		formId: string | undefined
+		formId: string
 		disabled: boolean
 	}>(),
 	{
-		formId: undefined,
-		disabled: true,
+		formId: "",
+		disabled: false,
 	},
 )
 const emit = defineEmits(["close"])
@@ -371,7 +371,7 @@ const cgPlanSpuItems = computed(() => {
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
 				unitPrice: unit?.retailPrice ? Number(unit?.retailPrice) : 0,
-				totalAmount: unit?.purchasePrice && item.quantity ? Number(unit.purchasePrice) * item.quantity : 0,
+				totalAmount: unit?.retailPrice && item.quantity ? Number(unit.retailPrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
 				orderType: baseDataForm.orderType,
@@ -382,7 +382,7 @@ const cgPlanSpuItems = computed(() => {
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
 				unitPrice: item.retailPrice ? Number(item.retailPrice) : 0,
-				totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
+				totalAmount: item?.retailPrice && item.quantity ? Number(item.retailPrice) * item.quantity : 0,
 				remark: item.remark,
 				unitId: item.unitId,
 				orderType: baseDataForm.orderType,
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
index 2849d1e..ec93b16 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="layout-padding">
-		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
+		<div v-if="!showForm" class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 					<el-form-item label="单据编号" prop="inventoryCode">
@@ -18,20 +18,16 @@
 					<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-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-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%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create()" v-auth="'supermarket_smErpInventoryRecords_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpInventoryRecords_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -68,39 +64,18 @@
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
-				<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="supplierName" 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>
 					<template #default="{ row }">
 						{{ displayPrice(row.totalAmount) }}
 					</template>
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button
-							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
-							icon="MessageBox"
-							text
-							type="success"
-							@click="edit(scope.row)"
-						>
-							详情
-						</el-button>
-						<el-button
-							v-else
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'supermarket_smErpInventoryRecords_edit'"
-							@click="edit(scope.row)"
-						>
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button
@@ -112,62 +87,77 @@
 						>
 							删除
 						</el-button>
-						<el-button
-							type="primary"
-							size="small"
-							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
-							link
-							icon="VideoPlay"
-							@click="deal(scope.row)"
-						>
-							开始处理
-						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 
-		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
-
-		<!-- 审批抽屉 -->
-		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
+		<sm-form v-else :formId="formId" :disabled="formDisabled" @close="formClose" />
 	</div>
 </template>
 
 <script setup lang="ts">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
-import ProcessDrawer from "/@/components/processDrawer/index.vue"
+import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { displayPrice } from "/@/utils/formatMoney"
-import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
-const { check_status } = useDict("check_status")
-// 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
-// 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
-const processFormState = reactive<{ formId: string | undefined; formDisabled: boolean; showForm: boolean }>({
-	formId: undefined,
-	formDisabled: true,
-	showForm: false,
-})
-const processDrawerRef = ref<InstanceType<typeof ProcessDrawer> | null>(null)
-
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		inventoryType: "5",
 	},
 	pageList: fetchList,
 })
+const showForm = ref(false)
+const formDisabled = ref(false)
+const formId = ref("")
+
+// 新增
+const create = () => {
+	formDisabled.value = false
+	formId.value = ""
+	showForm.value = true
+}
+
+// 删除
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+// 编辑
+const edit = (row: any) => {
+	if (!row.id) return useMessage().warning("清单id不存在")
+	formId.value = row.id
+	showForm.value = true
+}
+
+// 表单关闭
+const formClose = () => {
+	showForm.value = false
+	formId.value = ""
+	formDisabled.value = false
+	getDataList()
+}
 
-//  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
@@ -189,38 +179,4 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	selectObjs.value = objs.map(({ id }) => id)
 	multiple.value = !objs.length
 }
-
-const { create, edit, close } = useSmProcessTableAction(processFormState)
-
-const formClose = () => {
-	close()
-	getDataList()
-}
-
-// 点击开始处理
-const deal = (row: tableRow) => {
-	if (!row.processInstanceId) return useMessage().warning("流程id不存在")
-	processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row)
-}
-// 审批提交事件
-const taskSubmitEvent = () => {
-	getDataList()
-}
-
-// 删除操作
-const handleDelete = async (ids: string[]) => {
-	try {
-		await useMessageBox().confirm("此操作将永久删除")
-	} catch {
-		return
-	}
-
-	try {
-		await delObjs(ids)
-		getDataList()
-		useMessage().success("删除成功")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	}
-}
 </script>