我得任务

pages.json

@@ -993,7 +993,7 @@
             
         }
         ,{
-            "path" : "pages/task/audit/freight_settlement _approval",
+            "path" : "pages/task/audit/freight_settlement_approval",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "运费结算审核",
@@ -1002,7 +1002,7 @@
             
         }
         ,{
-            "path" : "pages/task/audit/freight_settlement _details",
+            "path" : "pages/task/audit/freight_settlement_details",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "运费结算详情",

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -1,22 +1,341 @@
 <template>
-	<view>
-		出入库任务审核
+	<view class="warp">
+		<view class="content1">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="任务类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<view v-if="type=='移库'" class="title part2">移库出库</view>
+				<view v-if="type=='退库'" class="title part2">退库</view>
+				<u-form-item label="编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='移库'||type=='退库'" label="仓库" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='出库'||type=='移库'" label="出库类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='入库'||type=='退库'" label="入库类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='移库'" label="移库任务编号" prop="receivingAddress" label-width="180">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="合同编号" v-if="type!='移库'" prop="freightUnitPrice" label-width="250">
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				</u-form-item>
+				<u-form-item label="货名" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='出库'||type=='移库'" label="预计出库日期" prop="receivingAddress" label-width="180">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='入库'||type=='退库'" label="预计入库日期" prop="receivingAddress" label-width="180">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='入库'||type=='退库'" label="入库经办人" prop="receivingAddress" label-width="150">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='出库'||type=='移库'" label="出库经办人" prop="receivingAddress" label-width="150">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<view class="title part2">可编辑项</view>
+				<u-form-item label="品级" prop="receivingAddress" label-width="150">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
+					<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
+					</u-picker>
+				</u-form-item>
+				<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+				</u-form-item>
+				<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+				</u-form-item>
+				<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+				</u-form-item>
+				<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+				</u-form-item>
+				<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="receivingAddress" label-width="170">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+				</u-form-item>
+				<view v-if="type=='移库'">
+					<view class="title part2">移库入库</view>
+					<u-form-item label="编号" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="入库类型" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="移库任务编号" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="货名" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="预计入库时间" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="入库经办人" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="品级" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+					</u-form-item>
+					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+					</u-form-item>
+				</view>
+				<view v-if="type=='退库'">
+					<view class="title part2">出</view>
+					<u-form-item label="编号" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="出库类型" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="合同编号" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="货名" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="预计出库时间" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="出库经办人" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="品级" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+					</u-form-item>
+					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+					</u-form-item>
+				</view>
+			</u-form>
+		</view>
+		<u-toast ref="uToast" />
+		<!-- <u-modal v-model="show" content="确定通过出入库任务？" showCancelButton></u-modal> -->
+		<view class="bottom-btn">
+<!-- 			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button> -->
+		</view>
 	</view>
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				
+				type:'移库',
+				show:false,
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress:'出库',
+					grade:"1"
+				},
+				pjList:[{
+					type:'一等品'
+				},
+				{
+					type:'二等品'
+				},
+				{
+					type:'三等品'
+				},
+				{
+					type:'等外'
+				}],
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
 			}
 		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
 		methods: {
-			
+			pjPicker(){},
+			passSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						// uni.showLoading({
+						// 	title: '正在加载',
+						// 	mask: true
+						// })
+						console.log('验证通过');
+						
+				// 		this.$api.doRequest('post',
+				// 			'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+				// 			this
+				// 			.purchaseOrder).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				uni.showToast({
+				// 					title: '提交成功',
+				// 					icon: 'none',
+				// 					duration: 2000,
+				// 					success: function() {
+				// 						uni.navigateTo({
+				// 							url: `/pageA/freightTransport/index`
+				// 						})
+				// 					}
+				// 				})
+				
+				// 			}
+				
+				// 		}).catch(res => {
+				// 			// uni.showToast({
+				// 			// 	title: res.data.message,
+				// 			// 	icon: 'none',
+				// 			// 	duration: 2000
+				// 			// })
+				// 		})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			},
+			rejectSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.show = true
+				// 		this.$api.doRequest('post',
+				// 			'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+				// 			this
+				// 			.purchaseOrder).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				uni.showToast({
+				// 					title: '提交成功',
+				// 					icon: 'none',
+				// 					duration: 2000,
+				// 					success: function() {
+				// 						uni.navigateTo({
+				// 							url: `/pageA/freightTransport/index`
+				// 						})
+				// 					}
+				// 				})
+				
+				// 			}
+				
+				// 		}).catch(res => {
+				// 			// uni.showToast({
+				// 			// 	title: res.data.message,
+				// 			// 	icon: 'none',
+				// 			// 	duration: 2000
+				// 			// })
+				// 		})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.content1,.content2 {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	}
+	.uForm {
+		padding: 0 40rpx;
+	}
+	.u-form-item{
+		padding: 0;
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	.part2{
+		margin-top: 20rpx;
+	}
+	.textarea{
+		border: 1px solid #ccc;
+	}
 </style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -1,6 +1,27 @@
 <template>
-	<view>
-		收购结算审核
+	<view class="warp">
+		<view class='content1'>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view v-for="(item,index) in 4">
+				<view class='row row1'>
+					<view class="left">SG11111111111</view>
+					<view class="right">辽H12345</view>
+				</view>
+				<view class='row'>
+					<view class="left">玉米（150000kg-2.58）</view>
+					<view class="right">100000元</view>
+				</view>
+			</view>
+			
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -12,11 +33,97 @@
 			}
 		},
 		methods: {
-			
+			rejectSubmit(){
+				uni.showModal({
+					content: "确定驳回该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+			passSubmit(){
+				uni.showModal({
+					content: "确定通过该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	.row1{
+		border-bottom: 0!important;
+	}
 </style>

pages/task/audit/acquisition_settlement_details.vue

@@ -1,6 +1,27 @@
 <template>
-	<view>
-		收购结算详情
+	<view class="warp">
+		<view class='content1'>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view v-for="(item,index) in 4">
+				<view class='row row1'>
+					<view class="left">SG11111111111</view>
+					<view class="right">辽H12345</view>
+				</view>
+				<view class='row'>
+					<view class="left">玉米（150000kg-2.58）</view>
+					<view class="right">100000元</view>
+				</view>
+			</view>
+			
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -12,11 +33,97 @@
 			}
 		},
 		methods: {
-			
+			rejectSubmit(){
+				uni.showModal({
+					content: "确定驳回该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+			passSubmit(){
+				uni.showModal({
+					content: "确定通过该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	.row1{
+		border-bottom: 0!important;
+	}
 </style>

pages/task/audit/freight_setting_approval.vue

@@ -1,22 +1,132 @@
 <template>
-	<view>
-		运费设置审核
+	<view class="warp">
+		<view class="transaction">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="货名" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				</u-form-item>
+				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				</u-form-item>
+			</u-form>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress:'444'
+				},
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
 			}
 		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
 		methods: {
-			
+			passSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.$api.doRequest('post',
+							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+							this
+							.purchaseOrder).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									icon: 'none',
+									duration: 2000,
+									success: function() {
+										uni.navigateTo({
+											url: `/pageA/freightTransport/index`
+										})
+									}
+								})
+				
+							}
+				
+						}).catch(res => {
+							// uni.showToast({
+							// 	title: res.data.message,
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+						})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.transaction {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
+	}
+	.uForm {
+		padding: 0 40rpx;
+	}
+	.u-form-item{
+		padding: 0;
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/audit/freight_setting_details.vue

@@ -1,19 +1,131 @@
 <template>
-	<view>
-		运费设置详情
+	<view class="warp">
+		<view class="transaction">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="货名" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				</u-form-item>
+				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				</u-form-item>
+			</u-form>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none">已通过</u-button>
+		</view>
 	</view>
+
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress:'444'
+				},
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
+			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		methods: {
+			passSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.$api.doRequest('post',
+							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+							this
+							.purchaseOrder).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									icon: 'none',
+									duration: 2000,
+									success: function() {
+										uni.navigateTo({
+											url: `/pageA/freightTransport/index`
+										})
+									}
+								})
+				
+							}
 				
