更新

pages/task/audit/warehouse_warrant.vue

@@ -335,6 +335,12 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						if(this.auditInfo.inWarehouseWeightTotal){
+							this.auditInfo.inWarehouseWeightTotal = this.auditInfo.inWarehouseWeightTotal.toFixed(2)
+						}
+						if(this.auditInfo.requestFundsTotal){
+							this.auditInfo.requestFundsTotal = this.auditInfo.requestFundsTotal.toFixed(2)
+						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {

pages/task/audit/warehouse_warrant_detail.vue

@@ -13,7 +13,7 @@
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
-					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'待付款'}}</view>
+					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'已完成'}}</view>
 				</view>
 				<view class="infoData">{{updateDate}}</view>
 			</view>
@@ -328,12 +328,18 @@
 						this.url2 = res1.data.data
 					}
 				})
-				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
+				this.$api.doRequest('post', '/warehousingOrder/exportPhoneDataHis', {
 					// searchType: 1,
 					batchId: this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						if(this.auditInfo.inWarehouseWeightTotal){
+							this.auditInfo.inWarehouseWeightTotal = this.auditInfo.inWarehouseWeightTotal.toFixed(2)
+						}
+						if(this.auditInfo.requestFundsTotal){
+							this.auditInfo.requestFundsTotal = this.auditInfo.requestFundsTotal.toFixed(2)
+						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {

pages/task/my_task.vue

@@ -10,6 +10,7 @@
 				<view class="left">
 					<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
 					<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+					<view @click='tabcarchange(5)' class='line' :class='statusFlag==5?"active":""'>已发起</view>
 				</view>
 				<view class="right">
 					<view class="right-contrent1">逐条审核</view>
@@ -29,11 +30,11 @@
 							<view v-if='statusFlag==3' class="title-row1">已审批
 								<text v-if='item.vesselId'>（{{item.vesselId}}）</text>
 							</view>
-
 							<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 						</view>
 						<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
 						<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
+						<text v-if='statusFlag==5' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
 					</view>
 					<view class="flex title_b">
 						<view style='color:#878C9C;' class="title row2">
@@ -207,7 +208,7 @@
 			} else {
 				this.checked = false
 			}
-
+			this.pages = 1
 			this.warehouseInOutInfo.currentPage = 1
 			this.data.currentPage = 1
 			this.taskInfo = []
@@ -236,7 +237,7 @@
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
-			if (this.statusFlag == 3) {
+			// if (this.statusFlag == 3) {
 				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 					this.pages += 1
 					if (this.statusFlag == 1) {
@@ -247,7 +248,7 @@
 
 					this.getIndexBuyData()
 				}
-			}
+			// }
 		},
 		// onLoad(options) {
 		// 	this.getIndexBuyData()
@@ -349,14 +350,20 @@
 				if (this.statusFlag == 1) {
 					// data = this.warehouseInOutInfo
 					url = '/newNoticeTask/query/noticeTasks'
-				} else {
+				} else if (this.statusFlag == 3) {
 					data.currentPage = pages
 					data.pageSize = limit
 					data.roleId = this.userInfo.roleIds
 					data.userId = this.userInfo.id
 					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
-
+				else if (this.statusFlag == 5) {
+					data.currentPage = pages
+					data.pageSize = limit
+					data.roleId = this.userInfo.roleIds
+					data.userId = this.userInfo.id
+					url = '/commonUser/query/findHisPageNoticeTasksMy'
+				}
 
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
@@ -475,7 +482,7 @@
 			},
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
-				this.pageSize = 1
+				this.pages = 1
 				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {