Bladeren bron

前端 小程序 sdy

zhongtianhaoyuan 3 jaren geleden
bovenliggende
commit
cf9b150366

+ 1 - 1
config/index.js

@@ -1,6 +1,6 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://192.168.1.115:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 1 - 1
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -391,7 +391,7 @@
 					this.$api.msg('皮重输入错误!')
 					return
 				}
-				if (this.detailData.tare > this.detailData.grossWeight) {
+				if (Number(this.detailData.tare) > Number(this.detailData.grossWeight)) {
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}

+ 7 - 7
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -451,9 +451,9 @@
 				(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 					String(this.detailData.grossWeight).length -
 					(String(this.detailData.grossWeight).indexOf('.') + 1) >
-					1) ||
-				this.detailData.grossWeight < 1 ||
-				this.detailData.grossWeight > 100000
+					3) ||
+				this.detailData.grossWeight < 0 ||
+				this.detailData.grossWeight > 10000
 			) {
 				this.$api.msg('毛重输入错误!')
 				return
@@ -468,7 +468,7 @@
 					(String(this.detailData.tare).indexOf('.') + 1) >
 					3) ||
 				this.detailData.tare < 0 ||
-				this.detailData.tare > 10
+				this.detailData.tare > 10000
 			) {
 				this.$api.msg('皮重输入错误!')
 				return
@@ -482,9 +482,9 @@
 				(String(this.detailData.deductionWeight).indexOf('.') != -1 &&
 					String(this.detailData.deductionWeight).length -
 					(String(this.detailData.deductionWeight).indexOf('.') + 1) >
-					1) ||
-				this.detailData.deductionWeight < 1 ||
-				this.detailData.deductionWeight > 100000
+					3) ||
+				this.detailData.deductionWeight < 0 ||
+				this.detailData.deductionWeight > 10
 			) {
 				this.$api.msg('扣重输入错误!')
 				return

+ 3 - 3
pages/erp/warehousing/warehousing.vue

@@ -478,7 +478,7 @@
 						(String(this.detailData.tare).indexOf('.') + 1) >
 						3) ||
 					this.detailData.tare < 0 ||
-					this.detailData.tare > 100000
+					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误!')
 					return
