小程序 代码更新 sdy

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -8,7 +8,7 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="OutList.taskStatus == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="OutList.taskStatus == '审核中'"
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="OutList.taskStatus == '审核中'||OutList.taskStatus == '待审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{OutList.taskStatus}}</view>
@@ -235,8 +235,8 @@
 				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
 					placeholder="请输入驳回原因" />
 				<view class="flex">
-					<u-button @click="show1 = false" class="submit">取消</u-button>
-					<u-button @click="rejectSubmit()" class="submit">确定</u-button>
+					<u-button @click="show1 = false" type="error"  hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
 				</view>
 			</view>
 		</u-popup>
@@ -369,6 +369,7 @@
 				}
 			},
 			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 => {
@@ -381,7 +382,7 @@
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
-								this.setTimeout(function() {
+								setTimeout(function() {
 										uni.navigateBack()
 								}, 1000);
 							}
@@ -402,7 +403,7 @@
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('驳回成功！')
-								this.setTimeout(function() {
+								setTimeout(function() {
 										uni.navigateBack()
 								}, 1000);
 							}
@@ -461,7 +462,7 @@
 	}
 
 	.submit {
-		width: 40%;
+		width: 50%;
 		background: #22C572;
 		border-radius: 10rpx;
 	}

pages/task/audit/Issueandreceipt_task_details.vue

@@ -1,248 +1,250 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="OutList.taskStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="OutList.taskStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="OutList.taskStatus == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{OutList.taskStatus}}</view>
+				</view>
+				<view class="infoData">{{OutList.updateDate}}</view>
+			</view>
+		</view>
 		<view class="content1">
-			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
-				<u-form-item label="任务类型" prop="receivingAddress" label-width="140">
-					<u-input v-model="OutList.inOutType" input-align="right" placeholder="" disabled />
+			<u-form :model="OutList" ref="uForm">
+				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
+					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
+					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
-				<!-- <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' 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 v-if="retreatList.judge == 3">
+					<!-- 退库 -->
+					<view class="uForm_item">
+						<view class="title part2">{{retreatList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{retreatList.sendWarehouse}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库类型</view>
+							<view class="right">{{retreatList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="retreatList.inOutType == '移库出库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{retreatList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="retreatList.inOutType != '移库出库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{retreatList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{retreatList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{retreatList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计出库日期</view>
+							<view class="right">{{retreatList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{retreatList.publisher}}</view>
+						</view>
 					</view>
-					<view class='row'>
-						<view class="left">货名</view>
-						<view class="right">{{OutList.goodsName}}</view>
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150">
+							<u-input v-model="retreatList.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="retreatList.bulkDensity" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
+						</u-form-item>
 					</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 v-if="OutList.judge == 1">
+					<view class="uForm_item">
+						<!-- 出库 -->
+						<view class="title part2">{{OutList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">出库（{{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' 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.publisher}}</view>
+						</view>
 					</view>
-					<view class='row'>
-						<view class="left">出库经办人</view>
-						<view class="right">{{OutList.publisher}}</view>
+
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150" v-if="retreatList.inOutType != '退库'">
+							<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"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
+							v-if="OutList.inOutType != '移库出库'">
+							<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150" />
+						</u-form-item>
+						<u-form-item v-if="retreatList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber"
+							label-width="170">
+							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
+						</u-form-item>
 					</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 class="uForm_item">
+						<!-- 入库 -->
+						<view class="title part2">{{EnterList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">入库（{{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>
-					<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 class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库' ">
+							<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"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="请输入容重占比" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
+						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
+							<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150" />
+						</u-form-item>
+						<u-form-item v-if="OutList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+							<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
+						</u-form-item>
 					</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/>
-					</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-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">驳回原因</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入驳回原因" />
+				<view class="flex">
+					<u-button @click="show1 = false" class="submit">取消</u-button>
+					<u-button @click="rejectSubmit()" class="submit">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<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="passSubmit()">{{OutList.taskStatus}}</u-button>
-			
-		</view>
+		<!-- <view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
+		</view> -->
 	</view>
 
 </template>
@@ -255,16 +257,14 @@
 		data() {
 			return {
 				id: "",
-				OutList: {},
-				EnterList: {},
+				OutList: {}, //出
+				EnterList: {}, //入
+				retreatList: {}, //退
 				type: '移库',
 				show: false,
-				purchaseOrder: {
-					freightUnitPrice: "123",
-					receivingAddress: '出库',
-					grade: "1"
-				},
-
+				show1: false,
+				border: false,
+				rejectInfo: "", //驳回原因
 				pjList: [{
 						type: '一等品'
 					},
@@ -278,28 +278,11 @@
 						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);
-		},
+		// onReady() {
+		// 	this.$refs.uForm.setRules(this.rules);
+		// },
 		onLoad(options) {
 			this.id = options.id
 			this.getList()
@@ -323,13 +306,15 @@
 										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
+									} else if (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
+									} else if (res.data.data[i].inOutType == "退库") {
+										this.retreatList = res.data.data[i]
+										this.retreatList.judge = 3
 									}
 								}
 							}
@@ -363,17 +348,23 @@
 				}
 			},
 			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')
+				// （1出库2入库3移库4退库并出库）
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空！')
+				} else {
+					this.show1 = false
+					if (this.OutList.taskTypeKey == 1) {
+						this.requestaudit(this.OutList)
+					} else if (this.OutList.taskTypeKey == 2) {
+						this.requestaudit(this.OutList)
+					} else if (
+						this.OutList.taskTypeKey == 3 ||
+						this.OutList.taskTypeKey == 4
+					) {
+						this.requestaudit(this.OutList, 'repetition')
+						if (!this.deletetask) {
+							this.requestaudit(this.OutList, 'repetition')
+						}
 					}
 				}
 			},
@@ -382,7 +373,7 @@
 				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', {
+						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: list.taskId,
 							approved: true,
 							auditMind: '34',
@@ -390,6 +381,9 @@
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
+								this.setTimeout(function() {
+										uni.navigateBack()
+								}, 1000);
 							}
 						})
 					}
@@ -400,14 +394,17 @@
 				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', {
+						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
-							auditMind: "驳回原因",
+							auditMind: this.rejectInfo,
 							needReapply: true
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('驳回成功！')
+								this.setTimeout(function() {
+										uni.navigateBack()
+								}, 1000);
 							}
 						})
 					}
