From 4f242af329198b4562fc836db7016a427e9d68d8 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 18 Feb 2025 16:29:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smErpCgDd.ts                              |   0
 src/views/supermarket/smErpCgDd/form.vue      | 140 ------------------
 src/views/supermarketerp/smErpCgDd/index.vue  |  10 +-
 .../smErpCgDd/smErpCgDdOption.vue             | 126 +++++++++-------
 4 files changed, 82 insertions(+), 194 deletions(-)
 rename src/api/{supermarket => supermarketerp}/smErpCgDd.ts (100%)
 delete mode 100644 src/views/supermarket/smErpCgDd/form.vue

diff --git a/src/api/supermarket/smErpCgDd.ts b/src/api/supermarketerp/smErpCgDd.ts
similarity index 100%
rename from src/api/supermarket/smErpCgDd.ts
rename to src/api/supermarketerp/smErpCgDd.ts
diff --git a/src/views/supermarket/smErpCgDd/form.vue b/src/views/supermarket/smErpCgDd/form.vue
deleted file mode 100644
index f888575..0000000
--- a/src/views/supermarket/smErpCgDd/form.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="出入库数量" prop="quantity">
-						<el-input v-model="form.quantity" placeholder="请输入出入库数量" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="累计进货数量" prop="totalNumber">
-						<el-input v-model="form.totalNumber" placeholder="请输入累计进货数量" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="累计总金额" prop="totalAmount">
-						<el-input v-model="form.totalAmount" placeholder="请输入累计总金额" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="货商" prop="supplierId">
-						<el-input v-model="form.supplierId" placeholder="请输入货商" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model="form.remark" placeholder="请输入备注" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="订单编号" prop="orderNumber">
-						<el-input v-model="form.orderNumber" placeholder="请输入订单编号" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<template #footer>
-			<span class="dialog-footer">
-				<el-button @click="visible = false">取消</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-			</span>
-		</template>
-	</el-dialog>
-</template>
-
-<script setup lang="ts" name="SmErpCgDdDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarket/smErpCgDd"
-import { rule } from "/@/utils/validate"
-const emit = defineEmits(["refresh"])
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-const { check_status } = useDict("check_status")
-
-// 提交表单数据
-const form = reactive({
-	id: "",
-	code: "",
-	dDate: "",
-	warehouseId: "",
-	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
-	merchantId: "",
-	deptId: "",
-	quantity: "",
-	totalNumber: "",
-	totalAmount: "",
-	supplierId: "",
-	remark: "",
-	orderNumber: "",
-})
-
-// 定义校验规则
-const dataRules = ref({})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-	visible.value = true
-	form.id = ""
-
-	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
-
-	// 获取smErpCgDd信息
-	if (id) {
-		form.id = id
-		getsmErpCgDdData(id)
-	}
-}
-
-// 提交
-const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
-	if (!valid) return false
-
-	try {
-		loading.value = true
-		form.id ? await putObj(form) : await addObj(form)
-		useMessage().success(form.id ? "修改成功" : "添加成功")
-		visible.value = false
-		emit("refresh")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 初始化表单数据
-const getsmErpCgDdData = (id: string) => {
-	// 获取数据
-	loading.value = true
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
-}
-
-// 暴露变量
-defineExpose({
-	openDialog,
-})
-</script>
diff --git a/src/views/supermarketerp/smErpCgDd/index.vue b/src/views/supermarketerp/smErpCgDd/index.vue
index 8b7b71b..180cb31 100644
--- a/src/views/supermarketerp/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/smErpCgDd/index.vue
@@ -59,7 +59,13 @@
 				<el-table-column prop="orderNumber" label="订单编号" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgDd_edit'" @click="handleClickEditCgPlan">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'supermarket_smErpCgDd_edit'"
+							@click="handleClickEditCgPlan(scope.row.id)"
+						>
 							编辑
 						</el-button>
 						<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgDd_del'" @click="handleDelete([scope.row.id])">
@@ -76,7 +82,7 @@
 <script setup lang="ts" name="systemSmErpCgDd">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarket/smErpCgDd"
+import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgDd"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index e5269a0..2c4f5a8 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -3,8 +3,8 @@
 		<div v-loading="loading" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
 			<el-form ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" formDialogRef label-width="140px">
 				<div class="flex flex-wrap">
-					<el-form-item label="采购订单编号" prop="code">
-						<el-input v-model.trim="baseDataForm.code" placeholder="请输入采购订单编号" disabled style="width: 200px" />
+					<el-form-item label="编号" prop="code">
+						<el-input v-model="baseDataForm.code" placeholder="请输入编号" style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="单据日期" prop="dDate">
@@ -19,56 +19,59 @@
 					</el-form-item>
 
 					<el-form-item label="仓库id" prop="warehouseId">
-						<el-input v-model.trim="baseDataForm.warehouseId" placeholder="请输入仓库id" disabled style="width: 200px" />
+						<el-input v-model="baseDataForm.warehouseId" placeholder="请输入仓库id" style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="经办人id" prop="handlerUserId">
-						<el-input v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人id" maxlength="50" style="width: 200px" />
-					</el-form-item>
-
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model="baseDataForm.checkStatus" placeholder="请输入审批状态" />
-					</el-form-item>
-
-					<el-form-item label="审批人id" prop="checkUserId">
-						<el-input v-model="baseDataForm.checkUserId" placeholder="请选择审批人id" />
-					</el-form-item>
-
-					<el-form-item label="审核日期" prop="checkTime">
-						<el-date-picker
-							style="width: 200px"
-							v-model.trim="baseDataForm.checkTime"
-							type="date"
-							placeholder="请选择审核日期"
-							format="YYYY-MM-DD"
-							value-format="YYYY-MM-DD"
-						/>
-					</el-form-item>
-
-					<el-form-item label="商户编号" prop="merchantId">
-						<el-input v-model="baseDataForm.merchantId" placeholder="请输入商户编号" />
-					</el-form-item>
-
-					<el-form-item label="部门id" prop="deptId">
-						<el-input v-model="baseDataForm.deptId" placeholder="请输入部门id" />
-					</el-form-item>
-
-					<el-form-item label="货商" prop="supplierId">
-						<el-select v-model.trim="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
-							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
+						<el-select v-model="baseDataForm.handlerUserId" placeholder="请选择经办人id" style="width: 200px">
+							<el-option label="请选择" value="0" />
 						</el-select>
 					</el-form-item>
 
-					<!-- <el-form-item label="仓库" prop="warehouseId">
-						<el-input v-model.trim="baseDataForm.warehouseId" placeholder="请输入仓库id" />
-					</el-form-item> -->
+					<el-form-item label="审批状态" prop="checkStatus">
+						<el-input v-model="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
+					</el-form-item>
 
-					<el-form-item label="经办人" prop="handlerUserId">
-						<el-input v-model.trim="baseDataForm.handlerUserId" placeholder="请输入经办人" maxlength="20" style="width: 200px" />
+					<el-form-item label="审批人id" prop="checkUserId">
+						<el-select v-model="baseDataForm.checkUserId" placeholder="请选择审批人id" style="width: 200px">
+							<el-option label="请选择" value="0" />
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="审核日期" prop="checkTime">
+						<el-input v-model="baseDataForm.checkTime" placeholder="请输入审核日期" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="商户编号" prop="merchantId">
+						<el-input v-model="baseDataForm.merchantId" placeholder="请输入商户编号" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="部门id" prop="deptId">
+						<el-input v-model="baseDataForm.deptId" placeholder="请输入部门id" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="出入库数量" prop="quantity">
+						<el-input v-model="baseDataForm.quantity" placeholder="请输入出入库数量" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="累计进货数量" prop="totalNumber">
+						<el-input v-model="baseDataForm.totalNumber" placeholder="请输入累计进货数量" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="累计总金额" prop="totalAmount">
+						<el-input v-model="baseDataForm.totalAmount" placeholder="请输入累计总金额" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="货商" prop="supplierId">
+						<el-input v-model="baseDataForm.supplierId" placeholder="请输入货商" style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="备注" prop="remark">
-						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" maxlength="50" style="width: 200px" />
+						<el-input v-model="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
+					</el-form-item>
+
+					<el-form-item label="订单编号" prop="orderNumber">
+						<el-input v-model="baseDataForm.orderNumber" placeholder="请输入订单编号" style="width: 200px" />
 					</el-form-item>
 				</div>
 			</el-form>
@@ -287,7 +290,8 @@ import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj, getPlanCode, getCgPlanSpuPage, getErpSpuSimpleAll } from "/@/api/supermarketerp/smErpCgPlan"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgDd"
+import { getPlanCode, getCgPlanSpuPage, getErpSpuSimpleAll } from "/@/api/supermarketerp/smErpCgPlan"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getSupplierTypeOptions } from "/@/api/supermarketerp/smErpSupplier"
 import { storePrice } from "/@/utils/formatMoney"
