From 4a640f62794ab34c71779085f3f41cfc6d5ff4b6 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 19 Mar 2025 20:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E7=9B=B8=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +- src/stores/purchase.ts | 27 +++ .../purchaseManagement/smErpCgBack/index.vue | 16 +- .../smErpCgInventory/index.vue | 10 +- .../purchaseManagement/smErpCgPlan/form.vue | 5 +- .../purchaseManagement/smErpCgPlan/index.vue | 24 ++- .../smErpRetailBack/index.vue | 2 + .../smErpRetailDelivery/index.vue | 2 +- .../supermarketerp/smErpSupplier/index.vue | 1 + .../smErpSupplier/upload-excel.vue | 165 ++++++++++++++++++ .../supermarketerp/stockTaking/index.vue | 20 +-- .../supermarketSpu/components/packageUnit.vue | 8 +- .../components/upload-excel.vue | 165 ++++++++++++++++++ .../supermarketerp/supermarketSpu/form.vue | 2 +- .../supermarketerp/supermarketSpu/index.vue | 2 + 15 files changed, 420 insertions(+), 39 deletions(-) create mode 100644 src/stores/purchase.ts create mode 100644 src/views/supermarketerp/smErpSupplier/upload-excel.vue create mode 100644 src/views/supermarketerp/supermarketSpu/components/upload-excel.vue diff --git a/.env.development b/.env.development index afdb6f6..d6df8ef 100644 --- a/.env.development +++ b/.env.development @@ -8,18 +8,18 @@ VITE_OPEN = true ENV = 'development' # ADMIN 服务地址 -# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上 +VITE_ADMIN_PROXY_PATH = http://47.96.250.9:8089/api/ # 测试线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/ -VITE_ADMIN_PROXY_PATH = http://192.168.101.64:9999/ # 邓-本地 +# VITE_ADMIN_PROXY_PATH = http://192.168.101.64:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 -# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 测试线上 +# VITE_IMAGE_BASE_PATH = http://47.96.250.9:8089/api # 测试线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 -# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 +# VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 +VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/src/stores/purchase.ts b/src/stores/purchase.ts new file mode 100644 index 0000000..ac02974 --- /dev/null +++ b/src/stores/purchase.ts @@ -0,0 +1,27 @@ +import { defineStore } from "pinia" + +export const usePurchase = defineStore("purchase", { + state: () => ({ + smErpCgPlan: { + id: "", + disabled: false, + }, + }), + actions: { + setSmErpCgPlanId(id: string) { + this.smErpCgPlan.id = id + }, + setSmErpCgPlanDisabled(disabled: boolean) { + this.smErpCgPlan.disabled = disabled + }, + }, + persist: { + enabled: true, + strategies: [ + { + key: "smErpCgPlan", //自定义 Key值 + storage: localStorage, // 选择存储方式 + }, + ], + }, +}) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue index 040df97..e0ea296 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue @@ -18,11 +18,11 @@ - + 查询 重置 @@ -76,11 +76,11 @@ - - - - - + + + @@ -120,7 +120,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" const router = useRouter() -const { erp_order_type, inventory_type, check_status } = useDict("erp_order_type", "inventory_type", "check_status") +const { check_status } = useDict("check_status") // 搜索变量 const queryRef = ref() const showSearch = ref(true) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue index 823539d..08e8203 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue @@ -76,11 +76,11 @@ - - - - - + + + diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue index 9b35eba..241cf8d 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue @@ -165,7 +165,9 @@ import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgPlan" import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common" import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue" import { formatDate } from "/@/utils/formatTime" +import { usePurchase } from "/@/stores/purchase" +const purchaseStore = usePurchase() const router = useRouter() const route = useRoute() const erpSpuSelectDialogRef = ref() // 商品选择对话框ref @@ -212,7 +214,8 @@ const validRules = ref>({ // 初始化数据 const getInitData = async () => { baseDataForm.id = undefined - const id = route.query.id as string + // const id = route.query.id as string + const id = purchaseStore.smErpCgPlan.id if (id) { loading.value = true // 获取补货申请编号 & 获取简要商品列表 diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue index 0d7160b..36acada 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue @@ -14,7 +14,7 @@ - + @@ -64,7 +64,11 @@ - + + +