diff --git a/src/api/storeManagement/additionalPlan.js b/src/api/storeManagement/additionalPlan.js index 38fde847..8b4186b4 100644 --- a/src/api/storeManagement/additionalPlan.js +++ b/src/api/storeManagement/additionalPlan.js @@ -81,4 +81,13 @@ export const getDeptList = params => { method: 'get', params }); -}; \ No newline at end of file +}; + +// 删除 /stBuyOrder/remove +export const del = params => { + return request({ + url: '/api/blade-wms/stBuyOrder/remove', + method: 'post', + params + }); +}; diff --git a/src/api/storeManagement/materialMaintenance.js b/src/api/storeManagement/materialMaintenance.js index ea0f8ef6..874e191e 100644 --- a/src/api/storeManagement/materialMaintenance.js +++ b/src/api/storeManagement/materialMaintenance.js @@ -26,4 +26,13 @@ export const editGoods = data =>{ method:'post', data }) -} \ No newline at end of file +} + +// 新增之后物料 +export const submitGoods = data =>{ + return request({ + url:'/api/blade-wms/stGoods/submit', + method:'post', + data + }) +} \ No newline at end of file diff --git a/src/views/approvalRecord/index.vue b/src/views/approvalRecord/index.vue index a3d351cb..c3fe8179 100644 --- a/src/views/approvalRecord/index.vue +++ b/src/views/approvalRecord/index.vue @@ -6,19 +6,10 @@ width="50%" @close="closeDialog" > -
- + - + - @@ -277,6 +277,7 @@ export default { closeDialog() { this.showDialog = false; this.checkShow = false; + this.approvalShow = false this.onLoad(this.page, this.query); }, diff --git a/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue b/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue index d55c03d3..a9296ac0 100644 --- a/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue +++ b/src/views/warehouseManagement/additionalPlan/components/additionalPlan.vue @@ -1,468 +1,516 @@ \ No newline at end of file diff --git a/src/views/warehouseManagement/components/materialAdd.vue b/src/views/warehouseManagement/components/materialAdd.vue new file mode 100644 index 00000000..3895541c --- /dev/null +++ b/src/views/warehouseManagement/components/materialAdd.vue @@ -0,0 +1,263 @@ + + + diff --git a/src/views/warehouseManagement/leveragingManagement.vue b/src/views/warehouseManagement/leveragingManagement.vue index 52f6ed41..2a4a69bf 100644 --- a/src/views/warehouseManagement/leveragingManagement.vue +++ b/src/views/warehouseManagement/leveragingManagement.vue @@ -36,7 +36,6 @@ :modelValue="returnDialog" width="90%" @close="returnDialog = false" - :loading="returnLoading" >
删除选择行
- + - + + @@ -87,6 +99,9 @@ + - - 取 消 - 确 定 + 确 定 @@ -153,10 +167,11 @@ export default { }, data() { return { - approverList:[], + submitLoading: false, + approverList: [], scarpTitle: '', loading: false, - returnLoading:false, + returnLoading: false, data: [], form: {}, query: {}, @@ -378,28 +393,6 @@ export default { width: 120, search: false, }, - - { - label: '是否报废', - prop: 'isScrap', - addDisplay: false, - editDisplay: false, - span: 6, - width: 120, - search: false, - type: 'select', - searchOrder: 17, - dicData: [ - { - label: '是', - value: 1, - }, - { - label: '否', - value: 0, - }, - ], - }, { label: '状态', prop: 'curStatus', @@ -445,10 +438,11 @@ export default { }, isOpen: false, moldAddMore: false, + selectList: [], //归还选择数据 }; }, mounted() { - this.getApproverList() + this.getApproverList(); }, methods: { getApproverList() { @@ -458,7 +452,7 @@ export default { }, changeGoods(e) { if (this.checkGoods == '') return; - this.returnLoading = true + this.returnLoading = true; getReturnData({ barCode: this.checkGoods, }).then(res => { @@ -468,18 +462,15 @@ export default { }); this.$nextTick(() => { this.returnData = [...res.data.data, ...this.returnData]; - this.checkGoods = '' + this.checkGoods = ''; }); - this.returnLoading = false + this.returnLoading = false; }); }, handleChange(val, index) { - console.log('val--------', val); - console.log('index---------', index); let tmp = this.returnData.filter(item => item.bfQty > 0); let nameArr = tmp.map(item => item.goodsName); let nameData = [...new Set(nameArr)]; - console.log('nameData--------', nameData); if (nameData.length > 0) { this.scarpTitle = `【${nameData.join(',')}】物料报废需工艺员审批，审批通过后可出库`; } else { @@ -488,6 +479,7 @@ export default { }, selectChange(list, row) { row._select = !row._select; + this.selectList = list; }, remove() { let tmp = this.returnData.find(item => item._select); @@ -504,36 +496,29 @@ export default { }); }, submit() { - if (this.returnData.length == 0) return; - this.returnData.map(item => { + if (this.selectList.length == 0) { + this.$message.error('请至少选择一条数据！'); + return; + } + const invalidRow = this.selectList.find(row => { + return row.bfQty >= 1 && (!row.approver || row.approver === ''); + }); + + if (invalidRow) { + this.$message.error(`物料【${invalidRow.goodsName}】报废数量大于等于1，请选择审批人！`); + return; + } + + this.selectList.map(item => { item.leId = item.id; }); - console.log('data==========', this.returnData); - addReturn(this.returnData).then(res => { + this.submitLoading = true; + addReturn(this.selectList).then(res => { if (res.data.code == 200) { this.$message.success('归还成功'); this.returnDialog = false; - - // let tmp = this.returnData.filter(item => item.bfQty > 0) - // if(tmp && tmp.length > 0){ - // console.log('tmp------------',tmp) - // let data = [] - // tmp.map(item =>{ - // data.push({ - // rlsId:item.rlsId, - // outQty:item.bfQty, - // bfType:1 - // }) - // }) - // batchScrapOut(data).then(res =>{ - // if(res.data.code == 200){ - // this.$message.success('归还成功') - // this.returnDialog = false - // } - // }) - // }else{ - - // } + this.onLoad(ths.page); + this.submitLoading = false; } }); }, diff --git a/src/views/warehouseManagement/materialMaintenance.vue b/src/views/warehouseManagement/materialMaintenance.vue index b2b3855c..ff59a3f6 100644 --- a/src/views/warehouseManagement/materialMaintenance.vue +++ b/src/views/warehouseManagement/materialMaintenance.vue @@ -17,7 +17,7 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" - :row-class-name="tableRowClassName" + :row-class-name="tableRowClassName" > @@ -29,32 +29,45 @@ + +