From 5b8679256a4f65abd1e62fef53303dbe2d05409e Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 21 Jan 2025 16:47:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supermarketerp/smErpSupplier.ts | 12 ++++---- src/api/supermarketerp/smErpSupplierType.ts | 10 +++---- src/views/supermarket/supermarketSpu/form.vue | 28 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/api/supermarketerp/smErpSupplier.ts b/src/api/supermarketerp/smErpSupplier.ts index 034bc16..a00b904 100644 --- a/src/api/supermarketerp/smErpSupplier.ts +++ b/src/api/supermarketerp/smErpSupplier.ts @@ -2,7 +2,7 @@ import request from '/@/utils/request'; export function fetchList(query?: Object) { return request({ - url: '/supermarketerp/smErpSupplier/page', + url: '/supermarket/smErpSupplier/page', method: 'get', params: query, }); @@ -10,7 +10,7 @@ export function fetchList(query?: Object) { export function addObj(obj?: Object) { return request({ - url: '/supermarketerp/smErpSupplier', + url: '/supermarket/smErpSupplier', method: 'post', data: obj, }); @@ -18,14 +18,14 @@ export function addObj(obj?: Object) { export function getObj(id?: string) { return request({ - url: '/supermarketerp/smErpSupplier/' + id, + url: '/supermarket/smErpSupplier/' + id, method: 'get', }); } export function delObjs(ids?: Object) { return request({ - url: '/supermarketerp/smErpSupplier', + url: '/supermarket/smErpSupplier', method: 'delete', data: ids, }); @@ -33,7 +33,7 @@ export function delObjs(ids?: Object) { export function putObj(obj?: Object) { return request({ - url: '/supermarketerp/smErpSupplier', + url: '/supermarket/smErpSupplier', method: 'put', data: obj, }); @@ -41,7 +41,7 @@ export function putObj(obj?: Object) { export function getSupplierTypeOptions(): any { return request({ - url: '/supermarketerp/smErpSupplierType/simpleAll', + url: '/supermarket/smErpSupplierType/simpleAll', method: 'get', }); } diff --git a/src/api/supermarketerp/smErpSupplierType.ts b/src/api/supermarketerp/smErpSupplierType.ts index 413850b..3d33a2b 100644 --- a/src/api/supermarketerp/smErpSupplierType.ts +++ b/src/api/supermarketerp/smErpSupplierType.ts @@ -2,7 +2,7 @@ import request from "/@/utils/request" export function fetchList(query?: Object) { return request({ - url: '/supermarketerp/smErpSupplierType/page', + url: '/supermarket/smErpSupplierType/page', method: 'get', params: query }) @@ -10,7 +10,7 @@ export function fetchList(query?: Object) { export function addObj(obj?: Object) { return request({ - url: '/supermarketerp/smErpSupplierType', + url: '/supermarket/smErpSupplierType', method: 'post', data: obj }) @@ -18,14 +18,14 @@ export function addObj(obj?: Object) { export function getObj(id?: string) { return request({ - url: '/supermarketerp/smErpSupplierType/' + id, + url: '/supermarket/smErpSupplierType/' + id, method: 'get' }) } export function delObjs(ids?: Object) { return request({ - url: '/supermarketerp/smErpSupplierType', + url: '/supermarket/smErpSupplierType', method: 'delete', data: ids }) @@ -33,7 +33,7 @@ export function delObjs(ids?: Object) { export function putObj(obj?: Object) { return request({ - url: '/supermarketerp/smErpSupplierType', + url: '/supermarket/smErpSupplierType', method: 'put', data: obj }) diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue index 52989b7..e234cd8 100644 --- a/src/views/supermarket/supermarketSpu/form.vue +++ b/src/views/supermarket/supermarketSpu/form.vue @@ -67,21 +67,26 @@ - + - + + + + + + @@ -96,16 +101,11 @@ - - - - - - + @@ -171,11 +171,11 @@ --> - + @@ -283,7 +283,7 @@ const dataRules = { productCode: [{ required: true, message: "货号不能为空", trigger: "blur" }], barcode: [{ required: true, message: "自编码/条码不能为空", trigger: "blur" }], productName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }], - unit: [{ required: true, message: "单位不能为空", trigger: "blur" }], + stock: [{ required: true, message: "单位不能为空", trigger: "blur" }], categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }], brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }], picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }], From daf6767bbd8647f1b4b97d087c5491c7418d250d Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 21 Jan 2025 16:54:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarketAuxiliaryCode.ts | 2 +- .../supermarketBrand.ts | 2 +- .../supermarketCategory.ts | 2 +- .../supermarketSpu.ts | 2 +- .../supermarketUnit.ts | 2 +- .../supermarketAuxiliaryCode/form.vue | 2 +- .../supermarketAuxiliaryCode/index.vue | 2 +- .../supermarketBrand/form.vue | 2 +- .../supermarketBrand/index.vue | 2 +- .../supermarketCategory/form.vue | 2 +- .../supermarketCategory/index.vue | 2 +- .../components/supermarketAuxiliaryCode/form.vue | 0 .../components/supermarketAuxiliaryCode/index.vue | 0 .../components/supermarketUnit/form.vue | 0 .../components/supermarketUnit/index.vue | 0 .../supermarketSpu/form.vue | 12 ++++++------ .../supermarketSpu/index.vue | 8 ++++---- .../supermarketUnit/form.vue | 4 ++-- .../supermarketUnit/index.vue | 6 +++--- 19 files changed, 26 insertions(+), 26 deletions(-) rename src/api/{supermarket => supermarketerp}/supermarketAuxiliaryCode.ts (94%) rename src/api/{supermarket => supermarketerp}/supermarketBrand.ts (94%) rename src/api/{supermarket => supermarketerp}/supermarketCategory.ts (94%) rename src/api/{supermarket => supermarketerp}/supermarketSpu.ts (95%) rename src/api/{supermarket => supermarketerp}/supermarketUnit.ts (94%) rename src/views/{supermarket => supermarketerp}/supermarketAuxiliaryCode/form.vue (96%) rename src/views/{supermarket => supermarketerp}/supermarketAuxiliaryCode/index.vue (98%) rename src/views/{supermarket => supermarketerp}/supermarketBrand/form.vue (97%) rename src/views/{supermarket => supermarketerp}/supermarketBrand/index.vue (98%) rename src/views/{supermarket => supermarketerp}/supermarketCategory/form.vue (97%) rename src/views/{supermarket => supermarketerp}/supermarketCategory/index.vue (98%) rename src/views/{supermarket => supermarketerp}/supermarketSpu/components/supermarketAuxiliaryCode/form.vue (100%) rename src/views/{supermarket => supermarketerp}/supermarketSpu/components/supermarketAuxiliaryCode/index.vue (100%) rename src/views/{supermarket => supermarketerp}/supermarketSpu/components/supermarketUnit/form.vue (100%) rename src/views/{supermarket => supermarketerp}/supermarketSpu/components/supermarketUnit/index.vue (100%) rename src/views/{supermarket => supermarketerp}/supermarketSpu/form.vue (98%) rename src/views/{supermarket => supermarketerp}/supermarketSpu/index.vue (97%) rename src/views/{supermarket => supermarketerp}/supermarketUnit/form.vue (96%) rename src/views/{supermarket => supermarketerp}/supermarketUnit/index.vue (96%) diff --git a/src/api/supermarket/supermarketAuxiliaryCode.ts b/src/api/supermarketerp/supermarketAuxiliaryCode.ts similarity index 94% rename from src/api/supermarket/supermarketAuxiliaryCode.ts rename to src/api/supermarketerp/supermarketAuxiliaryCode.ts index 7a20590..67e0604 100644 --- a/src/api/supermarket/supermarketAuxiliaryCode.ts +++ b/src/api/supermarketerp/supermarketAuxiliaryCode.ts @@ -1,4 +1,4 @@ -import request from "/@/utils/request" +import request from "/src/utils/request" export function fetchList(query?: Object) { return request({ diff --git a/src/api/supermarket/supermarketBrand.ts b/src/api/supermarketerp/supermarketBrand.ts similarity index 94% rename from src/api/supermarket/supermarketBrand.ts rename to src/api/supermarketerp/supermarketBrand.ts index d7d5b6b..75444c7 100644 --- a/src/api/supermarket/supermarketBrand.ts +++ b/src/api/supermarketerp/supermarketBrand.ts @@ -1,4 +1,4 @@ -import request from "/@/utils/request" +import request from "/src/utils/request" export function fetchList(query?: Object) { return request({ diff --git a/src/api/supermarket/supermarketCategory.ts b/src/api/supermarketerp/supermarketCategory.ts similarity index 94% rename from src/api/supermarket/supermarketCategory.ts rename to src/api/supermarketerp/supermarketCategory.ts index f1f3e39..7c238f0 100644 --- a/src/api/supermarket/supermarketCategory.ts +++ b/src/api/supermarketerp/supermarketCategory.ts @@ -1,4 +1,4 @@ -import request from "/@/utils/request" +import request from "/src/utils/request" export function fetchList(query?: Object) { return request({ diff --git a/src/api/supermarket/supermarketSpu.ts b/src/api/supermarketerp/supermarketSpu.ts similarity index 95% rename from src/api/supermarket/supermarketSpu.ts rename to src/api/supermarketerp/supermarketSpu.ts index 0e51f14..3a5154f 100644 --- a/src/api/supermarket/supermarketSpu.ts +++ b/src/api/supermarketerp/supermarketSpu.ts @@ -1,4 +1,4 @@ -import request from '/@/utils/request'; +import request from '/src/utils/request'; export function fetchList(query?: Object) { return request({ diff --git a/src/api/supermarket/supermarketUnit.ts b/src/api/supermarketerp/supermarketUnit.ts similarity index 94% rename from src/api/supermarket/supermarketUnit.ts rename to src/api/supermarketerp/supermarketUnit.ts index 88f56d1..e456796 100644 --- a/src/api/supermarket/supermarketUnit.ts +++ b/src/api/supermarketerp/supermarketUnit.ts @@ -1,4 +1,4 @@ -import request from '/@/utils/request'; +import request from '/src/utils/request'; export function fetchList(query?: Object) { return request({ diff --git a/src/views/supermarket/supermarketAuxiliaryCode/form.vue b/src/views/supermarketerp/supermarketAuxiliaryCode/form.vue similarity index 96% rename from src/views/supermarket/supermarketAuxiliaryCode/form.vue rename to src/views/supermarketerp/supermarketAuxiliaryCode/form.vue index bb35880..69d98b8 100644 --- a/src/views/supermarket/supermarketAuxiliaryCode/form.vue +++ b/src/views/supermarketerp/supermarketAuxiliaryCode/form.vue @@ -29,7 +29,7 @@ + + diff --git a/src/components/QueryTree/index.vue b/src/components/QueryTree/index.vue index c51194c..ffda414 100644 --- a/src/components/QueryTree/index.vue +++ b/src/components/QueryTree/index.vue @@ -2,7 +2,13 @@
- +
@@ -19,7 +25,7 @@ :icon="isExpand ? 'expand' : 'fold'" @click="toggleRowExpansionAll(isExpand ? false : true)" > - {{ isExpand ? '折叠' : '展开' }} + {{ isExpand ? "折叠" : "展开" }} @@ -47,8 +53,8 @@