From fd7a0f75f24fe9a5a7b6eabbcbfdb8b79b04fecc Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 30 Jun 2022 09:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9B=98=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheliang/dictcommons.js | 16 ++ .../anrui-scm-ui/src/api/kucunguanli/panku.js | 32 +++- anrui-scm/anrui-scm-ui/src/styles/index.scss | 2 +- .../src/views/kucunguanli/panku/pankuAdd.vue | 176 +++++++++++++----- .../views/kucunguanli/panku/pankuguanli.vue | 155 ++++++++++++--- 5 files changed, 308 insertions(+), 73 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js index a49d702e40..e77eb9c188 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js @@ -40,4 +40,20 @@ export function fetchBySid(sid) { method: 'get' }) } +// 根据当前登录用户的sid和分公司sid获取本分公司下除去当前用户的其余用户信息 +export function getUserByOrgSid(data) { + return request({ + url: 'portal/v1/sysuser/getUserByOrgSid', + method: 'get', + params: data + }) +} +// 根据当前登录用户分公司sid获取本分公司下存放地点 +export function fetchByUseOrgSid(data) { + return request({ + url: 'scm/v1/scmwarehouse/fetchByUseOrgSid', + method: 'get', + params: data + }) +} diff --git a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js index 4f70e45ac8..778fb69d68 100644 --- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js +++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/panku.js @@ -1,7 +1,7 @@ import request from '@/utils/request' export default { - // 查询分页列表 + // 查询分页列表(盘库记录列表) listPage: function(data) { return request({ url: '/scm/v1/scmvehicleinventory/listPage', @@ -10,15 +10,39 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, - // 保存修改记录 - saveOrUpdate: function(data) { + // 查询分页列表(待盘库记录列表) + pagelist: function(data) { return request({ - url: '/base/v1/basemodelmodprice/saveOrUpdate', + url: '/scm/v1/scmvehiclestayinventory/listPage', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } }) }, + // 判断是否生成盘库记录 + getInventoryRecords: function(userSid) { + return request({ + url: '/scm/v1/scmvehiclestayinventory/getInventoryRecords/' + userSid, + method: 'get' + }) + }, + // 待办库列表点击确认 + saveInventory: function(data) { + return request({ + url: 'scm/v1/scmvehicleinventory/saveInventory', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存 + updateState: function(data) { + return request({ + url: '/scm/v1/scmvehicleinventory/updateState', + method: 'post', + params: data, + }) + }, // 通过sid查询一条记录 fetchBySid: function(sid) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/styles/index.scss b/anrui-scm/anrui-scm-ui/src/styles/index.scss index 951adf8d22..d9e92df3fa 100644 --- a/anrui-scm/anrui-scm-ui/src/styles/index.scss +++ b/anrui-scm/anrui-scm-ui/src/styles/index.scss @@ -109,7 +109,7 @@ div:focus { background-color: #fff; } // 设置了滚动区域 -.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);} +.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);} .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;} .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} .listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;} diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue index d280d5fff9..0776e79610 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue @@ -14,21 +14,21 @@