From 34d3d8cd5a7fb78d829b6fe0b61fd7491f7465e2 Mon Sep 17 00:00:00 2001 From: zhaoxiaomin <1912125868@qq.com> Date: Thu, 30 May 2024 14:14:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehousing/otherStore/index.vue | 37 ++++++++-------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/src/views/warehousing/otherStore/index.vue b/src/views/warehousing/otherStore/index.vue index 5fd605c..6e59b5c 100644 --- a/src/views/warehousing/otherStore/index.vue +++ b/src/views/warehousing/otherStore/index.vue @@ -128,7 +128,7 @@ import {getBranchList, InitInOrder} from "@/api/system/branch"; import {getGoods} from "@/api/basicData/goods"; export default { name: "index", - dicts: ["goods_classify"], + dicts: ["goods_classify","good_class"], data() { const _that=this return { @@ -192,28 +192,7 @@ export default { chooselist:[], classifyList:[{ label: '物料分类', - children: [{ - label: '成品', - id:110 - },{ - label: '铝合金锭', - id:100 - },{ - label: '锌合金锭', - id:101 - },{ - label: '模具配件', - id:111 - },{ - label: '配件', - id:102 - },{ - label: '辅料', - id:108 - },{ - label: '模具', - id:101 - }] + children: [] }], defaultProps: { children: 'children', @@ -222,13 +201,23 @@ export default { }; }, mounted() { + // 物料分类的树结构 + this.getDicts("good_class").then((res)=>{ + res.data.forEach((item) => { + let newItem = { + label: item.dictLabel, + value: item.dictValue + }; + this.classifyList[0].children.push(newItem); + }) + }) this.getBranchList() this.queryTable() }, methods: { //商品分类点击某个（树） handleNodeClick(data) { - this.searchForm.chiff=data.id + this.searchForm.chiff=data.value this.paging.page=1 this.queryTable() }, From 484f418afea6ef151ff3f1988d49e9e789cb66e6 Mon Sep 17 00:00:00 2001 From: zhaoxiaomin <1912125868@qq.com> Date: Thu, 30 May 2024 16:07:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehousing/otherStore/index.vue | 45 ++++++++++++++-------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/views/warehousing/otherStore/index.vue b/src/views/warehousing/otherStore/index.vue index 6e59b5c..ef6aa57 100644 --- a/src/views/warehousing/otherStore/index.vue +++ b/src/views/warehousing/otherStore/index.vue @@ -5,7 +5,7 @@ @@ -21,11 +21,11 @@
- {{ item.goodName+'-'+item.goodsNo+'-'+item.specifications }} + {{ item.goodName+'-'+item.goodsNo+'-'+item.unitMsr }}
- 选择物料 + 选择物料 @@ -217,7 +217,7 @@ export default { methods: { //商品分类点击某个（树） handleNodeClick(data) { - this.searchForm.chiff=data.value + this.searchForm.classify=data.value this.paging.page=1 this.queryTable() }, @@ -243,19 +243,30 @@ export default { }, // 确定入库 onSubmit(){ - if(!this.form.no){ + if(!this.form.warehouseNo){ this.$message.error('请选择入库仓库！') return; } + if(this.chooselist.length==0){ + this.$message.error('请选择物料！') + return; + } + if(!this.form.containerNo){ + this.$message.error('请输入容器编码！') + return; + } const obj={ - no:this.form.no, + syncType:"A", orderType:11, + orderDate:'2024-05-30', containerNo:this.form.containerNo, - detail:this.chooselist + detail:this.chooselist, } - // console.log('确定入库',obj) InitInOrder(obj).then((res)=>{ - console.log(res) + if(res.code==200){ + this.$message.success('入库成功！') + this.reset() + } }) }, // 重置 @@ -263,14 +274,17 @@ export default { this.form={} this.chooselist=[] }, - //商品分类 - handleCommand(command) { - this.$message('click on item ' + command); - }, // 复选框 handleselection(row){ this.handleSelect = row }, + chooseGoods(){ + if(!this.form.warehouseNo){ + this.$message.error('请选择入库仓库！') + return; + } + this.dialogVisible = true + }, // 选择商品 choose(){ this.chooselist=[] @@ -279,9 +293,8 @@ export default { lineId:0, goodsNo:item.goodNo, goodName:item.goodName, - specifications:item.specifications, - unitMsr:'kg', - warehouseNo:102 + unitMsr:item.specifications, + warehouseNo:this.form.warehouseNo, } this.chooselist.push(newItem) }) From 581b75b5ea97a7133b9bb37a1b6a34cd982b6bf8 Mon Sep 17 00:00:00 2001 From: zhaoxiaomin <1912125868@qq.com> Date: Thu, 30 May 2024 16:27:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehousing/otherStore/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/warehousing/otherStore/index.vue b/src/views/warehousing/otherStore/index.vue index ef6aa57..d3e0782 100644 --- a/src/views/warehousing/otherStore/index.vue +++ b/src/views/warehousing/otherStore/index.vue @@ -167,11 +167,11 @@ export default { prop: 'specifications', istrue: true }, - { - label: '型号', - prop: '', - istrue: true - }, + // { + // label: '型号', + // prop: '', + // istrue: true + // }, { label: '所属分类', prop: 'specialMana', From a625398404e7ec7152d428e939d287dcb4596927 Mon Sep 17 00:00:00 2001 From: zhaoxiaomin <1912125868@qq.com> Date: Thu, 30 May 2024 16:40:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehousing/otherStore/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/warehousing/otherStore/index.vue b/src/views/warehousing/otherStore/index.vue index d3e0782..4517d33 100644 --- a/src/views/warehousing/otherStore/index.vue +++ b/src/views/warehousing/otherStore/index.vue @@ -128,7 +128,7 @@ import {getBranchList, InitInOrder} from "@/api/system/branch"; import {getGoods} from "@/api/basicData/goods"; export default { name: "index", - dicts: ["goods_classify","good_class"], + dicts: ["good_class"], data() { const _that=this return { @@ -174,10 +174,10 @@ export default { // }, { label: '所属分类', - prop: 'specialMana', + prop: 'classify', istrue: true, filter(row, value) { - return getDictLabel(value, _that.dict.type.goods_classify); + return getDictLabel(value, _that.dict.type.good_class); }, }, ], From 5965b95c83ff962e214ad5d088ac0a6564e76cad Mon Sep 17 00:00:00 2001 From: zhaoxiaomin <1912125868@qq.com> Date: Thu, 30 May 2024 16:42:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehousing/otherStore/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/warehousing/otherStore/index.vue b/src/views/warehousing/otherStore/index.vue index 4517d33..99ab6ba 100644 --- a/src/views/warehousing/otherStore/index.vue +++ b/src/views/warehousing/otherStore/index.vue @@ -62,7 +62,7 @@ > @@ -71,7 +71,7 @@ > @@ -151,13 +151,13 @@ export default { // 表头数据 { label: "复选框", type: "selection", prop: "selection", istrue: true }, { - label: '商品编号', + label: '物料编号', prop: 'goodNo', width: 160, istrue: true }, { - label: '商品名称', + label: '物料名称', prop: 'goodName', width: 150, istrue: true @@ -215,7 +215,7 @@ export default { this.queryTable() }, methods: { - //商品分类点击某个（树） + //物料分类点击某个（树） handleNodeClick(data) { this.searchForm.classify=data.value this.paging.page=1 @@ -227,7 +227,7 @@ export default { this.WarehousingList=res.rows }) }, - // 商品列表 + // 物料列表 async queryTable() { this.loading = true const request = { @@ -285,7 +285,7 @@ export default { } this.dialogVisible = true }, - // 选择商品 + // 选择物料 choose(){ this.chooselist=[] this.handleSelect.forEach((item)=>{ @@ -306,7 +306,7 @@ export default { this.searchForm={} this.dialogVisible = false }, - // 商品列表条件查询 + // 物料列表条件查询 searchList(){ this.paging.page=1 this.queryTable() From e452504191a587fdcca893264ccdbfec348fc896 Mon Sep 17 00:00:00 2001 From: zhaoxiaomin <1912125868@qq.com> Date: Thu, 30 May 2024 16:53:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehousing/otherStore/index.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/views/warehousing/otherStore/index.vue b/src/views/warehousing/otherStore/index.vue index 99ab6ba..97b48f2 100644 --- a/src/views/warehousing/otherStore/index.vue +++ b/src/views/warehousing/otherStore/index.vue @@ -137,15 +137,7 @@ export default { searchForm:{ }, - tableData: [ - { - goodNo:1, - goodName:'shh' - }, - { - goodNo:2, - goodName:'cdgf' - }], + tableData: [], tableProps:{}, config: [ // 表头数据