瀏覽代碼

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

gjy 3 年之前
父節點
當前提交
9454981d1a

+ 3 - 3
components/upload.vue

@@ -226,7 +226,7 @@
 			},
 			customBorder:{
 				type: String,
-				default: '2px dashed #C6CBCE'
+				// default: '2px dashed #C6CBCE'
 			},
 			customBtnFontSize:{
 				type: String,
@@ -739,11 +739,11 @@
 	}
 
 	.customStyle {
-		width: 100% !important;
+		width: 712rpx !important;
 		height: 440rpx !important;
 		background: #F5F6FA;
 		border-radius: 20rpx;
-		border: 2px dashed #C6CBCE;
+		// border: 2px dashed #C6CBCE;
 		display: flex !important;
 		justify-content: center;
 		align-items: center;

+ 6 - 2
pageD/identity/companyIdentity.vue

@@ -33,6 +33,7 @@
 			</view>
 			<view v-else>
 				<view>
+					<!-- <image src="../../static/img/authentication/business.png" mode=""></image> -->
 					<!-- 个人身份证正面 -->
 					<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
@@ -44,7 +45,8 @@
 						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 						:custom="uploadCustom2"></upload>
 				</view>
-				<view class="c-row b-b">
+				<view class="person-info">
+					<view class="c-row b-b">
 					<text class="tit_red">*</text>
 					<text class="tit">姓名</text>
 					<view class="con-list">
@@ -59,6 +61,8 @@
 							v-model="identityAuthenticationInfo.customerNumberCard"></input>
 					</view>
 				</view>
+				</view>
+				
 			</view>
 			<button class="btns btn" @click="jumpUrl">下一步</button>
 		</view>
@@ -91,7 +95,7 @@
 				businesslicense:[],
 				uploadOptions: {
 					"text": "上传营业执照",
-					"bgc": ""
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/0dd1401f54e34affaa11c711d808a0a0.png"
 				},
 				uploadOptions1: {
 					"text": "上传身份证头像页",

+ 10 - 1
pageD/identity/companyIdentityThree.vue

@@ -12,7 +12,8 @@
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 				:custom="uploadCustom"></upload>
 		</view>
-		<view class="c-row b-b">
+		<view class="person-info">
+			<view class="c-row b-b">
 			<text class="tit">银行卡号</text>
 			<view class="con-list">
 				<input type='number' placeholder="请填写银行卡号" name="input"
@@ -79,6 +80,8 @@
 				<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
 			</view>
 		</view>
+		</view>
+		
 		<button class="btns btn" @click="commit">提交</button>
 	</view>
 </template>
@@ -715,4 +718,10 @@
 	.tit_red {
 		color: #E54D42;
 	}
+	.person-info{
+		background: white;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 50rpx;
+	}
 </style>

+ 9 - 1
pageD/identity/companyIdentityTwo.vue

@@ -12,6 +12,7 @@
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 				:custom="uploadCustom1" ></upload>
 		</view>
+		<view class="person-info">
 		<view class="c-row b-b">
 			<text class="tit_red">*</text>
 			<text class="tit">姓名</text>
@@ -19,13 +20,14 @@
 				<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
 			</view>
 		</view>
-		<view class="c-row b-b">
+		<view class="c-row">
 			<text class="tit">身份证号</text>
 			<view class="con-list">
 				<input  placeholder="请填写身份证号" name="input"
 					v-model="identityAuthenticationInfo.customerNumberCard"></input>
 			</view>
 		</view>
+			</view>
 		<button class="btns btn" @click="jumpUrl">下一步</button>
 	</view>
 </template>
@@ -267,4 +269,10 @@
 	.tit_red{
 		color: #E54D42;
 	}
+	.person-info{
+		background: white;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 50rpx;
+	}
 </style>

+ 2 - 2
pageD/identity/driverIdentityThree.vue

@@ -95,11 +95,11 @@
 				},
 				uploadOptions2: {
 					"text": "上传道路运营证",
-					"bgc": ""
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/0dd1401f54e34affaa11c711d808a0a0.png"
 				},
 				uploadOptions3: {
 					"text": "上传从业资格证",
-					"bgc": ""
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/0dd1401f54e34affaa11c711d808a0a0.png"
 				},
 				travels: "../../static/img/authentication/travel(3).png",
 				drives: "../../static/img/authentication/drive(3).png",

+ 72 - 36
pages/attestation/index.vue

@@ -2,23 +2,39 @@
 	<view class="center">
 		<view class="homePage">
 			<view @click="liangShang">
-				<image src="../../static/img/authentication/bg@2x.png"   class="background"></image>
-				<view class="title" >
-					粮商身份
+				<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
+				<view class="title-warp">
+					<view>
+						<view class="title">
+							粮商身份
+						</view>
+						<view class="textTips_Css">
+							{{textTips}}
+						</view>
+					</view>
+					<image src="../../static/img/authentication/liangshang@3x.png" class="portrait1"></image>
 				</view>
 			</view>
 			<view class="arrows1" @click="addliangShang">
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
 			</view>
-			<image src="../../static/img/authentication/liangshang@3x.png" class="portrait1"></image>
 		</view>
 
 		<view class="homePage1">
 			<view @click="siJi">
 				<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-				<view class="title" @click="siJi">
-					司机身份
+				
+				<view class="title-warp">
+					<view>
+						<view class="title">
+							司机身份
+						</view>
+						<view class="textTips_Css">
+							{{textTips1}}
+						</view>
+					</view>
+					<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 				</view>
 			</view>
 			
@@ -26,7 +42,6 @@
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
 			</view>
-			<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 		</view>
 		
 		 <!-- <view class="homePage2">
@@ -72,6 +87,8 @@
 					id: "",
 				},
 				id:"",
