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

修改申请

wms3.0_pda
lijuncheng 11 months ago
parent
398deb1e60
commit
5336a12946
28 changed files with 492 additions and 398 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. 15
      common/array.js
  2. 36
      common/style/new_style.css
  3. 2
      mycomponents/request/requestFilter.vue
  4. 14
      pages/customerReturn/request/customerReturnRequest.vue
  5. 12
      pages/customerReturn/request/customerReturnRequestDetail.vue
  6. 14
      pages/deliver/request/deliverRequest.vue
  7. 15
      pages/deliver/request/deliverRequestDetail.vue
  8. 14
      pages/inspect/request/inspectRequest.vue
  9. 3
      pages/issue/coms/comIssueRequestDetailCard.vue
  10. 14
      pages/issue/request/issueRequest.vue
  11. 23
      pages/issue/request/issueRequestDetail.vue
  12. 14
      pages/productPutaway/request/putawayRequest.vue
  13. 12
      pages/productPutaway/request/putawayRequestDetail.vue
  14. 14
      pages/productionReturn/coms/comReturnCommonRequest.vue
  15. 2
      pages/productionReturn/coms/comReturnRequestInfo.vue
  16. 12
      pages/productionReturn/request/requestDetail.vue
  17. 14
      pages/purchaseReturn/request/returnRequest.vue
  18. 18
      pages/purchaseReturn/request/returnRequestDetail.vue
  19. 14
      pages/putaway/request/putawayRequest.vue
  20. 11
      pages/putaway/request/putawayRequestDetail.vue
  21. 8
      pages/repleinsh/request/repleinshRequest.vue
  22. 1
      pages/scrap/request/scrapRequestCreate.vue
  23. 12
      pages/scrap/request/scrapRequestDetail.vue
  24. 14
      pages/scrap/request/scrapRrequest.vue
  25. 14
      pages/unPlanned/request/issueRequest.vue
  26. 12
      pages/unPlanned/request/issueRequestDetail.vue
  27. 12
      pages/unPlanned/request/receiptRequest.vue
  28. 18
      pages/unPlanned/request/receiptRequestDetail.vue

15
common/array.js
View File

