前端

config/index.js

@@ -3,9 +3,9 @@ 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.138:8090/',
-	// baseUrlNew: 'http://192.168.110.82:8099/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的

pages/reimbursement/request_funds.vue

@@ -36,6 +36,12 @@
 					<input v-model='detailData.expenseName' placeholder="输入费用名称,1-15个字"></input>
 				</view>
 			</view>
+			<view v-if="reType == 2 || expensesType == '2'" class="c-row">
+				<view class="title">付款方名头</view>
+				<view class="con-list">
+					<input v-model='detailData.payerHeader' maxlength='25' placeholder="输入付款方名头"></input>
+				</view>
+			</view>
 			<view class="c-row">
 				<view class="title">金额（元）</view>
 				<view class="con-list">
@@ -300,6 +306,12 @@
 					this.$api.msg('请选择合同编号')
 					return
 				}
+				if (this.expensesType == '2') {
+					if(!this.detailData.payerHeader){
+						this.$api.msg('付款方不能为空')
+						return
+					}
+				}
 				if (!this.detailData.amountMoney) {
 					this.$api.msg('金额不能为空')
 					return

pages/task/audit/acquisitioncontract.vue

@@ -31,10 +31,10 @@
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
-				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
+				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
+				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起 - 止）" :borderBottom="false">
 				<view class="textCss">

pages/task/audit/freight_setting_approval.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>
@@ -110,7 +113,6 @@
 					this.$api.msg('运费单价不能为空')
 					return
 				}
-
 				uni.showLoading({
 					title: "审核中"
 				})

pages/task/audit/freight_settlement_approval.vue

@@ -62,7 +62,7 @@
 						<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">
@@ -72,8 +72,20 @@
 						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">付</view>
-						<view class="textInfo">{{item.amountIngPayable}}元</view>
+						<view class="right">服</view>
+						<view class="textInfo">{{item.serviceCharge}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">税</view>
+						<view class="textInfo">{{item.taxPoint}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">实</view>
+						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">合</view>
+						<view class="textInfo">{{item.totalPayable}}元</view>
 					</view>
 				</view>
 
@@ -333,7 +345,7 @@
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list[0].requestDate).getTime()
+								var time2 = new Date(this.list[0].createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle: this.list[0].requester.substring(0, 2),

pages/task/audit/freight_settlement_details.vue

@@ -55,7 +55,7 @@
 						<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">
@@ -65,8 +65,20 @@
 						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">付</view>
-						<view class="textInfo">{{item.amountIngPayable}}元</view>
+						<view class="right">服</view>
+						<view class="textInfo">{{item.serviceCharge}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">税</view>
+						<view class="textInfo">{{item.taxPoint}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">实</view>
+						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">合</view>
+						<view class="textInfo">{{item.totalPayable}}元</view>
 					</view>
 				</view>
 			</view>
@@ -286,7 +298,7 @@
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list[0].requestDate).getTime()
+								var time2 = new Date(this.list[0].createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle: this.list[0].requester.substring(0, 2),

pages/task/audit/purchasecontract.vue

@@ -40,6 +40,12 @@
 			<u-form-item label-width='260' label="交易主体" :borderBottom="false" v-if="list.transactionSubject">
 				<u-input v-model="list.transactionSubject" input-align="right" placeholder="--" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
+				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
+				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
 				<!-- <u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled /> -->
 			    <view class="textCss">

pages/task/audit/salecontract.vue

@@ -38,6 +38,12 @@
 			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
+				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
+				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' :borderBottom="false" label="中转公司" v-if="list.transitCompany">
 				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
 			</u-form-item>

pages/task/audit/warehouse_warrant.vue

@@ -189,7 +189,7 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view style='padding:10px;' class='flex bottom-btn'>
+		<view v-if='auditInfo.taskId' style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button @click='pass' type="success" class="btn2">通过</u-button>
 		</view>