Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -1185,7 +1185,7 @@
 	}
 	.content2 {
 		background: white;
-		margin: 20rpx 10px;
+		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
 	
@@ -1195,98 +1195,118 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
-			width: 2px;
+			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;

pages/task/audit/Issueandreceipt_task_details.vue

@@ -633,7 +633,7 @@
 	}
 	.content2 {
 		background: white;
-		margin: 20rpx 10px;
+		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
 	
@@ -643,96 +643,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/audit/acquisitioncontract.vue

@@ -1,5 +1,24 @@
 <template>
 	<view class="container">
+		<view class="headInfo">
+			<view class="headInfo_left">
+				<u-icon name="checkmark" color="#22C572" size="30" v-if="auditCheck=='success'"></u-icon>
+				<u-icon name="close" color="#FB2323" size="24" v-if="auditCheck=='error'"></u-icon>
+				<u-icon name="clock-fill" color="#FE6430" size="30" v-if="auditCheck=='question'"></u-icon>
+			</view>
+			<view class="headInfo_middle">
+				<view class="headInfo_title">收购合同审批</view>
+				<view class="headInfo_No">{{list.contractNo}}</view>
+			</view>
+			<view class="headInfo_right">
+				<view class="char_a" v-if="auditCheck == 'success'">审批通过</view>
+				<view class="char_b" v-if="auditCheck == 'question'">审核中</view>
+				<view class="char_c" v-if="auditCheck == 'error'">审批未通过</view>
+			</view>
+			<view class="adopt" v-if="auditCheck == 'success'">
+				<image src="../../../static/img/oa_office/adopt.png" class="adopt_img" mode=""></image>
+			</view>
+		</view>
 		<u-form ref="uForm">
 			<view class="form_top">基本信息</view>
 			<u-form-item label-width='260' label="合同编号" :borderBottom="false">
@@ -17,182 +36,198 @@
 			<u-form-item label-width='260' label="合营方电话" :borderBottom="false">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<view class="form_view" style="background: #F9F9FA;">
+			<u-form-item label-width='260' label="交货日期（起 - 止）" :borderBottom="false">
+				<view class="textCss">
+					{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
+				</view> 
+			</u-form-item>
+			<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false">
+				<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<!-- <u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-if="list.unitContractPrice">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-if="list.totalContractPrice">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-if="list.finalTradingVolume">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-if="list.settlementPrice">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsNameKey">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--"
+					disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsName">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-if="list.contractProcessInfo.waterContent">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--"
+					disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.impurity">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false" v-if="list.contractProcessInfo.mildewGrain">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-if="list.contractProcessInfo.grade">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
+			</u-form-item>
+			<u-form-item>
+				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
+			</u-form-item>
+			
+			<!-- <u-form-item label-width='260' label="附件"> -->
+				<!-- <view class="textCss">
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
+				</view> -->
+				
+			<!-- </u-form-item> -->
+			
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">货物信息</view>
+			<view class="form_view">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="交易主体" class="label_css" :borderBottom="false">
-							<u-input v-model="list.transactionSubject" class="input_css" input-align="right"
+						<u-form-item label-width='100' label="货名" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.goodsName" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--"
-								disabled />
+						<u-form-item label-width='150' label="品级" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.grade" class="input_css" input-align="right"
+								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="重量（吨）" class="label_css" :borderBottom="false">
-							<u-input v-model="list.weight" class="input_css" input-align="right" placeholder="--"
-								disabled />
+						<u-form-item label-width='230' label="容重（克/升）>=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.bulkDensity" class="input_css" input-align="right"
+								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='150' label="签订日期" class="label_css" :borderBottom="false">
-							<u-input v-model="list.signingDate" class="input_css" input-align="right" placeholder="--"
-								disabled />
+						<u-form-item label-width='230' label="霉变粒（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.mildewGrain" class="input_css" input-align="right"
+								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="货名" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.goodsName" class="input_css" input-align="right"
+						<u-form-item label-width='200' label="水分（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.waterContent" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="水分（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.waterContent" class="input_css" input-align="right"
+						<u-form-item label-width='200' label="杂质（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.impurity" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="品级" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.grade" class="input_css" input-align="right"
+						<u-form-item label-width='200' label="热损伤（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.jiaorenli" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="杂质（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.impurity" class="input_css" input-align="right"
-								placeholder="--" disabled />
+						<u-form-item label-width='230' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.imperfectGrain" class="input_css"
+								input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
+				
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">约定信息</view>
+			<view class="form_view">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='200' label="容重（克/升）>=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.bulkDensity" class="input_css" input-align="right"
+						<u-form-item label-width='150' label="交易主体" class="label_css" :borderBottom="false">
+							<u-input v-model="list.transactionSubject" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="霉变粒（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.mildewGrain" class="input_css" input-align="right"
-								placeholder="--" disabled />
+						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--"
+								disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='200' label="热损伤（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.jiaorenli" class="input_css" input-align="right"
-								placeholder="--" disabled />
+						<u-form-item label-width='150' label="重量（吨）" class="label_css" :borderBottom="false">
+							<u-input v-model="list.weight" class="input_css" input-align="right" placeholder="--"
+								disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='230' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.imperfectGrain" class="input_css"
-								input-align="right" placeholder="--" disabled />
+						<u-form-item label-width='150' label="签订日期" class="label_css" :borderBottom="false">
+							<u-input v-model="list.signingDate" class="input_css" input-align="right" placeholder="--"
+								disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
+				
 			</view>
-			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false">
-				<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--"
-					disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--"
-					disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
-			</u-form-item>
-			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			
-			<!-- <u-form-item label-width='260' label="附件"> -->
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
-						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<view class="fujian_title">共{{imglist.length}}个附件</view>
-				<view v-if='imglist.length>0'>
-					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
-						<view class="img_item">
-							<view class="" style="width: 16%;">
-								<image
-									v-if="item.type == 'pdf'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
-									mode=""></image>
-								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
-									mode=""></image>
-								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
-									mode=""></image>
-								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
-								</image>
-							</view>
-							<view class="" style="width: 70%;">
-								<view class="char_css">{{item.appendixName}}</view>
-								<view class="">{{item.appendixSize}}</view>
-							</view>
-							<view style="color: #19be6b;text-decoration:underline;" class="img_dowload" @click="openDocument(item)">
-								下载
-							</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{imglist.length}}个附件</view>
+			<view v-if='imglist.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image
+								v-if="item.type == 'pdf'"
+								class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								class="imgsign" src="../../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								class="imgsign" src="../../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else class="imgsign" :src="item.appendixPath" mode="">
+							</image>
+						</view>
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.appendixName}}</view>
+							<view class="img_size">{{item.appendixSize}}</view>
+						</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
 						</view>