@@ -492,8 +492,8 @@
 					(String(this.detailData.deductionWeight).indexOf('.') != -1 &&
 						String(this.detailData.deductionWeight).length -
 						(String(this.detailData.deductionWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.deductionWeight < 1 ||
+						3) ||
+					this.detailData.deductionWeight < 0 ||
 					this.detailData.deductionWeight > 10
 				) {
 					this.$api.msg('扣重输入错误!')

+ 302 - 159
pages/task/audit/Issueandreceipt_task_approval.vue

@@ -3,68 +3,149 @@
 		<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-input v-model="OutList.inOutType" 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 v-if="type=='移库'" class="title part2">移库出库</view>
+				<view v-if="type=='退库'" class="title part2">退库</view> -->
+				<view v-if="OutList.judge == 1">
+					<!-- 出库 -->
+					<view class="title part2">{{OutList.inOutType}}</view>
+					<view class='row'>
+						<view class="left">编号</view>
+						<view class="right">{{OutList.inOutType}} {{OutList.inOutTaskNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">仓库</view>
+						<view class="right">{{OutList.sendWarehouse}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">出库类型</view>
+						<view class="right">{{OutList.inOutType}}</view>
+					</view>
+				<!-- <view class='row'>
+						<view class="left">出库类型</view>
+						<view class="right">{{OutList.inOutType}}</view>
+					</view> -->
+					<view class='row' v-if="OutList.inOutType == '移库出库'">
+						<view class="left">移库任务编号</view>
+						<view class="right">{{OutList.moveTaskNo}}</view>
+					</view>
+					<view class='row' v-if="OutList.inOutType != '移库出库'">
+						<view class="left">合同编号</view>
+						<view class="right">{{OutList.contractNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">货名</view>
+						<view class="right">{{OutList.goodsName}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">重量(吨)</view>
+						<view class="right">{{OutList.weight}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">预计出库日期</view>
+						<view class="right">{{OutList.predictDate}}</view>
+					</view>
+					<!-- 	<view class='row'>
+					<view class="left">预计入库日期</view>
+					<view class="right">{{OutList.inOutDate}}</view>
+				</view> -->
+					<view class='row'>
+						<view class="left">出库经办人</view>
+						<view class="right">{{OutList.publisher}}</view>
+					</view>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="品级" prop="grade" label-width="150">
+						<u-input v-model="OutList.grade" 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="bulkDensity" label-width="190">
+						<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+						<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="businessDescribe" label-width="160"
+						label-position="top">
+						<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="" type="textarea"
+							class="textarea" />
+					</u-form-item>
+					<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+						<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
+					</u-form-item>
+				</view>
+				<view v-if="EnterList.judge == 2">
+					<!-- 入库 -->
+					<view class="title part2">{{EnterList.inOutType}}</view>
+					<view class='row'>
+						<view class="left">编号</view>
+						<view class="right">{{EnterList.inOutType}} {{EnterList.inOutTaskNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">仓库</view>
+						<view class="right">{{EnterList.warehouseName}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">入库类型</view>
+						<view class="right">{{EnterList.inOutType}}</view>
+					</view>
+					<view class='row' v-if="EnterList.inOutType == '移库入库'">
+						<view class="left">移库任务编号</view>
+						<view class="right">{{EnterList.moveTaskNo}}</view>
+					</view>
+					<view class='row' v-if="EnterList.inOutType != '移库入库'">
+						<view class="left">合同编号</view>
+						<view class="right">{{EnterList.contractNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">货名</view>
+						<view class="right">{{EnterList.goodsName}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">重量(吨)</view>
+						<view class="right">{{EnterList.weight}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">预计入库日期</view>
+						<view class="right">{{EnterList.predictDate}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">出库经办人</view>
+						<view class="right">{{EnterList.publisher}}</view>
+					</view>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="品级" prop="grade" label-width="150">
+						<u-input v-model="EnterList.grade" input-align="right" placeholder="" @click='show=true'
+							disabled />
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show"
+							mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
+						<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+						<u-input v-model="EnterList.waterContent" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="businessDescribe" label-width="160"
+						label-position="top">
+						<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="" type="textarea"
+							class="textarea" />
+					</u-form-item>
+					<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+						<u-input v-model="EnterList.binNumber" 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/>
@@ -159,42 +240,50 @@
 					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
 						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
 					</u-form-item>
-				</view>
+				</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> -->
+			<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>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				type:'移库',
-				show:false,
+				id: "",
+				OutList: {},
+				EnterList: {},
+				type: '移库',
+				show: false,
 				purchaseOrder: {
 					freightUnitPrice: "123",
-					receivingAddress:'出库',
-					grade:"1"
-				},
-				pjList:[{
-					type:'一等品'
-				},
-				{
-					type:'二等品'
+					receivingAddress: '出库',
+					grade: "1"
 				},
-				{
-					type:'三等品'
-				},
-				{
-					type:'等外'
-				}],
+
+				pjList: [{
+						type: '一等品'
+					},
+					{
+						type: '二等品'
+					},
+					{
+						type: '三等品'
+					},
+					{
+						type: '等外'
+					}
+				],
 				rules: {
 					freightUnitPrice: [{
 							validator: (rule, value, callback) => {
@@ -217,96 +306,131 @@
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		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('验证失败');
+			getList() {
+				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.$api.doRequest('get', '/inOutWarehouseTask/getInOutWarehouseTask', {
+							relevanceId: res.data.data.relevanceId
+						}).then(res => {
+							if (res.data.code == 200) {
+								for (let i = 0; i < res.data.data.length; i++) {
+									if (res.data.data[i].inOutType == "移库出库" || res.data.data[i]
+										.inOutType == "贸易服务出库" || res.data.data[i].inOutType == "销售出库" ||
+										res.data.data[i].inOutType == "暂存出库") {
+										this.OutList = res.data.data[i]
+										this.OutList.judge = 1
+									}
+									if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
+										.inOutType == "暂存入库" || res.data.data[i].inOutType == "退库" || res
+										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
+										"贸易服务入库") {
+										this.EnterList = res.data.data[i]
+										this.EnterList.judge = 2
+									}
+								}
+							}
+						})
 					}
-				});
+				})
 			},
-			rejectSubmit(){
-				this.$refs.uForm.validate(valid => {
-					if (valid) {
-						uni.showLoading({
-							title: '正在加载',
-							mask: true
+			pjPicker(e) {
+				this.OutList.grade = this.pjList[e[0]].type
+				this.OutList.gradeKey = e[0] + 1
+			},
+			pjPicker1(e) {
+				this.EnterList.grade = this.pjList[e[0]].type
+				this.EnterList.gradeKey = e[0] + 1
+			},
+			passSubmit() {
+				this.OutList.inOutFlag = 1
+				this.EnterList.inOutFlag = 2
+				if (this.OutList.taskTypeKey == 1) {
+					this.requestadd(this.OutList)
+				} else if (this.EnterList.taskTypeKey == 2) {
+					this.requestadd(this.EnterList)
+				} else if (
+					this.OutList.taskTypeKey == 3 ||
+					this.OutList.taskTypeKey == 4
+				) {
+					this.requestadd(this.OutList, 'repetition')
+					if (!this.deletetask) {
+						this.requestadd(this.EnterList, 'repetition')
+					}
+				}
+			},
+			rejectSubmit() {
+				if (this.EnterList.taskTypeKey == 1) {
+					this.requestaudit(this.EnterList)
+				} else if (this.EnterList.taskTypeKey == 2) {
+					this.requestaudit(this.EnterList)
+				} else if (
+					this.EnterList.taskTypeKey == 3 ||
+					this.EnterList.taskTypeKey == 4
+				) {
+					this.requestaudit(this.EnterList, 'repetition')
+					if (!this.deletetask) {
+						this.requestaudit(this.EnterList, 'repetition')
+					}
+				}
+			},
+			requestadd(list, status) {
+				list.compId = sessionStorage.getItem('ws-pf_compId')
+				list.publisher = this.userInfo.userName
+				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
+					if (res.data.code == 200) {
+						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
+							taskId: list.taskId,
+							approved: true,
+							auditMind: '34',
+							needReapply: false
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.$api.msg('审核成功!')
+							}
 						})
-						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('验证失败');
 					}
-				});
-			}
+				})
+			},
+			requestaudit(list, status) {
+				list.compId = '2710b21efc1e4393930c5dc800010dc4'
+				list.publisher = this.userInfo.userName
+				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
+					if (res.data.code == 200) {
+						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
+							taskId: list.taskId,
+							approved: false,
+							auditMind: "驳回原因",
+							needReapply: true
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.$api.msg('驳回成功!')
+							}
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	.content1,.content2 {
+	.content1,
+	.content2 {
 		background-color: #FFFFFF;
 		margin: 10rpx;
 		padding-bottom: 10rpx;
 		border-radius: 20rpx;
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
@@ -314,12 +438,15 @@
 			text-align: center;
 		}
 	}
+
 	.uForm {
 		padding: 0 40rpx;
 	}
-	.u-form-item{
+
+	.u-form-item {
 		padding: 0;
 	}
+
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -327,15 +454,31 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.part2{
+
+	.part2 {
 		margin-top: 20rpx;
 	}
-	.textarea{
+
+	.textarea {
 		border: 1px solid #ccc;
 	}
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #EEEEEE;
+		padding: 21rpx 0;
+
+		.right,
+		input {
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
 </style>

+ 108 - 46
pages/task/audit/acquisition_settlement_approval.vue

@@ -5,17 +5,17 @@
 				<view class="left">仓库</view>
 				<view class="right">鲅鱼圈一号库</view>
 			</view>
-			<view v-for="(item,index) in 4">
+			<view v-for="(item,index) in List">
 				<view class='row row1'>
-					<view class="left">SG11111111111</view>
-					<view class="right">辽H12345</view>
+					<view class="left">{{item.paymentNo}}</view>
+					<view class="right">{{item.carNo}}</view>
 				</view>
 				<view class='row'>
-					<view class="left">玉米(150000kg-2.58)</view>
-					<view class="right">100000元</view>
+					<view class="left">{{item.goodsName}}({{item.netWeight}} - {{item.tidalGrainPrice}})</view>
+					<view class="right">{{item.amountIngPayable}}</view>
 				</view>
 			</view>
-			
+
 		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
@@ -26,52 +26,109 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				
+				id: "",
+				currentPage: 1,
+				pageSize: 10,
+				List: [],
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow(options) {
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		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)
-						// 		}
-						// 	})
-						// }
+			getList() {
+				// this.$api.doRequest('get', '/stockPurchaseReceiptReport/getInfo', {
+				// id:this.id
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		console.log("hdshfuiehfiuo",res)
+				// 	}
+				// })
+				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					// warehouseName: this.warehouseName,
+					managementType: 1
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.List = res.data.data.records
 					}
 				})
 			},
-			passSubmit(){
-				uni.showModal({
-					content: "确定通过该设置?",
+			//駁回
+			rejectSubmit() {
+				if(this.List.length > 0){
+					uni.showModal({
+						content: "确定驳回付款申请?",
+						success(res) {
+							// this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+							// 	compId: "2710b21efc1e4393930c5dc800010dc4",
+							// 	id: item.id
+							// }).then(res => {
+							// 	if (res.data.code == 200) {
+							// 		this.List = res.data.data.records
+							// 	}
+							// })
+							 this.audit(this.List[0], 0, false, '', '')
+						}
+					})
+				}
+			},
+			//通過
+			passSubmit() {
+				if(this.List.length > 0){
+					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)
-						// 		}
-						// 	})
-						// }
+						 this.audit(this.List[0], 0, true)
 					}
 				})
+				}
+			},
+			audit(item, index, status, status2, reason) {
+				if (this.List.length > 0) {
+					if (status == true && item.status == "已驳回") {
+						this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							id: item.id
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.audit(this.List[index + 1], index + 1, status, status2, reason)
+							}
+						})
+					} else {
+						this.$api.doRequest('get', '/workflow/api/handle', {
+							taskId: item.taskId,
+							approved: status,
+							auditMind: reason != undefined ? '已驳回' : '34',
+							needReapply: status2 != undefined ? true : false
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.audit(this.List[index + 1], index + 1, status, status2, reason)
+							}
+						})
+					}
+				} else {
+					if (status == true) {
+						this.$message.success('通过成功')
+						this.getList()
+					} else if (status == false) {
+						this.$message.success('驳回成功')
+						this.getList()
+					}
+				}
 			},
 		}
 	}
@@ -82,25 +139,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;
@@ -108,9 +166,11 @@
 			}
 		}
 	}
-	.content2{
+
+	.content2 {
 		margin-top: 20rpx;
 	}
+
 	.bottom-btn {
 		width: 92%;
 		position: fixed;
@@ -118,12 +178,14 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.row1{
-		border-bottom: 0!important;
+
+	.row1 {
+		border-bottom: 0 !important;
 	}
 </style>

+ 5 - 2
pages/task/audit/freight_setting_approval.vue

@@ -58,10 +58,13 @@
 				}
 			}
 		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
+		onLoad() {
+			this.getList()
 		},
 		methods: {
+			getList(){
+				
+			},
 			passSubmit(){
 				this.$refs.uForm.validate(valid => {
 					if (valid) {

+ 92 - 11
pages/task/audit/freight_settlement_approval.vue

@@ -5,31 +5,31 @@
 				<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-container" v-for="(item,index) in list">
+				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
 				<view class="car-type-item">
 					<view class="left">装</view>
-					<view class="left">120.4吨</view>
+					<view class="left">{{item.loadingWeight}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">卸</view>
-					<view class="left">120.4吨</view>
+					<view class="left">{{item.unloadingWeight}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">结</view>
-					<view class="left">120.4吨</view>
+					<view class="left">{{item.settlementWeightchange}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">运</view>
-					<view class="left">120元/吨</view>
+					<view class="left">{{item.transportPrice}}元/吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">扣</view>
-					<view class="left">120.4吨</view>
+					<view class="left">{{item.deductionAmountchange}}元</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">付</view>
-					<view class="left">120.4吨</view>
+					<view class="left">{{item.amountEdPayable}}元</view>
 				</view>
 			</view>
 		</view>
@@ -45,11 +45,87 @@
 	export default {
 		data() {
 			return {
+				currentPage: 1,
+				pageSize: 10,
+				list: [],
 
 			}
 		},
+		onLoad() {
+			this.getList()
+		},
 		methods: {
-
+			getList() {
+				this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+					compId: "2710b21efc1e4393930c5dc800010dc4",
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					contractNo: "全部合同"
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data.records
+					}
+				})
+			},
+			// 驳回
+			rejectSubmit() {
+				if (this.list.length == 0) {
+					this.$message.success('没有要审核的条目!')
+				} else {
+					uni.showModal({
+						content: "是否确定驳回?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								this.audit(this.list[0], 0, false, true, '已驳回')
+							}
+						}
+					})
+				}
+			},
+			//通过
+			passSubmit() {
+				if (this.list.length == 0) {
+					this.$message.success('没有要审核的条目!')
+				} else {
+					uni.showModal({
+						content: "是否确定通过?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								this.a(0)
+								// this.audit(this.list[0], 0, true, 2)
+							}
+						}
+					})
+				}
+			},
+			a(ing){
+				console.log(ing)
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+						this.$message.success('通过成功')
+						this.getList()
+					} else if (status == false) {
+						this.$message.success('驳回成功')
+						this.getList()
+					}
+				}
+			},
 		}
 	}
 </script>
@@ -61,23 +137,27 @@
 		border-radius: 20rpx;
 		background: white;
 	}
+
 	.content {
-		.top{
+		.top {
 			display: flex;
 			justify-content: space-between;
 		}
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
 		}
-		.car-type-item{
+
+		.car-type-item {
 			display: inline-flex;
 			// justify-content: center;
 			width: 33.33%;
 		}
 	}
+
 	.bottom-btn {
 		width: 92%;
 		position: fixed;
@@ -85,6 +165,7 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;

+ 91 - 11
pages/task/audit/purchase_settlement_approval.vue

@@ -3,25 +3,25 @@
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>123456796</view>
+				<view>{{contractNo}}</view>
 			</view>
-			<view class="car-container" v-for="(item,index) in 4">
-				<view class="car-num title">辽H123465(c001)</view>
+			<view class="car-container" v-for="(item,index) in list">
+				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
 				<view class="car-type-item">
 					<view class="left">净重</view>
-					<view class="left">150.11吨</view>
+					<view class="left">{{item.netWeight}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">结重</view>
-					<view class="left">120.4吨</view>
+					<view class="left">120.4{{item.settlementWeight}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">扣款</view>
-					<view class="left">120元/吨</view>
+					<view class="left">{{item.deductionAmountchange}}元/吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">应付</view>
-					<view class="left">1000元</view>
+					<view class="left">{{item.amountIngPayable}}元</view>
 				</view>
 			</view>
 		</view>
@@ -37,11 +37,86 @@
 	export default {
 		data() {
 			return {
-
+				id: "",
+				currentPage:1,
+				pageSize:10,
+				list:[],
+				contractNo:"",
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
 		methods: {
-
+			getList(id) {
+				this.$api.doRequest('get', '/stockPurchaseReceiptReport/getInfo', {
+					id: this.id
+				}).then(res => {
+					this.contractNo = res.data.data.contractNo
+					if (res.data.code == 200) {
+						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
+						compId: "2710b21efc1e4393930c5dc800010dc4",
+						  currentPage: this.currentPage,
+						  pageSize: this.pageSize,
+						  contractNo: this.contractNo,
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.list = res.data.data.records
+							}
+						})
+					}
+				})
+			},
+			//驳回
+			rejectSubmit(){
+				if (this.list.length == 0) {
+					this.$message.success('没有要审核的条目!')
+				} else {
+					uni.showModal({
+						content: "是否确定驳回?",
+						success(res) {
+							if(res)
+							this.audit(this.list[0], 0, false, true, '已驳回')
+						}
+					})
+				}
+			},
+			//通过
+			passSubmit(){
+				if (this.list.length == 0) {
+					this.$message.success('没有要审核的条目!')
+				} else {
+					uni.showModal({
+						content: "是否确定通过?",
+						success(res) {
+							if(res)
+							this.audit(this.list[0], 0, true, 2)
+						}
+					})
+				}
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+						this.$message.success('通过成功')
+						this.getList()
+					} else if (status == false) {
+						this.$message.success('驳回成功')
+						this.getList()
+					}
+				}
+			},
 		}
 	}
 </script>
@@ -53,23 +128,27 @@
 		border-radius: 20rpx;
 		background: white;
 	}
+
 	.content {
-		.top{
+		.top {
 			display: flex;
 			justify-content: space-between;
 		}
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
 		}
-		.car-type-item{
+
+		.car-type-item {
 			display: inline-flex;
 			// justify-content: center;
 			width: 50%;
 		}
 	}
+
 	.bottom-btn {
 		width: 92%;
 		position: fixed;
@@ -77,6 +156,7 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;

+ 19 - 23
pages/task/audit/warehouse_approval.vue

@@ -24,38 +24,38 @@
 			</view>
 			<view class='row'>
 				<view class="left">扣重比</view>
-				<view class="right">{{list.warehouseName}}</view>
+				<view class="right">{{list.deductWeight}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">干粮收购价格(元/公斤)</view>
-				<view class="right">{{list.warehouseName}}</view>
+				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">销售上限</view>
-				<view class="right">{{list.warehouseName}}</view>
+				<view class="right">{{list.saleLimit}}</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 list.details" :key="index">
 				<view class="row">
 					<view class="left">等级</view>
-					<view class="right">一等、二等</view>
+					<view class="right">{{item.level}}</view>
 				</view>
 				<view class="row">
 					<view class="left">基准单价(元/公斤)</view>
-					<view class="right">2.2</view>
+					<view class="right">{{item.basePrice}}</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 class="row" v-for="(item1,index1) in item.modelList" :key="index1">
+					<view class="left">{{item1.startWater}}-{{item1.endWater}}降幅(元/0.1%)</view>
+					<view class="right">{{item1.price}}</view>
 				</view>
 			</view>
 		</view>
 		<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>
+			<u-button  @click='reject' type="error">驳回</u-button>
+			<u-button  @click='audit' type="success">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -66,14 +66,12 @@
 	} from 'vuex';
 	export default {
 		name: "task",
-
 		data() {
 			return {
 				show: false,
 				id: 0,
 				list: {},
 				form: {
-
 					name: '',
 					intro: '',
 					sex: ''
@@ -88,7 +86,6 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onLoad(options) {
-			console.log(options)
 			this.id = options.id
 		},
 		onShow() {
@@ -96,19 +93,15 @@
 			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)
 					}
 				})
 			},
@@ -123,11 +116,11 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', {
 								taskId: that.list.taskId,
 								approved: true,
 								auditMind: '34',
-								needReapply: false,
+								needReapply: true,
 							}).then(res1 => {
 								if (res1.data.code == 200) {
 									that.$api.msg('审核成功');
@@ -158,9 +151,12 @@
 							}).then(res1 => {
 								if (res1.data.code == 200) {
 									that.$api.msg('驳回成功');
-									that.$nextTick(function() {
-										uni.navigateBack()
-									})
+									// that.$nextTick(function() {
+									// 	uni.navigateBack()
+									// })
+									this.setTimeout(function() {
+											uni.navigateBack()
+									}, 1000);
 								} else {
 									that.$api.msg(res1.data.message);
 								}

+ 32 - 52
pages/task/audit/warehouse_details.vue

@@ -4,51 +4,51 @@
 			<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.deductWeight}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">干粮收购价格(元/公斤)</view>
-				<view class="right">2.58</view>
+				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
 			<view class='row'>
 				<view class="left">销售上限</view>
-				<view class="right">2000</view>
+				<view class="right">{{list.saleLimit}}</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 list.details" :key="index">
 				<view class="row">
 					<view class="left">等级</view>
-					<view class="right">一等、二等</view>
+					<view class="right">{{item.level}}</view>
 				</view>	
 				<view class="row">
 					<view class="left">基准单价(元/公斤)</view>
-					<view class="right">2.2</view>
+					<view class="right">{{item.basicUnitPrice}}</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 class="row" v-for="(item1,index1) in item.modelList" :key="index1">
+					<view class="left">{{item1.startWater}}-{{item1.endWater}}降幅(元/0.1%)</view>
+					<view class="right">{{item1.price}}</view>
 				</view>	
 			</view>
 		</view>
@@ -63,47 +63,27 @@
 	export default {
 		data() {
 			return {
-				
+				list: {},
+				id:"",
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow() {
+			var that = this
+			this.$nextTick(function() {
+				that.getData()
+			})
+		},
 		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)
-						// 		}
-						// 	})
-						// }
+			getData() {
+				var data = []
+				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data
 					}
 				})
 			},

+ 56 - 13
pages/task/my_task.vue

@@ -14,8 +14,6 @@
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex">
 					<text>{{item.messageTitle}}</text>
-					<!-- <view  class="title-tip-a" v-if="statusFlag==3">已完成</view>
-					<view  class="title-tip" v-if="statusFlag==1">未完成</view> -->
 					<view class='line'>2021-06-30 11:11:22</view>
 				</view>
 				<view class="flex title_b">
@@ -70,13 +68,11 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
-			debugger
 			this.warehouseInOutInfo.currentPage = 1
 			this.data.currentPage = 1
 			this.taskInfo = []
 			this.pcUserInfo = uni.getStorageSync("pcUserInfo")
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
 					uni.showModal({
 						title: '登录提示',
@@ -172,8 +168,9 @@
 								icon: 'none',
 								duration: 2000
 							})
-							uni.hideLoading()
+							uni.hideLoading(this.taskInfo,"信息")
 						}
+						console.log()
 					}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -298,7 +295,7 @@
 				this.getIndexBuyData(1)
 			},
 			navToDetailPage(item) {
-				debugger
+				console.log(item.businessCode)
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_details?id=' + item.businessId
@@ -333,23 +330,69 @@
 							url: '/pages/task/audit/warehouse_details/?id=' + item.businessId
 						})
 					}
