前端

pages/reimbursement/request_funds.vue

@@ -75,6 +75,33 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="reType == 2 || 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">
+					<input v-model='detailData.payee' placeholder="输入收款方"></input>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">账户</view>
+				<view class="con-list">
+					<input v-model='detailData.accountNumber' placeholder="输入账户"></input>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户行</view>
+				<view class="con-list">
+					<input v-model='detailData.bank' placeholder="输入开户行"></input>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户支行</view>
+				<view class="con-list">
+					<input v-model='detailData.bankBranch' placeholder="输入开户支行"></input>
+				</view>
+			</view>
+		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
 			<view @click="submit()" class="btn">提交</view>
@@ -131,6 +158,11 @@
 		onLoad(options) {
 			this.reType = options.reType
 			this.expensesType = options.expensesType
+			if(this.reType==2||this.expensesType==2){
+				uni.setNavigationBarTitle({
+						title: '请款'
+					});
+			}
 			this.id = options.id
 			if (this.id) {
 				this.getRequest()
@@ -148,7 +180,16 @@
 			if (this.contractNoInfo && this.detailData.purpose == "合同费用") {
 				this.detailData.contractId = this.contractNoInfo.id
 				this.detailData.contractNo = this.contractNoInfo.contractNo
-				this.$forceUpdate()
+				this.$api.doRequest('get', 'customerInfo/getPayeeInfo', {
+					contractNo: this.detailData.contractNo
+				}).then(res => {
+					this.detailData.payee=res.customerType=="企业客户"?res.compName:res.customerName
+					this.detailData.accountNumber=res.bankCard
+					this.detailData.bank=res.bankDeposit
+					this.detailData.bankBranch=res.bankDepositBranch
+					this.$forceUpdate()
+				})
+				
 			}
 		},
 		watch: {
@@ -302,9 +343,9 @@
 									if (res.data.code == 200) {
 										uni.hideLoading()
 										that.$api.msg('提交成功')
-										uni.navigateTo({
-											url: '/pages/reimbursement/the_reimbursement'
-										})
+										uni.navigateBack({
+											delta: 1
+										});
 									} else {
 										that.$api.msg('提交失败')
 									}
@@ -485,4 +526,7 @@
 		display: flex;
 		justify-content: center;
 	}
+	.margin-bottom{
+		margin-bottom:84px;
+	}
 </style>

pages/reimbursement/selectContract.vue

@@ -45,7 +45,6 @@
 			this.newSelectList =  uni.getStorageSync('reContractNoList');
 		},
 		onLoad(options) {
-			this.flag = options.flag
 			this.compId = helper.erpWarehouse.compId 
 			this.getContractNoList()
 		},
@@ -81,35 +80,16 @@
 				});
 			},
 			getContractNoList() {
-				if(this.flag){
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						compId: this.compId,
-						flag: 5,
-						
-					}).then(res => {
-						if (res.data.code == 200) {
-							this.moreList = res.data.data
-							this.newList = res.data.data
-						}
-					})
-				}else{
+
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						compId: this.compId,
-						flag: 7,
+						flag: 11,
 					}).then(res => {
 						if (res.data.code == 200) {
 							this.newList = res.data.data
-						}
-					})
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						compId: this.compId,
-						flag: 6,
-					}).then(res => {
-						if (res.data.code == 200) {
 							this.moreList = res.data.data
 						}
 					})
-				}
 			},
 		}
 	}

pages/task/audit/charge_against_revenue.vue

@@ -234,7 +234,7 @@
 					<view class="right-bottom">
 						{{auditMind.length}}/100个字
 					</view>
-					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+					<u-input :clearable='false' class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="100" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>

pages/task/audit/charge_against_revenue_detail.vue

@@ -211,25 +211,6 @@
 				<view class="row-line" v-if="index!= auditList.length - 1"></view>
 			</view>
 		</view>