@@ -418,18 +415,17 @@
 </script>
 
 <style scoped lang="scss">
-	.content1,
-	.content2 {
-		background-color: #FFFFFF;
+	.content1 {
 		margin: 10rpx;
-		padding-bottom: 10rpx;
-		border-radius: 20rpx;
+		padding-bottom: 224rpx;
 
 		.title {
-			font-size: 28rpx;
+			height: 70rpx;
+			line-height: 60rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			border-bottom: 2rpx solid #EEEEEE;
 		}
 	}
 
@@ -444,9 +440,24 @@
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -461,12 +472,15 @@
 
 	.textarea {
 		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		height: 100px;
 	}
 
 	.row {
 		display: flex;
 		justify-content: space-between;
-		border-bottom: 1px solid #EEEEEE;
+		// border-bottom: 1px solid #EEEEEE;
 		padding: 21rpx 0;
 
 		.right,
@@ -475,4 +489,58 @@
 			color: #333333;
 		}
 	}
+
+	//弹出框
+	// .popup {
+	// 	padding: 30rpx;
+	// 	border-radius: 20rpx;
+	// }
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		height: 100px;
+		margin: 30rpx;
+	}
+
+	.uForm_item {
+		padding: 20rpx;
+		background-color: #FFFFFF;
+		margin: 20rpx;
+		border-radius: 20rpx;
+	}
+
+	.rejectText {
+		text-align: center;
+	}
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+	
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+	
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+	
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -4,22 +4,23 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
+						<image src="../../../static/img/reject.png" mode="" v-if="status == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'"
+						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'"
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-if="status == '审核中' || status == '待决策人审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list.priceStatus}}</view>
+					<view class="infoText">{{status}}</view>
 				</view>
-				<view class="infoData">2020年1月15日 08:45</view>
+				<view class="infoData">{{updateDate}}</view>
 			</view>
 		</view>
 		<view class='content1'>
 			<view class='row content-item'>
 				<view class="left" style="color: #878C9C ;">仓库</view>
