Browse Source

修改采购退货和发料

wms3.0_pda
lijuncheng 11 months ago
parent
commit
a2f806f7b1
  1. 13
      mycomponents/detail/comRequestDetailCard.vue
  2. 2
      pages.json
  3. 7
      pages/issue/coms/comIssueRequestCreator.vue
  4. 3
      pages/issue/request/issueRequestCreate.vue
  5. 4
      pages/issue/request/issueRequestDetail.vue
  6. 5
      pages/productionReturn/coms/comReturnCommonRequest.vue
  7. 57
      pages/productionReturn/coms/comReturnRequestInfo.vue
  8. 1
      pages/productionReturn/request/requestDetail.vue
  9. 2
      pages/productionReturn/request/returnRequestCreate.vue
  10. 22
      pages/purchaseReturn/record/returnRecord.vue

13
mycomponents/detail/comRequestDetailCard.vue

@ -1,5 +1,7 @@
<template>
<view class="" style="background-color: #fff;">
<comReturnRequestInfo :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
</comReturnRequestInfo>
<uni-collapse ref="collapse1" @change="">
<uni-collapse-item :open="true">
<template v-slot:title>
@ -32,6 +34,7 @@
import recommend from '@/mycomponents/recommend/recommend.vue'
import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
import {
getDetailOption,
getDetailEditRemoveOption,
@ -45,6 +48,7 @@
recommend,
balanceQtyEdit,
comMessage,
comReturnRequestInfo
},
props: {
dataContent: {
@ -69,7 +73,11 @@
},
},
watch: {
dataContent(newVal) {
var test =this.dataContent
debugger
this.requestItem = newVal.subList[0];
},
},
data() {
@ -82,7 +90,8 @@
}
},
detailOptions: [],
scanOptions: []
scanOptions: [],
requestItem:{}
}
},

2
pages.json

@ -554,7 +554,7 @@
}
},
{
"path": "pages/productionReturn/request/returnToStoreRequestSubmit",
"path": "pages/productionReturn/request/returnRequestCreate",
"style": {
"navigationBarTitleText": "生产合格退料申请",
"enablePullDownRefresh": true,

7
pages/issue/coms/comIssueRequestCreator.vue

@ -65,6 +65,10 @@
type: Boolean,
default: true
},
isSwipe: {
type: Boolean,
default: true
},
},
watch: {
dataContent(newVal) {
@ -99,6 +103,9 @@
// this.scanOptions = getDetailRemoveOption();
// }
}
if(!this.isSwipe){
this.detailOptions=[]
}
},
methods: {

3
pages/issue/request/issueRequestCreate.vue

@ -5,7 +5,7 @@
</view>
<view v-else class="page-wraper">
<view class="page-main">
<comIssueRequestCreator ref="issueRequest" :dataContent="detailSource">
<comIssueRequestCreator ref="issueRequest" :dataContent="detailSource" :isSwipe ="false">
</comIssueRequestCreator>
<button class="btn_add" @click="goScan(false)">+去添加</button>
</view>
@ -101,7 +101,6 @@
subList: []
}
debugger
var subItem = {
productionLineCode: item.productionLineCode,
workStationCode: item.workStationCode,

4
pages/issue/request/issueRequestDetail.vue

@ -9,13 +9,13 @@
</view>
</view>
</scroll-view>
<div class="btn_bottom" >
<!-- <div class="btn_bottom" >
<view class="" style="display: flex;flex-direction: row;">
<view class="">
<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
</view>
</view>
</div>
</div> -->
</view>
<com-message ref="comMessage"></com-message>
</view>

5
pages/productionReturn/coms/comReturnCommonRequest.vue

@ -43,7 +43,8 @@
} from '@/api/request2.js';
import {
goHome,
updateTitle
updateTitle,
clearTirmAndWrap
} from '@/common/basic.js';
import {
@ -230,7 +231,7 @@
openScanDetailPopup() {
uni.navigateTo({
url: "./returnToStoreRequestSubmit?fromType=" + this.fromType
url: "./returnRequestCreate?fromType=" + this.fromType
})
},
openFilter(){

57
pages/productionReturn/coms/comReturnRequestInfo.vue

@ -0,0 +1,57 @@
<template>
<view class="cen_card" style="padding: 20rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>{{workShopCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>{{dataContent.productionLineCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">工位</view>
<view>{{ dataContent.workStationCode }}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">原材料库</view>
<view>{{ dataContent.toLocationCode}}</view>
</view>
</view>
<u-line />
</view>
</template>
<script>
export default {
components: {
},
data() {
return {};
},
props: {
workShopCode: {
type: String,
default: ''
},
dataContent: {
type: Object,
default: {}
},
},
methods: {
}
}
</script>
<style lang="scss">
</style>
<style>
</style>

1
pages/productionReturn/request/requestDetail.vue

@ -84,6 +84,7 @@
that.requestContent = res.data;
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList);
that.detailSource[0].workshopCode = that.requestContent.workshopCode
} else {
that.showMessage('列表数据为0');
}

2
pages/productionReturn/request/returnToStoreRequestSubmit.vue → pages/productionReturn/request/returnRequestCreate.vue

@ -5,7 +5,7 @@
</view>
<view v-else class="page-wraper">
<view class="page-main">
<comReturnRequestCreator ref="issueRequest" :dataContent="detailSource">
<comReturnRequestCreator ref="issueRequest" :dataContent="detailSource" :isSwipe ="false">
</comReturnRequestCreator>
<button class="btn_add" @click="goScan(false)">+去添加</button>
</view>

22
pages/purchaseReturn/record/returnRecord.vue

@ -226,17 +226,17 @@
if (this.fromType == "requestType") {
var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params))
// purchaseReturnRequestSubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("<br>退" + res.data, )
// } else {
// this.showErrorMessage(""+res.msg)
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
purchaseReturnRequestSubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成采购退货申请" + res.data, )
} else {
this.showErrorMessage("提交失败"+res.msg)
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
} else {
var itemCodes = []

Loading…
Cancel
Save