@ -73,14 +73,20 @@ export function getDetailAndHandleOption() {
]; ];
return option_detail; return option_detail;
} }
//详情、关闭 //详情、重新添加、关闭
export function getDetailAndCloseOption() { export function getDetailAndAddAndCloseOption() {
let option_detail = [{ let option_detail = [{
text: '详情', text: '详情',
style: { style: {
backgroundColor: '#3C9CFF' backgroundColor: '#3C9CFF'
} }
}, },
{
text: '重新\n添加',
style: {
backgroundColor: '#E6A23C'
}
},
{ {
text: '关闭', text: '关闭',
style: { style: {
@ -145,6 +151,11 @@ export function getRemoveOption() {
export function getAddAgainOption() { export function getAddAgainOption() {
let option_detail_remove = [{ let option_detail_remove = [{
text: '详情',
style: {
backgroundColor: '#3C9CFF'
}
}, {
text: '重新\n添加', text: '重新\n添加',
style: { style: {
backgroundColor: '#E6A23C' backgroundColor: '#E6A23C'

36
common/style/new_style.css
View File

@ -2642,8 +2642,8 @@ button[disabled] {
*/ */
.request_status_new { .request_status_new {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #CFF0BE;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2653,8 +2653,8 @@ button[disabled] {
*/ */
.request_status_reviewing { .request_status_reviewing {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #ECEE1F;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2664,8 +2664,8 @@ button[disabled] {
*/ */
.request_status_agreed { .request_status_agreed {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background:#82E26E;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2675,8 +2675,8 @@ button[disabled] {
*/ */
.request_status_refused { .request_status_refused {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #F33140;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2686,8 +2686,8 @@ button[disabled] {
*/ */
.request_status_handling { .request_status_handling {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #3C9CFF;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2697,8 +2697,8 @@ button[disabled] {
*/ */
.request_status_partial { .request_status_partial {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #D3FF3C;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2708,8 +2708,8 @@ button[disabled] {
*/ */
.request_status_completed { .request_status_completed {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #D3FF3C;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2719,8 +2719,8 @@ button[disabled] {
*/ */
.request_status_abort { .request_status_abort {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #F33140;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -2730,8 +2730,8 @@ button[disabled] {
*/ */
.request_status_cancelled { .request_status_cancelled {
font-size: 28rpx; font-size: 28rpx;
background: rgba(95, 203, 148, 0.2); background: #F33140;
color: #22AF68; color: #000000;
padding: 10rpx 20rpx 10rpx 20rpx; padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
} }

2
mycomponents/request/requestFilter.vue
View File

@ -96,7 +96,7 @@
this.$refs.popup.close() this.$refs.popup.close()
}, },
switchChangeWait(isOn) { switchChangeWait(isOn) {
let status = ""; let status = "1,2,3,4,5,6";
if (isOn) { if (isOn) {
status = "6"; status = "6";
} }

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

@ -49,7 +49,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -67,14 +67,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -88,7 +88,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -142,13 +142,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -194,7 +192,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

12
pages/customerReturn/request/customerReturnRequestDetail.vue
View File

@ -1,6 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
客户代码 : {{requestContent.customerCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<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">
@ -35,12 +43,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/customerReturn/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/customerReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {

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

@ -47,7 +47,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -66,14 +66,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -87,7 +87,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -142,13 +142,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -190,7 +188,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if(status == "5"){ } else if(status == "5"){
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
}else { }else {

15
pages/deliver/request/deliverRequestDetail.vue
View File

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
客户代码 : {{requestContent.customerCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="page-header"> <view class="page-header">
@ -41,13 +50,15 @@
import requestDetailInfoPopup from '@/pages/deliver/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/deliver/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import itemQty from '@/mycomponents/item/itemQty.vue' import itemQty from '@/mycomponents/item/itemQty.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
itemQty itemQty,
requestTop
}, },
data() { data() {
return { return {
@ -89,7 +100,7 @@
that.showMessage('未获取到详情'); that.showMessage('未获取到详情');
} else { } else {
that.detailSource = res.data that.detailSource = res.data
that.requestContent = res.data;
// if (res.data.subList.length > 0) { // if (res.data.subList.length > 0) {
// that.requestContent = res.data; // that.requestContent = res.data;
// that.subList = res.data.subList; // that.subList = res.data.subList;

14
pages/inspect/request/inspectRequest.vue
View File

@ -46,7 +46,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -64,14 +64,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption:[], addAgainOption:[],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -85,7 +85,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -133,7 +133,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if(status == "5"){ } else if(status == "5"){
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
}else { }else {
@ -153,13 +153,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,

3
pages/issue/coms/comIssueRequestDetailCard.vue
View File

@ -3,8 +3,7 @@
<view class="uni-flex uni-column"> <view class="uni-flex uni-column">
<!-- <com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem"> <!-- <com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
</com-issue-request-info> --> </com-issue-request-info> -->
<work-station :workshopCode="dataContent.workShopCode" :productionLineCode="requestItem.productionLineCode"
:workStationCode="requestItem.workStationCode" :rawLocationCode="requestItem.toLocationCode"></work-station>
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<view v-for="(item, index) in dataContent.subList" :key="index"> <view v-for="(item, index) in dataContent.subList" :key="index">

14
pages/issue/request/issueRequest.vue
View File

@ -50,7 +50,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -69,14 +69,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption:[], addAgainOption:[],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -89,7 +89,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(); this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption();
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -141,13 +141,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -192,7 +190,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if(status == "5"){ } else if(status == "5"){
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
}else { }else {

23
pages/issue/request/issueRequestDetail.vue
View File

@ -1,5 +1,17 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
<work-station :workshopCode="requestContent.workshopCode"
:productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode"
:rawLocationCode="titleInfo.toLocationCode"></work-station>
</view>
</view>
<u-line color="#D8D8D8" />
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list"> <view class="detail-list">
@ -35,22 +47,25 @@
getDataSource, getDataSource,
} from '@/common/detail.js'; } from '@/common/detail.js';
import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue" import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue"
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
import workStation from '@/mycomponents/workStation/workStation.vue'
export default { export default {
components: { components: {
comIssueRequestDetailCard, comIssueRequestDetailCard,
comMessage, comMessage,
requestTop,
workStation
}, },
data() { data() {
return { return {
id: '', id: '',
requestContent: {}, //任务内容 requestContent: {}, //任务内容
subList: [], //接口返回的任务 subList: [], //接口返回的任务
type: 'query' //来源新增add, query查询 type: 'query', //来源新增add, query查询
titleInfo: {}
}; };
}, },
onLoad(option) { onLoad(option) {
@ -88,7 +103,9 @@
} else { } else {
if (res.data.subList.length > 0) { if (res.data.subList.length > 0) {
that.requestContent = res.data; that.requestContent = res.data;
that.requestContent.subList = res.data.subList; that.requestContent.subList = res.data.subList;
that.titleInfo = that.requestContent.subList[0]
that.subList = res.data.subList; that.subList = res.data.subList;
// that.subList.forEach(res => { // that.subList.forEach(res => {
// res.fromLocationCode = res.toLocationCode // res.fromLocationCode = res.toLocationCode

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

@ -51,7 +51,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -69,14 +69,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
loadingType: "nomore", loadingType: "nomore",
@ -89,7 +89,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -147,13 +147,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -200,7 +198,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

12
pages/productPutaway/request/putawayRequestDetail.vue
View File

@ -1,6 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<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">
@ -34,12 +42,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/productPutaway/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/productPutaway/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {

14
pages/productionReturn/coms/comReturnCommonRequest.vue
View File

@ -50,7 +50,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -69,14 +69,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
loadingType: "nomore", loadingType: "nomore",
@ -110,7 +110,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
this.updateTitle(); this.updateTitle();
this.getList('refresh'); this.getList('refresh');
@ -163,13 +163,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
filters.push({ filters.push({
column: "business_type", column: "business_type",
action: "==", action: "==",
@ -223,7 +221,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

2
pages/productionReturn/coms/comReturnRequestInfo.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view class="cen_card" style="padding: 20rpx;"> <view class="cen_card" style="padding: 0rpx;">
<view class="cell_box uni-flex uni-row"> <view class="cell_box uni-flex uni-row">
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">车间</view> <view class="text_lightblue">车间</view>

12
pages/productionReturn/request/requestDetail.vue
View File

@ -1,9 +1,16 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
<comReturnRequestInfo :workShopCode="requestContent.workshopCode" :dataContent="requestContent"> <comReturnRequestInfo :workShopCode="requestContent.workshopCode" :dataContent="requestContent">
</comReturnRequestInfo> </comReturnRequestInfo>
</view> </view>
</view>
<view class="page-main"> <view class="page-main">
<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">
@ -39,14 +46,15 @@
import requestDetailInfoPopup from '@/pages/productionReturn/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/productionReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue' import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
comReturnRequestInfo comReturnRequestInfo,
requestTop
}, },
data() { data() {
return { return {

14
pages/purchaseReturn/request/returnRequest.vue
View File

@ -49,7 +49,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -68,14 +68,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -89,7 +89,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -141,13 +141,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -193,7 +191,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

18
pages/purchaseReturn/request/returnRequestDetail.vue
View File

@ -1,11 +1,19 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<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="">
<com-request-detail-card :dataContent="item" <com-request-detail-card :dataContent="item" @openDetail="openDetail">
@openDetail="openDetail">
</com-request-detail-card> </com-request-detail-card>
</view> </view>
</view> </view>
@ -34,12 +42,15 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/purchaseReturn/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/purchaseReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {
@ -101,8 +112,7 @@
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {}
}
}); });
}, },

14
pages/putaway/request/putawayRequest.vue
View File

@ -50,7 +50,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -69,14 +69,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -89,7 +89,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -142,13 +142,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -194,7 +192,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

11
pages/putaway/request/putawayRequestDetail.vue
View File

@ -1,5 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -35,12 +44,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/putaway/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/putaway/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {

8
pages/repleinsh/request/repleinshRequest.vue
View File

@ -42,7 +42,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption getDetailAndAddAndCloseOption
} from '@/common/array.js'; } from '@/common/array.js';
export default { export default {
@ -70,7 +70,7 @@
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
loadingType: "nomore", loadingType: "nomore",
@ -81,7 +81,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -179,7 +179,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else { } else {
this.showOptions = this.detailOptions; this.showOptions = this.detailOptions;
} }

1
pages/scrap/request/scrapRequestCreate.vue
View File

@ -81,6 +81,7 @@
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default { export default {
components: { components: {
winScanButton, winScanButton,

12
pages/scrap/request/scrapRequestDetail.vue
View File

@ -1,6 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
从仓库代码 : {{requestContent.fromWarehouseCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<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">
@ -34,12 +42,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/scrap/coms/requestDetailInfoPopup.vue' import requestDetailInfoPopup from '@/pages/scrap/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestDetailInfoPopup, requestDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {

14
pages/scrap/request/scrapRrequest.vue
View File

@ -49,7 +49,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -67,14 +67,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -88,7 +88,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -140,13 +140,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -192,7 +190,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

14
pages/unPlanned/request/issueRequest.vue
View File

@ -51,7 +51,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -70,14 +70,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -91,7 +91,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -144,13 +144,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "in",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -198,7 +196,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

12
pages/unPlanned/request/issueRequestDetail.vue
View File

@ -1,6 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
从仓库代码 : {{requestContent.fromWarehouseCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<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">
@ -34,12 +42,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue' import requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestIssDetailInfoPopup, requestIssDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {

12
pages/unPlanned/request/receiptRequest.vue
View File

@ -50,7 +50,7 @@
getDetailAndApproveOption, getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption, getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption, getDetailAndHandleOption,
getDetailAndCloseOption, getDetailAndAddAndCloseOption,
getAddAgainOption getAddAgainOption
} from '@/common/array.js'; } from '@/common/array.js';
@ -69,14 +69,14 @@
requestList: [], requestList: [],
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
status: "", status: "1,2,3,4,5,6",
totalCount: 0, totalCount: 0,
checkedWaitTask: false, checkedWaitTask: false,
detailOptions: [], detailOptions: [],
detailAndApproveOptions: [], detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [], detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [], detailAndHandleOption: [],
detailAndCloseOption: [], detailAndAddAndCloseOption: [],
addAgainOption: [], addAgainOption: [],
showOptions: [], showOptions: [],
fromType: "requestType", fromType: "requestType",
@ -90,7 +90,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption() this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(), this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption() this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption() this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
}, },
onReachBottom() { onReachBottom() {
@ -143,13 +143,11 @@
this.requestList = []; this.requestList = [];
} }
var filters = [] var filters = []
if (this.checkedWaitTask) {
filters.push({ filters.push({
column: "status", column: "status",
action: "==", action: "==",
value: this.status value: this.status
}) })
}
var params = { var params = {
filters: filters, filters: filters,
pageNo: this.pageNo, pageNo: this.pageNo,
@ -195,7 +193,7 @@
} else if (status == "3") { } else if (status == "3") {
this.showOptions = this.detailAndHandleOption; this.showOptions = this.detailAndHandleOption;
} else if (status == "4") { } else if (status == "4") {
this.showOptions = this.detailAndCloseOption; this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") { } else if (status == "5") {
this.showOptions = this.addAgainOption; this.showOptions = this.addAgainOption;
} else { } else {

18
pages/unPlanned/request/receiptRequestDetail.vue
View File

@ -1,12 +1,19 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
到仓库代码 : {{requestContent.toWarehouseCode}}
</view>
<u-line color="#D8D8D8" />
</view>
<view class="page-main"> <view class="page-main">
<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="">
<comRequestDetailCard :dataContent="item" <comRequestDetailCard :dataContent="item" @openDetail="openDetail">
@openDetail="openDetail">
</comRequestDetailCard> </comRequestDetailCard>
</view> </view>
</view> </view>
@ -35,12 +42,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue" import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestRecDetailInfoPopup from '@/pages/unPlanned/coms/requestRecDetailInfoPopup.vue' import requestRecDetailInfoPopup from '@/pages/unPlanned/coms/requestRecDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue' import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default { export default {
components: { components: {
comRequestDetailCard, comRequestDetailCard,
requestRecDetailInfoPopup, requestRecDetailInfoPopup,
comMessage, comMessage,
requestTop
}, },
data() { data() {
return { return {
@ -101,8 +110,7 @@
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {}
}
}); });
}, },

Write Preview
Loading…
Cancel
Save