-		<view v-if='show' class="shade">
-			<view class="wrap">
-				<view class="alert-top">
-					<view class="title">
-						{{title}}
-					</view>
-					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
-				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/100个字
-					</view>
-					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
-				</view>
-				<view @click='close()' class="cancel">取消</view>
-				<view @click='passSubmit()' class="confirm">确定</view>
-			</view>
-		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='fanhui' type="success" class="btn2">返回</u-button>

pages/task/audit/freight_setting_approval.vue

@@ -41,10 +41,12 @@
 					</view>
 
 				</u-form-item>
-				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-if='list.billingMethod==1' v-model="list.tranPriceIng" input-align="right"
+				<u-form-item label="运费（元）" prop="tranPrice" label-width="250">
+					<u-input v-if='list.billingMethod==1&&list.tranType=="汽运"' v-model="list.tranPriceIng" input-align="right"
+						placeholder="请输入运费单价" />
+					<u-input v-else-if='list.billingMethod!=1&&list.tranType=="汽运"' v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" />
+					<u-input v-else v-model="list.tranPriceIng" input-align="right"
 						placeholder="请输入运费单价" />
-					<u-input v-else v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</view>
@@ -103,8 +105,8 @@
 			},
 			passSubmit() {
 				var that = this
-				if (!this.list.tranPriceIng && this.list.billingMethod == 1 || !this.list.tranPriceIngCar && this.list
-					.billingMethod == 2) {
+				if (!this.list.tranPriceIng && this.list.billingMethod == 1&&this.list.tranType=="汽运" || !this.list.tranPriceIngCar && this.list
+					.billingMethod == 2&&this.list.tranType=="汽运"||!this.list.tranPriceIng &&this.list.tranType!="汽运") {
 					this.$api.msg('运费单价不能为空')
 					return
 				}
@@ -119,7 +121,7 @@
 				tranProcessInfo.billingMethod = that.list.billingMethod
 				tranProcessInfo.reviewer = that.userInfo.userName
 				tranProcessInfo.tranTypeKey = that.list.tranTypeKey
-				if (that.list.billingMethod == 1) {
+				if (that.list.billingMethod == 1&&that.list.tranType=="汽运"||that.list.tranType!="汽运") {
 					tranProcessInfo.tranPriceIng = that.list.tranPriceIng
 					url = '/tranProcessInfo/api/setUpTranPrice'
 				} else {
@@ -134,7 +136,7 @@
 								if (that.everyCheck) {
 									helper.setAudit(that.list)
 								} else {
-									// uni.navigateBack()
+									uni.navigateBack()
 								}
 								uni.hideLoading()
 							}, 1000);

pages/task/audit/freight_settlement_approval.vue

@@ -66,9 +66,10 @@
 						<view class="textInfo">{{item.transportPrice}}元/吨</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>
 						<view v-if='item.deductionAmount<0' class="center">加</view>
-						<view class="textInfo">{{item.deductionAmount}}元</view>
+						<view v-if='item.deductionAmount<0' class="textInfo">{{-item.deductionAmount}}元</view>
+						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">付</view>
@@ -332,11 +333,11 @@
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list[0].createDate).getTime()
+								var time2 = new Date(this.list[0].requestDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
-									operatorTitle: this.list[0].creater.substring(0, 2),
-									operatorName: this.list[0].creater,
+									operatorTitle: this.list[0].requester.substring(0, 2),
+									operatorName: this.list[0].requester,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',

pages/task/audit/freight_settlement_details.vue

@@ -59,9 +59,10 @@
 						<view class="textInfo">{{item.transportPrice}}元/吨</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>
 						<view v-if='item.deductionAmount<0' class="center">加</view>
-						<view class="textInfo">{{item.deductionAmount}}元</view>
+						<view v-if='item.deductionAmount<0' class="textInfo">{{-item.deductionAmount}}元</view>
+						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">付</view>
@@ -285,11 +286,11 @@
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list[0].createDate).getTime()
+								var time2 = new Date(this.list[0].requestDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
-									operatorTitle: this.list[0].creater.substring(0, 2),
-									operatorName: this.list[0].creater,
+									operatorTitle: this.list[0].requester.substring(0, 2),
+									operatorName: this.list[0].requester,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',