From b018c228bc73529f262fa47519bfa21517846e98 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 18 Jul 2023 11:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionStockListDiscuss.vue | 27 ++-- .../inventory/distributionStockListMarket.vue | 91 ++++++------ .../inventory/distributionStockListSelf.vue | 91 ++++++------ .../stockup/distributionStockup.vue | 140 ++++++++++++++---- .../stockup/distributionStockupDiscuss.vue | 27 ++-- .../stockup/distributionStockupMarket.vue | 29 ++-- .../stockup/distributionStockupSelf.vue | 29 ++-- .../warehouseWarehouseingAddReceipt.vue | 8 +- 8 files changed, 270 insertions(+), 172 deletions(-) diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue index 66090cd9..099134ce 100644 --- a/src/views/distribution/inventory/distributionStockListDiscuss.vue +++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue @@ -245,16 +245,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'mallName', - label: '商城名称', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'mallName', + // label: '商城名称', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'quantityStock', label: '库存数量', type: 1, @@ -466,7 +468,7 @@ export default { mounted () { this.init(); this.onLoad(this.page); - /** + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 */ @@ -568,7 +570,7 @@ export default { this.columnList = newarr; this.$functions.setStorage(window.location.pathname+'sortlist', headarr); } - + }, selectionsc(value) { console.log(value); @@ -778,6 +780,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; + this.query.typeService = '1'; 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/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue index 66090cd9..e138468f 100644 --- a/src/views/distribution/inventory/distributionStockListMarket.vue +++ b/src/views/distribution/inventory/distributionStockListMarket.vue @@ -189,16 +189,16 @@ export default { fixed: false, sortable: true, }, - { - prop: 'market', - label: '商场', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'market', + // label: '商场', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: 'descriptionGoods', label: '货物名称', @@ -227,16 +227,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'shop', - label: '门店', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'shop', + // label: '门店', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'storageLocation', label: '库位信息', type: 2, @@ -245,16 +247,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'mallName', - label: '商城名称', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'mallName', + // label: '商城名称', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'quantityStock', label: '库存数量', type: 1, @@ -385,16 +389,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'shoppingMall', - label: '所属商场', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'shoppingMall', + // label: '所属商场', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'warehouseName', label: '仓库名称', type: 2, @@ -466,7 +472,7 @@ export default { mounted () { this.init(); this.onLoad(this.page); - /** + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 */ @@ -568,7 +574,7 @@ export default { this.columnList = newarr; this.$functions.setStorage(window.location.pathname+'sortlist', headarr); } - + }, selectionsc(value) { console.log(value); @@ -778,6 +784,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; + this.query.typeService = '2'; 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/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue index 66090cd9..084d1d8e 100644 --- a/src/views/distribution/inventory/distributionStockListSelf.vue +++ b/src/views/distribution/inventory/distributionStockListSelf.vue @@ -189,16 +189,16 @@ export default { fixed: false, sortable: true, }, - { - prop: 'market', - label: '商场', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'market', + // label: '商场', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: 'descriptionGoods', label: '货物名称', @@ -227,16 +227,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'shop', - label: '门店', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'shop', + // label: '门店', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'storageLocation', label: '库位信息', type: 2, @@ -245,16 +247,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'mallName', - label: '商城名称', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'mallName', + // label: '商城名称', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'quantityStock', label: '库存数量', type: 1, @@ -385,16 +389,18 @@ export default { checkarr: [], fixed: false, sortable: true, - },{ - prop: 'shoppingMall', - label: '所属商场', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - },{ + }, + // { + // prop: 'shoppingMall', + // label: '所属商场', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + { prop: 'warehouseName', label: '仓库名称', type: 2, @@ -466,7 +472,7 @@ export default { mounted () { this.init(); this.onLoad(this.page); - /** + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 */ @@ -568,7 +574,7 @@ export default { this.columnList = newarr; this.$functions.setStorage(window.location.pathname+'sortlist', headarr); } - + }, selectionsc(value) { console.log(value); @@ -778,6 +784,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; + this.query.typeService = '3'; 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/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue index 939d5d06..b0c4f2ad 100644 --- a/src/views/distribution/stockup/distributionStockup.vue +++ b/src/views/distribution/stockup/distributionStockup.vue @@ -30,8 +30,8 @@
- + @@ -95,8 +95,8 @@ - - + + { + if(i.assignStatus == "2"){ + a = true; + return; + } + }) + // = this.selectionList.findIndex(i => i.assignStatus == 2); + if(!a){ + this.dialogFormCustomer = true; + this.getFork(); + this.getTeam() + }else{ + this.$message.warning("已指派，请勿重复指派！！！") + } }, //确定指派 callFordelivery(){ this.form.ids = this.ids; console.log("数据》》》",this.form); - /* addAssign(this.form).then(res =>{ + addAssign(this.form).then(res =>{ this.$message({ type: "success", message: "操作成功！" @@ -628,10 +695,19 @@ export default { this.onLoad(this.page); this.dialogFormCustomer = false; }) -*/ }, init () { this.height = this.setPx(document.body.clientHeight - 340); + getDictionaryBiz('distribution_type').then(res => { + // console.log("8908098080",res.data.data); + this.distributionType = res.data.data; + this.columnList[8].checkarr =res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); + }); + this.onLoad(this.page); }, searchHide () { this.search = !this.search; @@ -756,20 +832,22 @@ export default { let a = await getUser(i.forkliftId); i.forkliftId =a.data.data.name; }*/ - + let s =this.distributionType.find(d => d.dictKey == i.typeService); + console.log("sssss",s); + i.typeServiceName = s.dictValue; i.loader = i.groupName; i.stockupArea = i.headline; if(i.assignStatus == '2'){ - i.assignStatus = '已指派'; + i.assignStatusName = '已指派'; }else{ - i.assignStatus = '未指派'; + i.assignStatusName = '未指派'; } if(i.stockupStatus == '2'){ - i.stockupStatus = '待备货'; + i.stockupStatusName = '待备货'; }else if(i.stockupStatus == '3'){ - i.stockupStatus = '已备货'; + i.stockupStatusName = '已备货'; }else{ - i.stockupStatus = '未备货'; + i.stockupStatusName = '未备货'; } }); this.selectionClear(); diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index 5c260748..319fa96e 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -1,8 +1,8 @@