diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js index 28401dec..0aa26aea 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/becomeoil/index.js @@ -29,7 +29,7 @@ export default { // 查询成品油库 listPage: function(params) { return request({ - url: '/cyf/inventory/listPage ', + url: '/cyf/invenRecord/listPage ', method: 'post', data: params, headers: { @@ -45,4 +45,16 @@ export default { method: 'get' }) }, + // 查询成品油库 + listPages: function(params) { + return request({ + url: '/cyf/inventory/listPage ', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/customermanagement/customermanagement.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/customermanagement/customermanagement.js index 592a738e..80fcdf63 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/customermanagement/customermanagement.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/customermanagement/customermanagement.js @@ -38,7 +38,7 @@ export function savePcCustomerInfo(data) { } // -- 修改 已改 -export function updatePcCustomerInfo(data) { +export function PcCustomerInfo(data) { return request({ url: '/crm/v1/crmcustomertemp/update/' + data.sid, method: 'post', diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supervise/becomeOil/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supervise/becomeOil/index.js new file mode 100644 index 00000000..ec88a8be --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/supervise/becomeOil/index.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +let tokens = window.sessionStorage.getItem('tokenValue') +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/cyf/supplier/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 增加成品库存 + save: function(params) { + return request({ + url: '/cyf/invenRecord/save', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 查询产品 + selectList: function(data) { + return request({ + url: '/cyf/productInfo/selectList', + method: 'get', + data: data, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + addInfo: function(data) { + return request({ + url: '/cyf/supplier/save', + method: 'post', + data: data + }); + }, +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue index 5063ecc5..76bc266a 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue @@ -157,6 +157,16 @@ name: "/supervise/OutRegister", path: "/supervise/OutRegister", }, + { + alwaysShow: true, + component: "index", + meta: { + icon: "el-icon-help", + title: "成品库存登记", + }, + name: "/supervise/becomeOil", + path: "/supervise/becomeOil", + }, ], }, { @@ -298,6 +308,16 @@ name: "/inventory/shopRecord", path: "/inventory/shopRecord", }, + { + alwaysShow: true, + component: "index", + meta: { + icon: "el-icon-help", + title: "成品库存记录", + }, + name: "/inventory/oilBecome", + path: "/inventory/oilBecome", + }, ], }, { diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js index 0e07943f..d1477ae6 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js @@ -256,6 +256,15 @@ export const constantRoutes = [{ title: '成品出库登记' } }, + { + path: '/supervise/becomeOil', + component: () => + import('@/views/supervise/becomeOil/index.vue'), + name: 'index', + meta: { + title: '成品库存登记' + } + }, ] }, { path: '/inventory', @@ -380,6 +389,15 @@ export const constantRoutes = [{ title: '商品盘库记录' } }, + { + path: '/inventory/oilBecome', + component: () => + import('@/views/inventory/oilBecome/index.vue'), + name: 'index', + meta: { + title: '成品库存记录' + } + }, ] }, diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue index 4b3581dd..94414469 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/becomeoil/index.vue @@ -66,7 +66,7 @@ :index="indexMethod" align="center" /> - + @@ -225,7 +225,7 @@ export default { // 查询列表信息 getList() { this.listLoading = true; - req.listPage(this.listQuery).then((response) => { + req.listPages(this.listQuery).then((response) => { this.listLoading = false; if (response.success) { this.list = response.data.records; diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/commodity.vue index a0f1d018..4b5c2b71 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/commodity.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/commodity.vue @@ -15,11 +15,11 @@
- 类型名称: + 品牌名称:
- 类型编码: + 品牌编号:
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue index 3377043c..ff3b12b9 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue @@ -39,7 +39,7 @@
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue index 34255e65..97c6153c 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue @@ -109,7 +109,7 @@ - 商品名称 + 类别名称 - 类别名称 + 商品类别 diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/index.vue index 52931c87..55ce4bca 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/index.vue @@ -1,51 +1,50 @@ diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue new file mode 100644 index 00000000..686938f2 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilBecome/index.vue @@ -0,0 +1,287 @@ + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue index 2b8e91e2..e028d753 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue @@ -1,7 +1,7 @@