sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改申请参数

wms3.0_pda
lijuncheng 12 months ago
parent
aa0b3faf5d
commit
1ed84d2ba5
8 changed files with 232 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      pages/productPutaway/record/productPutawayRecord.vue
  2. 38
      pages/productionReturn/coms/comReturn.vue
  3. 43
      pages/purchaseReturn/record/returnRecord.vue
  4. 6
      pages/putaway/record/putawayRecord.vue
  5. 37
      pages/repleinsh/record/repleinshRecord.vue
  6. 34
      pages/scrap/record/scrapRecord.vue
  7. 36
      pages/unPlanned/record/issueRecord.vue
  8. 37
      pages/unPlanned/record/receiptRecord.vue

42
pages/productPutaway/record/productPutawayRecord.vue
View File

@ -9,7 +9,7 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
@ -98,7 +98,7 @@
received: false, received: false,
isShowPackingCode: true, isShowPackingCode: true,
scanCount: 0, scanCount: 0,
jobContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [], locationTypeList: [],
@ -268,7 +268,7 @@
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
var params = this.setParams(false) var params = this.setRequestParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
// productPutawayRequestSubmit(params).then(res => { // productPutawayRequestSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
@ -291,7 +291,7 @@
getManagementPrecisions(itemCodes, this.toLocationCode, res => { getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams(true) var params = this.setRecordParams(true)
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
// productPutawayRecordSubmit(params).then(res => { // productPutawayRecordSubmit(params).then(res => {
@ -314,7 +314,33 @@
}, },
setParams(queryModel) { setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
},
setRecordParams(queryModel) {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
@ -342,9 +368,9 @@
} }
}) })
}) })
this.jobContent.subList = subList this.dataContent.subList = subList
this.jobContent.creator = creator; this.dataContent.creator = creator;
return this.jobContent; return this.dataContent;
}, },

38
pages/productionReturn/coms/comReturn.vue
View File

@ -8,7 +8,7 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<record-com-detail-card :dataContent="item" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :settingParam="dataContent"
@removeData="removeData" @updateData="updateData" @removePack="removePack"> @removeData="removeData" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
@ -119,7 +119,7 @@
return { return {
id: '', id: '',
scanCount: 0, scanCount: 0,
jobContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
fromLocationInfo: {}, fromLocationInfo: {},
@ -285,7 +285,7 @@
}); });
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
var params = this.setParams(false) var params = this.setRequestParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
// productionReturnRequestSubmit(params).then(res => { // productionReturnRequestSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
@ -331,6 +331,32 @@
}, },
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
},
setParams(queryModel) { setParams(queryModel) {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
@ -359,9 +385,9 @@
} }
}) })
}) })
this.jobContent.subList = subList this.dataContent.subList = subList
this.jobContent.creator = creator; this.dataContent.creator = creator;
return this.jobContent; return this.dataContent;
}, },

43
pages/purchaseReturn/record/returnRecord.vue
View File

@ -87,7 +87,8 @@
tolocationTypeList: [], tolocationTypeList: [],
businessType: {}, //业务类型 businessType: {}, //业务类型
poNumber: '', poNumber: '',
fromType: "" fromType: "",
dataContent : {}
}; };
}, },
@ -219,10 +220,10 @@
}); });
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
var params = this.setParams();
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
if (this.fromType == "requestType") { if (this.fromType == "requestType") {
var params = this.setParams(false) var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
// purchaseReturnRequestSubmit(params).then(res => { // purchaseReturnRequestSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
@ -246,7 +247,7 @@
getManagementPrecisions(itemCodes, this.toLocationCode, res => { getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams(true) var params = this.setRecordParams(true)
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
// purchaseReturnRecordSubmit(params).then(res => { // purchaseReturnRecordSubmit(params).then(res => {
@ -274,7 +275,7 @@
}, },
setParams(queryModel) { setRecordParams(queryModel) {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
@ -300,9 +301,35 @@
} }
}) })
}) })
this.jobContent.subList = subList this.dataContent.subList = subList
this.jobContent.creator = creator; this.dataContent.creator = creator;
return this.jobContent; return this.dataContent;
},
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
}, },
showMessage(message) { showMessage(message) {

6
pages/putaway/record/putawayRecord.vue
View File

@ -98,7 +98,7 @@
id: '', id: '',
receiptJob: {}, receiptJob: {},
received: false, received: false,
dataContent: {}, //任务内容 dataContent: {}, //内容
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [], locationTypeList: [],
businessTypeInfo: {}, businessTypeInfo: {},
@ -283,7 +283,7 @@
getManagementPrecisions(itemCodes, this.toLocationCode, res => { getManagementPrecisions(itemCodes, this.toLocationCode, res => {
if (res.success) { if (res.success) {
this.managementList = res.list; this.managementList = res.list;
var params = this.setParams(true) var params = this.setRecordParams(true)
console.log("提交参数", JSON.stringify(params)); console.log("提交参数", JSON.stringify(params));
// putawayRecordSubmit(params).then(res => { // putawayRecordSubmit(params).then(res => {
@ -305,7 +305,7 @@
} }
}, },
setParams(queryModel) { setRecordParams(queryModel) {
var subList = [] var subList = []
var creator = this.$store.state.user.id var creator = this.$store.state.user.id
this.detailSource.forEach(item => { this.detailSource.forEach(item => {

37
pages/repleinsh/record/repleinshRecord.vue
View File

@ -8,7 +8,7 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
@ -97,7 +97,7 @@
received: false, received: false,
isShowPackingCode: true, isShowPackingCode: true,
scanCount: 0, scanCount: 0,
jobContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [], locationTypeList: [],
@ -256,9 +256,12 @@
mask: true mask: true
}); });
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params))
// repleinshRequestSubmit(params).then(res => { // repleinshRequestSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
@ -303,6 +306,32 @@
return subList; return subList;
}, },
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
},
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) {} if (res) {}

