From 6bce2b80c292697aa3996cc97f69c1586520563d Mon Sep 17 00:00:00 2001 From: dt_2916866708 <> Date: Wed, 24 Jan 2024 15:51:25 +0800 Subject: [PATCH 1/3] 12 --- src/views/product/productAdd/newIndex.vue | 7 ++++--- vue.config.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/product/productAdd/newIndex.vue b/src/views/product/productAdd/newIndex.vue index 9b1f122..fc9cc98 100644 --- a/src/views/product/productAdd/newIndex.vue +++ b/src/views/product/productAdd/newIndex.vue @@ -195,14 +195,14 @@ - + - + @@ -375,7 +375,8 @@ export default { formValidate: { recommendOrNewMark: "1", productStatus: "1", - attr: [] + attr: [], + productDetail:"" }, formDynamics: { ruleName: '', diff --git a/vue.config.js b/vue.config.js index f640b53..21aa923 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { proxy: { [process.env.VUE_APP_BASE_API]: { // target: `cls`, - target: `http://192.168.0.254:38080`, + target: `http://192.168.0.16:38080`, // target: `http://192.168.0.22:38080`, // target: `http://192.168.1.83:38080`, // target: 'http://222.132.26.119:8081', From aedc739a3d68509d677747048ee6bc7bd97c316e Mon Sep 17 00:00:00 2001 From: mrsun <1078706823@qq.com> Date: Thu, 25 Jan 2024 16:39:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/product/productAttr.js | 131 ++++++++-------- src/router/index.js | 16 +- src/views/product/inventoryRecords/index.vue | 156 +++++++++++++++++++ 3 files changed, 236 insertions(+), 67 deletions(-) create mode 100644 src/views/product/inventoryRecords/index.vue diff --git a/src/api/product/productAttr.js b/src/api/product/productAttr.js index 0ed6494..b54d4ae 100644 --- a/src/api/product/productAttr.js +++ b/src/api/product/productAttr.js @@ -1,208 +1,215 @@ import request from '@/utils/request' -var service_name = 'oil-mall' +var service_name = 'oil-mall' export default { - productAddGetSites(productId) { + productAddGetSites(productId) { return request({ url: `/${service_name}/mallProductSiteRelation/get/${productId}`, - method: 'GET', + method: 'GET', }) }, - productAddGetEdit(productId) { + productAddGetEdit(productId) { return request({ url: `/${service_name}/mallProductInfo/getEdit/${productId}`, - method: 'GET', + method: 'GET', }) }, - productListAuditingDetailgetByPage(productId) { + productListAuditingDetailgetByPage(productId) { return request({ url: `/${service_name}/mallProductAuditHistory/getListByProductId/${productId}`, - method: 'GET', + method: 'GET', }) }, - productListDelete(data) { + productListDelete(data) { return request({ url: `/${service_name}/mallProductInfo/delete`, - method: 'post', + method: 'post', data }) }, - productListAuditProduct(data) { + productListAuditProduct(data) { return request({ url: `/${service_name}/mallProductInfo/auditProduct`, - method: 'post', + method: 'post', data }) }, - productListUpdateBatchList(data) { + productListUpdateBatchList(data) { return request({ url: `/${service_name}/mallProductStock/updateBatchList`, - method: 'post', + method: 'post', data }) }, - productListGetByPage(data) { + productListGetByPage(data) { return request({ url: `/${service_name}/mallProductInfo/getByPage`, - method: 'post', + method: 'post', data }) }, - addUpdate(data) { + addUpdate(data) { return request({ url: `/${service_name}/mallProductInfo/update`, - method: 'post', + method: 'post', data }) }, - addSave(data) { + addSave(data) { return request({ url: `/${service_name}/mallProductInfo/save`, - method: 'post', + method: 'post', data }) }, - getAllSites(data) { + getAllSites(data) { return request({ url: `/${service_name}/mallProductSiteRelation/getAllSites`, - method: 'post', + method: 'post', data }) }, - brandGetAll(data) { + brandGetAll(data) { return request({ url: `/${service_name}/mallProductBrands/getAll`, - method: 'post', + method: 'post', data }) }, - brandUpdate(data) { + brandUpdate(data) { return request({ url: `/${service_name}/mallProductBrands/update`, - method: 'post', + method: 'post', data }) }, - brandDelete(data) { + brandDelete(data) { return request({ url: `/${service_name}/mallProductBrands/delete`, - method: 'post', + method: 'post', data }) }, - brandSave(data) { + brandSave(data) { return request({ url: `/${service_name}/mallProductBrands/save`, - method: 'post', + method: 'post', data }) - }, - brandGetByPage(data) { + }, + brandGetByPage(data) { return request({ url: `/${service_name}/mallProductBrands/getByPage`, - method: 'post', + method: 'post', data }) - }, - getAllAttributesType() { + }, + getAllAttributesType() { return request({ url: `/${service_name}/mallProductAttributesType/getAllAttributesType`, - method: 'get', + method: 'get', }) - }, - getClassificationTree() { + }, + getClassificationTree() { return request({ url: `/${service_name}/mallProductClassification/getClassificationTree`, - method: 'get', + method: 'get', }) - }, - classifySave(page) { + }, + classifySave(page) { return request({ url: `/${service_name}/mallProductClassification/save`, method: 'post', data: page }) - }, - classifyUpdate(page) { + }, + classifyUpdate(page) { return request({ url: `/${service_name}/mallProductClassification/update`, method: 'post', data: page }) - }, + }, classifyGetByPage(page) { // 分页查询 return request({ url: `/${service_name}/mallProductClassification/getByPage`, method: 'post', data: page }) - }, + }, typeFindByPage(page) { // 分页查询 return request({ url: `/${service_name}/mallProductAttributesType/getByPage`, method: 'post', data: page }) - }, + }, getByPage(page) { // 分页查询 return request({ url: `/${service_name}/mallProductAttributes/getByPage`, method: 'post', data: page }) - }, + }, getAttrList(id) { // 分页查询 return request({ url: `/${service_name}/mallProductAttributes/get/${id}`, - method: 'GET', + method: 'GET', }) - }, -delete(page) { + }, +delete(page) { return request({ url: `/${service_name}/mallProductAttributes/delete`, method: 'post', data: page }) - }, - classifyDelete(page) { + }, + classifyDelete(page) { return request({ url: `/${service_name}/mallProductClassification/delete`, method: 'post', data: page }) - }, - typeSave(page) { + }, + typeSave(page) { return request({ url: `/${service_name}/mallProductAttributesType/save`, method: 'post', data: page }) - }, - save(page) { + }, + save(page) { return request({ url: `/${service_name}/mallProductAttributes/save`, method: 'post', data: page }) - }, - typeUpdate(page) { + }, + typeUpdate(page) { return request({ url: `/${service_name}/mallProductAttributes/update`, method: 'post', data: page }) - }, - update(page) { + }, + update(page) { return request({ url: `/${service_name}/mallProductAttributesType/update`, method: 'post', data: page }) - }, - typeDelete(page) { + }, + typeDelete(page) { return request({ url: `/${service_name}/mallProductAttributesType/delete`, method: 'post', data: page }) - }, + }, + getInventoryRecords(page) { + return request({ + url: `/oil-mongo-log/updateStock/getRecords`, + method: 'post', + data: page + }) + }, } diff --git a/src/router/index.js b/src/router/index.js index 05d2062..63d8cdd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,7 +24,7 @@ export const constantRoutes = [{ redirect: 'productList', meta: { title: '商品', icon: 'iconkongzhitai', affix: true }, children: [ - { + { path: '/productList', component: () => import('@/views/product/productList/index'), name: 'productList', @@ -53,10 +53,16 @@ export const constantRoutes = [{ component: () => import('@/views/product/productAttr/index'), name: 'productAttr', meta: { title: '商品属性', icon: 'iconkongzhitai', affix: true } - }, + }, + { + path: '/inventoryRecords', + component: () => import('@/views/product/inventoryRecords/index'), + name: 'inventoryRecords', + meta: { title: '库存记录', icon: 'iconkongzhitai', affix: true } + }, ] }, -{ path: '/CustomerMarket', component: CustomerMarket }, +{ path: '/CustomerMarket', component: CustomerMarket }, { path: '/profile', component: Layout, @@ -70,7 +76,7 @@ export const constantRoutes = [{ meta: { title: '个人中心', icon: 'user', noCache: true } } ] -}, +}, { path: '/redirect', component: Layout, @@ -91,7 +97,7 @@ export const constantRoutes = [{ path: '/login', component: () => import('@/views/login/index'), hidden: true -}, +}, { path: '/distribution', component: () => import('@/views/distribution/distribution'), diff --git a/src/views/product/inventoryRecords/index.vue b/src/views/product/inventoryRecords/index.vue new file mode 100644 index 0000000..9f67310 --- /dev/null +++ b/src/views/product/inventoryRecords/index.vue @@ -0,0 +1,156 @@ + + + + From ddd35c0232f78c38796a7eedcc2f758c4b3f6984 Mon Sep 17 00:00:00 2001 From: mrsun <1078706823@qq.com> Date: Thu, 25 Jan 2024 16:44:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/product/inventoryRecords/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/product/inventoryRecords/index.vue b/src/views/product/inventoryRecords/index.vue index 9f67310..d2b435b 100644 --- a/src/views/product/inventoryRecords/index.vue +++ b/src/views/product/inventoryRecords/index.vue @@ -63,7 +63,7 @@ 剩余：{{ scope.row.stockResidue }} - +