-				<view class="right">鲅鱼圈一号库</view>
+				<view class="right">{{warehouseName}}</view>
 			</view>
 			<view class="content-item">
 				<view v-for="(item,index) in List">
@@ -37,6 +38,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
+			<!-- getRoles("acquisitionQuality.initial") -->
 			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
 			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
 		</view>
@@ -52,8 +54,13 @@
 			return {
 				id: "",
 				currentPage: 1,
-				pageSize: 10,
-				List: [],
+				pageSize: 100,
+				List: [{
+					approveStatus: "",
+				}],
+				status: "",
+				updateDate:"",
+				warehouseName:"",
 			}
 		},
 		onLoad(options) {
@@ -67,23 +74,27 @@
 		},
 		methods: {
 			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
+				//查仓库名
+				this.$api.doRequest('get', '/paymentManagement/getInfo', {
+					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.List = res.data.data.records
+						this.status = res.data.data.approveStatus
+						this.updateDate = res.data.data.updateDate
+						this.warehouseName = res.data.data.warehouseName
+						this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							warehouseName: res.data.data.warehouseName,
+							managementType: 1
+						}).then(res1 => {
+							if (res1.data.code == 200) {
+								this.List = res1.data.data.records
+							}
+						})
 					}
 				})
+
 			},
 			//驳回
 			rejectSubmit() {
@@ -155,10 +166,12 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 200rpx 20rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
 	}
 
 	.content1 {
+		margin-top: 30rpx;
+
 		.content-item {
 			border-radius: 20rpx;
 			background: white;
@@ -226,29 +239,30 @@
 	.row1 {
 		border-bottom: 0 !important;
 	}
+
 	.topInfo {
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
-	
+
 			.logo {
 				width: 40rpx;
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
-	
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-	
+
 			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;

pages/task/audit/acquisition_settlement_details.vue

@@ -1,27 +1,46 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="status == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-if="status == '审核中' || status == '待决策人审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{status}}</view>
+				</view>
+				<view class="infoData">{{updateDate}}</view>
+			</view>
+		</view>
 		<view class='content1'>
-			<view class='row'>
-				<view class="left">仓库</view>
-				<view class="right">鲅鱼圈一号库</view>
+			<view class='row content-item'>
+				<view class="left" style="color: #878C9C ;">仓库</view>
+				<view class="right">{{warehouseName}}</view>
 			</view>
-			<view v-for="(item,index) in List">
-				<view class='row row1'>
-					<view class="left">{{item.paymentNo}}</view>
-					<view class="right">{{item.carNo}}</view>
-				</view>
-				<view class='row'>
-					<view class="left">{{item.goodsName}}({{item.netWeight}} - {{item.tidalGrainPrice}})</view>
-					<view class="right">{{item.amountIngPayable}}</view>
+			<view class="content-item">
+				<view v-for="(item,index) in List">
+					<view class='row row1'>
+						<view class="left title">{{item.paymentNo}}</view>
+						<view class="right title">{{item.carNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left goodsInfoCss">{{item.goodsName}}({{item.netWeight}}kg -
+							￥{{item.tidalGrainPrice}})</view>
+						<view class="right priceCss">￥{{item.amountIngPayable}}</view>
+					</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 style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
+		</view> -->
 	</view>
 </template>
 
@@ -34,8 +53,13 @@
 			return {
 				id: "",
 				currentPage: 1,
-				pageSize: 10,
-				List: [],
+				pageSize: 100,
+				List: [{
+					approveStatus: "",
+				}],
+				status: "",
+				updateDate:"",
+				warehouseName:"",
 			}
 		},
 		onLoad(options) {
@@ -49,23 +73,27 @@
 		},
 		methods: {
 			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
+				//查仓库名
+				this.$api.doRequest('get', '/paymentManagement/getInfo', {
+					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.List = res.data.data.records
+						this.status = res.data.data.approveStatus
+						this.updateDate = res.data.data.updateDate
+						this.warehouseName = res.data.data.warehouseName
+						this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							warehouseName: res.data.data.warehouseName,
+							managementType: 1
+						}).then(res1 => {
+							if (res1.data.code == 200) {
+								this.List = res1.data.data.records
+							}
+						})
 					}
 				})
+
 			},
 			//驳回
 			rejectSubmit() {
@@ -112,8 +140,8 @@
 						this.$api.doRequest('get', '/workflow/api/handle', {
 							taskId: item.taskId,
 							approved: status,
-							auditMind: reason  ? '已驳回' : '34',
-							needReapply: status2  ? true : false
+							auditMind: reason ? '已驳回' : '34',
+							needReapply: status2 ? true : false
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.audit(this.List[index + 1], index + 1, status, status2, reason)
@@ -137,55 +165,108 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
 	}
 
-	.content1,
-	.content2 {
-		border-radius: 20rpx;
-		background: white;
-		padding: 20rpx;
+	.content1 {
+		margin-top: 30rpx;
+
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
 
 		.title {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			margin: 30rpx 0;
+		}
+
+		.goodsInfoCss {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #878C9C;
+			margin: 26rpx 10rpx;
+		}
+
+		.priceCss {
+			font-size: 40rpx;
+			margin: 26rpx 10rpx;
+			color: #22C572;
+			font-weight: 600;
 		}
 
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-			padding: 21rpx 0;
 
 			.right,
 			input {
 				font-size: 28rpx;
-				color: #333333;
+				// color: #333333;
 			}
 		}
 	}
 
-	.content2 {
-		margin-top: 20rpx;
-	}
-
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
-	}
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
 
-	.submit {
-		width: 40%;
-		background: #22C572;
-		border-radius: 10rpx;
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.row1 {
 		border-bottom: 0 !important;
 	}
+
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/audit/freight_setting_approval.vue

@@ -13,7 +13,7 @@
 					</view>
 					<view class="infoText">{{list.priceStatus}}</view>
 				</view>
-				<view class="infoData">2020年1月15日 08:45</view>
+				<view class="infoData">{{list.updateDate}}</view>
 			</view>
 		</view>
 		<view class="transaction">
@@ -49,7 +49,9 @@
 	export default {
 		data() {
 			return {
-				list: {},
+				list: {
+					priceStatus:"",
+				},
 				id: "",
 			}
 		},
@@ -78,7 +80,7 @@
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
 					if (res.data.code == 200) {
 						this.$api.msg('审核通过成功!')
-						this.setTimeout(function() {
+						setTimeout(function() {
 							uni.navigateBack()
 						}, 1000);
 					}

pages/task/audit/freight_setting_details.vue

@@ -4,13 +4,16 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-					<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'" style="height: 40rpx;"></image><!-- 驳回 -->
-					<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'" style="height: 40rpx;"></image><!-- 通过 -->
-					<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'" style="height: 40rpx;"></image><!-- 待审核 -->
+						<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{list.priceStatus}}</view>
 				</view>
-				<view class="infoData">2020年1月15日 08:45</view>
+				<view class="infoData">{{list.updateDate}}</view>
 			</view>
 		</view>
 		<view class="transaction">
@@ -31,15 +34,18 @@
 					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</view>
-		
+		<!-- <u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button> -->
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -51,6 +57,9 @@
 			this.id = options.id
 			this.getList()
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		methods: {
 			getList() {
 				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
@@ -60,12 +69,20 @@
 				})
 			},
 			passSubmit() {
+				var that = this
 				var tranProcessInfo = {}
 				tranProcessInfo.id = this.list.id
 				tranProcessInfo.flag = "1"
 				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
+				tranProcessInfo.reviewer = this.userInfo.userName
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-					that.$api.msg('审核通过成功')
+					if (res.data.code == 200) {
+						this.$api.msg('审核通过成功!')
+						this.setTimeout(function() {
+							uni.navigateBack()
+						}, 1000);
+					}
+
 				})
 			}
 		}
@@ -100,8 +117,9 @@
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
+
 		.topInfo-item {
-			height: 158rpx;
+			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
@@ -111,18 +129,21 @@
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-			.infoData{
+
+			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;
 				margin-top: 10rpx;
 			}
 		}
 	}
