From f26d9b3b5ee48b917c0dad6c546f46703fa1c5fa Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 24 Feb 2025 16:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictTag/index.vue              | 21 +++++------
 .../smErpCgBack/smErpCgBackOption.vue         | 29 +++++++--------
 src/views/supermarketerp/smErpCgDd/index.vue  |  4 +--
 .../smErpCgDd/smErpCgDdOption.vue             | 35 +++++++++----------
 .../smErpCgPlan/cgPlanOption.vue              | 16 ++-------
 .../smErpInventoryRecordsOption.vue           | 29 +++++++--------
 6 files changed, 61 insertions(+), 73 deletions(-)

diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 229b682..9a0e8f1 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -2,9 +2,9 @@
 	<div>
 		<template v-for="(item, index) in props.options">
 			<template v-if="values.includes(item.value || item)">
-				<span v-if="item.elTagType == 'default' || item.elTagType == ''" :key="index" :index="index" :class="item.elTagClass">{{
-					item.label || item
-				}}</span>
+				<span v-if="item.elTagType == 'default' || item.elTagType == ''" :key="index" :index="index" :class="item.elTagClass">
+					{{ item.label || item }}
+				</span>
 				<el-tag
 					v-else
 					:disable-transitions="true"
@@ -12,15 +12,16 @@
 					:index="index"
 					:type="item.elTagType === 'primary' ? '' : item.elTagType"
 					:class="item.elTagClass"
-					>{{ item.label || item }}</el-tag
 				>
+					{{ item.label || item }}
+				</el-tag>
 			</template>
 		</template>
 	</div>
 </template>
 
 <script setup lang="ts" name="dict-tag">
-import { computed } from 'vue';
+import { computed } from "vue"
 
 const props = defineProps({
 	// 数据
@@ -30,15 +31,15 @@ const props = defineProps({
 	},
 	// 当前的值
 	value: [Number, String, Array],
-});
+})
 
 const values = computed(() => {
-	if (props.value !== null && typeof props.value !== 'undefined') {
-		return Array.isArray(props.value) ? props.value : [String(props.value)];
+	if (props.value !== null && typeof props.value !== "undefined") {
+		return Array.isArray(props.value) ? props.value : [String(props.value)]
 	} else {
-		return [];
+		return []
 	}
-});
+})
 </script>
 
 <style scoped>
diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
index cb6922b..13b0072 100644
--- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
@@ -108,6 +108,7 @@
 								:label="item.unit"
 								:value="item.id"
 							/>
+							<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
@@ -124,17 +125,22 @@
 
 				<vxe-column field="unitPrice" title="进价">
 					<template #default="{ row }">
-						{{ row.purchasePrice ?? row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice }}
+						{{
+							row.purchasePrice
+								? displayPrice(row.purchasePrice)
+								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
+						}}
 					</template>
 				</vxe-column>
 
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
-						{{
-							row.unitId && row.quantity
-								? Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity
-								: ""
-						}}
+						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
+							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+						</span>
+						<span v-if="row.unitId && row.quantity && row.erpUnitVos">
+							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+						</span>
 					</template>
 				</vxe-column>
 
@@ -179,11 +185,11 @@ import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryReco
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
-import { storePrice } from "/@/utils/formatMoney"
 import { formatDate } from "/@/utils/formatTime"
 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"
 
 const router = useRouter()
 const route = useRoute()
@@ -198,15 +204,10 @@ const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
-	inventoryType: "4",
-	sourceId: "",
-	warehouseId: "",
 	handlerUserId: "",
 	checkStatus: "",
 	checkUserId: "",
 	checkTime: "",
-	merchantId: "",
-	deptId: "",
 	supplierId: "",
 	remark: "",
 	orderType: "2",
