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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.129",
-    "versionCode" : 21129,
+    "versionName" : "2.1.131",
+    "versionCode" : 21131,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/task/audit/freight_setting_approval.vue

@@ -2,18 +2,7 @@
 	<view class="warp">
 		<view class="topInfo">
 			<view class="topInfo-item">
-				<view class="flex info" v-if='list.billingMethod==2'>
-					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatusCar == '已驳回'"
-							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatusCar == '已通过'"
-							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatusCar == '审核中'"
-							style="height: 40rpx;"></image><!-- 待审核 -->
-					</view>
-					<view class="infoText">{{list.priceStatusCar}}</view>
-				</view>
-				<view class="flex info" v-else>
+				<view class="flex info">
 					<view class="logo">
 						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
@@ -344,15 +333,23 @@
 				that.$api.doRequest('post', url, tranProcessInfo)
 					.then(res => {
 						if (res.data.code == 200) {
-							that.$api.msg('审核通过成功!')
-							setTimeout(function() {
-								if (that.everyCheck) {
-									helper.setAudit(that.list)
-								} else {
-									uni.navigateBack()
-								}
-								uni.hideLoading()
-							}, 1000);
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: true,
+								auditMind: '',
+								needReapply: true,
+							}).then(res => {
+								that.$api.msg('通过成功')
+								that.show = false
+								setTimeout(function() {
+									if (that.everyCheck) {
+										helper.setAudit(that.list)
+									} else {
+										uni.navigateBack()
+									}
+									uni.hideLoading()
+								}, 1000);
+							})
 						}
 					})
 

pages/task/audit/freight_setting_details.vue

@@ -18,6 +18,9 @@
 		</view>
 		<view class="transaction">
 			<u-form :model="list" ref="list" class="uForm">
+				<u-form-item label="运费类型" prop="contractNo" label-width="140">
+					{{list.tranType}}运费
+				</u-form-item>
 				<u-form-item label="合同编号" prop="contractNo" label-width="140">
 					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
@@ -34,8 +37,11 @@
 					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-if='list.billingMethod==2' v-model="list.tranPriceCar" input-align="right" placeholder="请输入运费单价" disabled/>
-					<u-input v-else v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-if='list.billingMethod==2&&list.tranPriceCar!=0' v-model="list.tranPriceCar" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.billingMethod==2&&list.tranPriceCar==0' v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.billingMethod==1&&list.tranPrice==0' v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.tranPrice' v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
 				</u-form-item>
 			</u-form>
 		</view>

pages/task/my_task.vue

@@ -153,7 +153,7 @@
 								'&compId=' + this
 								.pcUserInfo.compId
 						}
-					} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+					} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 						if (this.statusFlag == 1) {
 							item.itemUrl = `/pages/task/audit/freight_setting_approval?id=` + item.businessId
 						} else {
@@ -437,7 +437,7 @@
 									this.taskInfo[i].messageTitle = '仓库设置'
 								}
 							} else if (this.taskInfo[i].businessType == 'Tran') {
-								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
+								if (this.taskInfo[i].businessCode == 'YUNJIA-TRAN-APPROVE') {
 									this.taskInfo[i].messageTitle = '运费设置'
 								}
 							} else if (this.taskInfo[i].businessType == 'ACQ') {
@@ -591,7 +591,7 @@
 								.pcUserInfo.compId + "&isShowbtn=true"
 						})
 					}
-				} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+				} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +

pages/user/report.vue

@@ -5,11 +5,18 @@
 				title-color='white'>
 			</u-navbar>
 			<view class="row2">
-				<view class="left" @click="dateClick">
+				<!-- <view class="left" @click="dateClick">
 					{{nowDate}}
 					<u-icon name="arrow-down-fill" size="16" class="icon"></u-icon>
-				</view>
+				</view> -->
+				<!-- <view class="left">
+					<div :class="btnIndex==1?'activeBtn':''" @click="selectData(1)" class="type-style">新季</div>
+					<div :class="btnIndex==2?'activeBtn':''" @click="selectData(2)" class="type-style">历史</div>  
+				</view> -->
 				<view class="right">
+					<div :class="btnIndex==1?'activeBtn':''" @click="selectData(1)" class="btn-style">新季</div>
+					<div :class="btnIndex==2?'activeBtn':''" @click="selectData(2)" class="btn-style">历史</div>  
+					
 					<view :class="typeSelect==index?'type-bgc':''" class="type-style" v-for="(item,index) in moneyList"
 						@click="typeClick(index)">
 						{{item.name}}
@@ -266,6 +273,7 @@
 		},
 		data() {
 			return {
+				btnIndex:1,
 				scrollTop: 0,
 				carInterval: null,
 				inventoryAct: 0,
@@ -392,13 +400,14 @@
 			}
 		},
 		onLoad: function(option) {
-			uni.showLoading({
-				title: "数据加载中...",
-				mask: true
-			})
-			if (this.nowDate == '2022年1月') {
-				this.seachMoth = '2022-01'
-			}
+			// uni.showLoading({
+			// 	title: "数据加载中...",
+			// 	mask: true
+			// })
+			// if (this.nowDate == '2022年1月') {
+			// 	this.seachMoth = '2022-10-10'  
+			// }
+			this.seachMoth = '2022-10-10'  
 			this.init()
 		},
 		destroyed() {
@@ -408,6 +417,16 @@
 			clearInterval(this.carInterval)
 		},
 		methods: {
+			 selectData(type){
+			      this.seachMoth = ''
+			      this.btnIndex = type
+			      if(type==2){
+			        this.seachMoth = '2021-10-10'  
+			      }else{
+			        this.seachMoth = '2022-10-10'  
+			      }
+			      this.init()
+			},
 			goToPage(index) {
 				// console.log(index)
 				if (index == 4) {
@@ -434,6 +453,10 @@
 			init() {
 				this.url = "https://liangxin.zthymaoyi.com/map_0105.html?id=" + uni.getStorageSync('pcUserInfo').compId +
 					'&seachMoth=' + this.seachMoth
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
 				this.$api.doRequest('get', '/biInfoController//selectBiInfoNew?compId=' + uni.getStorageSync('pcUserInfo')
 					.compId + '&seachMoth=' + this.seachMoth).then(res => {
 					console.log("数据报表", res)
@@ -868,10 +891,7 @@
 				}, 10)
 			},
 			confirm(e) {
-				uni.showLoading({
-					title: "加载中",
-					mask: true
-				})
+				
 				console.log(e)
 				this.nowDate = e[0].label + e[1].label
 				let _year = e[0].label.substring(0, 4)
@@ -981,7 +1001,8 @@
 			display: flex;
 			justify-content: space-between;
 
-			.left {}
+			.left {
+			}
 
 			.right {
 				display: flex;
@@ -1099,7 +1120,21 @@
 			}
 		}
 	}
-
+	.btn-style{
+		//   width: 70px;
+		// height: 28px;
+		background: rgba(47,108,233,0.2);
+		border-radius: 4px;
+		border: 1px solid rgba(0,220,255,0.2);
+		padding: 5px 20px;
+		box-sizing: border-box;
+		// font-size: 16px;
+		margin-right: 10px;
+		cursor:pointer
+	}
+	.activeBtn{
+	  color:#06DBF1
+	}
 	.content6 {
 		.map {
 			border: 0;