-						
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
+					
+					<!-- <u-icon name="attach" ></u-icon> -->
+					<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 				</view>
-			<!-- </u-form-item> -->
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">流程</view>
 			<view class="content2">
-				<view class="title row">
-					流程
-				</view>
 				<view v-for="(item,index) in auditList" :key='index' class="audit">
 					<view class="row">
 						<view class="left">
@@ -319,7 +354,8 @@
 				isAdd: true,
 				imgShow: false,
 				url: "",
-				everyCheck: ''
+				everyCheck: '',
+				auditCheck:"question",//判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -496,6 +532,17 @@
 
 								}
 								console.log(response.data.data)
+								for(let i = 0 ;i<response.data.data.length;i++){
+									if(response.data.data[i].status == "error"){
+										this.auditCheck = "error"
+										break;
+									}else if(response.data.data[i].status == "question"){
+										this.auditCheck = "question"
+										break;
+									}else{ 
+										this.auditCheck = "success"
+									}
+								}
 								this.auditList = response.data.data
 								var time2 = new Date(this.list.createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
@@ -627,10 +674,11 @@
 	}
 
 	.u-form {
+		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
 		padding: 30rpx 10px;
-
+	
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
@@ -824,11 +872,10 @@
 		justify-content: flex-end;
 		width: 100%;
 		text-align: right;
+		color: #333333;
 	}