+
 	.submit {
 		width: 98%;
 		background: #22C572;

pages/task/audit/freight_settlement_approval.vue

@@ -13,7 +13,7 @@
 					</view>
 					<view class="infoText">{{list[0].approveStatus}}</view>
 				</view>
-				<view class="infoData">2020年1月15日 08:45</view>
+				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
@@ -34,7 +34,7 @@
 					</view>
 					<view class="car-type-item">
 						<view class="right">结</view>
-						<view class="textInfo">{{item.settlementWeightchange}}吨</view>
+						<view class="textInfo">{{item.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="left">运</view>
@@ -42,11 +42,11 @@
 					</view>
 					<view class="car-type-item">
 						<view class="center">扣</view>
-						<view class="textInfo">{{item.deductionAmountchange}}元</view>
+						<view class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">付</view>
-						<view class="textInfo">{{item.amountEdPayable}}元</view>
+						<view class="textInfo">{{item.amountIngPayable}}元</view>
 					</view>
 				</view>
 			</view>

pages/task/audit/freight_settlement_details.vue

@@ -1,43 +1,61 @@
 <template>
 	<view class="container">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="list[0].approveStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list[0].approveStatus}}</view>
+				</view>
+				<view class="infoData">{{list[0].updateDate}}</view>
+			</view>
+		</view>
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>123456796</view>
+				<view>{{list[0].contractNo}}</view>
 			</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">{{item.loadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">卸</view>
-					<view class="left">{{item.unloadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">结</view>
-					<view class="left">{{item.settlementWeightchange}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">运</view>
-					<view class="left">{{item.transportPrice}}元/吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">扣</view>
-					<view class="left">{{item.deductionAmountchange}}元</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">付</view>
-					<view class="left">{{item.amountEdPayable}}元</view>
+			<view class="car-container">
+				<view v-for="(item,index) in list" style="border-bottom: 2rpx solid #EEEEEE;margin-top: 30rpx;">
+					<view class="car-num title">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-type-item">
+						<view class="left">装</view>
+						<view class="textInfo">{{item.loadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">卸</view>
+						<view class="textInfo">{{item.unloadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">结</view>
+						<view class="textInfo">{{item.settlementWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">运</view>
+						<view class="textInfo">{{item.transportPrice}}元/吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">扣</view>
+						<view class="textInfo">{{item.deductionAmount}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">付</view>
+						<view class="textInfo">{{item.amountIngPayable}}元</view>
+					</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 style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click="rejectSubmit()" type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
+		</view> -->
 	</view>
 </template>
 
@@ -47,7 +65,11 @@
 			return {
 				currentPage: 1,
 				pageSize: 10,
-				list: [],
+				list: [
+					{
+						approveStatus:"",
+					}
+				],
 			}
 		},
 		onLoad() {
@@ -130,15 +152,18 @@
 <style scoped lang="scss">
 	.container {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
-		border-radius: 20rpx;
-		background: white;
+		padding: 20rpx 20rpx 230rpx 20rpx;
 	}
 
 	.content {
 		.top {
 			display: flex;
 			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 30rpx 20rpx;
+			font-size: 36rpx;
+			margin-top: 30rpx;
 		}
 
 		.title {
@@ -146,21 +171,44 @@
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
+			margin-bottom: 30rpx;
+		}
+		.car-container{
+			padding: 10rpx 20rpx;
+			border-radius: 20rpx;
+			background: white;
+			margin:30rpx 0 ;
+			// border-bottom: 2rpx solid #EEEEEE;
 		}
 
 		.car-type-item {
 			display: inline-flex;
 			// justify-content: center;
 			width: 33.33%;
+			margin-bottom: 40rpx ;
+		}
+		.title{
+			font-size: 36rpx;
 		}
 	}
-
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -168,4 +216,56 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
+	.left{
+		background: #FEECE6;
+		color: #FE6430;
+	}
+	.center{
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+	.right{
+		background: #E9F8F0 ;
+		color: #22C572 ;
+	}
+	.left,.center,.right{
+		width: 50rpx;
+		height: 50rpx;
+		text-align: center;
+		line-height: 50rpx;
+		border-radius: 10rpx;
+	}
+	.textInfo{
+		margin: 6rpx 0 0 10rpx;
+	}
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 158rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+	
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+	
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+	
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/audit/purchase_settlement_approval.vue

@@ -62,7 +62,11 @@
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
-				list: [],
+				list: [
+					{
+						status:"",
+					}
+				],
 				contractNo: "",
 			}
 		},

pages/task/audit/purchase_settlement_details.vue

@@ -1,36 +1,57 @@
 <template>
 	<view class="container">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="list[0].status == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].status == '审核中'||list[0].status == '未审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list[0].status}}</view>
+				</view>
+				<view class="infoData">{{list[0].warehousingDate}}</view>
+			</view>
+		</view>
 		<view class="content">
-			<view class="top">
-				<view>合同编号</view>
+			<view class="top content-item">
 				<view>{{contractNo}}</view>
+				<view>元/吨</view>
 			</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">{{item.netWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">结重</view>
-					<view class="left">120.4{{item.settlementWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">扣款</view>
-					<view class="left">{{item.deductionAmountchange}}元/吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">应付</view>
-					<view class="left">{{item.amountIngPayable}}元</view>
+			<view class="content-item">
+				<view class="car-container" v-for="(item,index) in list">
+					<view class="car-num title">{{item.carNo}}</view>
+					<view class="row">
+						<view class="left car-type-item">净重</view>
+						<view class="right weightInfoCss">{{item.netWeight}} 吨</view>
+					</view>
+					<view class="row">
+						<view class="left car-type-item">结重</view>
+						<view class="right weightInfoCss">{{item.settlementWeight}} 吨</view>
+					</view>
+					<view class="row">
+						<view class="left car-type-item">扣款</view>
+						<view class="right weightInfoCss">￥{{item.deductionAmountchange?item.deductionAmountchange:"0"}}/吨</view>
+					</view>
+					<view class="row ">
+						<view class="left money">应付</view>
+						<view class="right moneyInfo">￥{{item.amountIngPayable}}元</view>
+					</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> -->
-			 <u-button type="primary" class="submit" hover-class="none" >???</u-button>
-		</view>
+		<!-- <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 style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='rejectSubmit' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='passSubmit' type="success" class="btn2">通过</u-button>
+		</view> -->
 	</view>
 </template>
 
@@ -39,10 +60,10 @@
 		data() {
 			return {
 				id: "",
-				currentPage:1,
-				pageSize:10,
-				list:[],
-				contractNo:"",
+				currentPage: 1,
+				pageSize: 10,
+				list: [],
+				contractNo: "",
 			}
 		},
 		onLoad(options) {
@@ -57,10 +78,10 @@
 					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,
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							contractNo: this.contractNo,
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.list = res.data.data.records
@@ -70,10 +91,10 @@
 				})
 			},
 			//驳回
-			rejectSubmit(){
+			rejectSubmit() {
 				var that = this
 				if (this.list.length == 0) {
-						that.$api.msg('没有要审核的条目！')
+					that.$api.msg('没有要审核的条目！')
 				} else {
 					// uni.showModal({
 					// 	content: "是否确定驳回?",
@@ -82,8 +103,8 @@
 					// 		this.audit(this.list[0], 0, false, true, '已驳回')
 					// 	}
 					// })
-					
-					
+
+
 					uni.showModal({
 						content: "是否确定驳回？",
 						showCancel: true,
@@ -91,14 +112,16 @@
 						success: function(res) {
 							if (res.confirm) {
 								that.audit(that.list[0], 0, false, true, '已驳回')
-							}}})
+							}
+						}
+					})
 				}
 			},
 			//通过
-			passSubmit(){
+			passSubmit() {
 				var that = this
 				if (this.list.length == 0) {
-						that.$api.msg('没有要审核的条目！')
+					that.$api.msg('没有要审核的条目！')
 				} else {
 					// uni.showModal({
 					// 	content: "是否确定通过?",
@@ -114,7 +137,9 @@
 						success: function(res) {
 							if (res.confirm) {
 								that.audit(that.list[0], 0, true, 2)
-							}}})
+							}
+						}
+					})
 				}
 			},
 			//审核方法
@@ -130,10 +155,10 @@
 					})
 				} else {
 					if (status == true) {
-							that.$api.msg('通过成功')
+						that.$api.msg('通过成功')
 						this.getList()
 					} else if (status == false) {
-							that.$api.msg('驳回成功')
+						that.$api.msg('驳回成功')
 						this.getList()
 					}
 				}
@@ -144,43 +169,114 @@
 
 <style scoped lang="scss">
 	.container {
-		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
-		border-radius: 20rpx;
-		background: white;
+		padding: 20rpx 20rpx 250rpx 20rpx;
 	}
 
 	.content {
+		margin-top: 30rpx;
 		.top {
 			display: flex;
 			justify-content: space-between;
 		}
 
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
+
 		.title {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
+			margin: 20rpx 0;
+		}
+		.car-container{
+			border-bottom: 2rpx solid #EEEEEE;
 		}
 
 		.car-type-item {
-			display: inline-flex;
-			// justify-content: center;
-			width: 50%;
+			font-size: 28rpx;
+			margin: 20rpx 0;
+			color: #878C9C;
+		}
+
+		.weightInfoCss {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 500;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// .right,
+			// input {
+			// 	font-size: 28rpx;
+			// 	// color: #333333;
+			// }
 		}
-	}
 
-	.bottom-btn {
-		width: 92%;
+		.money {
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-bottom: 30rpx ;
+		}
+
+		.moneyInfo {
+			color: #22C572;
+			font-size: 32rpx;
+		}
+	}
+.bottom-btn {
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
-	}
-
-	.submit {
-		width: 40%;
-		background: #22C572;
-		border-radius: 10rpx;
-	}
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
+		}
+		.topInfo {
+			height: 210rpx;
+			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+			padding: 30rpx;
+		
+			.topInfo-item {
+				height: 150rpx;
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
+				padding: 40rpx;
+		
+				.logo {
+					width: 40rpx;
+					height: 40rpx;
+					margin-top: 8rpx;
+				}
+		
+				.infoText {
+					font-size: 36rpx;
+					font-weight: 600;
+					margin-left: 20rpx;
+				}
+		
+				.infoData {
+					color: #878C9C;
+					font-size: 26rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -143,7 +143,7 @@
 									}).then(res1 => {
 										if (res1.data.code == 200) {
 											that.$api.msg('审核成功');
-											that.setTimeout(function() {
+											setTimeout(function() {
 													uni.navigateBack()
 											}, 1000);
 										} else {
@@ -174,10 +174,7 @@
 							}).then(res1 => {
 								if (res1.data.code == 200) {
 									that.$api.msg('驳回成功');
-									// that.$nextTick(function() {
-									// 	uni.navigateBack()
-									// })
-									this.setTimeout(function() {
+									setTimeout(function() {
 											uni.navigateBack()
 									}, 1000);
 								} else {

pages/task/audit/warehouse_details.vue

@@ -1,5 +1,21 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="list.status == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.status == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.status == '审核中'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list.status}}</view>
+				</view>
+				<view class="infoData">{{list.updateDate}}</view>
+			</view>
+		</view>
 		<view class='content1'>
 			<view class="title">基本信息</view>
 			<view class='row'>
@@ -30,43 +46,57 @@
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
-			<view class='row'>
+			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
 		<view class="content2">
 			<view class="title">粮价设置</view>
-			<view  v-for="(item,index) in list.details" :key="index">
+			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
 					<view class="left">等级</view>
 					<view class="right">{{item.level}}</view>
-				</view>	
+				</view>
 				<view v-if="list.paramType == '2'" class="row">
 					<view class="left">基准单价（元/公斤）</view>
-					<view class="right">{{item.basicUnitPrice}}</view>
-				</view>	
-				<view class="row" v-for="(item1,index1) in item.modelList" :key="index1">
+					<view class="right">{{item.basePrice}}</view>
+				</view>
+				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1" :class="index1==item.modelList.length-1?'boder':''">
 					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
 					<view v-else class="left">{{item1.startWater}}-{{item1.endWater}}扣重比</view>
 					<view class="right">{{item1.price}}</view>
-				</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>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
+		name: "task",
 		data() {
 			return {
+				show: false,
+				id: 0,
 				list: {},
-				id:"",
-			}
+				form: {
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				radio: '',
+				pcUserInfo: uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList: []
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
 		},
 		onLoad(options) {
 			this.id = options.id
@@ -88,6 +118,72 @@
 					}
 				})
 			},
+			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', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
+								if (res.data.code == 200) {
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										approved: true,
+										auditMind: "",
+										needReapply: true,
+										taskId:  that.list.taskId,
+									}).then(res1 => {
+										if (res1.data.code == 200) {
+											that.$api.msg('审核成功');
+											that.setTimeout(function() {
+													uni.navigateBack()
+											}, 1000);
+										} else {
+											that.$api.msg(res1.data.message);
+										}
+									})
+								} 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()
+									// })
+									this.setTimeout(function() {
+											uni.navigateBack()
+									}, 1000);
+								} else {
+									that.$api.msg(res1.data.message);
+								}
+							})
+						}
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -95,27 +191,28 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 330rpx 20rpx;
 	}
