diff --git a/.cursorrules b/.cursorrules deleted file mode 100644 index 66b900e..0000000 --- a/.cursorrules +++ /dev/null @@ -1,30 +0,0 @@ -You are an expert in TypeScript, Vite, Vue3, Vue Router, Pinia, VueUse ,Daisy UI, Element Plus, and Tailwind, with a deep understanding of best practices and performance optimization techniques in these technologies. - -Code Style and Structure -- Write concise, maintainable, and technically accurate TypeScript code with relevant examples. -- Use functional and declarative programming patterns; avoid classes. -- Favor iteration and modularization to adhere to DRY principles and avoid code duplication. -- Use descriptive variable names with auxiliary verbs (e.g., isLoading, hasError). -- Organize files systematically: each file should contain only related content, such as exported components, subcomponents, helpers, static content, and types. - -Naming Conventions -- Use lowercase with dashes for directories (e.g., components/auth-wizard). -- Favor named exports for functions. - -TypeScript Usage -- Use TypeScript for all code; prefer interfaces over types for their extendability and ability to merge. -- Avoid enums; use maps instead for better type safety and flexibility. -- Use functional components with TypeScript interfaces. - -Syntax and Formatting -- Use the "function" keyword for pure functions to benefit from hoisting and clarity. -- Always use the Vue Composition API script setup style. -- The order is template , typescript , Sass - -UI and Styling -- Use Element Plus,Daisyui, and Tailwind for components and styling. -- Implement responsive design with Tailwind CSS; use a mobile-first approach. -- Styles need to support both light and dark modes - -Performance Optimization -- Leverage VueUse functions where applicable to enhance reactivity and performance. diff --git a/.env.development b/.env.development index 0b88f07..17c96dd 100644 --- a/.env.development +++ b/.env.development @@ -8,9 +8,9 @@ VITE_OPEN = true ENV = 'development' # ADMIN 服务地址 -#VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 +VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ -VITE_ADMIN_PROXY_PATH = http://localhost:9999/ +# VITE_ADMIN_PROXY_PATH = http://localhost:9999/ # VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://192.168.101.37:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境 @@ -18,7 +18,7 @@ VITE_ADMIN_PROXY_PATH = http://localhost:9999/ # 图片访问基础地址 VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc -VITE_IMAGE_BASE_PATH = http://localhost:9999 +# VITE_IMAGE_BASE_PATH = http://localhost:9999 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://192.168.101.37:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境 diff --git a/dist.zip b/dist.zip deleted file mode 100644 index c08b1a8..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/views/supermarket/smSpu/form.vue b/src/views/supermarket/smSpu/form.vue index 84650b1..5af2e36 100644 --- a/src/views/supermarket/smSpu/form.vue +++ b/src/views/supermarket/smSpu/form.vue @@ -70,20 +70,17 @@ draggable @close="" > - + ({ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) +const resetQuery = () => { + state.queryForm.productName = "" + getDataList() +} + // 点击选择库存商品 const handleClickSelectSpu = () => { loading.value = true + resetQuery() spuSelectDialogVisible.value = true try { getDataList() diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode/form.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode/form.vue index e4e15cd..12f2ddb 100644 --- a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode/form.vue +++ b/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode/form.vue @@ -37,7 +37,6 @@ const form = reactive({ // 定义校验规则 const dataRules = ref({ barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }], - spuId: [{ required: true, message: "spuID不能为空", trigger: "blur" }], }) // 打开弹窗 @@ -47,6 +46,7 @@ const openDialog = (rowData: any = null) => { // 重置表单数据 dataFormRef.value?.resetFields() + form.barCode = "" if (rowData) { Object.assign(form, rowData) diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue index 3a3f7f6..2d4a879 100644 --- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue +++ b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/form.vue @@ -31,10 +31,12 @@ - -

注:内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换,影响erp库存自动扣减操作。 - 例如:一瓶矿泉水内装填'1',为售卖的最小基础单位,如果想按箱卖,在继续添加包装单位为箱,内装为24

-
+ +

+ 注:内装数据必须为该商品的最小售卖的基本单位,否则无法完成库存数量转换,影响erp库存自动扣减操作。 + 例如:一瓶矿泉水内装填'1',为售卖的最小基础单位,如果想按箱卖,在继续添加包装单位为箱,内装为24 +

+
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue index c5eb06e..c79481c 100644 --- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue +++ b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit/index.vue @@ -37,8 +37,9 @@ class="ml10" v-auth="'supermarket_supermarketUnit_add'" @click="formDialogRef.openDialog()" - >新 增 + 新 增 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - -

注:最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品,都会进行总库存-内装数,实现多种包装形式售卖

-
- -
-
+ + + + + + + + +

+ 注:最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品,都会进行总库存-内装数,实现多种包装形式售卖 +

+
+ +
+
@@ -123,21 +125,21 @@ - - - - - + + + + + - - - - - + + + + + @@ -159,9 +161,7 @@ - + @@ -171,24 +171,30 @@ 取消 上一步 下一步 - 确 认 + + 确 认 +