-
-
 	.textarea {
-		margin: 20px auto;
+		margin: 15rpx auto;
 		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
@@ -861,28 +908,28 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-
+	
 		.row {
 			display: flex;
-
+	
 			.left {
 				display: flex;
 				align-items: center;
-
+	
 				.item1 {
 					position: relative;
-
+	
 					.item-content {
-						background: #22C572;
-						width: 50px;
-						height: 50px;
-						border-radius: 10px;
-						line-height: 50px;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
 						text-align: center;
-						font-size: 18px;
+						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -891,27 +938,27 @@
 						bottom: -3px;
 						background: #fff;
 					}
-
+	
 					.status.success {
 						border: 1px solid rgb(60, 156, 255);
 					}
-
+	
 					.status.error {
 						border: 1px solid rgb(245, 108, 108);
 					}
-
+	
 					.status.question {
 						border: 1px solid #f9ae3d;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -920,31 +967,33 @@
 					border-radius: 5px;
 					color: #B0B1B5;
 				}
-
+	
 				.right-item {
 					display: flex;
 					justify-content: space-between;
-
+	
 					.time {
 						color: #999;
 					}
-
+	
 					.item2 {
 						margin-left: 20rpx;
-
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
-
+	
 						.status.success {
 							color: #6CC48C;
 						}
-
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
-
+	
 						.status.question {
 							color: #f9ae3d;
 						}
@@ -952,10 +1001,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -968,22 +1017,22 @@
 				padding: 0 2px;
 				margin: 0 auto;
 			}
-
+	
 			.status {
 				position: absolute;
 				top: 0;
 				right: 0;
 			}
 		}
-
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}
@@ -996,9 +1045,11 @@
 		font-weight: 600;
 	}
 
-	.form_view {
+	.form_view{
 		margin: 20rpx 0;
 		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
 	}
 
 	.label_css {
@@ -1009,30 +1060,33 @@
 	.input_css {
 		font-size: 20rpx;
 	}
-	.char_css {
-		font-size: 30rpx;
-		font-weight: 600;
-		display: -webkit-box;
-		overflow: hidden;
-		/*! autoprefixer: off; */
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical;
-		text-overflow: ellipsis;
-		word-break: break-all;
-	}
-	.fujian_title{
-		font-size: 34rpx;
-		margin-top: 20px;
-		font-weight: 600;
-		// margin-left: 10px;
-	}
-	
 	.img_item {
 		display: flex;
 		width: 100%;
 		margin: 10px 0;
 		padding: 0 10rpx;
+		.imgsign{
+			width: 25px;
+			height: 25px;
+			margin-top: 6px;
+		}
+		.char_css {
+			font-size: 28rpx;
+			font-weight: 600;
+			display: -webkit-box;
+			overflow: hidden;
+			/*! autoprefixer: off; */
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			word-break: break-all;
+		}
+		.img_size{
+			color: #B0B3BF;
+			font-size: 12px;
+			margin-top: 5px;
+		}
 	
 		.img_dowload {
 			width: 14%;
@@ -1040,4 +1094,57 @@
 			text-align: right;
 		}
 	}
+	.headInfo{
+		height: 100px;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+		display: flex;
+		position: relative;
+		.headInfo_left{
+			width: 10%;
+			line-height: 60px;
+			text-align: center;
+		}
+		.headInfo_middle{
+			width: 70%;
+			padding-left: 10px;
+		}
+		.headInfo_right{
+			width: 20%;
+			line-height: 60px;
+			.char_a{
+				color: #22C572;
+			}
+			.char_b{
+				 color: #FE6430;
+			}
+			.char_c{
+				color: #FB2323;
+			}
+			.char_a,.char_b,.char_c{
+				font-size: 16px;
+			}
+		}
+		.adopt{
+			position: absolute;
+			right: 30px;
+			top: 60px;
+			.adopt_img{
+				width: 90px;
+				height: 90px;
+			}
+		}
+		.headInfo_title{
+			font-size: 19px;
+			color: #333333;
+			font-weight: 600;
+		}
+		.headInfo_No{
+			color: #878C9C;
+			font-size: 13px;
+			margin-top: 10px;
+		}
+	}
 </style>

pages/task/audit/charge_against_revenue.vue

@@ -120,20 +120,20 @@
 							<view class="" style="width: 16%;">
 								<image
 									v-if="item.type == 'pdf'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									class="imgsign" src="../../../static/img/oa_office/pdf3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									class="imgsign" src="../../../static/img/oa_office/excle3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									class="imgsign" src="../../../static/img/oa_office/word3.png"
 									mode=""></image>
-								<image v-else style="width: 40px; height: 40px;"
+								<image v-else class="imgsign"
 									src="../../../static/img/oa_office/img.png" mode=""></image>
 							</view>
 							<view class="" style="width: 70%;">
 								<view class="char_css">{{item.appendixName}}</view>
-								<view class="">{{item.appendixSize}}</view>
+								<view class="img_size">{{item.appendixSize}}</view>
 							</view>
 							<view class="img_dowload" @click="openDocument(item)">下载</view>
 						</view>
@@ -846,28 +846,28 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-
+	
 		.row {
 			display: flex;
-
+	
 			.left {
 				display: flex;
 				align-items: center;
-
+	
 				.item1 {
 					position: relative;
-
+	
 					.item-content {
-						background: #22C572;
-						width: 50px;
-						height: 50px;
-						border-radius: 10px;
-						line-height: 50px;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
 						text-align: center;
-						font-size: 18px;
+						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -876,27 +876,27 @@
 						bottom: -3px;
 						background: #fff;
 					}
-
+	
 					.status.success {
 						border: 1px solid rgb(60, 156, 255);
 					}
-
+	
 					.status.error {
 						border: 1px solid rgb(245, 108, 108);
 					}
-
+	
 					.status.question {
 						border: 1px solid #f9ae3d;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -905,31 +905,33 @@
 					border-radius: 5px;
 					color: #B0B1B5;
 				}
-
+	
 				.right-item {
 					display: flex;
 					justify-content: space-between;
-
+	
 					.time {
 						color: #999;
 					}
-
+	
 					.item2 {
 						margin-left: 20rpx;
-
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
-
+	
 						.status.success {
 							color: #6CC48C;
 						}
-
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
-
+	
 						.status.question {
 							color: #f9ae3d;
 						}
@@ -937,10 +939,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -953,27 +955,26 @@
 				padding: 0 2px;
 				margin: 0 auto;
 			}
-
+	
 			.status {
 				position: absolute;
 				top: 0;
 				right: 0;
 			}
 		}
-
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}
 	}
-
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -1144,7 +1145,30 @@
 		display: flex;
 		width: 100%;
 		margin: 10px 0;
-
+		padding: 0 10rpx;
+		.imgsign{
+			width: 25px;
+			height: 25px;
+			margin-top: 6px;
+		}
+		.char_css {
+			font-size: 28rpx;
+			font-weight: 600;
+			display: -webkit-box;
+			overflow: hidden;
+			/*! autoprefixer: off; */
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			word-break: break-all;
+		}
+		.img_size{
+			color: #B0B3BF;
+			font-size: 12px;
+			margin-top: 5px;
+		}
+	
 		.img_dowload {
 			width: 14%;
 			color: #22C572;

pages/task/audit/charge_against_revenue_detail.vue

@@ -736,96 +736,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/audit/freight_settlement_approval.vue

@@ -12,18 +12,19 @@
 							v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list[0].approveStatus}}</view>
+					<view class="infoText">{{list[0].approveStatus?list[0].approveStatus:list[0].status}}</view>
 				</view>
 				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
-				<view>合同编号</view>
+				<view v-if='list[0].contractFlag=="1"'>合同编号</view>
+				<view v-if='list[0].contractFlag=="0"'>移库编号</view>
 				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-				<view class="top1" style="display: flex;">
+				<view v-if='list[0].contractFlag=="1"' class="top1" style="display: flex;">
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>

pages/task/audit/freight_settlement_details.vue

@@ -9,18 +9,19 @@
 						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 					</view>
-					<view class="infoText">{{list[0].status}}</view>
+					<view class="infoText">{{list[0].approveStatus?list[0].approveStatus:list[0].status}}</view>
 				</view>
 				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
-				<view>合同编号</view>
+				<view v-if='list[0].contractFlag=="1"'>合同编号</view>
+				<view v-if='list[0].contractFlag=="0"'>移库编号</view>
 				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-				<view class="top1" style="display: flex;">
+				<view v-if='list[0].contractFlag=="1"' class="top1" style="display: flex;">
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>

pages/task/audit/purchasecontract.vue

@@ -1,26 +1,126 @@
 <template>
 	<view class="container">
+		<view class="headInfo">
+			<view class="headInfo_left">
+				<u-icon name="checkmark" color="#22C572" size="30" v-if="auditCheck=='success'"></u-icon>
+				<u-icon name="close" color="#FB2323" size="24" v-if="auditCheck=='error'"></u-icon>
+				<u-icon name="clock-fill" color="#FE6430" size="30" v-if="auditCheck=='question'"></u-icon>
+			</view>
+			
+			<view class="headInfo_middle">
+				<view class="headInfo_title">销售合同审批</view>
+				<view class="headInfo_No">{{list.contractNo}}</view>
+			</view>
+			<view class="headInfo_right">
+				<view class="char_a" v-if="auditCheck == 'success'">审批通过</view>
+				<view class="char_b" v-if="auditCheck == 'question'">审核中</view>
+				<view class="char_c" v-if="auditCheck == 'error'">审批未通过</view>
+			</view>
+			<view class="adopt" v-if="auditCheck == 'success'">
+				<image src="../../../static/img/oa_office/adopt.png" class="adopt_img" mode=""></image>
+			</view>
+		</view>
 		<u-form ref="uForm">
 			<view class="form_top">基本信息</view>
 			<u-form-item label-width='260' label="合同编号" :borderBottom="false">
 				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
 			</u-form-item>
+			<u-form-item label-width='260' label="买方" :borderBottom="false">
+				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="买方电话" :borderBottom="false">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方" :borderBottom="false">
+				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方电话" :borderBottom="false">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
 			<u-form-item label-width='260' label="交易主体" :borderBottom="false">
 				<u-input v-model="list.transactionSubject" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<view class="form_view" style="background: #F9F9FA;">
-				<u-row customStyle="margin-bottom: 10px;">
-					<u-col span="6">
-						<u-form-item label-width='150' label="结算方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.settlementMethod" input-align="right" placeholder="--" disabled />
-						</u-form-item>
-					</u-col>
-					<u-col span="6">
-						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.deliverType1" input-align="right" placeholder="--" disabled />
-						</u-form-item>
-					</u-col>
-				</u-row>
+			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
+				<!-- <u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled /> -->
+			    <view class="textCss">
+			    	{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
+			    </view> 
+			</u-form-item>
+			<u-form-item label-width='260' label="签订日期" :borderBottom="false">
+				<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-if="list.unitContractPrice">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-if="list.totalContractPrice">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-if="list.settlementPrice">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<!-- <u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item label-width='260' label="货源所在地区" :borderBottom="false" v-if="list.sourceProvince">
+				<view class="textCss">
+					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				</view>
+			</u-form-item>
+			<u-form-item label-width='260' label="货源详细地址" :borderBottom="false" v-if="list.sourceGoods">
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="交货地所在地区" :borderBottom="false" v-if="list.deliveryProvince">
+				<view class="textCss">
+					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				</view>
+			</u-form-item>
+			<u-form-item label-width='260' label="交货地详细地址" :borderBottom="false" v-if="list.placeDelivery">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			
+			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-if="list.finalTradingVolume">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.deliverType == 1 && list.personCharge' label-width='260' label="临时仓库负责人" :borderBottom="false">
+				<u-input v-model="list.personCharge" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsNameKey">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsName">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-if="list.contractProcessInfo.waterContent">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.impurity">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-if="list.contractProcessInfo.grade">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
+			</u-form-item>
+			<u-form-item>
+				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无信息" disabled />
+			</u-form-item>
+			<!-- <u-form-item label-width='260' label="附件"> -->
+				<!-- <view class="textCss">
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
+				</view> -->
+				
+			<!-- </u-form-item> -->
+			
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">货物信息</view>
+			<view class="form_view">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' label="货名" class="label_css" :borderBottom="false">
@@ -35,7 +135,7 @@
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='200' label="容重（克/升）>=" class="label_css" :borderBottom="false">
+						<u-form-item label-width='230' label="容重（克/升）>=" class="label_css" :borderBottom="false">
 							<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
@@ -64,11 +164,33 @@
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='260' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
+						<u-form-item label-width='250' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
 							<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">约定信息</view>
+			<u-form-item label-width='150' label="结算方式" class="label_css" :borderBottom="false">
+				<u-input v-model="list.settlementMethod" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<view class="form_view">
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						
+						<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false" v-if="list.overShort">
+							<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.deliverType1" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' label="运输方式" class="label_css" :borderBottom="false">
@@ -94,128 +216,42 @@
 					</u-col>
 				</u-row>
 			</view>
-			<u-form-item label-width='260' label="买方" :borderBottom="false">
-				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
-
-			</u-form-item>
-			<u-form-item label-width='260' label="买方电话" :borderBottom="false">
-				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方" :borderBottom="false">
-				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话" :borderBottom="false">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false">
-				<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
-
-			</u-form-item>
-			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="货源所在地区" :borderBottom="false">
-				<view class="textCss">
-					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
-				</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="货源详细地址" :borderBottom="false">
-				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="交货地所在地区" :borderBottom="false">
-				<view class="textCss">
-					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
-				</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="交货地详细地址" :borderBottom="false">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="签订日期" :borderBottom="false">
-				<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人" :borderBottom="false">
-				<u-input v-model="list.personCharge" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
-			</u-form-item>
-			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无信息" disabled />
-			</u-form-item>
-			<!-- <u-form-item label-width='260' label="附件"> -->
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
-						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<view class="fujian_title">共{{imglist.length}}个附件</view>
-				<view v-if='imglist.length>0'>
-					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
-						<view class="img_item">
-							<view class="" style="width: 16%;">
-								<image
-									v-if="item.type == 'pdf'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
-									mode=""></image>
-								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
-									mode=""></image>
-								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
-									mode=""></image>
-								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
-								</image>
-							</view>
-							<view class="" style="width: 70%;">
-								<view class="char_css">{{item.appendixName}}</view>
-								<view class="">{{item.appendixSize}}</view>
-							</view>
-							<view style="color: #19be6b;text-decoration:underline;" class="img_dowload" @click="openDocument(item)">
-								下载
-							</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{imglist.length}}个附件</view>
+			<view v-if='imglist.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image
+								v-if="item.type == 'pdf'"
+								 class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								 class="imgsign" src="../../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								 class="imgsign" src="../../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else class="imgsign" :src="item.appendixPath" mode="">
+							</image>
+						</view>
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.appendixName}}</view>
+							<view class="img_size">{{item.appendixSize}}</view>
+						</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
 						</view>
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
+					<!-- <u-icon name="attach" ></u-icon> -->
+					<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 				</view>
-			<!-- </u-form-item> -->
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">流程</view>
 			<view class="content2">
-				<view class="title row">
-					流程
-				</view>
 				<view v-for="(item,index) in auditList" :key='index' class="audit">
 					<view class="row">
 						<view class="left">
@@ -332,7 +368,8 @@
 				isAdd: true,
 				imgShow: false,
 				url: "",
-				everyCheck: ''
+				everyCheck: '',
+				auditCheck:"question",//判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -474,6 +511,17 @@
 									
 								}
 								console.log(response.data.data)
+								for(let i = 0 ;i<response.data.data.length;i++){
+									if(response.data.data[i].status == "error"){
+										this.auditCheck = "error"
+										break;
+									}else if(response.data.data[i].status == "question"){
+										this.auditCheck = "question"
+										break;
+									}else{ 
+										this.auditCheck = "success"
+									}
+								}
 								this.auditList = response.data.data
 								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
@@ -604,10 +652,11 @@
 	}
 
 	.u-form {
+		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
-		padding: 0 10px;
-
+		padding: 30rpx 10px;
+	
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
@@ -801,17 +850,18 @@
 		justify-content: flex-end;
 		width: 100%;
 		text-align: right;
+		color: #333333;
 	}
 
 
 	.textarea {
-		margin: 20px auto;
-		width: 100%;
-		background: #F9F9FA;
-		border-radius: 10px;
-		border: 1px solid #EEEEEE;
-		font-size: 28rpx;
-		padding: 10px;
+	margin: 18rpx auto;
+	width: 100%;
+	background: #F9F9FA;
+	border-radius: 10px;
+	border: 1px solid #EEEEEE;
+	font-size: 28rpx;
+	padding: 10px;
 	}
 
 	.u-textarea-style {
@@ -844,96 +894,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
@@ -955,8 +1025,8 @@
 	.form_view{
 		margin: 20rpx 0;
 		border-radius: 20rpx;
-		
-		
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
 	}
 	.label_css{
 		font-size: 26rpx;
@@ -965,30 +1035,33 @@
 	.input_css{
 		font-size: 20rpx;
 	}
-	.char_css {
-		font-size: 30rpx;
-		font-weight: 600;
-		display: -webkit-box;
-		overflow: hidden;
-		/*! autoprefixer: off; */
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical;
-		text-overflow: ellipsis;
-		word-break: break-all;
-	}
-	.fujian_title{
-		font-size: 34rpx;
-		margin-top: 20px;
-		font-weight: 600;
-		// margin-left: 10px;
-	}
-	
 	.img_item {
 		display: flex;
 		width: 100%;
 		margin: 10px 0;
 		padding: 0 10rpx;
+		.imgsign{
+			width: 25px;
+			height: 25px;
+			margin-top: 6px;
+		}
+		.char_css {
+			font-size: 28rpx;
+			font-weight: 600;
+			display: -webkit-box;
+			overflow: hidden;
+			/*! autoprefixer: off; */
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			word-break: break-all;
+		}
+		.img_size{
+			color: #B0B3BF;
+			font-size: 12px;
+			margin-top: 5px;
+		}
 	
 		.img_dowload {
 			width: 14%;
@@ -996,4 +1069,56 @@
 			text-align: right;
 		}
 	}
+	.headInfo{
+		height: 100px;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+		display: flex;
+		.headInfo_left{
+			width: 10%;
+			line-height: 60px;
+			text-align: center;
+		}
+		.headInfo_middle{
+			width: 70%;
+			padding-left: 10px;
+		}
+		.headInfo_right{
+			width: 20%;
+			line-height: 60px;
+			.char_a{
+				color: #22C572;
+			}
+			.char_b{
+				 color: #FE6430;
+			}
+			.char_c{
+				color: #FB2323;
+			}
+			.char_a,.char_b,.char_c{
+				font-size: 16px;
+			}
+		}
+		.adopt{
+			position: absolute;
+			right: 30px;
+			top: 60px;
+			.adopt_img{
+				width: 90px;
+				height: 90px;
+			}
+		}
+		.headInfo_title{
+			font-size: 19px;
+			color: #333333;
+			font-weight: 600;
+		}
+		.headInfo_No{
+			color: #878C9C;
+			font-size: 13px;
+			margin-top: 10px;
+		}
+	}
 </style>

pages/task/audit/salecontract.vue

@@ -1,21 +1,107 @@
 <template>
 	<view class="container">
+		<view class="headInfo">
+			<view class="headInfo_left">
+				<u-icon name="checkmark" color="#22C572" size="30" v-if="auditCheck=='success'"></u-icon>
+				<u-icon name="close" color="#FB2323" size="24" v-if="auditCheck=='error'"></u-icon>
+				<u-icon name="clock-fill" color="#FE6430" size="30" v-if="auditCheck=='question'"></u-icon>
+			</view>
+			
+			<view class="headInfo_middle">
+				<view class="headInfo_title">销售合同审批</view>
+				<view class="headInfo_No">{{list.contractNo}}</view>
+			</view>
+			<view class="headInfo_right">
+				<view class="char_a" v-if="auditCheck == 'success'">审批通过</view>
+				<view class="char_b" v-if="auditCheck == 'question'">审核中</view>
+				<view class="char_c" v-if="auditCheck == 'error'">审批未通过</view>
+			</view>
+			<view class="adopt" v-if="auditCheck == 'success'">
+				<image src="../../../static/img/oa_office/adopt.png" class="adopt_img" mode=""></image>
+			</view>
+		</view>
+		
 		<u-form ref="uForm" >
 			<view class="form_top">基本信息</view>
-			
+			<u-form-item label-width='260' :borderBottom="false" class="label_css"  label="合同编号">
+				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="买方">
+				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="买方电话">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="卖方">
+				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="中转公司">
+				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起 - 止）">
+			   <view class="textCss">
+			   	{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
+			   </view> 
+			</u-form-item>
+			<!-- <u-form-item label-width='260' :borderBottom="false" label="交货日期（止）">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item label-width='150' :borderBottom="false" label="签订日期">
+			<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='230' :borderBottom="false" label="合同总价（元）">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="合同单价（元/吨）">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区">
+				<view class="textCss">
+					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				</view>
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址">
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区">
+				<view class="textCss">
+					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				</view>
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' :borderBottom="false" label="最终实际交易量（吨）">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' :borderBottom="false" label="结算单价（元/吨）" v-if="list.settlementPrice">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="合同收入（元）" v-if="list.contractProcessInfo.goodsNameKey">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="已开发票（元）" v-if="list.contractProcessInfo.goodsName">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="费用支出（元）" v-if="list.contractProcessInfo.waterContent">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="未开发票（元）" v-if="list.contractProcessInfo.impurity">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="未回款（元）" v-if="list.contractProcessInfo.mildewGrain">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况" v-if="list.contractProcessInfo.grade">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">货物信息</view>
 			<view class="form_view" style="background: #F9F9FA;">
-				<u-row customStyle="margin-bottom: 10px;">
-					<u-col span="6">
-						<u-form-item label-width='150' :borderBottom="false" label="结算方式" class="label_css">
-							<u-input v-model="list.settlementMethod" class="input_css" input-align="right" placeholder="--" disabled />
-						</u-form-item>
-					</u-col>
-					<u-col span="6">
-						<u-form-item label-width='150' :borderBottom="false" label="交货方式" class="label_css">
-							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--" disabled />
-						</u-form-item>
-					</u-col>
-				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' :borderBottom="false" label="货名" class="label_css">
@@ -44,21 +130,21 @@
 						</u-form-item>
 					</u-col>
 				</u-row>
-
+				
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='230' :borderBottom="false" label="热损伤（%）<=" class="label_css">
 							<u-input v-model="list.contractGoodsInfo.jiaorenli" class="input_css" input-align="right" placeholder="--"
 								disabled />
 						</u-form-item>
-
+				
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='230' :borderBottom="false" label="杂质（%）<=" class="label_css">
 							<u-input v-model="list.contractGoodsInfo.impurity" class="input_css" input-align="right" placeholder="--"
 								disabled />
 						</u-form-item>
-
+				
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
@@ -75,6 +161,24 @@
 						</u-form-item>
 					</u-col>
 				</u-row>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">约定信息</view>
+			<view class="form_view">
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='150' :borderBottom="false" label="结算方式" class="label_css">
+							<u-input v-model="list.settlementMethod" class="input_css" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' :borderBottom="false" label="交货方式" class="label_css">
+							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' :borderBottom="false" label="运输方式" class="label_css">
@@ -113,194 +217,110 @@
 					</u-col>
 				</u-row>
 			</view>
-			<u-form-item label-width='260' :borderBottom="false" class="label_css"  label="合同编号">
-				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起）">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货日期（止）">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='150' :borderBottom="false" label="签订日期">
-			<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='230' :borderBottom="false" label="合同总价（元）">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="买方">
-				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="买方电话">
-				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="卖方">
-				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="中转公司">
-				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="合同单价（元/吨）">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区">
-				<view class="textCss">
-					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
-				</view>
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址">
-				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区">
-				<view class="textCss">
-					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
-				</view>
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' :borderBottom="false" label="最终实际交易量（吨）">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' :borderBottom="false" label="结算单价（元/吨）">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="合同收入（元）">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="已开发票（元）">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="费用支出（元）">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="未开发票（元）">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="未回款（元）">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="备注信息">
-			</u-form-item>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">备注信息</view>
 			<u-form-item>
 				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
 			</u-form-item>
-			<!-- <u-form-item label-width='90' label="附件"> -->
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imglist"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<!-- {{list.contractProcessInfo.grade}} -->
-				<!-- <view v-for='item in imglist'>
-					<image style='width:100px;height:100px;' :src="item" mode=""></image>
-				</view> -->
-				<view class="fujian_title">共{{imglist.length}}个附件</view>
-				<view v-if='imglist.length>0'>
-					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
-						<view class="img_item">
-							<view class="" style="width: 16%;">
-								<image
-									v-if="item.type == 'pdf'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
-									mode=""></image>
-								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
-									mode=""></image>
-								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
-									mode=""></image>
-								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
-								</image>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{imglist.length}}个附件</view>
+			<view v-if='imglist.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image
+								v-if="item.type == 'pdf'"
+								class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								 class="imgsign" src="../../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								 class="imgsign" src="../../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else  class="imgsign" :src="item.appendixPath" mode="">
+							</image>
+						</view>
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.appendixName}}</view>
+							<view class="img_size">{{item.appendixSize}}</view>
+						</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
+						</view>
+					</view>
+					</view>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">流程</view>
+			<view class="content2">
+			<view v-for="(item,index) in auditList" :key='index' class="audit">
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<view class="item-content">{{item.operatorTitle}}</view>
+							<view v-if="item.status=='success'" class='status success'>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
 							</view>
