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

config/index.js

@@ -3,14 +3,14 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	// baseUrlNew: 'http://192.168.110.9:9888/',
+	// baseUrlNew: 'http://192.168.110.9:9100/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

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

pages/bill/index.vue

@@ -22,7 +22,8 @@
 			<view style='margin:5px;padding:10px 0;border-bottom:1px solid #eee;'
 				class="flex justify-between align-item-center">
 				<view style='color:#878C9C;'>{{item.paymentNo}}</view>
-				<view class='already' v-if='item.status=="全部付款"'>已付款</view>
+				<view class='already' v-if='item.status=="部分付款"'>部分付款</view>
+				<view class='already' v-else-if='item.status=="全部付款"'>全部付款</view>
 				<view class='not' v-else>待付款</view>
 			</view>
 			<view style='line-height:30px;'>

pages/erpbusiness/add_quality_testing.vue

@@ -6,14 +6,14 @@
 				<view class="title">类型</view>
 				<view class="con-list">
 					<u-radio-group @change="groupChange" v-model="typevalue">
-						<u-radio v-if="utils.getCurrectRoles('acquisitionQuality.initial')" key="1" label="贸易入库"
+						<u-radio v-show="utils.getCurrectRoles('acquisitionQuality.initial')" key="1" label="贸易入库"
 							name="1">贸易入库</u-radio>
-						<u-radio v-if="utils.getCurrectRoles('acquisitionQuality.qview')" key="3" label="收购入库" name="3">
+						<u-radio v-show="utils.getCurrectRoles('acquisitionQuality.qview')" key="3" label="收购入库" name="3">
 							收购入库</u-radio>
 					</u-radio-group>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
@@ -28,63 +28,63 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
+			<view v-show='typevalue==1&&gridList.inOutType!="移库入库"||typevalue==3' class="c-row ">
 				<view class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
 				</view>
 			</view>
-			<view v-if='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
+			<view v-show='typevalue==1&&gridList.inOutType=="移库入库"' class="c-row ">
 				<view class="title">移库编号</view>
 				<view class="con-list">
 					{{gridList.contractNo?gridList.contractNo:'自动获取，不可编辑'}}
 				</view>
 			</view>
-			<!-- <view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<!-- <view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">业务编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view> -->
-			<view v-if='typevalue==1' style=' align-items: flex-start;' class="c-row ">
+			<view v-show='typevalue==1' style=' align-items: flex-start;' class="c-row ">
 				<view class="title">提示</view>
 				<view class="con-list">
 					{{gridList.tips?gridList.tips:'自动获取，不可编辑'}}
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">成本</view>
 				<view class="con-list">
-					<view v-if='!coststatus'>{{gridList.cost?gridList.cost:'自动获取，不可编辑'}}</view>
-					<view v-if='coststatus'>
+					<view v-show='!coststatus'>{{gridList.cost?gridList.cost:'自动获取，不可编辑'}}</view>
+					<view v-show='coststatus'>
 						<input v-model='gridList.cost' placeholder="请输入成本" name="input" type="digit"></input>
 					</view>
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changecost">{{costtext}}</button>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">运费</view>
 				<view class="con-list flex">
-					<view v-if='!freightstatus'>{{gridList.freight?gridList.freight:'自动获取，不可编辑'}}</view>
-					<view v-if='freightstatus'>
+					<view v-show='!freightstatus'>{{gridList.freight?gridList.freight:'自动获取，不可编辑'}}</view>
+					<view v-show='freightstatus'>
 						<input v-model='gridList.freight' placeholder="请输入运费" name="input" type="digit"></input>
 					</view>
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changefreight">{{freighttext}}</button>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">扣款</view>
 				<view class="con-list">
 					<input v-model='gridList.deductionAmount' placeholder="请输入扣款" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">入库类型</view>
 				<view class="con-list">
 					{{gridList.inOutType?gridList.inOutType:'自动获取，不可编辑'}}
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">入库日期</view>
 				<view class="con-list">
 					<view @click='show5=true'>{{gridList.inOutDate?gridList.inOutDate:'请选择入库日期'}}</view>
@@ -93,7 +93,7 @@
 				</view>
 			</view>
 			<view
-				v-if='typevalue==1||typevalue==3&&gridList.outType=="自运"&&utils.getCurrectRoles("acquisitionQuality.initial")'
+				v-show='typevalue==1||typevalue==3&&gridList.outType=="自运"&&utils.getCurrectRoles("acquisitionQuality.initial")'
 				class="c-row ">
 				<view class="title">车队</view>
 				<view class="con-list">
@@ -103,7 +103,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
 					<view @click='show7=true'>{{gridList.outType?gridList.outType:'请选择运输方式'}}</view>
@@ -112,7 +112,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
 					<view @click='show8=true'>{{outType?outType:'请选择运输方式'}}</view>
@@ -121,7 +121,7 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==1' class="c-row ">
+			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
 				<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
@@ -137,61 +137,61 @@
 				
 				</view>
 			</view>
-			<view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
+			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
+			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
 				class="c-row ">
 				<view class="title">封号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
+			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
+			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
 				class="c-row ">
 				<view class="title">封号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
+			<view v-show="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					<view>{{gridList.goodsName}}</view>
-					<!-- <view v-if='goodsdisabled'>{{gridList.goodsName}}</view> -->
-					<!-- <view v-if='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
+					<!-- <view v-show='goodsdisabled'>{{gridList.goodsName}}</view> -->
+					<!-- <view v-show='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
 					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
 						mode="selector">
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
-					<view @click='gocustomer' v-if='gridList.customerName'>
+					<view @click='gocustomer' v-show='gridList.customerName'>
 						{{gridList.customerName}}({{gridList.customerPhone}})
 					</view>
-					<view @click='gocustomer' v-else>
+					<view @click='gocustomer' v-show='!gridList.customerName'>
 						选择客户
 					</view>
 				</view>
 			</view>
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
@@ -207,7 +207,7 @@
 				
 				</view>
 			</view>
-			<!-- <view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
+			<!-- <view v-show="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
@@ -222,13 +222,13 @@
 						name="input" type="digit"></input>
 				</view>
 			</view> -->
-			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
 					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
@@ -237,22 +237,22 @@
 					</u-picker>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
 					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
-			<view v-if='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
 				<view class="title">类型</view>
-				<view v-if="!edit" class="con-list">
+				<view v-show="!edit" class="con-list">
 					<view @click='show3=true'>{{gridList.type?gridList.type:'请选择类型'}}</view>
 					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector">
 					</u-picker>
 				</view>
-				<view v-else class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
+				<view  v-show="edit" class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 				class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
@@ -261,7 +261,7 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
-			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 				class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list">
@@ -270,7 +270,7 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 				class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
@@ -278,7 +278,7 @@
 						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 				class="c-row">
 				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list">
@@ -286,32 +286,32 @@
 						placeholder="请输入干粮单价" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">封号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
 				<view class="title">封号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 		</view>
-		<view v-if="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
+		<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
 			<view class='wrap'>
 				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
 					<view class='title_b'>化验信息</view>
@@ -337,8 +337,8 @@
 					</view>
 				</view>
 				<view class="c-row ">
-					<view v-if='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
-					<view v-else class="title">蛋白</view>
+					<view v-show='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
+					<view v-show='gridList.goodsName=="大豆"' class="title">蛋白</view>
 					<view class="con-list">
 						<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit" @input="obtainPrice"></input>
 					</view>
@@ -377,7 +377,8 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			showCancelButton='false' :content="content"  @cancel="cancelClick"></u-modal>
+			<!-- @confirm="alertBtn" -->
 		<u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
 			<view class="buns_item">
 				<view class="but_css" @click="print">打印小票</view>
@@ -903,13 +904,23 @@
 					number = number.substring(number.length - 4, number.length)
 					this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 				}
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 					flag: this.contractFlag,
 				}).then(res => {
+					
 					if (res.data.data) {
 						this.contractNolist = res.data.data
+						uni.hideLoading()
 					}
-				})
+					
+				}).catch(error => {
+				    uni.hideLoading()
+					// this.$emit('on-error', error);
+				});
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: this.flag,
 					warehouseName: this.gridList.warehouseName
@@ -1050,7 +1061,6 @@
 								}
 							}
 						}
-
 						this.gridList.goodsNameKey = this.contractNolist[i].goodsNameKey
 						this.gridList.grade = this.contractNolist[i].grade
 						this.gridList.inOutType = this.contractNolist[i].inOutType
@@ -1135,6 +1145,7 @@
 					}
 
 				}
+				this.$forceUpdate()
 				console.log(this.gridList)
 			},
 			print() {

pages/erpbusiness/customer.vue

@@ -18,13 +18,13 @@
 
 			<view v-for='item in gridList'>
 				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
-					<view v-if="item.supplier"> {{item.customerName}}({{item.customerPhone}})-{{item.supplier}} </view>
-					<view v-else> {{item.customerName}}({{item.customerPhone}}) </view>
+					<view v-if="item.supplier"> {{item.customerName}}({{item.bankCard}})-{{item.supplier}} </view>
+					<view v-else> {{item.customerName}}({{item.bankCard}}) </view>
 				</view>
 			</view>
 			<view v-for='item in recentCustomers' style='display:inline-block;'>
 				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>
-					{{item.customerName}}({{item.customerPhone}})
+					{{item.customerName}}({{item.bankCard}})
 				</view>
 			</view>
 		</view>

pages/task/audit/freight_setting_approval.vue

@@ -2,7 +2,18 @@
 	<view class="warp">
 		<view class="topInfo">
 			<view class="topInfo-item">
-				<view class="flex info">
+				<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="logo">
 						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->

pages/task/audit/freight_setting_details.vue

@@ -34,7 +34,8 @@
 					<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-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<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-form-item>
 			</u-form>
 		</view>

pages/user/report.vue

@@ -830,6 +830,7 @@
 							this.moneyList = res.data.data[i].biViewInfoList
 							console.log('收入', this.moneyList)
 						} 
+						this.$forceUpdate()
 					}
 					this.chartlist = _list
 					// this.scroll()