-				}
-				
-				else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
-					if (this.statusFlag == 3) {
+				} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
+					if(this.statusFlag==1){
 						uni.navigateTo({
-							url: '/pageD/warehousings/warehousingDetails?id=' + item.businessId + '&compId=' + this
-								.pcUserInfo.compId
+							url: `/pages/task/audit/acquisition_settlement_approval?id=${item.businessId}`
+						})
+					}else{
+						uni.navigateTo({
+							url: '/pages/task/audit/acquisition_settlement_details/?id=' + item.businessId
+						})
+					}
+				}else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId
 							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
 						})
 					} else {
 						uni.navigateTo({
 							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: '/pageD/warehousings/warehousings?id=' + item.businessId + '&compId=' + this
+							url: `/pages/task/audit/Issueandreceipt_task_details?id=` + item.businessId + '&compId=' + this
 								.pcUserInfo.compId
 						})
 					}
 
+				}else if (item.businessCode == 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/purchase_settlement_approval?id=` + item.businessId
+							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+						})
+					} else {
+						uni.navigateTo({
+							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/purchase_settlement_details?id=` + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
+						})
+					}
+				}else if (item.businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/freight_settlement_approval?id=` + item.businessId
+							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+						})
+					} else {
+						uni.navigateTo({
+							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/freight_settlement_details?id=` + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
+						})
+					}
+				}else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId
+							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+						})
+					} else {
+						uni.navigateTo({
+							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/freight_setting_details?id=` + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
+						})
+					}
 				}
 				if (item.taskType == "入库任务") {