@@ -416,7 +417,7 @@ const cgPlanSpuItems = computed(() => {
 				id: item.isNew ? undefined : item.id,
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
-				unitPrice: unit.purchasePrice ? storePrice(unit?.purchasePrice) : 0,
+				unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
 				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
@@ -426,7 +427,7 @@ const cgPlanSpuItems = computed(() => {
 				id: item.isNew ? undefined : item.id,
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
-				unitPrice: item.unitPrice ? storePrice(item.unitPrice) : 0,
+				unitPrice: item.unitPrice ? Number(item.unitPrice) : 0,
 				totalAmount: Number(item.unitPrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
diff --git a/src/views/supermarketerp/smErpCgDd/index.vue b/src/views/supermarketerp/smErpCgDd/index.vue
index 3073527..70f6c6e 100644
--- a/src/views/supermarketerp/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/smErpCgDd/index.vue
@@ -44,10 +44,10 @@
 				<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>
+						<dict-tag :options="check_status" :value="scope.row.checkStatus" />
 					</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 5e57b15..5c8a31e 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -112,6 +112,7 @@
 								:label="item.unit"
 								:value="item.id"
 							/>
+							<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
@@ -126,22 +127,24 @@
 					</template>
 				</vxe-column>
 
-				<vxe-column field="unitPrice" title="进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+				<vxe-column field="purchasePrice" title="进价">
 					<template #default="{ row }">
-						{{ row.purchasePrice ?? row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice }}
-					</template>
-					<template #edit="{ row }">
-						<el-input v-model="row.purchasePrice" />
+						{{
+							row.purchasePrice
+								? displayPrice(row.purchasePrice)
+								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
+						}}
 					</template>
 				</vxe-column>
 
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
-						{{
-							row.unitId && row.quantity
-								? Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity
-								: ""
-						}}
+						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
+							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+						</span>
+						<span v-if="row.unitId && row.quantity && row.erpUnitVos">
+							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+						</span>
 					</template>
 				</vxe-column>
 
@@ -186,11 +189,11 @@ import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgDd"
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
-import { storePrice } from "/@/utils/formatMoney"
 import { formatDate } from "/@/utils/formatTime"
 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"
 
 const router = useRouter()
 const route = useRoute()
@@ -210,10 +213,6 @@ const baseDataForm = reactive<any>({
 	linkCode: "",
 	checkStatus: "",
 	checkUserId: "",
-	checkTime: "",
-	merchantId: "",
-	deptId: "",
-	quantity: "",
 	totalNumber: "",
 	totalAmount: "",
 	supplierId: "",
@@ -252,8 +251,6 @@ const dataRules = ref({
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	unitId: [{ required: true, message: "必须选择" }],
 	quantity: [{ required: true, type: "number", min: 1, max: 99, message: "数值范围1~99" }],
-	unitPrice: [{ required: true, type: "number", min: 0, message: "请输入数值" }],
-	purchasePrice: [{ required: true, type: "number", min: 0, message: "请输入数值" }],
 })
 
 // 初始化数据
@@ -425,7 +422,7 @@ const cgPlanSpuItems = computed(() => {
 				id: item.isNew ? undefined : item.id,
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
-				unitPrice: unit.purchasePrice ? storePrice(unit?.purchasePrice) : 0,
+				unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
 				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
@@ -435,7 +432,7 @@ const cgPlanSpuItems = computed(() => {
 				id: item.isNew ? undefined : item.id,
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
-				unitPrice: item.unitPrice ? storePrice(item.unitPrice) : 0,
+				unitPrice: item.unitPrice ? Number(item.unitPrice) : 0,
 				totalAmount: Number(item.unitPrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
diff --git a/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
index 1f95a72..723aecd 100644
--- a/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
+++ b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
@@ -177,7 +177,6 @@ import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgPlan"
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
-import { storePrice } from "/@/utils/formatMoney"
 import { formatDate } from "/@/utils/formatTime"
 
 const router = useRouter()
@@ -191,9 +190,7 @@ const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
 const baseDataForm = reactive<any>({
 	id: undefined,
 	planCode: "",
-	orderNumber: "",
 	planDate: formatDate(new Date(), "YYYY-mm-dd"),
-	supplierId: "",
 	handlerUserId: "",
 	remark: "",
 })
@@ -218,7 +215,6 @@ const dataRules = ref({
 	planCode: [{ required: true, message: "采购计划编号不能为空", trigger: "blur" }],
 	planDate: [{ required: true, message: "采购计划单据日期不能为空", trigger: "blur" }],
 	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
-	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
 
 // 可编辑表格校验规则
@@ -239,15 +235,7 @@ const getInitData = async () => {
 			.finally(() => (loading.value = false))
 
 		if (cgPlanData && cgPlanData.code === 0) {
-			Object.assign(baseDataForm, {
-				id: cgPlanData.data.id,
-				planCode: cgPlanData.data.planCode,
-				orderNumber: cgPlanData.data.orderNumber,
-				planDate: cgPlanData.data.planDate,
-				supplierId: cgPlanData.data.supplierId,
-				handlerUserId: cgPlanData.data.handlerUserId,
-				remark: cgPlanData.data.remark,
-			})
+			Object.assign(baseDataForm, cgPlanData.data)
 			state.editableTableData = cgPlanData.data.items
 			state.erpSpuItemsMemo = cgPlanData.data.items
 		}
@@ -388,7 +376,7 @@ const cgPlanSpuItems = computed(() => {
 			id: item.isNew ? undefined : item.id,
 			erpSpuId: item.erpSpuId,
 			quantity: item.quantity,
-			unitPrice: unit.purchasePrice ? storePrice(unit?.purchasePrice) : 0,
+			unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
 			totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 			remark: item.remark,
 			unitId: item.unitId,
diff --git a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
index 90fe2a4..66eb5c9 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue
@@ -112,6 +112,7 @@
 								:label="item.unit"
 								:value="item.id"
 							/>
+							<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
@@ -128,17 +129,22 @@
 
 				<vxe-column field="unitPrice" title="进价">
 					<template #default="{ row }">
-						{{ row.purchasePrice ?? row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice }}
+						{{
+							row.purchasePrice
+								? displayPrice(row.purchasePrice)
+								: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
+						}}
 					</template>
 				</vxe-column>
 
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
-						{{
-							row.unitId && row.quantity
-								? Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity
-								: ""
-						}}
+						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
+							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+						</span>
+						<span v-if="row.unitId && row.quantity && row.erpUnitVos">
+							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+						</span>
 					</template>
 				</vxe-column>
 
@@ -183,11 +189,11 @@ import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryReco
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
-import { storePrice } from "/@/utils/formatMoney"
 import { formatDate } from "/@/utils/formatTime"
 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"
 
 const router = useRouter()
 const route = useRoute()
@@ -202,15 +208,10 @@ const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
-	inventoryType: "3",
-	sourceId: "",
-	warehouseId: "",
 	handlerUserId: "",
 	checkStatus: "",
 	checkUserId: "",
 	checkTime: "",
-	merchantId: "",
-	deptId: "",
 	supplierId: "",
 	remark: "",
 	orderType: "1",
@@ -420,7 +421,7 @@ const cgPlanSpuItems = computed(() => {
 				id: item.isNew ? undefined : item.id,
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
-				unitPrice: unit.purchasePrice ? storePrice(unit?.purchasePrice) : 0,
+				unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
 				totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,
@@ -430,7 +431,7 @@ const cgPlanSpuItems = computed(() => {
 				id: item.isNew ? undefined : item.id,
 				erpSpuId: item.erpSpuId,
 				quantity: item.quantity,
-				unitPrice: item.unitPrice ? storePrice(item.unitPrice) : 0,
+				unitPrice: item.unitPrice ? Number(item.unitPrice) : 0,
 				totalAmount: Number(item.unitPrice || 0) * item.quantity,
 				remark: item.remark,
 				unitId: item.unitId,