+				textTips:"",
+				textTips1:"",
 			};
 		},
 		computed: {
@@ -305,6 +322,20 @@
 							})
 						}
 					});
+					//查看是否有粮商身份
+					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
+						if(res.data.code==11016){
+							this.textTips = "您还未认证粮商身份"
+						}
+					})
+					// 查看是否有司机身份
+					this.$api.doRequest('get', '/driverViewInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
+						if(res.data.code==11019){
+							this.textTips1 = "您还未认证司机身份"
+						}
+						//res.data.code==11020 司机身份在审核
+					})
+					
 				// this.$api.doRequest('get', '/identityAuthenticationInfo/selectCount', {
 				// 	customerTypeFlag:3,customerType:"粮农"
 				// 	}, 'application/json;charset=UTF-8').then(res => {
@@ -355,26 +386,32 @@
 						url: `/pageD/identity/driverIdentityLook?id=${item.id}`
 					})
 				}
-
 			}
 		}
 	}
 </script>
 
-<style>
+<style scoped>
 	.center {
 		overflow-x: hidden;
-		padding: 10px 20px;
+		padding: 0rpx 10rpx;
+		height: calc(100vh - 90rpx);
 	}
 
 	.title {
 		font-size: 22px;
-		font-weight: 900;
-		/* margin-top: 30px; */
-		top: 50px;
-		left: 24px;
-		position: relative;
-
+		font-weight: 600;
+	}
+	.title-warp{
+		position: absolute;
+		width: calc(100% - 40rpx);
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 35rpx;
+		top: 80rpx;
+		left: 10rpx;
 	}
 
 	.company {
@@ -383,7 +420,6 @@
 	}
 
 	.infos {
-		/* margin: 10px 20px; */
 		width: 100%;
 		display: inline-table;
 	}
