Browse Source

修改申请

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

17
common/array.js

@ -73,14 +73,20 @@ export function getDetailAndHandleOption() {
];
return option_detail;
}
//详情、关闭
export function getDetailAndCloseOption() {
//详情、重新添加、关闭
export function getDetailAndAddAndCloseOption() {
let option_detail = [{
text: '详情',
style: {
backgroundColor: '#3C9CFF'
}
},
{
text: '重新\n添加',
style: {
backgroundColor: '#E6A23C'
}
},
{
text: '关闭',
style: {
@ -91,7 +97,7 @@ export function getDetailAndCloseOption() {
return option_detail;
}
// 采购退货返回侧滑按钮 详情 、编辑、库位、移除
export function getPurchaseReceiptOption(allowModifyQty,allowModifyLocation) {
export function getPurchaseReceiptOption(allowModifyQty, allowModifyLocation) {
var option = []
option.push(...getDetailOption())
if (allowModifyQty == "TRUE") {
@ -145,6 +151,11 @@ export function getRemoveOption() {
export function getAddAgainOption() {
let option_detail_remove = [{
text: '详情',
style: {
backgroundColor: '#3C9CFF'
}
}, {
text: '重新\n添加',
style: {
backgroundColor: '#E6A23C'

36
common/style/new_style.css

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

2
mycomponents/request/requestFilter.vue

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

62
pages/customerReturn/request/customerReturnRequest.vue

@ -49,7 +49,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -67,15 +67,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
@ -88,7 +88,7 @@
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -142,13 +142,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -194,10 +192,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -215,32 +213,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.customerReturnRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.customerReturnRequestApprove(dataContent.id)
})
} else if (text=="审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.customerReturnRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.customerReturnRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.customerReturnRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.customerReturnRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -307,13 +305,13 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
customerReturnRequestClose(id) {
customerReturnRequestClose(id).then(res => {
if (res.data) {
@ -324,7 +322,7 @@
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -339,7 +337,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -354,7 +352,7 @@
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -369,7 +367,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -384,7 +382,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})

14
pages/customerReturn/request/customerReturnRequestDetail.vue

@ -1,6 +1,14 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<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 requestDetailInfoPopup from '@/pages/customerReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {

14
pages/deliver/request/deliverRequest.vue

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

17
pages/deliver/request/deliverRequestDetail.vue

@ -1,5 +1,14 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="page-header">
@ -41,13 +50,15 @@
import requestDetailInfoPopup from '@/pages/deliver/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import itemQty from '@/mycomponents/item/itemQty.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
itemQty
itemQty,
requestTop
},
data() {
return {
@ -89,7 +100,7 @@
that.showMessage('未获取到详情');
} else {
that.detailSource = res.data
that.requestContent = res.data;
// if (res.data.subList.length > 0) {
// that.requestContent = res.data;
// that.subList = res.data.subList;

14
pages/inspect/request/inspectRequest.vue

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

3
pages/issue/coms/comIssueRequestDetailCard.vue

@ -3,8 +3,7 @@
<view class="uni-flex uni-column">
<!-- <com-issue-request-info :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
</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">
<view v-for="(item, index) in dataContent.subList" :key="index">

14
pages/issue/request/issueRequest.vue

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

25
pages/issue/request/issueRequestDetail.vue

@ -1,5 +1,17 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list">
@ -35,29 +47,32 @@
getDataSource,
} from '@/common/detail.js';
import comIssueRequestDetailCard from "@/pages/issue/coms/comIssueRequestDetailCard.vue"
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
import workStation from '@/mycomponents/workStation/workStation.vue'
export default {
components: {
comIssueRequestDetailCard,
comMessage,
requestTop,
workStation
},
data() {
return {
id: '',
requestContent: {}, //
subList: [], //
type: 'query' //add, query
type: 'query', //add, query
titleInfo: {}
};
},
onLoad(option) {
this.id = option.id;
this.getDetail();
},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
@ -88,7 +103,9 @@
} else {
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.requestContent.subList = res.data.subList;
that.titleInfo = that.requestContent.subList[0]
that.subList = res.data.subList;
// that.subList.forEach(res => {
// res.fromLocationCode = res.toLocationCode

66
pages/productPutaway/request/putawayRequest.vue

@ -14,7 +14,7 @@
</view>
</uni-swipe-action>
<uni-load-more :status="loadingType" v-if="requestList.length>0" />
<request-info-popup ref='requestInfoPopup'></request-info-popup>
</view>
<requestButton @goScan='openScanDetailPopup'></requestButton>
@ -51,7 +51,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -69,15 +69,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
loadingType: "nomore",
@ -88,8 +88,8 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -147,13 +147,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -200,10 +198,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else{
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -221,32 +219,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.productPutawayRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.productPutawayRequestApprove(dataContent.id)
})
} else if (text=="审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.productPutawayRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.productPutawayRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.productPutawayRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.productPutawayRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -312,13 +310,13 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
productPutawayRequestClose(id) {
productPutawayRequestClose(id).then(res => {
if (res.data) {
@ -329,7 +327,7 @@
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -344,7 +342,7 @@
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -359,7 +357,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -374,7 +372,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -389,7 +387,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})

14
pages/productPutaway/request/putawayRequestDetail.vue

@ -1,6 +1,14 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<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 requestDetailInfoPopup from '@/pages/productPutaway/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {

98
pages/productionReturn/coms/comReturnCommonRequest.vue

@ -50,7 +50,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -69,31 +69,31 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
loadingType: "nomore",
title:"",
fromType:""
title: "",
fromType: ""
};
},
props: {
businessType: {
type: String,
default: ''
},
},
},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
@ -109,26 +109,26 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
this.updateTitle();
this.getList('refresh');
},
methods: {
updateTitle() {
if (this.businessType == 'ReturnToStore') {
this.title = "生产合格退料申请"
this.fromType ="ReturnToStore"
this.fromType = "ReturnToStore"
} else if (this.businessType == 'ReturnToHold') {
this.title = "生产隔离退料申请"
this.fromType ="ReturnToHold"
this.fromType = "ReturnToHold"
}
updateTitle(this.title)
},
onShow(){
onShow() {
this.getList('refresh');
},
onReachBottom() {
@ -138,7 +138,7 @@
}
this.getList("more");
},
onPullDownRefresh() {
this.getList('refresh');
},
@ -163,13 +163,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
filters.push({
column: "business_type",
action: "==",
@ -201,7 +199,7 @@
this.requestList = type === "refresh" ? list : this.requestList.concat(list);
this.pageNo++;
updateTitle(this.title+"("+this.totalCount + ")")
updateTitle(this.title + "(" + this.totalCount + ")")
}).catch(error => {
if (type === "refresh") {
@ -223,10 +221,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -237,42 +235,42 @@
url: "./returnRequestCreate?fromType=" + this.fromType
})
},
openFilter(){
openFilter() {
this.$refs.filter.openFilter();
},
swipeClick(e, dataContent) {
var text = clearTirmAndWrap(e.content.text)
if (e.content.text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (e.content.text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.productionReturnRequestHandle(dataContent.id)
})
} else if (e.content.text == "审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.productionReturnRequestSubmitApprove(dataContent.id)
})
} else if (e.content.text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.productionReturnRequestSubmitApproveAgree(dataContent.id)
})
} else if (e.content.text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.productionReturnRequestSubmitApproveRefused(dataContent.id)
})
} else if (e.content.text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.productionReturnRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.productionReturnRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -280,8 +278,8 @@
}
});
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@ -340,11 +338,11 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
productionReturnRequestClose(id) {
productionReturnRequestClose(id).then(res => {
@ -356,7 +354,7 @@
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -371,7 +369,7 @@
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -386,7 +384,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -401,7 +399,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -416,7 +414,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})

2
pages/productionReturn/coms/comReturnRequestInfo.vue

@ -1,5 +1,5 @@
<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_info">
<view class="text_lightblue">车间</view>

24
pages/productionReturn/request/requestDetail.vue

@ -1,8 +1,15 @@
<template>
<view class="page-wraper">
<view class="page-header">
<comReturnRequestInfo :workShopCode="requestContent.workshopCode" :dataContent="requestContent">
</comReturnRequestInfo>
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
<comReturnRequestInfo :workShopCode="requestContent.workshopCode" :dataContent="requestContent">
</comReturnRequestInfo>
</view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
@ -39,14 +46,15 @@
import requestDetailInfoPopup from '@/pages/productionReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
comReturnRequestInfo
comReturnRequestInfo,
requestTop
},
data() {
return {
@ -59,7 +67,7 @@
onLoad(option) {
this.id = option.id;
var businessType = option.businessType;
var title="生产退料申请详情"
var title = "生产退料申请详情"
if (businessType == 'ReturnToStore') {
title = "生产合格退料申请详情"
} else if (this.businessType == 'ReturnToHold') {
@ -67,7 +75,7 @@
}
this.getDetail();
updateTitle(title)
},
//
onNavigationBarButtonTap(e) {
@ -104,7 +112,7 @@
that.requestContent.fromLocationCode = that.subList[0].fromLocationCode
that.requestContent.productionLineCode = that.subList[0].productionLineCode
that.requestContent.workStationCode = that.subList[0].workStationCode
} else {
that.showMessage('列表数据为0');
}

62
pages/purchaseReturn/request/returnRequest.vue

@ -49,7 +49,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -68,15 +68,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
@ -88,8 +88,8 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -141,13 +141,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -193,10 +191,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -213,32 +211,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.purchaseReturnRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.purchaseReturnRequestApprove(dataContent.id)
})
} else if (text=="审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.purchaseReturnRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.purchaseReturnRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.purchaseReturnRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.purchaseReturnRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -246,7 +244,7 @@
}
});
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@ -339,7 +337,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -354,7 +352,7 @@
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -369,7 +367,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -384,13 +382,13 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
},
}
}

