|
@@ -2,7 +2,8 @@
|
|
<view class="content">
|
|
<view class="content">
|
|
<view class="content1-top">
|
|
<view class="content1-top">
|
|
<view class="search-form round">
|
|
<view class="search-form round">
|
|
- <u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9' placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
|
|
|
|
|
|
+ <u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9'
|
|
|
|
+ placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
|
|
@custom="searchKeyWord()"></u-search>
|
|
@custom="searchKeyWord()"></u-search>
|
|
</view>
|
|
</view>
|
|
<view class="top2">
|
|
<view class="top2">
|
|
@@ -23,12 +24,12 @@
|
|
<view class="title flex align-item-center">
|
|
<view class="title flex align-item-center">
|
|
<view>
|
|
<view>
|
|
<view v-if='statusFlag==1' class="title-row1">待审批
|
|
<view v-if='statusFlag==1' class="title-row1">待审批
|
|
- <text v-if='item.vesselId' >({{item.vesselId}})</text>
|
|
|
|
|
|
+ <text v-if='item.vesselId'>({{item.vesselId}})</text>
|
|
</view>
|
|
</view>
|
|
<view v-if='statusFlag==3' class="title-row1">已审批
|
|
<view v-if='statusFlag==3' class="title-row1">已审批
|
|
<text v-if='item.vesselId'>({{item.vesselId}})</text>
|
|
<text v-if='item.vesselId'>({{item.vesselId}})</text>
|
|
</view>
|
|
</view>
|
|
-
|
|
|
|
|
|
+
|
|
<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
|
|
<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
|
|
</view>
|
|
</view>
|
|
<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
|
|
<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
|
|
@@ -78,10 +79,7 @@
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
currentPage: 1
|
|
currentPage: 1
|
|
},
|
|
},
|
|
- data: {
|
|
|
|
- pageSize: 10,
|
|
|
|
- currentPage: 1
|
|
|
|
- },
|
|
|
|
|
|
+ data: {},
|
|
keyword: "",
|
|
keyword: "",
|
|
copyTaskInfo: []
|
|
copyTaskInfo: []
|
|
};
|
|
};
|
|
@@ -89,7 +87,7 @@
|
|
onBackPress(e) {
|
|
onBackPress(e) {
|
|
if (uni.getStorageSync("everyTask")) {
|
|
if (uni.getStorageSync("everyTask")) {
|
|
uni.switchTab({
|
|
uni.switchTab({
|
|
- url: '/pages/user/user'
|
|
|
|
|
|
+ url: '/pages/user/user'
|
|
});
|
|
});
|
|
return true
|
|
return true
|
|
}
|
|
}
|
|
@@ -107,10 +105,9 @@
|
|
item.itemUrl = '/pages/task/procurement_details?id=' + item.businessId
|
|
item.itemUrl = '/pages/task/procurement_details?id=' + item.businessId
|
|
} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
|
|
} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
|
|
item.itemUrl = '/pages/task/sale_details?id=' + item.businessId
|
|
item.itemUrl = '/pages/task/sale_details?id=' + item.businessId
|
|
- }
|
|
|
|
- else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
|
|
|
|
- item.itemUrl = '/pages/task/audit/daishou_details?id=' + item.businessId
|
|
|
|
- }else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
|
|
|
|
+ item.itemUrl = '/pages/task/audit/daishou_details?id=' + item.businessId
|
|
|
|
+ } else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
|
|
item.itemUrl = '/pages/task/audit/salecontract?id=' + item.businessId
|
|
item.itemUrl = '/pages/task/audit/salecontract?id=' + item.businessId
|
|
} else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
|
|
} else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
|
|
item.itemUrl = '/pages/task/audit/purchasecontract?id=' + item.businessId
|
|
item.itemUrl = '/pages/task/audit/purchasecontract?id=' + item.businessId
|
|
@@ -161,20 +158,19 @@
|
|
} else {
|
|
} else {
|
|
item.itemUrl = `/pages/task/audit/freight_setting_details?id=` + item.businessId
|
|
item.itemUrl = `/pages/task/audit/freight_setting_details?id=` + item.businessId
|
|
}
|
|
}
|
|
- }else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {//库点收购
|
|
|
|
|
|
+ } else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') { //库点收购
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
item.itemUrl = `/pages/task/audit/acquisition_information_approval?id=` + item.businessId
|
|
item.itemUrl = `/pages/task/audit/acquisition_information_approval?id=` + item.businessId
|
|
} else {
|
|
} else {
|
|
item.itemUrl = `/pages/task/audit/acquisition_information_details?id=` + item.businessId
|
|
item.itemUrl = `/pages/task/audit/acquisition_information_details?id=` + item.businessId
|
|
}
|
|
}
|
|
- }else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {//贸易服务
|
|
|
|
|
|
+ } else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') { //贸易服务
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
item.itemUrl = `/pages/task/audit/tradeServices_audit?id=` + item.businessId
|
|
item.itemUrl = `/pages/task/audit/tradeServices_audit?id=` + item.businessId
|
|
} else {
|
|
} else {
|
|
item.itemUrl = `/pages/task/audit/tradeServices_audit_approval?id=` + item.businessId
|
|
item.itemUrl = `/pages/task/audit/tradeServices_audit_approval?id=` + item.businessId
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
item.itemUrl = `/pages/task/audit/collection_business_approval?id=` + item.businessId
|
|
item.itemUrl = `/pages/task/audit/collection_business_approval?id=` + item.businessId
|
|
} else {
|
|
} else {
|
|
@@ -240,15 +236,17 @@
|
|
// this.warehouseInOutInfo.phone = this.userInfo.phone
|
|
// this.warehouseInOutInfo.phone = this.userInfo.phone
|
|
},
|
|
},
|
|
onReachBottom() { //上拉触底函数
|
|
onReachBottom() { //上拉触底函数
|
|
- if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
|
|
|
|
- this.pages += 1
|
|
|
|
- if (this.statusFlag == 1) {
|
|
|
|
- this.warehouseInOutInfo.currentPage += 1
|
|
|
|
- } else {
|
|
|
|
- this.data.currentPage += 1
|
|
|
|
- }
|
|
|
|
|
|
+ if (this.statusFlag == 3) {
|
|
|
|
+ if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
|
|
|
|
+ this.pages += 1
|
|
|
|
+ if (this.statusFlag == 1) {
|
|
|
|
+ this.warehouseInOutInfo.currentPage += 1
|
|
|
|
+ } else {
|
|
|
|
+ this.data.currentPage += 1
|
|
|
|
+ }
|
|
|
|
|
|
- this.getIndexBuyData()
|
|
|
|
|
|
+ this.getIndexBuyData()
|
|
|
|
+ }
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// onLoad(options) {
|
|
// onLoad(options) {
|
|
@@ -340,6 +338,7 @@
|
|
})
|
|
})
|
|
},
|
|
},
|
|
getIndexBuyData(status) {
|
|
getIndexBuyData(status) {
|
|
|
|
+ debugger
|
|
const that = this
|
|
const that = this
|
|
var pages = that.pages
|
|
var pages = that.pages
|
|
var limit = that.limit
|
|
var limit = that.limit
|
|
@@ -349,14 +348,16 @@
|
|
})
|
|
})
|
|
var data = {}
|
|
var data = {}
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
- data = this.warehouseInOutInfo
|
|
|
|
|
|
+ // data = this.warehouseInOutInfo
|
|
url = '/newNoticeTask/query/noticeTasks'
|
|
url = '/newNoticeTask/query/noticeTasks'
|
|
} else {
|
|
} else {
|
|
- data = this.data
|
|
|
|
|
|
+ data.currentPage = pages
|
|
|
|
+ data.pageSize = limit
|
|
|
|
+ data.roleId = this.userInfo.roleIds
|
|
|
|
+ data.userId = this.userInfo.id
|
|
url = '/commonUser/query/findHisPageNoticeTasks'
|
|
url = '/commonUser/query/findHisPageNoticeTasks'
|
|
}
|
|
}
|
|
- data.currentPage = pages
|
|
|
|
- data.pageSize = limit
|
|
|
|
|
|
+
|
|
|
|
|
|
//this.warehouseInOutInfo.status = this.status
|
|
//this.warehouseInOutInfo.status = this.status
|
|
this.$api.doRequest('get', url, data).then(res => {
|
|
this.$api.doRequest('get', url, data).then(res => {
|
|
@@ -389,7 +390,7 @@
|
|
// _str.showRow = false
|
|
// _str.showRow = false
|
|
// }.split(' ')[0]
|
|
// }.split(' ')[0]
|
|
this.taskInfo[i].department = this.taskInfo[i].messageTitle
|
|
this.taskInfo[i].department = this.taskInfo[i].messageTitle
|
|
- if(this.taskInfo[i].messageContent.split(' ').length > 1){
|
|
|
|
|
|
+ if (this.taskInfo[i].messageContent.split(' ').length > 1) {
|
|
this.taskInfo[i].messageContent = this.taskInfo[i].messageContent.split(' ')[1]
|
|
this.taskInfo[i].messageContent = this.taskInfo[i].messageContent.split(' ')[1]
|
|
}
|
|
}
|
|
if (this.taskInfo[i].businessType == 'WAREHOUSE') {
|
|
if (this.taskInfo[i].businessType == 'WAREHOUSE') {
|
|
@@ -433,11 +434,11 @@
|
|
if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
|
|
if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
|
|
this.taskInfo[i].messageTitle = '运费设置'
|
|
this.taskInfo[i].messageTitle = '运费设置'
|
|
}
|
|
}
|
|
- }else if (this.taskInfo[i].businessType == 'ACQ') {
|
|
|
|
|
|
+ } else if (this.taskInfo[i].businessType == 'ACQ') {
|
|
if (this.taskInfo[i].businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
|
|
if (this.taskInfo[i].businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
|
|
this.taskInfo[i].messageTitle = '收购信息审核'
|
|
this.taskInfo[i].messageTitle = '收购信息审核'
|
|
}
|
|
}
|
|
- }else if (this.taskInfo[i].businessType == 'TRADE') {
|
|
|
|
|
|
+ } else if (this.taskInfo[i].businessType == 'TRADE') {
|
|
if (this.taskInfo[i].businessCode == 'TRADE-WAREHOUSE-REPORT') {
|
|
if (this.taskInfo[i].businessCode == 'TRADE-WAREHOUSE-REPORT') {
|
|
this.taskInfo[i].messageTitle = '贸易服务审核'
|
|
this.taskInfo[i].messageTitle = '贸易服务审核'
|
|
}
|
|
}
|
|
@@ -491,16 +492,15 @@
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: '/pages/task/audit/salecontract?id=' + item.businessId + "&isShowbtn=true"
|
|
url: '/pages/task/audit/salecontract?id=' + item.businessId + "&isShowbtn=true"
|
|
})
|
|
})
|
|
- }
|
|
|
|
- else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: '/pages/task/audit/daishou_details?id=' + item.businessId + "&isShowbtn=true"
|
|
url: '/pages/task/audit/daishou_details?id=' + item.businessId + "&isShowbtn=true"
|
|
})
|
|
})
|
|
- }else if (item.businessCode == 'DAICHU-CONTRACT-APPROVE') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'DAICHU-CONTRACT-APPROVE') {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: '/pages/task/audit/daichu_details?id=' + item.businessId + "&isShowbtn=true"
|
|
url: '/pages/task/audit/daichu_details?id=' + item.businessId + "&isShowbtn=true"
|
|
})
|
|
})
|
|
- }else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: '/pages/task/audit/purchasecontract?id=' + item.businessId + "&isShowbtn=true"
|
|
url: '/pages/task/audit/purchasecontract?id=' + item.businessId + "&isShowbtn=true"
|
|
})
|
|
})
|
|
@@ -533,12 +533,13 @@
|
|
} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
|
|
} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}&id=${item.acceptId}`
|
|
|
|
|
|
+ url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}&id=${item.businessId}`
|
|
})
|
|
})
|
|
|
|
|
|
} else {
|
|
} else {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: '/pages/task/audit/acquisition_settlement_details?id=' + item.businessId +'&isShowbtn=true'
|
|
|
|
|
|
+ url: '/pages/task/audit/acquisition_settlement_details?id=' + item.businessId +
|
|
|
|
+ '&isShowbtn=true'
|
|
})
|
|
})
|
|
}
|
|
}
|
|
} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
|
|
} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
|
|
@@ -591,7 +592,7 @@
|
|
"&isShowbtn=true"
|
|
"&isShowbtn=true"
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- }else if (item.businessCode == 'TRAN-TEAM-APPROVE') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'TRAN-TEAM-APPROVE') {
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +
|
|
url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +
|
|
@@ -603,20 +604,22 @@
|
|
"&isShowbtn=true"
|
|
"&isShowbtn=true"
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- }else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages/task/audit/acquisition_information_approval?id=` + item.businessId + "&isShowbtn=true"
|
|
|
|
|
|
+ url: `/pages/task/audit/acquisition_information_approval?id=` + item.businessId +
|
|
|
|
+ "&isShowbtn=true"
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages/task/audit/acquisition_information_details?id=` + item.businessId + "&isShowbtn=true"
|
|
|
|
|
|
+ url: `/pages/task/audit/acquisition_information_details?id=` + item.businessId +
|
|
|
|
+ "&isShowbtn=true"
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- }else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {
|
|
|
|
|
|
+ } else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages/task/audit/tradeServices_audit?id=` + item.businessId
|
|
|
|
|
|
+ url: `/pages/task/audit/tradeServices_audit?id=` + item.businessId
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
@@ -626,15 +629,17 @@
|
|
} else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
|
|
} else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
|
|
if (this.statusFlag == 1) {
|
|
if (this.statusFlag == 1) {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages/task/audit/collection_business_approval?id=` + item.businessId + "&isShowbtn=true"
|
|
|
|
|
|
+ url: `/pages/task/audit/collection_business_approval?id=` + item.businessId +
|
|
|
|
+ "&isShowbtn=true"
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages/task/audit/collection_business_details?id=` + item.businessId + "&isShowbtn=true"
|
|
|
|
|
|
+ url: `/pages/task/audit/collection_business_details?id=` + item.businessId +
|
|
|
|
+ "&isShowbtn=true"
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
if (item.taskType == "入库任务") {
|
|
if (item.taskType == "入库任务") {
|
|
|
|
|
|
if (item.statusFlag == 3) {
|
|
if (item.statusFlag == 3) {
|
|
@@ -663,6 +668,10 @@
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
|
|
+ .content {
|
|
|
|
+ padding-bottom: 50rpx;
|
|
|
|
+ }
|
|
|
|
+
|
|
.tag {
|
|
.tag {
|
|
background: #F5F6F9;
|
|
background: #F5F6F9;
|
|
padding: 5px;
|
|
padding: 5px;
|
|
@@ -774,8 +783,8 @@
|
|
|
|
|
|
.title-row1 {
|
|
.title-row1 {
|
|
font-size: 34rpx;
|
|
font-size: 34rpx;
|
|
- font-weight:600;
|
|
|
|
-
|
|
|
|
|
|
+ font-weight: 600;
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
.row2 {
|
|
.row2 {
|