diff --git a/.env.development b/.env.development
index e0df6a1..2b6d25d 100644
--- a/.env.development
+++ b/.env.development
@@ -8,12 +8,12 @@ VITE_OPEN = true
ENV = 'development'
# ADMIN 服务地址
-# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
-VITE_ADMIN_PROXY_PATH = http://localhost:9999
+VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+# VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
-VITE_IMAGE_BASE_PATH = http://localhost:9999
+VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+# VITE_IMAGE_BASE_PATH = http://localhost:9999
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
index d4c8ee0..4e7f86a 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
@@ -35,11 +35,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -71,6 +89,10 @@ const form = reactive({
unit: '',
status: '',
packageNum: 0,
+ purchasePrice: '',
+ retailPrice: '',
+ promotionPrice: '',
+ costPrice: '',
});
// 定义校验规则
@@ -80,7 +102,8 @@ const dataRules = ref({
unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
- spuId: [{ required: true, message: 'spuId不能为空', trigger: 'blur' }],
+ purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
+ retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
});
// 打开弹窗
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index a0d69d1..ad8eb77 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -294,20 +294,6 @@ const getsupermarketSpuData = (id: string) => {
.finally(() => {
loading.value = false;
});
- getSupermarketUnit(id)
- .then((res: any) => {
- form.supermarketUnitEntityList = res.data;
- })
- .finally(() => {
- loading.value = false;
- });
- getSupermarketAuxiliaryCode(id)
- .then((res: any) => {
- form.supermarketAuxiliaryCodeEntityList = res.data;
- })
- .finally(() => {
- loading.value = false;
- });
};
// 打开弹窗
@@ -315,8 +301,6 @@ const openDialog = async (id: string) => {
visible.value = true;
currentTabPaneIndex.value = 0;
form.id = '';
- form.supermarketUnitEntityList = [];
- form.supermarketAuxiliaryCodeEntityList = [];
// 重置表单数据
dataFormRef.value?.resetFields();
diff --git a/vite.config.ts b/vite.config.ts
index 759a73a..8fbe8e0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,8 +9,8 @@ import viteCompression from 'vite-plugin-compression';
// @ts-ignore
import { svgBuilder } from '/@/components/IconSelector/index';
-import dns from 'node:dns'
-dns.setDefaultResultOrder('verbatim')
+import dns from 'node:dns';
+dns.setDefaultResultOrder('verbatim');
const pathResolve = (dir: string) => {
return resolve(__dirname, '.', dir);
@@ -24,7 +24,7 @@ const alias: Record = {
const viteConfig = defineConfig((mode: ConfigEnv) => {
const env = loadEnv(mode.mode, process.cwd());
// 判断是否开发环境
- const isDev = env.ENV === 'development'
+ const isDev = env.ENV === 'development';
return {
plugins: [
vue(), // Vue 插件
@@ -77,18 +77,18 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
},
},
build: {
- outDir: 'dist', // 打包输出目录
+ outDir: 'dist', // 打包输出目录//
chunkSizeWarningLimit: 1500, // 代码分包阈值
// 开发使用 esbuild 更快，生产环境打包使用 terser 可以删除更多注释
- minify: isDev ? 'esbuild' : 'terser',
+ minify: isDev ? 'esbuild' : 'terser',
terserOptions: {
compress: {
drop_console: true, // 删除 console
drop_debugger: true, // 删除 debugger
},
format: {
- comments: false // 删除所有注释
- }
+ comments: false, // 删除所有注释
+ },
},
rollupOptions: {
output: {