-			};
+						}).catch(res => {
+							// uni.showToast({
+							// 	title: res.data.message,
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+						})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style scoped lang="scss">
+	.transaction {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
+	}
+	.uForm {
+		padding: 0 40rpx;
+	}
+	.u-form-item{
+		padding: 0;
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/audit/freight_settlement _approval.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		运费结算审核
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/task/audit/freight_settlement_approval.vue

@@ -0,0 +1,93 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in 4">
+				<view class="car-num title">辽H123465（c001）</view>
+				<view class="car-type-item">
+					<view class="left">装</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">卸</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">运</view>
+					<view class="left">120元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">付</view>
+					<view class="left">120.4吨</view>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+	.content {
+		.top{
+			display: flex;
+			justify-content: space-between;
+		}
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+		.car-type-item{
+			display: inline-flex;
+			// justify-content: center;
+			width: 33.33%;
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/purchase_settlement_approval.vue

@@ -1,6 +1,35 @@
 <template>
-	<view>
-		采购结算审核
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in 4">
+				<view class="car-num title">辽H123465（c001）</view>
+				<view class="car-type-item">
+					<view class="left">净重</view>
+					<view class="left">150.11吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结重</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣款</view>
+					<view class="left">120元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">应付</view>
+					<view class="left">1000元</view>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +37,49 @@
 	export default {
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+	.content {
+		.top{
+			display: flex;
+			justify-content: space-between;
+		}
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+		.car-type-item{
+			display: inline-flex;
+			// justify-content: center;
+			width: 50%;
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/audit/purchase_settlement_details.vue

@@ -1,6 +1,35 @@
 <template>
-	<view>
-		采购结算详情
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in 4">
+				<view class="car-num title">辽H123465（c001）</view>
+				<view class="car-type-item">
+					<view class="left">净重</view>
+					<view class="left">150.11吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结重</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣款</view>
+					<view class="left">120元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">应付</view>
+					<view class="left">1000元</view>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +37,49 @@
 	export default {
 		data() {
 			return {
-				
+
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+	.content {
+		.top{
+			display: flex;
+			justify-content: space-between;
+		}
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+		.car-type-item{
+			display: inline-flex;
+			// justify-content: center;
+			width: 50%;
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -4,70 +4,171 @@
 			<view class="title">基本信息</view>
 			<view class='row'>
 				<view class="left">仓库</view>
-				<view class="right">鲅鱼圈一号库</view>
+				<view class="right">{{list.warehouseName}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">货名</view>
-				<view class="right">玉米</view>
+				<view class="right">{{list.goodsName}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">基准水分（%）</view>
-				<view class="right">30</view>
+				<view class="right">{{list.waterBase}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">干粮水分（%）</view>
-				<view class="right">40</view>
+				<view class="right">{{list.waterMin}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">水分上限（%）</view>
-				<view class="right">40</view>
+				<view class="right">{{list.waterMax}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">扣重比</view>
-				<view class="right">1.25</view>
+				<view class="right">{{list.warehouseName}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">干粮收购价格（元/公斤）</view>
-				<view class="right">2.58</view>
+				<view class="right">{{list.warehouseName}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">销售上限</view>
-				<view class="right">2000</view>
+				<view class="right">{{list.warehouseName}}</view>
 			</view>
 		</view>
 		<view class="content2">
 			<view class="title">粮价设置</view>
-			<view  v-for="(item,index) in 4" :key="index">
+			<view v-for="(item,index) in 4" :key="index">
 				<view class="row">
 					<view class="left">等级</view>
 					<view class="right">一等、二等</view>
-				</view>	
+				</view>
 				<view class="row">
 					<view class="left">基准单价（元/公斤）</view>
 					<view class="right">2.2</view>
-				</view>	
+				</view>
 				<view class="row" v-for="(item1,index1) in 10" :key="index1">
 					<view class="left">15-23降幅（元/0.1%）</view>
 					<view class="right">0.001</view>
-				</view>	
+				</view>
 			</view>
 		</view>
-		<view>
-			<button>驳回</button>
-			<button>通过</button>
+		<u-toast ref="uToast" />
+		<view style='padding:10px;' class='flex'>
+			<u-button v-if='list.status=="未审核"' @click='reject' type="error">驳回</u-button>
+			<u-button v-if='list.status=="未审核"' @click='audit' type="success">通过</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
+		name: "task",
+
 		data() {
 			return {
-				
-			}
+				show: false,
+				id: 0,
+				list: {},
+				form: {
+
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				radio: '',
+				pcUserInfo: uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList: []
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onLoad(options) {
+			console.log(options)
+			this.id = options.id
+		},
+		onShow() {
+			var that = this
+			this.$nextTick(function() {
+				that.getData()
+			})
+
+			// this.userInfo =  uni.getStorageSync("userInfo")
 		},
 		methods: {
-			
+			getData() {
+				debugger
+				var data = []
+				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data
+						console.log(this.list)
+					}
+				})
+			},
+			confirm(item) {
+				this.list.contractNo = item[0].value
+			},
+			audit() {
+				var that = this
+				uni.showModal({
+					content: "是否确定通过审核？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: true,
+								auditMind: '34',
+								needReapply: false,
+							}).then(res1 => {
+								if (res1.data.code == 200) {
+									that.$api.msg('审核成功');
+									that.$nextTick(function() {
+										uni.navigateBack()
+									})
+								} else {
+									that.$api.msg('系统异常，请联系管理员');
+								}
+							})
+						}
+					}
+				})
+			},
+			reject() {
+				var that = this
+				uni.showModal({
+					content: "是否确定驳回？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: false,
+								auditMind: '已驳回',
+								needReapply: true,
+							}).then(res1 => {
+								if (res1.data.code == 200) {
+									that.$api.msg('驳回成功');
+									that.$nextTick(function() {
+										uni.navigateBack()
+									})
+								} else {
+									that.$api.msg(res1.data.message);
+								}
+							}).catch()
+						}
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -77,25 +178,26 @@
 		margin: 10rpx;
 		padding: 20rpx 20rpx 140rpx 20rpx;
 	}
+
 	.content1,
 	.content2 {
 		border-radius: 20rpx;
 		background: white;
 		padding: 20rpx;
-	
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: center;
 		}
-	
+
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
 			padding: 21rpx 0;
-	
+
 			.right,
 			input {
 				font-size: 28rpx;
@@ -103,7 +205,22 @@
 			}
 		}
 	}
-	.content2{
+
+	.content2 {
 		margin-top: 20rpx;
 	}
+
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/audit/warehouse_details.vue

@@ -1,6 +1,61 @@
 <template>
-	<view>
-		仓库设置详情
+	<view class="warp">
+		<view class='content1'>
+			<view class="title">基本信息</view>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view class='row'>
+				<view class="left">货名</view>
+				<view class="right">玉米</view>
+			</view>
+			<view class='row'>
+				<view class="left">基准水分（%）</view>
+				<view class="right">30</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮水分（%）</view>
+				<view class="right">40</view>
+			</view>
+			<view class='row'>
+				<view class="left">水分上限（%）</view>
+				<view class="right">40</view>
+			</view>
+			<view class='row'>
+				<view class="left">扣重比</view>
+				<view class="right">1.25</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮收购价格（元/公斤）</view>
+				<view class="right">2.58</view>
+			</view>
+			<view class='row'>
+				<view class="left">销售上限</view>
+				<view class="right">2000</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">粮价设置</view>
+			<view  v-for="(item,index) in 4" :key="index">
+				<view class="row">
+					<view class="left">等级</view>
+					<view class="right">一等、二等</view>
+				</view>	
+				<view class="row">
+					<view class="left">基准单价（元/公斤）</view>
+					<view class="right">2.2</view>
+				</view>	
+				<view class="row" v-for="(item1,index1) in 10" :key="index1">
+					<view class="left">15-23降幅（元/0.1%）</view>
+					<view class="right">0.001</view>
+				</view>	
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none">已通过</u-button>
+		</view>
 	</view>
 </template>
 
@@ -12,11 +67,94 @@
 			}
 		},
 		methods: {
-			
+			rejectSubmit(){
+				uni.showModal({
+					content: "确定驳回该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+			passSubmit(){
+				uni.showModal({
+					content: "确定通过该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
 		}
 	}
 </script>
 
-<style>
-
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/my_task.vue

@@ -162,19 +162,19 @@
 					title: "正在加载"
 				})
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
-				res => {
-					if (res.data.code == 200) {
-						this.taskInfo = res.data.data
-						uni.hideLoading()
-					} else {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-						uni.hideLoading()
-					}
-				}).catch(res => {
+					res => {
+						if (res.data.code == 200) {
+							this.taskInfo = res.data.data
+							uni.hideLoading()
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							uni.hideLoading()
+						}
+					}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
 						icon: 'none',
@@ -225,25 +225,40 @@
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '出入库任务'
 								}
+							} else if (this.taskInfo[i].businessType == 'acquisition') {
+								if (this.taskInfo[i].businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
+									this.taskInfo[i].messageTitle = '付款管理'
+								}
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-PRICE-APPROVE') {
+									this.taskInfo[i].messageTitle = '仓库设置'
+								}
 							} else if (this.taskInfo[i].businessType == 'REPORT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '采购平仓统计'
+								}
 								if (this.taskInfo[i].businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
-									this.taskInfo[i].messageTitle = '仓库设置'
-								} else if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
-									this.taskInfo[i].messageTitle = '运费设置'
-								} else if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
-									this.taskInfo[i].messageTitle = '运费结算'
-								} else if (this.taskInfo[i].businessCode == 'SALE-RECEIPT-REPORT') {
-									this.taskInfo[i].messageTitle = '收购结算'
-								} else if (this.taskInfo[i].businessCode == 'SALE-CLOSE-REPORT') {
-									this.taskInfo[i].messageTitle = '采购结算'
+									this.taskInfo[i].messageTitle = '采购入库统计'
 								}
-							} else if (this.taskInfo[i].businessType == 'PROCUREMENT') {
-								if (this.taskInfo[i].businessCode == 'PROCUREMENT-ORDER-APPROVE') {
-									this.taskInfo[i].messageTitle = '入库任务'
+								if (this.taskInfo[i].businessCode == 'SALE-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '销售平仓统计'
+								}
+								if (this.taskInfo[i].businessCode == 'SALE-RECEIPT-REPORT') {
+									this.taskInfo[i].messageTitle = '销售入库统计'
+								}
+								if (this.taskInfo[i].businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {
+									this.taskInfo[i].messageTitle = '运输结算统计'
 								}
 							} else if (this.taskInfo[i].businessType == 'PROCUREMENT') {
 								if (this.taskInfo[i].businessCode == 'PROCUREMENT-ORDER-APPROVE') {
-									this.taskInfo[i].messageTitle = '出库任务'
+									this.taskInfo[i].messageTitle = '采购订单'
+								}
+							} else if (this.taskInfo[i].businessType == 'SALE') {
+								if (this.taskInfo[i].businessCode == 'SALE-ORDER-APPROVE') {
+									this.taskInfo[i].messageTitle = '销售订单'
+								}
+							} else if (this.taskInfo[i].businessType == 'TRANSPORTATIONTASK') {
+								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
+									this.taskInfo[i].messageTitle = '运费设置'
 								}
 							}
 						}
@@ -282,7 +297,8 @@
 				this.pageSize = 1
 				this.getIndexBuyData(1)
 			},
-			navToDetailPage(item) {debugger
+			navToDetailPage(item) {
+				debugger
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_details?id=' + item.businessId
@@ -307,7 +323,19 @@
 					uni.navigateTo({
 						url: '/pages/task/sale_close_details?id=' + item.businessId
 					})
-				} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+				} else if (item.businessCode == 'PROCUREMENT-PRICE-APPROVE') {
+					if(this.statusFlag==1){
+						uni.navigateTo({
+							url: `/pages/task/audit/warehouse_approval?id=${item.businessId}`
+						})
+					}else{
+						uni.navigateTo({
+							url: '/pages/task/audit/warehouse_details/?id=' + item.businessId
+						})
+					}
+				}
+				
+				else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
 					if (this.statusFlag == 3) {
 						uni.navigateTo({
 							url: '/pageD/warehousings/warehousingDetails?id=' + item.businessId + '&compId=' + this
@@ -323,29 +351,28 @@
 					}
 
 				}
+				if (item.taskType == "入库任务") {
 
-				// 	if(item.taskType == "入库任务"){
-
-				// 	if(item.statusFlag == 3){
-				// 	uni.navigateTo({
-				// 		url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
-				// 	})
-				// 	}else{
-				// 		uni.navigateTo({
-				// 			url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
-				// 		})
-				// 	}
-				// }else if(item.taskType == "出库任务"){
-				// 	if(item.statusFlag == 3){
-				// 	uni.navigateTo({
-				// 		url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
-				// 	})
-				// 	}else{
-				// 		uni.navigateTo({
-				// 			url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
-				// 		})
-				// 	}
-				// }
+					if (item.statusFlag == 3) {
+						uni.navigateTo({
+							url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+						})
+					}
+				} else if (item.taskType == "出库任务") {
+					if (item.statusFlag == 3) {
+						uni.navigateTo({
+							url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+						})
+					}
+				}
 			}
 		}
 	}