@@ -400,7 +436,8 @@
 	.homePage {
 		width: 100%;
 		height: 350rpx;
-		margin-top: 20rpx;
+		margin-top: 8rpx;
+		position: relative;
 	}
 
 	.arrows {
@@ -411,10 +448,11 @@
 	}
 
 	.arrow {
-		width: 16px;
-		height: 16px;
+		width: 36rpx;
+		height: 26rpx;
 		float: right;
 		right: 20px;
+		top: 6rpx;
 	}
 
 	.portrait {
@@ -424,35 +462,33 @@
 		right: -70px;
 	}
 
-	.homePage1 {
-		width: 100%;
-		height: 350rpx;
-		margin-top: 50rpx;
-	}
-	.homePage2 {
+	.homePage1,.homePage2 {
 		width: 100%;
 		height: 350rpx;
 		margin-top: 50rpx;
+		position: relative;
 	}
 
 	.background {
-		width: 90%;
+		width: 100%;
 		height: 200px;
-		margin: 0 auto;
-		position: absolute;
 	}
 
 	.arrows1 {
 		position: absolute;
-		right: 30px;
-		margin-top: 120px;
+		right: 10rpx;
+		bottom: 4rpx;
+		z-index: 3;
 	}
 
 	.portrait1 {
-		width: 75px;
-		height: 75px;
-		margin-right: 20px;
-		float: right;
-
+		width:150rpx;
+		height:150rpx;
+		border-radius: 8rpx;
+	}
+	.textTips_Css{
+		color: #AFB3BF;
+		font-size: 28rpx;
+		margin-top: 10rpx;
 	}
 </style>

+ 4 - 4
pages/erp/exWarehousing/exWarehousing.vue

@@ -75,7 +75,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">出库类型</view>
-				<input v-model='detailData.inOutType'  class="right-bottom"  :disabled="isSelectType"></input>
+				<input v-model='detailData.inOutType'  class="right-bottom"  :disabled="isSelectType" placeholder="自动获取"></input>
 			<!-- 	<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker> -->
@@ -240,15 +240,15 @@
 					inOutType: "请选择出库类型",
 					warehouseInOutDetail: {},
 					gradeKey: "",
-					grossWeight: 0,
-					tare: 0,
+					grossWeight: "",
+					tare: "",
 				},
 				params: {
 					year: true,
 					month: true,
 					day: true,
 				},
-				netWeight: 0,
+				// netWeight: 0,
 			}
 		},
 		computed: {

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

@@ -84,7 +84,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">入库类型</view>
-				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType" @click="selectType"></input>
+				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType" @click="selectType" placeholder="自动获取"></input>
 				<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker>
@@ -251,7 +251,7 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
-				netWeight: 0,
+				// netWeight: 0,
 				inOutDate1: "",
 				detailData: {
 					contractNo: "请选择合同编号",

+ 0 - 1
pages/task/audit/acquisition_settlement_approval.vue

@@ -125,7 +125,6 @@
 						})
 					}
 				})
-
 			},
 			//驳回
 			rejectSubmit() {

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

@@ -28,10 +28,18 @@
 					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
 				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
-					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled />
+					<!-- <u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled /> -->
+					<view class="text_info">
+						{{list.sendPrivate}}{{list.receiveCity}}{{list.sendDetailedAddress}}{{list.sendDetailedAddress}}
+					</view>
+					
 				</u-form-item>
 				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
-					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
+					<!-- <u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled /> -->
+					<view class="text_info">
+						{{list.receivePrivate}}{{list.sendCity}}{{list.receiveArea}}{{list.receiveDetailedAddress}}
+					</view>
+					
 				</u-form-item>
 				<u-form-item label="运费(元/吨)" prop="tranPrice" label-width="250">
 					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
@@ -203,4 +211,9 @@
 	/deep/.u-input__textarea{
 		height: 300rpx!important;
 	}
+	.text_info{
+		display: flex;
+		width: 100%;
+		justify-content: flex-end;
+	}
 </style>

+ 6 - 4
pages/task/audit/purchasecontract.vue

@@ -4,9 +4,6 @@
 			<u-form-item label-width='260' label="合同编号">
 				<u-input  v-model="list.contractNo" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="货名">
-				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled/>
-			</u-form-item>
 			<u-form-item label-width='260' label="买方">
 				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
 			</u-form-item>
@@ -78,7 +75,9 @@
 			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
 				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			
+			<u-form-item  label-width='260' label="货名">
+				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled/>
+			</u-form-item>
 			<u-form-item  label-width='260' label="水分(%)<=">
 				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled/>
 			</u-form-item>
@@ -158,6 +157,7 @@
 				list: [
 					{
 						status:"",
+						contractGoodsInfo:{},
 					}
 				],
 				imglist:[],
@@ -194,6 +194,7 @@
 					   })
 					}
 				})