44
pages/purchaseReturn/request/returnRequestDetail.vue

@ -1,11 +1,19 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<com-request-detail-card :dataContent="item"
@openDetail="openDetail">
<com-request-detail-card :dataContent="item" @openDetail="openDetail">
</com-request-detail-card>
</view>
</view>
@ -19,7 +27,7 @@
<script>
import {
getPurchaseReturnRequestDetail,
} from '@/api/request2.js';
import {
@ -34,12 +42,15 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/purchaseReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {
@ -81,28 +92,27 @@
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.subList.forEach(res=>{
// res.fromLocationCode = res.toLocationCode
res.locationCode = res.fromLocationCode
})
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.subList.forEach(res => {
// res.fromLocationCode = res.toLocationCode
res.locationCode = res.fromLocationCode
})
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
}
}).catch(error => {
uni.hideLoading()
this.showMessage(error)
})
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
}
if (res) {}
});
},

68
pages/putaway/request/putawayRequest.vue

@ -50,7 +50,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -69,15 +69,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
@ -88,8 +88,8 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -142,13 +142,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -194,10 +192,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -207,7 +205,7 @@
uni.navigateTo({
url: "../request/putawayRequestCreate"
})
// uni.navigateTo({
// url: "../record/putawayRecord?fromType=" + this.fromType
// })
@ -219,32 +217,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.putawayRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.putawayRequestApprove(dataContent.id)
})
} else if (text=="审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.putawayRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.putawayRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.putawayRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.putawayRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -252,7 +250,7 @@
}
});
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@ -310,13 +308,13 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
putawayRequestClose(id) {
putawayRequestClose(id).then(res => {
if (res.data) {
@ -327,7 +325,7 @@
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -342,7 +340,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -357,7 +355,7 @@
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -372,7 +370,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -387,7 +385,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})

13
pages/putaway/request/putawayRequestDetail.vue

@ -1,5 +1,14 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
@ -35,12 +44,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/putaway/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {

8
pages/repleinsh/request/repleinshRequest.vue

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

3
pages/scrap/request/scrapRequestCreate.vue

@ -80,7 +80,8 @@
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
export default {
components: {
winScanButton,

14
pages/scrap/request/scrapRequestDetail.vue

@ -1,6 +1,14 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<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 requestDetailInfoPopup from '@/pages/scrap/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {

66
pages/scrap/request/scrapRrequest.vue

@ -14,7 +14,7 @@
</view>
</uni-swipe-action>
<uni-load-more :status="loadingType" />
<request-info-popup ref='requestInfoPopup'></request-info-popup>
</view>
<requestButton @goScan='openScanDetailPopup'></requestButton>
@ -49,7 +49,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -67,15 +67,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
@ -87,8 +87,8 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -140,13 +140,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -192,10 +190,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -203,7 +201,7 @@
openScanDetailPopup() {
uni.navigateTo({
url: "./scrapRequestCreate"
url: "./scrapRequestCreate"
})
},
@ -212,32 +210,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.scrapRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.scrapRequestApprove(dataContent.id)
})
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.scrapRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.scrapRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.scrapRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.scrapRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -304,13 +302,13 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
scrapRequestClose(id) {
scrapRequestClose(id).then(res => {
if (res.data) {
@ -321,7 +319,7 @@
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -336,7 +334,7 @@
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -351,7 +349,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -366,7 +364,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -381,7 +379,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})

70
pages/unPlanned/request/issueRequest.vue

@ -14,7 +14,7 @@
</view>
</uni-swipe-action>
<uni-load-more :status="loadingType" />
<requestIssInfoPopup ref='requestInfoPopup'></requestIssInfoPopup>
</view>
<requestButton @goScan='openScanDetailPopup'></requestButton>
@ -51,7 +51,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -70,15 +70,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
@ -90,8 +90,8 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -144,13 +144,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "in",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -198,10 +196,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -218,32 +216,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.unPlannedIssueRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.unPlannedIssueRequestApprove(dataContent.id)
})
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.unPlannedIssueRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.unPlannedIssueRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.unPlannedIssueRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.unPlannedIssueRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -299,7 +297,7 @@
}
});
},
unPlannedIssueRequestApprove(id) {
unPlannedIssueRequestApprove(id).then(res => {
if (res.data) {
@ -310,13 +308,13 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
unPlannedIssueRequestClose(id) {
unPlannedIssueRequestClose(id).then(res => {
if (res.data) {
@ -324,11 +322,11 @@
title: "申请关闭成功"
})
this.getList("refresh")
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -340,11 +338,11 @@
title: "申请审批通过成功"
})
this.getList("refresh")
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -359,7 +357,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -374,7 +372,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -389,7 +387,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})

14
pages/unPlanned/request/issueRequestDetail.vue

@ -1,6 +1,14 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<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 requestIssDetailInfoPopup from '@/pages/unPlanned/coms/requestIssDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestIssDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {

66
pages/unPlanned/request/receiptRequest.vue

@ -50,7 +50,7 @@
getDetailAndApproveOption,
getDetailAndApprovePassAndApproveNoOption,
getDetailAndHandleOption,
getDetailAndCloseOption,
getDetailAndAddAndCloseOption,
getAddAgainOption
} from '@/common/array.js';
@ -69,15 +69,15 @@
requestList: [],
pageNo: 1,
pageSize: 10,
status: "",
status: "1,2,3,4,5,6",
totalCount: 0,
checkedWaitTask: false,
detailOptions: [],
detailAndApproveOptions: [],
detailAndApprovePassAndApproveNoOption: [],
detailAndHandleOption: [],
detailAndCloseOption: [],
addAgainOption:[],
detailAndAddAndCloseOption: [],
addAgainOption: [],
showOptions: [],
fromType: "requestType",
loadingType: "nomore",
@ -89,8 +89,8 @@
this.addAgainOption = getAddAgainOption();
this.detailAndApproveOptions = getDetailAndApproveOption()
this.detailAndApprovePassAndApproveNoOption = getDetailAndApprovePassAndApproveNoOption(),
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndCloseOption = getDetailAndCloseOption()
this.detailAndHandleOption = getDetailAndHandleOption()
this.detailAndAddAndCloseOption = getDetailAndAddAndCloseOption()
},
onReachBottom() {
@ -143,13 +143,11 @@
this.requestList = [];
}
var filters = []
if (this.checkedWaitTask) {
filters.push({
column: "status",
action: "==",
value: this.status
})
}
filters.push({
column: "status",
action: "==",
value: this.status
})
var params = {
filters: filters,
pageNo: this.pageNo,
@ -195,10 +193,10 @@
} else if (status == "3") {
this.showOptions = this.detailAndHandleOption;
} else if (status == "4") {
this.showOptions = this.detailAndCloseOption;
} else if(status == "5"){
this.showOptions = this.detailAndAddAndCloseOption;
} else if (status == "5") {
this.showOptions = this.addAgainOption;
}else {
} else {
this.showOptions = this.detailOptions;
}
return this.showOptions
@ -215,32 +213,32 @@
if (text == "详情") {
this.openRequestInfoPopup(dataContent);
} else if (text == "处理") {
this.showQuestionMessage("确定要处理当前申请吗?",res=>{
this.showQuestionMessage("确定要处理当前申请吗?", res => {
this.unPlannedReceiptRequestHandle(dataContent.id)
})
} else if (text == "提交审批") {
this.showQuestionMessage("确定要审批当前申请吗?",res=>{
this.showQuestionMessage("确定要审批当前申请吗?", res => {
this.unPlannedReceiptRequestApprove(dataContent.id)
})
} else if (text == "审批通过") {
this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
this.unPlannedReceiptRequestApproveAgree(dataContent.id)
})
} else if (text == "审批驳回") {
this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
this.unPlannedReceiptRequestApproveRefused(dataContent.id)
})
} else if (text == "关闭") {
this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
this.showQuestionMessage("确定要关闭当前申请吗?", res => {
this.unPlannedReceiptRequestClose(dataContent.id)
})
}else if(text == "重新添加"){
this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
} else if (text == "重新添加") {
this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
this.unPlannedReceiptRequestAddAgain(dataContent.id)
})
}
},
showQuestionMessage(hint,callBack){
showQuestionMessage(hint, callBack) {
this.$refs.comMessage.showQuestionMessage(hint,
res => {
if (res) {
@ -248,7 +246,7 @@
}
});
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
@ -307,13 +305,13 @@
} else {
this.showMessage("申请提交审批失败")
}
}).catch(error => {
this.showMessage(error)
})
},
unPlannedReceiptRequestClose(id) {
unPlannedReceiptRequestClose(id).then(res => {
if (res.data) {
@ -324,7 +322,7 @@
} else {
this.showMessage("申请关闭失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -336,11 +334,11 @@
title: "申请审批通过成功"
})
this.getList("refresh")
} else {
this.showMessage("申请审批通过失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -355,7 +353,7 @@
} else {
this.showMessage("申请审批驳回失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -370,7 +368,7 @@
} else {
this.showMessage("申请处理失败")
}
}).catch(error => {
this.showMessage(error)
})
@ -385,7 +383,7 @@
} else {
this.showMessage("申请重新添加失败")
}
}).catch(error => {
this.showMessage(error)
})

40
pages/unPlanned/request/receiptRequestDetail.vue

@ -1,12 +1,19 @@
<template>
<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">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comRequestDetailCard :dataContent="item"
@openDetail="openDetail">
<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
</comRequestDetailCard>
</view>
</view>
@ -35,12 +42,14 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestRecDetailInfoPopup from '@/pages/unPlanned/coms/requestRecDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
requestRecDetailInfoPopup,
comMessage,
requestTop
},
data() {
return {
@ -82,27 +91,26 @@
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.subList.forEach(res=>{
res.fromLocationCode = res.toLocationCode
})
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.subList.forEach(res => {
res.fromLocationCode = res.toLocationCode
})
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
}
}).catch(error => {
uni.hideLoading()
this.showMessage(error)
})
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
}
if (res) {}
});
},

Loading…
Cancel
Save