@@ -295,12 +299,21 @@ import { storePrice } from "/@/utils/formatMoney"
 // 基本表单数据类型
 interface FormVO {
 	id: string | undefined
-	planCode: string
-	orderNumber: string
-	planDate: string
-	supplierId: string
+	code: string
+	dDate: string
+	warehouseId: string
 	handlerUserId: string
+	checkStatus: string
+	checkUserId: string
+	checkTime: string
+	merchantId: string
+	deptId: string
+	quantity: string
+	totalNumber: string
+	totalAmount: string
+	supplierId: string
 	remark: string
+	orderNumber: string
 	[key: string]: string | undefined
 }
 
@@ -326,13 +339,22 @@ const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
 
 // 基本信息表单数据
 const baseDataForm = reactive<FormVO>({
-	id: undefined,
-	planCode: "",
-	orderNumber: "",
-	planDate: "",
-	supplierId: "",
+	id: "",
+	code: "",
+	dDate: "",
+	warehouseId: "",
 	handlerUserId: "",
+	checkStatus: "",
+	checkUserId: "",
+	checkTime: "",
+	merchantId: "",
+	deptId: "",
+	quantity: "",
+	totalNumber: "",
+	totalAmount: "",
+	supplierId: "",
 	remark: "",
+	orderNumber: "",
 })
 const state = reactive<{
 	editableTableData: RowVO[]