diff --git a/src/api/basicdata/basicClientAccount.js b/src/api/basicdata/basicClientAccount.js new file mode 100644 index 00000000..f8ddb2ce --- /dev/null +++ b/src/api/basicdata/basicClientAccount.js @@ -0,0 +1,21 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/logpm-basicdata/basicdataClientAccount/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/logpm-basicdata/basicdataClientAccount/submit', + method: 'post', + data: row + }) +} diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js index 62b5a3a4..2d50e59f 100644 --- a/src/api/basicdata/basicdataGoodsAllocation.js +++ b/src/api/basicdata/basicdataGoodsAllocation.js @@ -49,6 +49,15 @@ export const enable = (ids) => { } }) } +export const downAllocation = (ids) => { + return request({ + url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation', + method: 'post', + params: { + ids, + } + }) +} export const shelf = (ids) => { return request({ url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation', diff --git a/src/api/basicdata/basicdataGoodsShelf.js b/src/api/basicdata/basicdataGoodsShelf.js index 968b074f..3fb2c3ef 100644 --- a/src/api/basicdata/basicdataGoodsShelf.js +++ b/src/api/basicdata/basicdataGoodsShelf.js @@ -87,15 +87,15 @@ export const getShowTemplate = (row) => { }) } -export const getPrintTemplate = (ids) => { - return request({ - url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate', - method: 'get', - params:{ - ids - } - }) -} +// export const getPrintTemplate = (ids) => { +// return request({ +// url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate', +// method: 'get', +// params:{ +// ids +// } +// }) +// } export const getQRCodeImg = (qrCode) => { return request({ diff --git a/src/api/basicdata/basicdataTray.js b/src/api/basicdata/basicdataTray.js index 2a387ca7..6ee67a91 100644 --- a/src/api/basicdata/basicdataTray.js +++ b/src/api/basicdata/basicdataTray.js @@ -102,13 +102,32 @@ export const getDetail = (id) => { export const remove = (ids) => { return request({ - url: '/api/logpm-basicdata/Tray/remove', + url: '/api/logpm-basicdata/tray/remove', method: 'post', params: { ids, } }) } +export const disable = (ids) => { + return request({ + url: '/api/logpm-basicdata/tray/disable', + method: 'post', + params: { + ids, + } + }) +} +export const addable = (ids) => { + return request({ + url: '/api/logpm-basicdata/tray/addable', + method: 'post', + params: { + ids, + } + }) +} + export const add = (row) => { return request({ @@ -132,4 +151,11 @@ export const vacant = (row) => { data: row }) } +export const vacants = (row) => { + return request({ + url: '/api/logpm-basicdata/tray/vacants', + method: 'post', + data: row + }) +} diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js index 40f5ef02..ce3fff11 100644 --- a/src/option/distribution/distributionStockup.js +++ b/src/option/distribution/distributionStockup.js @@ -724,6 +724,10 @@ export default { label: "备货区", prop: "stockupArea", }, + { + label: "操作", + prop: "stockupArea", + }, ], columnBasic: [ //基本信息 { diff --git a/src/router/views/index.js b/src/router/views/index.js index 27bc74f9..aa5e83f1 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -925,7 +925,30 @@ export default [ component: () => import('@/views/basicdata/team/basicdataTeamStaff.vue'), }, ], + }, + + + { + path: '/basicdata/brand/basicClientAccount', + component: Layout, + redirect: '/basicdata/brand/basicClient', + children: [ + { + path: '/basicdata/brand/basicClientAccount', + name: '客户账号列表', + meta: { + i18n: 'dict', + }, + props: route => ({ + id: route.query.id + }), + component: () => import('@/views/basicdata/brand/basicClientAccount.vue'), + }, + ], + + }, + // { // path: 'basicdata/goodsShelf/basicdataGoodsShelfView', // component: Layout, diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index ea5a83aa..7e048b48 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -126,6 +126,9 @@ 三方商城 + + 开通账号 + @@ -313,6 +316,36 @@ + + + + + + + + + + + + + + + + 默认系统初始化密码 + + + + + + + >>', row); @@ -706,7 +833,6 @@ export default { }, //打开文件 downloadLink(row) { - console.log('>>>>>', row); window.open('http://192.168.10.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories))); }, //控制控货 @@ -807,6 +933,11 @@ export default { getDictionaryBiz('client_type').then(res => { // console.log("字典》》》",res); this.clientType = res.data.data; + this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); }); //字典 getDictionaryBiz('basic_freight_type').then(res => { diff --git a/src/views/basicdata/brand/basicClientAccount.vue b/src/views/basicdata/brand/basicClientAccount.vue new file mode 100644 index 00000000..6b046d0e --- /dev/null +++ b/src/views/basicdata/brand/basicClientAccount.vue @@ -0,0 +1,458 @@ + + + + + \ No newline at end of file diff --git a/src/views/basicdata/brand/basicdataTripartiteMall.vue b/src/views/basicdata/brand/basicdataTripartiteMall.vue index 470b0e20..73115466 100644 --- a/src/views/basicdata/brand/basicdataTripartiteMall.vue +++ b/src/views/basicdata/brand/basicdataTripartiteMall.vue @@ -270,7 +270,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; - this.query.client = this.$route.query.id; + this.query.clientId = this.$route.query.id; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue index 170c7cd4..d84f7176 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue @@ -31,6 +31,11 @@ plain @click="handleEnable">启 用 + 一 键 下 架 + @@ -78,7 +83,7 @@