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

成品发货申请 成品发货任务 客户退货申请 客户退货任务

hella_vue3
zhang_li 5 months ago
parent
c7ef460c8a
commit
9b0818564b
9 changed files with 69 additions and 77 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. 47
      src/api/request2.js
  2. 16
      src/pages/customerReturn/coms/comReturnJobCard.vue
  3. 11
      src/pages/customerReturn/coms/comReturnRequestCard.vue
  4. 4
      src/pages/customerReturn/job/returnJob.vue
  5. 14
      src/pages/customerReturn/request/customerReturnRequest.vue
  6. 28
      src/pages/deliver/coms/comDeliverJobCard.vue
  7. 8
      src/pages/deliver/coms/comDeliverRequestCard.vue
  8. 4
      src/pages/deliver/job/deliverJob.vue
  9. 14
      src/pages/deliver/request/deliverRequest.vue

47
src/api/request2.js
View File

@ -2148,7 +2148,13 @@ export function getStockUpJobList(params) {
data: params, data: params,
}); });
} }
// export function getStockUpJobList(params) {
// return request({
// url: baseApi + "/wms/stockup-main-detail/senior",
// method: "post",
// data: params,
// });
// }
/** /**
* 直接备货 获取任务明细 * 直接备货 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
@ -2290,14 +2296,20 @@ export function productDismantleRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getDeliverJobList(params) {
// return request({
// url: baseApi + "/wms/deliver-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getDeliverJobList(params) { export function getDeliverJobList(params) {
return request({ return request({
url: baseApi + "/wms/deliver-job-main/senior", url: baseApi + "/wms/deliver-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 制品发货 获取任务明细 * 制品发货 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
@ -2361,14 +2373,20 @@ export function deliverJobSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getDeliverRequestList(params) {
// return request({
// url: baseApi + "/wms/deliver-request-main/senior",
// method: "post",
// data: params,
// });
// }
export function getDeliverRequestList(params) { export function getDeliverRequestList(params) {
return request({ return request({
url: baseApi + "/wms/deliver-request-main/senior", url: baseApi + "/wms/deliver-request-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 制品发货申请 获取任务明细 * 制品发货申请 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
@ -2575,9 +2593,16 @@ export function productRecycleRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getCustomerReturnJobList(params) {
// return request({
// url: baseApi + "/wms/customerreturn-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getCustomerReturnJobList(params) { export function getCustomerReturnJobList(params) {
return request({ return request({
url: baseApi + "/wms/customerreturn-job-main/senior", url: baseApi + "/wms/customerreturn-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
@ -2644,15 +2669,21 @@ export function customerReturnJobSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getCustomerReturnRequestList(params) {
// return request({
// url: baseApi + "/wms/customerreturn-request-main/senior",
// method: "post",
// data: params,
// });
// }
export function getCustomerReturnRequestList(params) { export function getCustomerReturnRequestList(params) {
return request({ return request({
url: baseApi + "/wms/customerreturn-request-main/senior", url: baseApi + "/wms/customerreturn-request-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 客户退货申请 任务明细 * 客户退货申请 任务明细
* @param {*} id 任务id * @param {*} id 任务id

16
src/pages/customerReturn/coms/comReturnJobCard.vue
View File

@ -1,26 +1,16 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="task_text">
<view class="">
申请单号 : {{dataContent.requestNumber}}
</view>
</view>
<view class="task_text">
<view class="">
客户代码 : {{dataContent.customerCode}}
</view>
</view>
</view>
</job-com-main-card> </job-com-main-card>
</template> </template>
<script> <script>
import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue' import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
jobComMainCard, jobComMainCard,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

11
src/pages/customerReturn/coms/comReturnRequestCard.vue
View File

@ -1,21 +1,16 @@
<template> <template>
<request-com-main-card :dataContent="dataContent"> <request-com-main-card :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<!-- <view class="task_text">
申请单号 : {{dataContent.requestNumber}}
</view> -->
<view class="task_text">
客户代码 : {{dataContent.customerCode}}
</view>
</view>
</request-com-main-card> </request-com-main-card>
</template> </template>
<script> <script>
import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue' import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
requestComMainCard, requestComMainCard,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

4
src/pages/customerReturn/job/returnJob.vue
View File

@ -175,7 +175,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './returnDetail?id=' + item.id + '&status=' + item.status url: './returnDetail?id=' + item.masterId + '&status=' + item.status
}); });
}, },
@ -194,7 +194,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
this.cancleJob(dataContent.id); this.cancleJob(dataContent.masterId);
} }
}); });
} }

14
src/pages/customerReturn/request/customerReturnRequest.vue
View File

@ -124,7 +124,7 @@
}, },
openRequestDetail(item) { openRequestDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './customerReturnRequestDetail?id=' + item.id url: './customerReturnRequestDetail?id=' + item.masterId
}); });
}, },
@ -211,27 +211,27 @@
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (text == "处理") { } else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?", res => { this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.customerReturnRequestHandle(dataContent.id) this.customerReturnRequestHandle(dataContent.masterId)
}) })
} else if (text == "提交审批") { } else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?", res => { this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.customerReturnRequestApprove(dataContent.id) this.customerReturnRequestApprove(dataContent.masterId)
}) })
} else if (text == "审批通过") { } else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => { this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.customerReturnRequestApproveAgree(dataContent.id) this.customerReturnRequestApproveAgree(dataContent.masterId)
}) })
} else if (text == "审批驳回") { } else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => { this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.customerReturnRequestApproveRefused(dataContent.id) this.customerReturnRequestApproveRefused(dataContent.masterId)
}) })
} else if (text == "关闭") { } else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?", res => { this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.customerReturnRequestClose(dataContent.id) this.customerReturnRequestClose(dataContent.masterId)
}) })
} else if (text == "重新添加") { } else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => { this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.customerReturnRequestAddAgain(dataContent.id) this.customerReturnRequestAddAgain(dataContent.masterId)
}) })
} }
}, },

28
src/pages/deliver/coms/comDeliverJobCard.vue
View File

@ -1,38 +1,16 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<!-- <view class="task_text">
<view class="">
申请单号 : {{dataContent.requestNumber}}
</view>
</view> -->
<view class="task_text">
<view class="">
发货计划单号 : {{dataContent.deliverPlanNumber}}
</view>
</view>
<view class="task_text">
<view class="">
发货类型 : {{dataContent.deliverType}}
</view>
</view>
<view class="task_text">
<view class="">
客户代码 : {{dataContent.customerCode}}
</view>
</view>
</view>
</job-com-main-card> </job-com-main-card>
</template> </template>
<script> <script>
import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue' import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
jobComMainCard, jobComMainCard,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

8
src/pages/deliver/coms/comDeliverRequestCard.vue
View File

@ -1,18 +1,16 @@
<template> <template>
<request-com-main-card :dataContent="dataContent"> <request-com-main-card :dataContent="dataContent">
<view class="task_item"> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="task_text">
客户代码 : {{dataContent.customerCode}}
</view>
</view>
</request-com-main-card> </request-com-main-card>
</template> </template>
<script> <script>
import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue' import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
components: { components: {
requestComMainCard, requestComMainCard,
jobComMainDetailCard
}, },
data() { data() {
return {}; return {};

4
src/pages/deliver/job/deliverJob.vue
View File

@ -176,7 +176,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './deliverDetail?id=' + item.id + '&status=' + item.status url: './deliverDetail?id=' + item.masterId + '&status=' + item.status
}); });
}, },
@ -195,7 +195,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
this.cancleJob(dataContent.id); this.cancleJob(dataContent.masterId);
} }
}); });
} }

14
src/pages/deliver/request/deliverRequest.vue
View File

@ -125,7 +125,7 @@
}, },
openRequestDetail(item) { openRequestDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './deliverRequestDetail?id=' + item.id url: './deliverRequestDetail?id=' + item.masterId
}); });
}, },
getList(type) { getList(type) {
@ -209,27 +209,27 @@
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (text == "处理") { } else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{ this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.deliverRequestHandle(dataContent.id) this.deliverRequestHandle(dataContent.masterId)
}) })
} else if (text == "提交审批") { } else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{ this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.deliverRequestApprove(dataContent.id) this.deliverRequestApprove(dataContent.masterId)
}) })
} else if (text=="审批通过") { } else if (text=="审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{ this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.deliverRequestApproveAgree(dataContent.id) this.deliverRequestApproveAgree(dataContent.masterId)
}) })
} else if (text == "审批驳回") { } else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{ this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.deliverRequestApproveRefused(dataContent.id) this.deliverRequestApproveRefused(dataContent.masterId)
}) })
} else if (text == "关闭") { } else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{ this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.deliverRequestClose(dataContent.id) this.deliverRequestClose(dataContent.masterId)
}) })
}else if(text == "重新添加"){ }else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{ this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
this.deliverRequestAddAgain(dataContent.id) this.deliverRequestAddAgain(dataContent.masterId)
}) })
} }
}, },

Write Preview
Loading…
Cancel
Save