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
aac9333bc9 becd39f135
commit
c7ef460c8a
8 changed files with 62 additions and 51 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. 39
      src/api/request2.js
  2. 16
      src/pages/productPutaway/coms/comProductJobCard.vue
  3. 9
      src/pages/productPutaway/coms/comPutawayRequestCard.vue
  4. 14
      src/pages/productPutaway/request/putawayRequest.vue
  5. 11
      src/pages/productReceipt/coms/comProductJobCard.vue
  6. 8
      src/pages/productReceipt/job/productReceiptJob.vue
  7. 12
      src/pages/productRecycle/coms/comRecycleJobCard.vue
  8. 4
      src/pages/productRecycle/job/productRecycleJob.vue

39
src/api/request2.js
View File

@ -1960,15 +1960,21 @@ export function unPlannedIssueRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductReceiptJobList(params) {
// return request({
// url: baseApi + "/wms/productreceipt-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductReceiptJobList(params) { export function getProductReceiptJobList(params) {
return request({ return request({
url: baseApi + "/wms/productreceipt-job-main/senior", url: baseApi + "/wms/productreceipt-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 制品收货 获取任务明细 * 制品收货 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
@ -2042,14 +2048,20 @@ export function productReceiptRecordsubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductPutawayJobList(params) {
// return request({
// url: baseApi + "/wms/productputaway-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductPutawayJobList(params) { export function getProductPutawayJobList(params) {
return request({ return request({
url: baseApi + "/wms/productputaway-job-main/senior", url: baseApi + "/wms/productputaway-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 制品上架 获取任务明细 * 制品上架 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id
@ -2474,9 +2486,16 @@ export function deliverRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductRecycleJobList(params) {
// return request({
// url: baseApi + "/wms/productredress-job-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductRecycleJobList(params) { export function getProductRecycleJobList(params) {
return request({ return request({
url: baseApi + "/wms/productredress-job-main/senior", url: baseApi + "/wms/productredress-job-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
@ -2918,14 +2937,20 @@ export function transferIssueRecordSubmit(params) {
* 获取日期任务列表 * 获取日期任务列表
* @param {*} * @param {*}
*/ */
// export function getProductPutawayRequestList(params) {
// return request({
// url: baseApi + "/wms/productputaway-request-main/senior",
// method: "post",
// data: params,
// });
// }
export function getProductPutawayRequestList(params) { export function getProductPutawayRequestList(params) {
return request({ return request({
url: baseApi + "/wms/productputaway-request-main/senior", url: baseApi + "/wms/productputaway-request-detail/senior",
method: "post", method: "post",
data: params, data: params,
}); });
} }
/** /**
* 制品上架申请 获取任务明细 * 制品上架申请 获取任务明细
* @param {*} id 任务id * @param {*} id 任务id

16
src/pages/productPutaway/coms/comProductJobCard.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.supplierCode}}
</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 {};

9
src/pages/productPutaway/coms/comPutawayRequestCard.vue
View File

@ -1,18 +1,17 @@
<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.supplierCode}}
</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 {};

14
src/pages/productPutaway/request/putawayRequest.vue
View File

@ -125,7 +125,7 @@
}, },
openRequestDetail(item) { openRequestDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './putawayRequestDetail?id=' + item.id url: './putawayRequestDetail?id=' + item.masterId
}); });
}, },
@ -218,27 +218,27 @@
this.openRequestInfoPopup(dataContent); this.openRequestInfoPopup(dataContent);
} else if (text == "处理") { } else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?", res => { this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.productPutawayRequestHandle(dataContent.id) this.productPutawayRequestHandle(dataContent.masterId)
}) })
} else if (text == "提交审批") { } else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?", res => { this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.productPutawayRequestApprove(dataContent.id) this.productPutawayRequestApprove(dataContent.masterId)
}) })
} else if (text == "审批通过") { } else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => { this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.productPutawayRequestApproveAgree(dataContent.id) this.productPutawayRequestApproveAgree(dataContent.masterId)
}) })
} else if (text == "审批驳回") { } else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => { this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.productPutawayRequestApproveRefused(dataContent.id) this.productPutawayRequestApproveRefused(dataContent.masterId)
}) })
} else if (text == "关闭") { } else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?", res => { this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.productPutawayRequestClose(dataContent.id) this.productPutawayRequestClose(dataContent.masterId)
}) })
} else if (text == "重新添加") { } else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => { this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.productPutawayRequestAddAgain(dataContent.id) this.productPutawayRequestAddAgain(dataContent.masterId)
}) })
} }
}, },

11
src/pages/productReceipt/coms/comProductJobCard.vue
View File

@ -1,6 +1,7 @@
<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_item">
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
申请单号 : {{dataContent.requestNumber}} 申请单号 : {{dataContent.requestNumber}}
@ -18,7 +19,7 @@
</view> </view>
</view> </view>
<!-- <view class="task_text"> <view class="task_text">
<view class=""> <view class="">
班组 : {{dataContent.team}} 班组 : {{dataContent.team}}
</view> </view>
@ -27,16 +28,18 @@
<view class=""> <view class="">
班次 : {{dataContent.shift}} 班次 : {{dataContent.shift}}
</view> </view>
</view> --> </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/productReceipt/job/productReceiptJob.vue
View File

@ -206,15 +206,15 @@
openJobDetail(item) { openJobDetail(item) {
if (this.type == 'predict') { if (this.type == 'predict') {
uni.navigateTo({ uni.navigateTo({
url: './productReceiptDetail?id=' + item.id + '&status=' + item.status url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status
}); });
} else if(this.type == 'assemble'){ } else if(this.type == 'assemble'){
uni.navigateTo({ uni.navigateTo({
url: './fgProductReceiptDetail?id=' + item.id + '&status=' + item.status url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status
}); });
}else { }else {
uni.navigateTo({ uni.navigateTo({
url: './scrapReceiptDetail?id=' + item.id + '&status=' + item.status url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status
}); });
} }
}, },
@ -234,7 +234,7 @@
this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?", this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
res => { res => {
if (res) { if (res) {
this.cancleJob(dataContent.id); this.cancleJob(dataContent.masterId);
} }
}); });
} }

12
src/pages/productRecycle/coms/comRecycleJobCard.vue
View File

@ -1,22 +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_item">
<view class="task_text">
<view class="">
申请单号 : {{dataContent.requestNumber}}
</view>
</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/productRecycle/job/productRecycleJob.vue
View File

@ -177,7 +177,7 @@
openJobDetail(item) { openJobDetail(item) {
uni.navigateTo({ uni.navigateTo({
url: './productRecycleJobDetail?id=' + item.id + '&status=' + item.status url: './productRecycleJobDetail?id=' + item.masterId + '&status=' + item.status
}); });
}, },
@ -196,7 +196,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