-							<view class="" style="width: 70%;">
-								<view class="char_css">{{item.appendixName}}</view>
-								<view class="">{{item.appendixSize}}</view>
+							<view v-if="item.status=='error'" class='status error'>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
 							</view>
-							<view style="color: #19be6b;text-decoration:underline;" class="img_dowload" @click="openDocument(item)">
-								下载
+							<view v-if="item.status=='question'" class='status question'>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 							</view>
 						</view>
-						
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
-				</view>
-			<!-- </u-form-item> -->
-			<view class="content2">
-				<view class="title row">
-					流程
-				</view>
-				<view v-for="(item,index) in auditList" :key='index' class="audit">
-					<view class="row">
-						<view class="left">
-							<view class="item1">
-								<view class="item-content">{{item.operatorTitle}}</view>
-								<view v-if="item.status=='success'" class='status success'>
-									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
-								</view>
-								<view v-if="item.status=='error'" class='status error'>
-									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+					<view class="right">
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
 								</view>
-								<view v-if="item.status=='question'" class='status question'>
-									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view v-if="item.status=='success'" class="status success">
+									{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+										v-if='!item.commonStaffs1&&index!=0'>已审核</text>
 								</view>
-							</view>
-						</view>
-						<view class="right">
-							<view class="right-item">
-								<view class="item2">
-									<view class="name">{{item.desc}}
-									</view>
-									<!-- <view class='time'>{{item.updateDate}}</view> -->
-									<view v-if="item.status=='success'" class="status success">
-										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
-											v-if='!item.commonStaffs1&&index!=0'>已审核</text>
-									</view>
-									<view v-if="item.status=='error'" class="status error">
-										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
-											v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
-									</view>
-									<view v-if="item.status=='question'" class="status question">
-										{{item.commonStaffs1?item.staffscontent:''}}<text
-											v-if='!item.commonStaffs1'>未审核</text>
-									</view>
-									<!-- <view  class="status success">吕波（已审核）</view> -->
-
+								<view v-if="item.status=='error'" class="status error">
+									{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+										v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
 								</view>
-								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
-									class='time'>
-									{{item.updateDate}}
+								<view v-if="item.status=='question'" class="status question">
+									{{item.commonStaffs1?item.staffscontent:''}}<text
+										v-if='!item.commonStaffs1'>未审核</text>
 								</view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+			
 							</view>
-							<view v-if='item.auditMind' class="right-content">
-								{{item.auditMind}}
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
+								class='time'>
+								{{item.updateDate}}
 							</view>
 						</view>
-						<view v-if='item.commonStaffs1' class="right">
-							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
-							</u-icon>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
 						</view>
 					</view>
-					<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
-						<view class='row2'>
-							<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
-								<view class="item-content">
-									<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
-									<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
-								</view>
-								<view class="name">{{item1.staffName}}</view>
+					<view v-if='item.commonStaffs1' class="right">
+						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
+						</u-icon>
+					</view>
+				</view>
+				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+					<view class='row2'>
+						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+							<view class="item-content">
+								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
 							</view>
+							<view class="name">{{item1.staffName}}</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
 				</view>
+				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+			</view>
 			</view>
 		</u-form>
 		<view v-if='list.taskId' style='padding:10px;' class='flex bottom-btn'>
@@ -329,7 +349,6 @@
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
 		</view>
-
 		<view @click='imgShow=false' v-if="imgShow" class="shade">
 			<image style='position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;' :src="url" mode=""></image>
 		</view>
@@ -371,6 +390,7 @@
 				rejectInfo: "",
 				rejectInfo1: "",
 				isSHowBtn: true,
+				auditCheck:"question",//判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -539,6 +559,17 @@
 
 								}
 								console.log(response.data.data)
+								for(let i = 0 ;i<response.data.data.length;i++){
+									if(response.data.data[i].status == "error"){
+										this.auditCheck = "error"
+										break;
+									}else if(response.data.data[i].status == "question"){
+										this.auditCheck = "question"
+										break;
+									}else{ 
+										this.auditCheck = "success"
+									}
+								}
 								this.auditList = response.data.data
 								var time2 = new Date(this.list.createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
@@ -683,6 +714,7 @@
 	}
 
 	.u-form {
+		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
 		padding: 30rpx 10px;
@@ -876,7 +908,7 @@
 	}
 
 	.textarea {
-		margin: 20px auto;
+		margin: 18rpx auto;
 		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
@@ -934,13 +966,13 @@
 					position: relative;
 
 					.item-content {
-						background: #22C572;
-						width: 50px;
-						height: 50px;
-						border-radius: 10px;
-						line-height: 50px;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
 						text-align: center;
-						font-size: 18px;
+						font-size: 15px;
 						color: #fff;
 					}
 
@@ -992,10 +1024,12 @@
 
 					.item2 {
 						margin-left: 20rpx;
+						margin-top: -7px;
 
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
 
 						.status.success {
@@ -1059,8 +1093,8 @@
 	.form_view{
 		margin: 20rpx 0;
 		border-radius: 20rpx;
-		
-		
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
 	}
 	.label_css{
 		font-size: 26rpx;
@@ -1072,23 +1106,64 @@
 	/deep/.uni-textarea-wrapper{
 		height:200px;
 	}
-	.char_css {
-		font-size: 30rpx;
-		font-weight: 600;
-		display: -webkit-box;
-		overflow: hidden;
-		/*! autoprefixer: off; */
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical;
-		text-overflow: ellipsis;
-		word-break: break-all;
-	}
-	.fujian_title{
-		font-size: 34rpx;
-		margin-top: 20px;
-		font-weight: 600;
-		// margin-left: 10px;
+	
+	// .fujian_title{
+	// 	font-size: 34rpx;
+	// 	margin-top: 20px;
+	// 	font-weight: 600;
+	// 	// margin-left: 10px;
+	// }
+	.headInfo{
+		height: 100px;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+		display: flex;
+		.headInfo_left{
+			width: 10%;
+			line-height: 60px;
+			text-align: center;
+		}
+		.headInfo_middle{
+			width: 70%;
+			padding-left: 10px;
+		}
+		.headInfo_right{
+			width: 20%;
+			line-height: 60px;
+			.char_a{
+				color: #22C572;
+			}
+			.char_b{
+				 color: #FE6430;
+			}
+			.char_c{
+				color: #FB2323;
+			}
+			.char_a,.char_b,.char_c{
+				font-size: 16px;
+			}
+		}
+		.adopt{
+			position: absolute;
+			right: 30px;
+			top: 60px;
+			.adopt_img{
+				width: 90px;
+				height: 90px;
+			}
+		}
+		.headInfo_title{
+			font-size: 19px;
+			color: #333333;
+			font-weight: 600;
+		}
+		.headInfo_No{
+			color: #878C9C;
+			font-size: 13px;
+			margin-top: 10px;
+		}
 	}
 	
 	.img_item {
@@ -1096,6 +1171,28 @@
 		width: 100%;
 		margin: 10px 0;
 		padding: 0 10rpx;
+		.imgsign{
+			width: 25px;
+			height: 25px;
+			margin-top: 6px;
+		}
+		.char_css {
+			font-size: 28rpx;
+			font-weight: 600;
+			display: -webkit-box;
+			overflow: hidden;
+			/*! autoprefixer: off; */
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			word-break: break-all;
+		}
+		.img_size{
+			color: #B0B3BF;
+			font-size: 12px;
+			margin-top: 5px;
+		}
 	
 		.img_dowload {
 			width: 14%;

pages/task/audit/warehouse_details.vue

@@ -394,96 +394,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/audit/warehouse_warrant.vue

@@ -711,96 +711,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/audit/warehouse_warrant_detail.vue

@@ -637,96 +637,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
-					.status{
-						position:absolute;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.time {
+						color: #999;
 					}
+	
 					.item2 {
 						margin-left: 20rpx;
-						
+						margin-top: -7px;
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
+							margin-bottom: 4px;
 						}
+	
 						.status.success {
 							color: #6CC48C;
 						}
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
+	
 						.status.question {
 							color: #f9ae3d;
 						}
 					}
 				}
-			}	
+			}
 		}
-		.row2{
-			display:flex;
-			.item-content{
-				background:#22C572;
-			    width: 30px;
-			    height: 30px;
-			    border-radius: 50%;
-			    line-height: 30px;
-			    text-align: center;
-			    font-size: 12px;
-			    color: #fff;
-				padding:0 2px;
-				margin:0 auto;
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
 			}
-			.status{
-				position:absolute;
-				top:0;right:0;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;