+				
 			},
 			//驳回
 			rejectSubmit() {
@@ -423,6 +424,7 @@
 			right:0;
 		}
 		.textCss{
+			display: flex;
 			justify-content: flex-end;
 			width: 100%;
 			text-align: right;

+ 409 - 0
pages/task/audit/salecontract.vue

@@ -1,3 +1,411 @@
+<template>
+	<view class="container">
+		<u-form ref="uForm">
+			<u-form-item label-width='260' label="合同编号">
+				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="运输方式">
+				<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="买方">
+				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="买方电话">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方">
+				<u-input v-model="list.seller" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方电话">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="结算方式">
+				<u-input v-model="list.settlementMethod" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="交货方式">
+				<u-input v-model="list.deliverType1" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="包装方式">
+				<u-input v-model="list.packingMethod" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="验收方式">
+				<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="重量(吨)">
+				<u-input v-model="list.weight" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="交货日期(起)">
+				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="溢短装(%)">
+				<u-input v-model="list.overShort" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="交货日期(止)">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="合同单价(元/吨)">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="合同总价(元)">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="货源所在地区">
+				<view class="textCss">
+					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				</view>
+			</u-form-item>
+			<u-form-item  label-width='260' label="货源详细地址">
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="交货地所在地区">
+				<view class="textCss">
+					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				</view>
+			</u-form-item>
+			<u-form-item  label-width='260' label="交货地详细地址">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item label-width='260' label="签订日期">
+				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='300' label="最终实际交易量 (吨)">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="货名">
+				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="水分(%)<=">
+				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="品级">
+				<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="杂质(%)<=">
+				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="容重(克/升)>=">
+				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="霉变粒(%)<=">
+				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="热损伤(%)<=">
+				<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="不完善粒(%)<=">
+				<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="合同收入(元)">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="已开发票(元)">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			
+			
+			<u-form-item  label-width='260' label="费用支出(元)">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="未开发票(元)">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="未回款(元)">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="双章原件回收情况">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="备注信息">
+				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled/>
+			</u-form-item>
+			<u-form-item  label-width='260' label="附件">
+				<!-- {{list.contractProcessInfo.grade}} -->
+				<view v-for='item in imglist'>
+					<image style='width:100px;height:100px;' :src="item" mode=""></image>
+				</view>
+				
+			</u-form-item>
+		</u-form>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button v-if='list.approveStatus'  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='list.approveStatus'  @click='pass' type="success" class="btn2">通过</u-button>
+		</view>
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
+				<u-icon name="close"></u-icon></view>
+				<view style='padding:10px;'>
+					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
+				</view>
+				<view  @click='passSubmit()' class="cancel">取消</view>
+				<view  @click='passSubmit()' class="confirm">确定</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: "",
+				currentPage: 1,
+				pageSize: 10,
+				list: [
+					{
+						status:"",
+					}
+				],
+				imglist:[],
+				auditMind:'',
+				show:false,
+				title:'',
+				contractNo: "",
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		methods: {
+			getList(id) {
+				var that = this
+				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
+					id: this.id
+				}).then(res => {
+					if(res.data.code==200){
+						this.list=res.data.data
+						if (this.list.deliverType == 1) {
+							this.list.deliverType1 = '我方送货'
+						} else if (this.list.deliverType == 2) {
+							this.list.deliverType1 = '对方自提'
+						}
+						this.$api.doRequest('get', '/appendix/query/getFileList', {
+							appendixIds:that.list.addressUrl
+						}).then(res1 => {
+							for(var i=0;i<res1.data.data.length;i++){
+								that.imglist.push(res1.data.data[i].appendixPath)
+							}
+					   })
+					}
+				})
+			},
+			//驳回
+			rejectSubmit() {
+				var that = this
+				that.$api.doRequest('post', '/workflow/api/handle', {
+					taskId: that.list.taskId,
+					approved: false,
+					auditMind: this.auditMind,
+					needReapply: true,
+				}).then(res => {
+					that.$api.msg('驳回成功')
+					that.show=false
+				})
+			},
+			pass(){
+				this.show=true
+				this.title='审核意见'
+			},
+			reject() {
+				this.show=true
+				this.title='驳回原因'
+			},
+			//通过
+			passSubmit() {
+				var that = this
+				that.$api.doRequest('post', '/workflow/api/handle', {
+					taskId: that.list.taskId,
+					approved: true,
+					auditMind: this.auditMind,
+					needReapply: true,
+				}).then(res => {
+					that.$api.msg('通过成功')
+					that.show=false
+				})
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+						that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+						that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		padding: 20rpx 20rpx 250rpx 20rpx;
+	}
+	.u-form{
+		background:#fff;
+		border-radius:10px;
+		padding:0 10px;
+		.u-form-item{
+			line-height:30px;
+			padding:5px 0;
+		}
+	}
+	.content {
+		margin-top: 30rpx;
+		.top {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+			margin: 20rpx 0;
+		}
+		.car-container{
+			border-bottom: 2rpx solid #EEEEEE;
+		}
+
+		.car-type-item {
+			font-size: 28rpx;
+			margin: 20rpx 0;
+			color: #878C9C;
+		}
+
+		.weightInfoCss {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 500;
+		}
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// .right,
+			// input {
+			// 	font-size: 28rpx;
+			// 	// color: #333333;
+			// }
+		}
+
+		.money {
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-bottom: 30rpx ;
+		}
+
+		.moneyInfo {
+			color: #22C572;
+			font-size: 32rpx;
+		}
+	}
+.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom:0;
+		display: flex;
+		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
+		}
+		.topInfo {
+			height: 210rpx;
+			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+			padding: 30rpx;
+		
+			.topInfo-item {
+				height: 150rpx;
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
+				padding: 40rpx;
+		
+				.logo {
+					width: 40rpx;
+					height: 40rpx;
+					margin-top: 8rpx;
+				}
+		
+				.infoText {
+					font-size: 36rpx;
+					font-weight: 600;
+					margin-left: 20rpx;
+				}
+		
+				.infoData {
+					color: #878C9C;
+					font-size: 26rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
+		.shade{
+			position:fixed;
+			top:0;
+			left:0;
+			height:100%;width:100%;
+			background:rgba(0,0,0,0.1);
+			z-index:3;
+			.wrap{
+				position:absolute;
+				left:0;top:0;right:0;bottom:0;margin:auto;
+				background:#fff;
+				width:80%;
+				height:30%;
+			}
+		}
+		.cancel,.confirm{
+			position:absolute;
+			display:inline-block;
+			width:50%;
+			text-align:center;
+			bottom:0;
+			padding:10px;
+			border-top:1px solid #eee;
+		}
+		.cancel{
+			left:0;
+			border-right:1px solid #eee;
+		}
+		.confirm{
+			right:0;
+		}
+	.textCss{
+		display:flex;
+		justify-content: flex-end;
+		width: 100%;
+	}
+</style>
+=======
 <template>
 	<view class="container">
 		<u-form ref="uForm">
@@ -413,3 +821,4 @@
 			right:0;
 		}
 </style>
+>>>>>>> 49be1654324e86f64e708549561aaf5e93133cfe