+
 	.content1,
 	.content2 {
 		border-radius: 20rpx;
 		background: white;
 		padding: 20rpx;
-	
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			text-align: left;
 		}
-	
+
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
 			padding: 21rpx 0;
-	
+
 			.right,
 			input {
 				font-size: 28rpx;
@@ -123,19 +220,68 @@
 			}
 		}
 	}
-	.content2{
+
+	.content2 {
 		margin-top: 20rpx;
 	}
+
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;
 		border-radius: 10rpx;
 	}
+	.boder{
+		border:0;
+		border-bottom: 0!important;
+	}
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+	
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+	
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+	
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/task/my_task.vue

@@ -11,22 +11,25 @@
 			</view>
 		</view>
 		<view class="introduce-section">
-			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
-				<view class="title flex align-item-center">
-					<view>
-						<view class="title-row1">{{item.department}}:</view>
-						<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
+			<view v-for="(item, index) in taskInfo" :key="index" @click="navToDetailPage(item)">
+				<view v-if="item.showRow" class="guess-item">
+					<view class="title flex align-item-center">
+						<view>
+							<view class="title-row1">{{item.department}}:</view>
+							<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
+						</view>
+						<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
+						<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
 					</view>
-					<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
-					<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
-				</view>
-				<view class="flex title_b">
-					<view style='color:#878C9C;' class="title row2">
-						{{item.messageContent}}
+					<view class="flex title_b">
+						<view style='color:#878C9C;' class="title row2">
+							{{item.messageContent}}
+						</view>
 					</view>
