Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -7,7 +7,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
 	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',

pages/reimbursement/the_reimbursement.vue

@@ -39,9 +39,9 @@
 					<!-- v-if="item.status == '已驳回'" -->
 					<!-- v-if="item.status == '已驳回'" -->
 					<view class="wenzi1 audit" @click="deleExpense(item)"
-						v-if="!item.approveStatus||item.status=='已完成'">删除</view>
+						v-if="item.status=='已驳回'">删除</view>
 					<view class="wenzi1 audit" @click="requestFunds(3,item)"
-						v-if="item.approveStatus=='待内勤审核'&&item.status!='已完成'&&item.status!='已付款'">编辑</view>
+						v-if="item.status=='已驳回'">编辑</view>
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
 			</view>

pages/task/audit/freight_setting_approval.vue

@@ -134,7 +134,7 @@
 								if (that.everyCheck) {
 									helper.setAudit(that.list)
 								} else {
-									uni.navigateBack()
+									// uni.navigateBack()
 								}
 								uni.hideLoading()
 							}, 1000);

pages/task/audit/freight_settlement_approval.vue

@@ -12,18 +12,19 @@
 							v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list[0].approveStatus}}</view>
+					<view class="infoText">{{list[0].approveStatus?list[0].approveStatus:list[0].status}}</view>
 				</view>
 				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
-				<view>合同编号</view>
+				<view v-if='list[0].contractFlag=="1"'>合同编号</view>
+				<view v-if='list[0].contractFlag=="0"'>移库编号</view>
 				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-				<view class="top1" style="display: flex;">
+				<view v-if='list[0].contractFlag=="1"' class="top1" style="display: flex;">
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>
@@ -198,7 +199,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, that.rejectInfo)
+								that.audit(that.list[0], 0, false, true, that.auditMind)
 							}
 						}
 					})
@@ -218,7 +219,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list[0], 0, true, 2, that.rejectInfo1)
+								that.audit(that.list[0], 0, true, 2, that.auditMind)
 							}
 						}
 					})
@@ -234,7 +235,7 @@
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: list.taskId,
 						approved: status,
-						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
+						auditMind: this.auditMind ,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						if (status == true) {

pages/task/audit/freight_settlement_details.vue

@@ -9,18 +9,19 @@
 						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 					</view>
-					<view class="infoText">{{list[0].status}}</view>
+					<view class="infoText">{{list[0].approveStatus?list[0].approveStatus:list[0].status}}</view>
 				</view>
 				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
-				<view>合同编号</view>
+				<view v-if='list[0].contractFlag=="1"'>合同编号</view>
+				<view v-if='list[0].contractFlag=="0"'>移库编号</view>
 				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-				<view class="top1" style="display: flex;">
+				<view v-if='list[0].contractFlag=="1"' class="top1" style="display: flex;">
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>

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) {