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

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

hella_vue3
niexiting 5 months ago
parent
ab46faec0a 0ba1a3439d
commit
9725bd4a7a
11 changed files with 84 additions and 78 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. 58
      src/api/request2.js
  2. 14
      src/pages/issue/coms/comIssueJobCard.vue
  3. 8
      src/pages/issue/coms/comIssueRequestCard.vue
  4. 4
      src/pages/issue/job/issueJob.vue
  5. 14
      src/pages/issue/request/issueRequest.vue
  6. 15
      src/pages/productionReceipt/coms/comProductionJobCard.vue
  7. 4
      src/pages/productionReceipt/job/productionReceiptJob.vue
  8. 14
      src/pages/productionReturn/coms/comReturnCommonRequest.vue
  9. 19
      src/pages/productionReturn/coms/comReturnJobCard.vue
  10. 8
      src/pages/productionReturn/coms/comReturnRequestCard.vue
  11. 4
      src/pages/productionReturn/job/returnJob.vue

58
src/api/request2.js
View File

@ -1299,14 +1299,20 @@ export function putawayRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getIssueJobList(params) {
// return request({
// url: baseApi + "/wms/issue-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getIssueJobList(params) { export function getIssueJobList(params) {
return request({ return request({
url: baseApi + "/wms/issue-job-main/senior", url: baseApi + "/wms/issue-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 发料任务明细 * 发料任务明细
* @param {*} 任务id * @param {*} 任务id
@ -1383,14 +1389,20 @@ export function issueJobSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductionReceiptJobList(params) {
// return request({
// url: baseApi + "/wms/productionreceipt-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductionReceiptJobList(params) { export function getProductionReceiptJobList(params) {
return request({ return request({
url: baseApi + "/wms/productionreceipt-job-main/senior", url: baseApi + "/wms/productionreceipt-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 生产收料 获取任务明细 * 生产收料 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
@ -3014,14 +3026,20 @@ export function productPutawayRequestClose(id) {
* 发料申请列表 * 发料申请列表
* @param {*} params * @param {*} params
*/ */
// export function getIssueRequestList(params) {
// return request({
// url: baseApi + "/wms/issue-request-main/senior",
// method: "post",
// data: params,
// });
// }
export function getIssueRequestList(params) { export function getIssueRequestList(params) {
return request({ return request({
url: baseApi + "/wms/issue-request-main/senior", url: baseApi + "/wms/issue-request-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 发料申请明细 * 发料申请明细
* @param {*} id * @param {*} id
@ -3141,9 +3159,16 @@ export function issueRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductionreturnJobList(params) {
// return request({
// url: baseApi + "/wms/productionreturn-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductionreturnJobList(params) { export function getProductionreturnJobList(params) {
return request({ return request({
url: baseApi + "/wms/productionreturn-job-main/senior", url: baseApi + "/wms/productionreturn-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
@ -3210,9 +3235,16 @@ export function productionReturnJobSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductionReturnRequestList(params) {
// return request({
// url: baseApi + "/wms/productionreturn-request-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductionReturnRequestList(params) { export function getProductionReturnRequestList(params) {
return request({ return request({
url: baseApi + "/wms/productionreturn-request-main/senior", url: baseApi + "/wms/productionreturn-request-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
@ -3376,14 +3408,20 @@ export function getUnPlannedIssueRequestDetail(id) {
* 获取任务列表 * 获取任务列表
* @param {*} * @param {*}
*/ */
// export function getUnPlannedReceiptRequestList(params) {
// return request({
// url: baseApi + "/wms/unplannedreceipt-request-main/senior",
// method: "post",
// data: params,
// });
// }
export function getUnPlannedReceiptRequestList(params) { export function getUnPlannedReceiptRequestList(params) {
return request({ return request({
url: baseApi + "/wms/unplannedreceipt-request-main/senior", url: baseApi + "/wms/unplannedreceipt-request-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 计划外入库申请 获取任务明细 * 计划外入库申请 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id

14
src/pages/issue/coms/comIssueJobCard.vue
View File

@ -1,24 +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">
申请单号 {{dataContent.requestNumber}}
</view> -->
<view class="task_text">
车间 {{dataContent.workShopCode}}
</view>
<view class="task_text">
生产线 {{dataContent.workShopCode}}
</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/issue/coms/comIssueRequestCard.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.workshopCode}}
</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/issue/job/issueJob.vue
View File

@ -198,7 +198,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './issueDetail?id=' + item.id + '&status=' + item.status url: './issueDetail?id=' + item.masterId + '&status=' + item.status
}); });
}, },
@ -217,7 +217,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/issue/request/issueRequest.vue
View File

@ -119,7 +119,7 @@
methods: { methods: {
openRequestDetail(item) { openRequestDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './issueRequestDetail?id=' + item.id url: './issueRequestDetail?id=' + item.masterId
}); });
}, },
@ -210,27 +210,27 @@
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (text == "处理") { } else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?", res => { this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.issueRequestHandle(dataContent.id) this.issueRequestHandle(dataContent.masterId)
}) })
} else if (text == "提交审批") { } else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?", res => { this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.issueRequestSubmitApprove(dataContent.id) this.issueRequestSubmitApprove(dataContent.masterId)
}) })
} else if (text.includes("审批通过")) { } else if (text.includes("审批通过")) {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => { this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.issueRequestSubmitApproveAgree(dataContent.id) this.issueRequestSubmitApproveAgree(dataContent.masterId)
}) })
} else if (text == "审批驳回") { } else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => { this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.issueRequestSubmitApproveRefused(dataContent.id) this.issueRequestSubmitApproveRefused(dataContent.masterId)
}) })
} else if (text == "关闭") { } else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?", res => { this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.issueRequestClose(dataContent.id) this.issueRequestClose(dataContent.masterId)
}) })
}else if(text == "重新添加"){ }else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{ this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
this.issueRequestAddAgain(dataContent.id) this.issueRequestAddAgain(dataContent.masterId)
}) })
} }
}, },

15
src/pages/productionReceipt/coms/comProductionJobCard.vue
View File

@ -1,25 +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.issueJobNumber}}
</view>
</view>
<view class="task_text">
<view class="">
车间:{{dataContent.workshopCode}}
</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 {};

4
src/pages/productionReceipt/job/productionReceiptJob.vue
View File

@ -179,7 +179,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './productionReceiptDetail?id=' + item.id + '&status=' + item.status url: './productionReceiptDetail?id=' + item.masterId + '&status=' + item.status
}); });
}, },
@ -198,7 +198,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/productionReturn/coms/comReturnCommonRequest.vue
View File

@ -144,7 +144,7 @@
}, },
openRequestDetail(item) { openRequestDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './requestDetail?id=' + item.id + '&businessType=' + this.businessType url: './requestDetail?id=' + item.masterId + '&businessType=' + this.businessType
}); });
}, },
getList(type) { getList(type) {
@ -242,27 +242,27 @@
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (text == "处理") { } else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?", res => { this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.productionReturnRequestHandle(dataContent.id) this.productionReturnRequestHandle(dataContent.masterId)
}) })
} else if (text == "提交审批") { } else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?", res => { this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.productionReturnRequestSubmitApprove(dataContent.id) this.productionReturnRequestSubmitApprove(dataContent.masterId)
}) })
} else if (text == "审批通过") { } else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => { this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.productionReturnRequestSubmitApproveAgree(dataContent.id) this.productionReturnRequestSubmitApproveAgree(dataContent.masterId)
}) })
} else if (text == "审批驳回") { } else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => { this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.productionReturnRequestSubmitApproveRefused(dataContent.id) this.productionReturnRequestSubmitApproveRefused(dataContent.masterId)
}) })
} else if (text == "关闭") { } else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?", res => { this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.productionReturnRequestClose(dataContent.id) this.productionReturnRequestClose(dataContent.masterId)
}) })
} else if (text == "重新添加") { } else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => { this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.productionReturnRequestAddAgain(dataContent.id) this.productionReturnRequestAddAgain(dataContent.masterId)
}) })
} }
}, },

19
src/pages/productionReturn/coms/comReturnJobCard.vue
View File

@ -1,27 +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="">
业务类型 : {{getBusinessTypeName(dataContent.businessType)}}
</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/productionReturn/coms/comReturnRequestCard.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.workshopCode}}
</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/productionReturn/job/returnJob.vue
View File

@ -179,7 +179,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
}); });
}, },
@ -198,7 +198,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
this.cancleJob(dataContent.id); this.cancleJob(dataContent.masterId);
} }
}); });
} }

Write Preview
Loading…
Cancel
Save