+					<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'" />
+					<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'" />
 				</view>
-				<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'" />
-				<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'" />
+
 			</view>
 			<view v-show="isSole">
 				<uni-load-more :status="loadStatus"></uni-load-more>
@@ -155,6 +158,18 @@
 			},
 		},
 		methods: {
+			// getRoles(){
+			// 	let _rolesList =  uni.getStorageSync('rolesList')
+			// 	let _list = ['','']
+			// 	for(let i = 0;i<_list.length;i++){
+			// 		for(let k = 0;k<_rolesList.length;k++){
+			// 			if(_list[i]==_rolesList[k]){
+			// 				return true
+			// 			}
+			// 		}
+			// 	}
+			// 	return false
+			// },
 			searchKeyWord() {
 				if (!this.keyword) {
 					this.$api.msg('关键字不能为空')
@@ -203,6 +218,7 @@
 				}
 				data.currentPage = pages
 				data.pageSize = limit
+				
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {
@@ -214,8 +230,6 @@
 							} else {
 								that.taskInfo = that.taskInfo.concat(data)
 							}
-
-
 						} else {
 							if (that.pages > 1) {
 								that.pages -= 1
@@ -225,6 +239,13 @@
 							that.loadStatus = 'nomore'
 						}
 						for (var i = 0; i < this.taskInfo.length; i++) {
+							let _str = this.taskInfo[i]
+							// let a = this.getRoles()
+							if(_str.messageContent.indexOf("您发起")>-1){
+								_str.showRow = false
+							}else{
+								_str.showRow = true;
+							}
 							this.taskInfo[i].department=this.taskInfo[i].messageContent.split(' ')[0]
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
@@ -350,7 +371,6 @@
 						})
 					}
 				}else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
-					debugger
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId
@@ -372,8 +392,7 @@
 					} 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
+							url: `/pages/task/audit/purchase_settlement_details?id=` + item.businessId
 						})
 					}
 				}else if (item.businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {