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

pages/reimbursement/get_request_funds.vue

@@ -27,6 +27,18 @@
 					<view>{{detailData.expenseName}}</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.expensesType == '2'">
+				<view class="title">付款方名头</view>
+				<view class="con-list">
+					<view>{{detailData.payerHeader}}</view>
+				</view>
+			</view>
+			<view class="c-row" v-if="detailData.purpose == '经营性费用' && detailData.expensesType == '2'">
+				<view class="title">所属名头</view>
+				<view class="con-list">
+					<view>{{detailData.belongName}}</view>
+				</view>
+			</view>
 			<view class="c-row">
 				<view class="title">金额（元）</view>
 				<view class="con-list">
@@ -74,6 +86,33 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="detailData.expensesType == '2'" class='wrap margin-bottom'>
+			<view class="xinxi"  style="font-size: 28rpx; ">收款账户信息</view>
+			<view class="c-row">
+				<view class="title">收款方</view>
+				<view class="con-list">
+					<view>{{detailData.payee}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">账户</view>
+				<view class="con-list">
+					<view>{{detailData.accountNumber}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户行</view>
+				<view class="con-list">
+					<view>{{detailData.bank}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户支行</view>
+				<view class="con-list">
+					<view>{{detailData.bankBranch}}</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 

pages/reimbursement/request_funds.vue

@@ -149,7 +149,7 @@
 					totalDistribution: '0',
 				},
 				fileList1: [],
-				show1:true,
+				show1:false,
 				warehouseType: '1',
 				typeRemark: 'textarea',
 				border: true,
@@ -321,6 +321,7 @@
 					this.detailData.expensesPurpose = "5"
 					delete this.detailData.warehouseName
 					delete this.detailData.contractNo
+					this.show1 = true
 				}
 				console.log(this.detailData)
 			},

pages/task/audit/charge_against_revenue.vue

@@ -65,6 +65,14 @@
 				<view class="left">费用名称</view>
 				<view class="right">{{auditInfo.expenseName}}</view>
 			</view>
+			<view class="row" v-if='auditInfo.expensesType==2'>
+				<view class="left">付款方名头</view>
+				<view class="right">{{auditInfo.payerHeader}}</view>
+			</view>
+			<view class="row" v-if='auditInfo.expensesPurpose==5 && auditInfo.expensesType==2'>
+				<view class="left">所属名头</view>
+				<view class="right">{{auditInfo.belongName}}</view>
+			</view>
 			<view class="row">
 				<view class="left">金额（元）</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -109,6 +117,27 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="title ">
+				收款账户信息
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">收款方</view>
+				<view class="right">{{auditInfo.payee}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">账户</view>
+				<view class="right">{{auditInfo.accountNumber}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户行</view>
+				<view class="right">{{auditInfo.bank}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户支行</view>
+				<view class="right">{{auditInfo.bankBranch}}</view>
+			</view>
+		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
 				附件

pages/task/audit/charge_against_revenue_detail.vue

@@ -65,6 +65,14 @@
 				<view class="left">费用名称</view>
 				<view class="right">{{auditInfo.expenseName}}</view>
 			</view>
+			<view class="row" v-if='auditInfo.expensesType==2'>
+				<view class="left">付款方名头</view>
+				<view class="right">{{auditInfo.payerHeader}}</view>
+			</view>
+			<view class="row" v-if='auditInfo.expensesPurpose==5 && auditInfo.expensesType==2'>
+				<view class="left">所属名头</view>
+				<view class="right">{{auditInfo.belongName}}</view>
+			</view>
 			<view class="row">
 				<view class="left">金额（元）</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -109,6 +117,27 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="title ">
+				收款账户信息
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">收款方</view>
+				<view class="right">{{auditInfo.payee}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">账户</view>
+				<view class="right">{{auditInfo.accountNumber}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户行</view>
+				<view class="right">{{auditInfo.bank}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户支行</view>
+				<view class="right">{{auditInfo.bankBranch}}</view>
+			</view>
+		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
 				附件

pages/task/audit/freight_settlement_approval.vue

@@ -62,9 +62,13 @@
 						<view class="textInfo">{{item.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">单</view>
+						<view class="left">预</view>
 						<view class="textInfo">{{item.transportPrice}}元/吨</view>
 					</view>
+					<view class="car-type-item">
+						<view class="left">算</view>
+						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
+					</view>
 					<view class="car-type-item">
 						<view v-if='item.deductionAmount>=0' class="center">扣</view>
 						<view v-if='item.deductionAmount<0' class="center">加</view>

pages/task/audit/freight_settlement_details.vue

@@ -55,9 +55,13 @@
 						<view class="textInfo">{{item.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">单</view>
+						<view class="left">预</view>
 						<view class="textInfo">{{item.transportPrice}}元/吨</view>
 					</view>
+					<view class="car-type-item">
+						<view class="left">算</view>
+						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
+					</view>
 					<view class="car-type-item">
 						<view v-if='item.deductionAmount>=0' class="center">扣</view>
 						<view v-if='item.deductionAmount<0' class="center">加</view>