34
pages/scrap/record/scrapRecord.vue
View File

@ -17,7 +17,7 @@
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" <record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData" :isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
@removePack="removePack"> @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
@ -99,7 +99,7 @@
received: false, received: false,
isShowPackingCode: true, isShowPackingCode: true,
scanCount: 0, scanCount: 0,
jobContent: {}, //任务内容 dataContent: {}, //任务内容
subList: [], //接口返回的任务subList subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
locationTypeList: [], locationTypeList: [],
@ -263,10 +263,10 @@
mask: true mask: true
}); });
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params))
// scrapRequestSubmit(params).then(res => { // scrapRequestSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
@ -310,6 +310,32 @@
return subList; return subList;
}, },
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
},
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {

36
pages/unPlanned/record/issueRecord.vue
View File

@ -102,7 +102,8 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
reason: "", reason: "",
reasonList: [], reasonList: [],
fromType: "" fromType: "",
dataContent:{}
} }
}, },
@ -222,9 +223,12 @@
this.showErrorMessage("请选择出库原因") this.showErrorMessage("请选择出库原因")
return; return;
} }
var params = this.setParams();
console.log("提交参数",JSON.stringify(params));
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
var params = this.setRequestParams();
console.log("提交参数",JSON.stringify(params));
// unPlannedIssueRequestSubmit(params).then(res => { // unPlannedIssueRequestSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
// if (res.data) { // if (res.data) {
@ -266,6 +270,32 @@
}) })
return subList; return subList;
}, },
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
},
} }
} }
</script> </script>

37
pages/unPlanned/record/receiptRecord.vue
View File

@ -100,7 +100,8 @@
reason: "", reason: "",
reasonList: [], reasonList: [],
fromType: "", fromType: "",
showToLoaction:true showToLoaction:true,
dataContent:{}
} }
}, },
@ -249,7 +250,7 @@
} }
if(this.fromType=="requestType"){ if(this.fromType=="requestType"){
var params = this.setParams(false) var params = this.setRequestParams()
console.log("提交" + JSON.stringify(params)) console.log("提交" + JSON.stringify(params))
// unPlannedReceiptRequestbSubmit(params).then(res => { // unPlannedReceiptRequestbSubmit(params).then(res => {
// uni.hideLoading() // uni.hideLoading()
@ -322,9 +323,35 @@
} }
}) })
}) })
this.jobContent.subList = subList this.dataContent.subList = subList
this.jobContent.creator = creator; this.dataContent.creator = creator;
return this.jobContent; return this.dataContent;
},
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
if(supplierCode==""){
supplierCode = detail.package.supplierCode
}
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";
this.dataContent.status= 1 ;
this.dataContent.autoCommit = "FALSE";
this.dataContent.autoAgree = "FALSE";
this.dataContent.autoExecute = "FALSE";
this.dataContent.directCreateRecord = "FALSE";
return this.dataContent;
}, },
} }

Write Preview
Loading…
Cancel
Save