From c16cf279398687d5f4b69cfd8808fe8cbe06a8b5 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 17 Feb 2025 15:30:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/route.ts                           |   8 -
 .../{createCgPlan.vue => cgPlanOption.vue}    |  10 +-
 src/views/supermarketerp/smErpCgPlan/form.vue | 196 ------------------
 .../supermarketerp/smErpCgPlan/index.vue      |   4 +-
 4 files changed, 11 insertions(+), 207 deletions(-)
 rename src/views/supermarketerp/smErpCgPlan/{createCgPlan.vue => cgPlanOption.vue} (98%)
 delete mode 100644 src/views/supermarketerp/smErpCgPlan/form.vue

diff --git a/src/router/route.ts b/src/router/route.ts
index 0b754ae..a04053d 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -57,14 +57,6 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 			isHide: true,
 		},
 	},
-	{
-		path: "/createCgPlan",
-		name: "创建采购计划",
-		component: () => import("/@/views/supermarketerp/smErpCgPlan/createCgPlan.vue"),
-		meta: {
-			isHide: true,
-		},
-	},
 ]
 
 /**
diff --git a/src/views/supermarketerp/smErpCgPlan/createCgPlan.vue b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
similarity index 98%
rename from src/views/supermarketerp/smErpCgPlan/createCgPlan.vue
rename to src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
index 7345376..ab584a2 100644
--- a/src/views/supermarketerp/smErpCgPlan/createCgPlan.vue
+++ b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue
@@ -334,7 +334,15 @@ const getInitData = async () => {
 		loading.value = true
 		getObj(id)
 			.then((res: any) => {
-				Object.assign(baseDataForm, res.data)
+				Object.assign(baseDataForm, {
+					planCode: res.data.planCode,
+					orderNumber: res.data.orderNumber,
+					planDate: res.data.planDate,
+					supplierId: res.data.supplierId,
+					handlerUserId: res.data.handlerUserId,
+					remark: res.data.remark,
+				})
+				state.editableTableData = res.data.items
 			})
 			.finally(() => {
 				loading.value = false
diff --git a/src/views/supermarketerp/smErpCgPlan/form.vue b/src/views/supermarketerp/smErpCgPlan/form.vue
deleted file mode 100644
index a79a479..0000000
--- a/src/views/supermarketerp/smErpCgPlan/form.vue
+++ /dev/null
@@ -1,196 +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-row :gutter="24">
-				<el-col :span="12" class="mb20">
-					<el-form-item label="采购计划编号" prop="planCode">
-						<el-input v-model="form.planCode" placeholder="请输入采购计划编号" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="采购计划单据日期" prop="planDate">
-						<el-input v-model="form.planDate" placeholder="请输入采购计划单据日期" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="仓库id" prop="warehouseId">
-						<el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="经办人id" prop="handlerUserId">
-						<el-input v-model="form.handlerUserId" placeholder="请输入经办人id" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model="form.checkStatus" placeholder="请输入审批状态" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="审批人id" prop="checkUserId">
-						<el-input v-model="form.checkUserId" placeholder="请输入审批人id" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="审核日期" prop="checkTime">
-						<el-input v-model="form.checkTime" placeholder="请输入审核日期" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户编号" prop="merchantId">
-						<el-input v-model="form.merchantId" placeholder="请输入商户编号" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="部门id" prop="deptId">
-						<el-input v-model="form.deptId" placeholder="请输入部门id" />
-					</el-form-item>
-				</el-col>
-
-				<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="SmErpCgPlanDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgPlan"
-import { rule } from "/@/utils/validate"
-const emit = defineEmits(["refresh"])
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-
-// 提交表单数据
-const form = reactive({
-	id: "",
-	planCode: "",
-	planDate: "",
-	warehouseId: "",
-	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
-	merchantId: "",
-	deptId: "",
-	quantity: "",
-	totalNumber: "",
-	totalAmount: "",
-	supplierId: "",
-	remark: "",
-	orderNumber: "",
-})
-
-// 定义校验规则
-const dataRules = ref({
-	planCode: [{ required: true, message: "采购计划编号不能为空", trigger: "blur" }],
-	planDate: [{ required: true, message: "采购计划单据日期不能为空", trigger: "blur" }],
-})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-	visible.value = true
-	form.id = ""
-
-	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
-
-	// 获取smErpCgPlan信息
-	if (id) {
-		form.id = id
-		getsmErpCgPlanData(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 getsmErpCgPlanData = (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/smErpCgPlan/index.vue b/src/views/supermarketerp/smErpCgPlan/index.vue
index c841ee5..109c9f1 100644
--- a/src/views/supermarketerp/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/smErpCgPlan/index.vue
@@ -142,9 +142,9 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 }
 
 // 点击创建采购清单
-const handleClickCreateCgPlan = () => router.push({ path: "/createCgPlan" })
+const handleClickCreateCgPlan = () => router.push({ path: "/supermarketerp/smErpCgPlan/cgPlanOption" })
 // 点击编辑采购清单
-const handleClickEditCgPlan = (id: string) => router.push({ path: "/createCgPlan", query: { id } })
+const handleClickEditCgPlan = (id: string) => router.push({ path: "/supermarketerp/smErpCgPlan/cgPlanOption", query: { id } })
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {

From 1b661b67f1076bc580f38604a5d3af6486f68fa5 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 17 Feb 2025 15:31:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev-local | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .env.dev-local

diff --git a/.env.dev-local b/.env.dev-local
new file mode 100644
index 0000000..d3add9f
--- /dev/null
+++ b/.env.dev-local
@@ -0,0 +1,20 @@
+# port 端口号
+VITE_PORT = 8888
+
+#浏览器自动打开
+VITE_OPEN = true
+
+# 本地环境
+ENV = 'local'
+
+
+# ADMIN 服务地址
+VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+
+
+# 图片访问基础地址
+VITE_IMAGE_BASE_PATH = http://localhost:9999
+
+
+# 代码生成服务地址
+VITE_GEN_PROXY_PATH = http://192.168.110.156:5003