From 274050ac09f9505605865239f1863eb3aa7bf7f5 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Sun, 23 Feb 2025 20:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../smErpCgBack/smErpCgBackOption.vue | 13 +++++--------
src/views/supermarketerp/smErpCgDd/index.vue | 4 ++--
.../supermarketerp/smErpCgDd/smErpCgDdOption.vue | 6 +++---
src/views/supermarketerp/smErpCgPlan/index.vue | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
index 442c91a..1361182 100644
--- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
@@ -11,13 +11,13 @@
-
+
@@ -26,9 +26,6 @@
-
-
-
@@ -202,7 +199,7 @@ const baseDataForm = reactive({
id: "",
inventoryCode: "",
inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
- inventoryType: "3",
+ inventoryType: "4",
sourceId: "",
warehouseId: "",
handlerUserId: "",
@@ -213,7 +210,7 @@ const baseDataForm = reactive({
deptId: "",
supplierId: "",
remark: "",
- orderType: "1",
+ orderType: "2",
totalAmount: "",
})
const state = reactive<{
@@ -273,7 +270,7 @@ const getInitData = async () => {
const [erpSpuSimpleAll, supplierTypeOptions, planCode] = await Promise.allSettled([
getErpSpuSimpleAll(),
getSupplierTypeOptions(),
- getPlanCode({ type: 3 }),
+ getPlanCode({ type: 4 }),
]).then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)
supplierTypeOptions && supplierTypeOptions.code === 0 && (supplierTypeDict.value = supplierTypeOptions.data)
diff --git a/src/views/supermarketerp/smErpCgDd/index.vue b/src/views/supermarketerp/smErpCgDd/index.vue
index 22a9c6c..a0b5fd3 100644
--- a/src/views/supermarketerp/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/smErpCgDd/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index d568944..29f38f0 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -8,7 +8,7 @@
-
+
@@ -201,7 +201,7 @@ const supplierTypeDict = ref([]) // 货商下拉选项
const baseDataForm = reactive({
id: "",
code: "",
- dDate: formatDate(new Date(), "YYYY-mm-dd"),
+ ddDate: formatDate(new Date(), "YYYY-mm-dd"),
warehouseId: "",
handlerUserId: "",
linkCode: "",
@@ -240,7 +240,7 @@ const state = reactive<{
// 基本信息表单校验规则
const dataRules = ref({
code: [{ required: true, message: "采购订单编号不能为空", trigger: "blur" }],
- dDate: [{ required: true, message: "采购订单单据日期不能为空", trigger: "blur" }],
+ ddDate: [{ required: true, message: "采购订单单据日期不能为空", trigger: "blur" }],
handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
})
diff --git a/src/views/supermarketerp/smErpCgPlan/index.vue b/src/views/supermarketerp/smErpCgPlan/index.vue
index fcecf03..36cc754 100644
--- a/src/views/supermarketerp/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/smErpCgPlan/index.vue
@@ -64,7 +64,7 @@
-
+