Browse Source

修改审核

wangchao 2 years ago
parent
commit
83ff827b24
2 changed files with 27 additions and 22 deletions
  1. 13 11
      pages/task/audit/freight_setting_approval.vue
  2. 14 11
      pages/task/audit/warehouse_warrant.vue

+ 13 - 11
pages/task/audit/freight_setting_approval.vue

@@ -42,7 +42,8 @@
 
 				</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" placeholder="请输入运费单价" />
+					<u-input v-if='list.billingMethod==1' 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>
@@ -102,29 +103,30 @@
 			},
 			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.tranPriceIngCar && this.list
+					.billingMethod == 2) {
 					this.$api.msg('运费单价不能为空')
 					return
 				}
-				
+
 				uni.showLoading({
 					title: "审核中"
 				})
 				var tranProcessInfo = {}
-				var url=''
+				var url = ''
 				tranProcessInfo.id = that.list.id
 				tranProcessInfo.flag = "2"
-				tranProcessInfo.billingMethod=that.list.billingMethod
+				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) {
 					tranProcessInfo.tranPriceIng = that.list.tranPriceIng
-					url='/tranProcessInfo/api/setUpTranPrice'
-				}else{
+					url = '/tranProcessInfo/api/setUpTranPrice'
+				} else {
 					tranProcessInfo.tranPriceIngCar = that.list.tranPriceIngCar
-					url='/tranProcessInfo/api/setUpTranPriceCar'
+					url = '/tranProcessInfo/api/setUpTranPriceCar'
 				}
-				that.$api.doRequest('post',url , tranProcessInfo)
+				that.$api.doRequest('post', url, tranProcessInfo)
 					.then(res => {
 						if (res.data.code == 200) {
 							that.$api.msg('审核通过成功!')
@@ -228,4 +230,4 @@
 		width: 100%;
 		justify-content: flex-end;
 	}
-</style>
+</style>

+ 14 - 11
pages/task/audit/warehouse_warrant.vue

@@ -25,15 +25,15 @@
 			</view>
 			<view class="row">
 				<view class="left">请款日期</view>
-				<view class="right">{{auditInfo.inWarehouseWeightTotal}}</view>
+				<view class="right">{{auditInfo.requestDate}}</view>
 			</view>
 			<view class="row">
 				<view class="left">请款人</view>
-				<view class="right">{{auditInfo.inWarehouseWeightTotal}}</view>
+				<view class="right">{{auditInfo.requestPerson}}</view>
 			</view>
 			<view class="row">
 				<view class="left">所属仓库 </view>
-				<view class="right">{{auditInfo.inWarehouseWeightTotal}}</view>
+				<view class="right">{{auditInfo.warehouseName}}</view>
 			</view>
 			<view class="row">
 				<view class="left">合计重量(吨)</view>
@@ -50,31 +50,34 @@
 			<view class="title ">
 				支付明细
 			</view>
-			<view class="mx-content" v-for="item in 3">
+			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList">
 				<view class="name">
-					张三
+					{{item.customer}}
 				</view>
 				<view class="mx-bottom">
 					<view class="mx-row1">
 						<view class="mx-item">
-							玉米
+							{{item.goodsName}}
 						</view>
-						<view class="mx-item">
+						<!-- <view class="mx-item">
 							平均容重720
 						</view>
 						<view class="mx-item">
 							平均水分14
-						</view>
+						</view> -->
 					</view>
 					<view class="mx-row2">
 						<view class="mx-item">
-							100吨
+							{{item.inWarehouseWeight}}吨
+
 						</view>
 						<view class="mx-item">
-							2000元/吨
+							<!-- 2000元/吨 -->
+							单价待定
 						</view>
 						<view class="mx-item">
-							200000元
+							{{item.requestFunds}}元
+
 						</view>
 					</view>
 				</view>