Bladeren bron

Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-app-ui into feature/asyncOrder

qzyReal 1 jaar geleden
bovenliggende
commit
0a84e80797

+ 19 - 3
pages.json

@@ -317,6 +317,13 @@
 			}
 
 		}, {
+			"path": "pages/market/one/leader/detailThree",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
 			"path": "pages/market/one/leader/members",
 			"style": {
 				"navigationBarTitleText": "订单边民",
@@ -499,13 +506,22 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		},
+		{
 			"path": "pages/market/one/leader/handle",
 			"style": {
 				"navigationBarTitleText": "订单确认",
 				"enablePullDownRefresh": false
 			}
 
+		},
+		{
+			"path": "pages/market/one/leader/handleThree",
+			"style": {
+				"navigationBarTitleText": "订单确认",
+				"enablePullDownRefresh": false
+			}
+
 		}
 	    ,{
             "path" : "pages/shop/shop",
@@ -527,12 +543,12 @@
         }
         ,{
             "path" : "pages/personal/bankInfo",
-            "style" :                                                                                    
+            "style" :
             {
                 "navigationBarTitleText": "银行卡信息",
                 "enablePullDownRefresh": false
             }
-            
+
         }
     ],
 	"tabBar": {

+ 5 - 1
pages/index/index.vue

@@ -119,7 +119,11 @@ export default {
 			});
 		},
 		confirm() {
-			uni.navigateTo({ url: '/pages/market/one/leader/handle?orderId=' + this.order.id });
+			if(this.order.declareType == '1') {
+				uni.navigateTo({ url: '/pages/market/one/leader/handle?orderId=' + this.order.id });
+			} else {
+				uni.navigateTo({ url: '/pages/market/one/leader/handleThree?orderId=' + this.order.id + '&peopleConfirmStatus=' + this.order.peopleConfirmStatus + '&cooperEntrustStatus=' + this.order.cooperEntrustStatus+ '&applyConfirmStatus=' + this.order.applyConfirmStatus});
+			}
 			this.show = false;
 		},
 		getRead() {

+ 1 - 1
pages/market/one/confirm/apply.vue

@@ -84,7 +84,7 @@ export default {
 			});
 		},
 		detail(item) {
-			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
+			uni.navigateTo({url: '/pages/market/one/leader/detailThree?id=' + item.id});
 		},
 		confirm(e) {
 			this.param.dateBegin = e[0];

+ 1 - 1
pages/market/one/confirm/cooperation.vue

@@ -86,7 +86,7 @@ export default {
 			});
 		},
 		detail(item) {
-			uni.navigateTo({ url: '/pages/market/one/leader/detail?id=' + item.id });
+			uni.navigateTo({ url: '/pages/market/one/leader/detailThree?id=' + item.id });
 		},
 		confirm(e) {
 			this.param.dateBegin = e[0];

+ 28 - 36
pages/market/one/leader/detail.vue

@@ -7,69 +7,61 @@
 					<text class="label">订单编号</text>
 					<text class="desc">{{item.tradeNo}}</text>
 				</view>
-				<!-- <view class="item">
-					<text class="label">申报单号</text>
-					<text class="desc">13454334567</text>
-				</view> -->
 				<view class="item">
-					<text class="label">商家名称</text>
-					<text class="desc">{{item.enterpriseName}}</text>
+					<text class="label">结算单号</text>
+					<text class="desc omit">{{ item.settleBillNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">联系号码</text>
-					<text class="desc">{{item.concat}}</text>
+					<text class="label">预申报编号</text>
+					<text class="desc omit">{{ item.platSeqNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">商品名称</text>
-					<text class="desc">{{item.goodsTransitName}}</text>
+					<text class="label">买家</text>
+					<text class="desc omit">{{ item.buyUserName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc">{{item.goodsUnit}}</text>
+					<text class="label">车牌号</text>
+					<text class="desc">{{ item.veNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">净重</text>
-					<text class="desc">{{item.netWeight}}</text>
+					<text class="label">商品名称</text>
+					<text class="desc">¥ {{ item.goodsNames }}</text>
 				</view>
 				<view class="item">
-					<text class="label">毛重</text>
-					<text class="desc">{{item.grossWeight}}</text>
+					<text class="label">商品单位</text>
+					<text class="desc">¥ {{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
-					<text class="label">价格</text>
-					<text class="desc">{{item.totalPrice}}</text>
+					<text class="label">商铺名称</text>
+					<text class="desc">¥ {{ item.shopName }}</text>
 				</view>
-				<!-- <view class="item">
-					<text class="label">边民</text>
-					<text class="desc" style="color: blue;" @click="members(item.orderId)">查看</text>
-				</view> -->
 				<view class="item">
-					<text class="label">发布时间</text>
-					<text class="desc">{{item.goodsTransitCreateTime}}</text>
+					<text class="label">申报金额</text>
+					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
 				<view class="item">
-					<text class="label">下单时间</text>
-					<text class="desc">{{item.orderCreateTime}}</text>
+					<text class="label">净重</text>
+					<text class="desc">{{ item.netWeight }}</text>
 				</view>
 				<view class="item">
-					<text class="label">购买边民组</text>
-					<text class="desc">{{item.groupName}}</text>
+					<text class="label">毛重</text>
+					<text class="desc">¥ {{ item.grossWeight }}</text>
 				</view>
 				<view class="item">
-					<text class="label">确认时间</text>
-					<text class="desc">{{item.enterpriseConfirmTime}}</text>
+					<text class="label">申报数量</text>
+					<text class="desc">{{ item.buyQty }}</text>
 				</view>
 				<view class="item">
-					<text class="label">进境时间</text>
-					<text class="desc">{{item.entrantTime}}</text>
+					<text class="label">交易地区名称</text>
+					<text class="desc">¥ {{ item.tradeAreaName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">进口时间</text>
-					<text class="desc">{{item.importTime}}</text>
+					<text class="label">进出口预申报单号</text>
+					<text class="desc">¥ {{ item.preIeportNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">出互市区时间</text>
-					<text class="desc">{{item.outFrontierTradeTime}}</text>
+					<text class="label">批次预录入号</text>
+					<text class="desc">{{ item.preNo }}</text>
 				</view>
 			</view>
 		</view>

+ 146 - 0
pages/market/one/leader/detailThree.vue

@@ -0,0 +1,146 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="box order_detail" style="margin-top: 0px">
+				<u-divider text="订单信息"></u-divider>
+				<view class="item" style="padding-top: 0px">
+					<text class="label">业务编号</text>
+					<text class="desc omit">{{ item.platSeqNo }}</text>
+				</view>
+				<view class="item">
+					<text class="label">预录入编号</text>
+					<text class="desc">{{ item.preNo }}</text>
+				</view>
+				<view class="item">
+					<text class="label">关联进境申报单编号</text>
+					<text class="desc">{{ item.itrdclDeclareId }}</text>
+				</view>
+				<view class="item">
+					<text class="label">申报人类型</text>
+					<text class="desc">{{ item.declareType }}</text>
+				</view>
+				<view class="item">
+					<text class="label">申报人姓名</text>
+					<text class="desc">{{ item.declareName }}</text>
+				</view>
+				<view class="item">
+					<text class="label">申报人身份证号</text>
+					<text class="desc">{{ item.ciphertextIdno }}</text>
+				</view>
+				<view class="item" v-if="item.declareType == '2'">
+					<text class="label">商铺编码</text>
+					<text class="desc">{{ item.shopNo }}</text>
+				</view>
+				<view class="item" v-if="item.declareType == '2'">
+					<text class="label">商铺名称</text>
+					<text class="desc">{{ item.shopName }}</text>
+				</view>
+
+				<view class="item">
+					<text class="label">商品名称</text>
+					<text class="desc">{{ item.goodsNames }}</text>
+				</view>
+				<view class="item">
+					<text class="label">商品额度</text>
+					<text class="desc">{{ item.gLimit }}</text>
+				</view>
+
+				<view class="item">
+					<text class="label">总金额</text>
+					<text class="desc">{{ item.sumAmt }}</text>
+				</view>
+				<view class="item">
+					<text class="label">总毛重</text>
+					<text class="desc">{{ item.sumGrossWt }}</text>
+				</view>
+				<view class="item">
+					<text class="label">总净重</text>
+					<text class="desc">{{ item.sumNetWt }}</text>
+				</view>
+				<view class="item">
+					<text class="label">币制</text>
+					<text class="desc">{{ item.currCode }}</text>
+				</view>
+				<view class="item">
+					<text class="label">件数</text>
+					<text class="desc">{{ item.packNo }}</text>
+				</view>
+				<view class="item">
+					<text class="label">车牌号</text>
+					<text class="desc">{{ item.veNo }}</text>
+				</view>
+				<view class="item">
+					<text class="label">运输方式</text>
+					<text class="desc">{{ item.trafMode }}</text>
+				</view>
+				<view class="item" v-if="item.declareType == '3' || item.declareType == '4'">
+					<text class="label" v-if="item.declareType == '3'">互助组备案编号</text>
+					<text class="label" v-if="item.declareType == '4'">合作社备案编号</text>
+					<text class="desc">¥ {{ item.orgPutrecNo }}</text>
+				</view>
+				<view class="item" v-if="item.declareType == '3' || item.declareType == '4'">
+					<text class="label" v-if="item.declareType == '3'">互助组名称</text>
+					<text class="label" v-if="item.declareType == '4'">合作社名称</text>
+					<text class="desc">¥ {{ item.orgName }}</text>
+				</view>
+				<view class="item" v-if="item.declareType == '4'">
+					<text class="label">合作社信用代码</text>
+					<text class="desc">¥ {{ item.orgScc }}</text>
+				</view>
+				<view class="item">
+					<text class="label">监管场所</text>
+					<text class="desc">{{ item.fieldName }}</text>
+				</view>
+				<view class="item">
+					<text class="label">贸易国别</text>
+					<text class="desc">{{ item.tradeCountry }}</text>
+				</view>
+				<view class="item">
+					<text class="label">企业编码</text>
+					<text class="desc">{{ item.entCode }}</text>
+				</view>
+				<view class="item">
+					<text class="label">企业名称</text>
+					<text class="desc">{{ item.entName }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			item: {},
+			param: {},
+		};
+	},
+	onLoad(e) {
+		if (e.id) {
+			this.param.orderId = e.id
+			this.http.request({
+				url: '/level-one-server/app/TbImportOrder/importOrderDetail',
+				data: this.param,
+				success: res => {
+					this.item = res.data.data;
+				}
+			});
+		}
+	},
+	methods: {
+		//查看边民
+		members(id) {
+			uni.navigateTo({
+				url: '/pages/market/one/leader/members?id=' + id
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

+ 99 - 88
pages/market/one/leader/handle.vue

@@ -2,38 +2,79 @@
 	<view>
 		<view class="cmain">
 			<view class="box order_detail" style="padding: 13px">
-				<u-steps :current="current">
+				<u-steps :current="0">
 					<u-steps-item title="订单确认"></u-steps-item>
-					<u-steps-item title="互助委托确认"></u-steps-item>
-					<u-steps-item title="进口申报确认"></u-steps-item>
 				</u-steps>
 			</view>
 			<view class="box order_detail">
-				<view v-if="current == 0">
+				<view>
 					<view class="item ctt">订单确认</view>
 				</view>
-				<view v-if="current == 1">
-					<view class="item ctt">互助委托书</view>
-					<view class="item desc">边民 {{ item.buyUserName }}(身份证号:4509231***12)委托代理边民互市(进口/入境)商品交易(进口/入境)商品交易信息如下:</view>
+				<view class="expand" :style="{height:expand?'auto':'300px'}">
+					<view class="item">
+						<text class="label">订单编号</text>
+						<text class="desc omit">{{ item.tradeNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">结算单号</text>
+						<text class="desc omit">{{ item.settleBillNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">预申报编号</text>
+						<text class="desc omit">{{ item.platSeqNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">买家</text>
+						<text class="desc omit">{{ item.buyUserName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">车牌号</text>
+						<text class="desc">{{ item.veNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">¥ {{ item.goodsNames }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品单位</text>
+						<text class="desc">¥ {{ item.goodsUnit }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商铺名称</text>
+						<text class="desc">¥ {{ item.shopName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报金额</text>
+						<text class="desc">¥ {{ item.totalPrice }}</text>
+					</view>
+					<view class="item">
+						<text class="label">净重</text>
+						<text class="desc">{{ item.netWeight }}</text>
+					</view>
+					<view class="item">
+						<text class="label">毛重</text>
+						<text class="desc">¥ {{ item.grossWeight }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报数量</text>
+						<text class="desc">{{ item.buyQty }}</text>
+					</view>
+					<view class="item">
+						<text class="label">交易地区名称</text>
+						<text class="desc">¥ {{ item.tradeAreaName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">进出口预申报单号</text>
+						<text class="desc">¥ {{ item.preIeportNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">批次预录入号</text>
+						<text class="desc">{{ item.preNo }}</text>
+					</view>
 				</view>
-				<view v-if="current == 2">
-					<view class="item ctt">进口申报确认</view>
-				</view>
-				<view class="item">
-					<text class="label">订单编号</text>
-					<text class="desc omit">{{ item.tradeNo }}</text>
-				</view>
-				<view class="item">
-					<text class="label">商品名称</text>
-					<text class="desc">{{ item.goodsNames }}</text>
-				</view>
-				<view class="item">
-					<text class="label">商品金额</text>
-					<text class="desc">¥ {{ item.totalPrice }}</text>
-				</view>
-				<view class="item">
-					<text class="label">车牌号</text>
-					<text class="desc">{{ item.veNo }}</text>
+				<view class="more" @click="expand = !expand">
+					<text class="icon">&#xe649;</text>
+					<text>{{expand?'收起':'更多信息'}}</text>
 				</view>
 			</view>
 		</view>
@@ -51,9 +92,9 @@
 export default {
 	data() {
 		return {
-			current: 0,
+			expand: false, //展开
 			item: {},
-			orderId: '',
+			orderId: ''
 		};
 	},
 	onLoad(e) {
@@ -73,68 +114,25 @@ export default {
 			});
 		},
 		ok() {
-			//根据不同的步骤提交不同的url或者状态参数
-			if (this.current == 0) {
-				uni.showModal({
-					title: '提示',
-					content: '我已核对信息无误',
-					success: res => {
-						if (res.confirm) {
-							this.http.request({
-								url: '/level-one-server/app/TbOrder/confirmOrder',
-								method: 'POST',
-								data: { orderId: this.item.id },
-								success: res => {
-									uni.showToast({ title: '订单确认成功' });
-									this.current = 1;
-									uni.setNavigationBarTitle({ title: '互助委托确认' });
-								}
-							});
-						}
-					}
-				});
-			}
-			if (this.current == 1) {
-				uni.showModal({
-					title: '提示',
-					content: '我已核对信息无误',
-					success: res => {
-						if (res.confirm) {
-							this.http.request({
-								url: '/level-one-server/app/TbOrder/cooperOrder',
-								method: 'POST',
-								data: { orderId: this.item.id },
-								success: res => {
-									uni.showToast({ title: '互助委托确认成功' });
-									this.current = 2;
-									uni.setNavigationBarTitle({ title: '进口申报确认' });
-								}
-							});
-						}
-					}
-				});
-			}
-			if (this.current == 2) {
-				uni.showModal({
-					title: '提示',
-					content: '我已核对信息无误',
-					success: res => {
-						if (res.confirm) {
-							this.http.request({
-								url: '/level-one-server/app/TbOrder/applyOrder',
-								method: 'POST',
-								data: { orderId: this.item.id },
-								success: res => {
-									uni.showToast({ title: '进口申报确认成功' });
-									setTimeout(() => {
-										uni.switchTab({ url: '/pages/index/index' });
-									}, 1000);
-								}
-							});
-						}
+			uni.showModal({
+				title: '提示',
+				content: '我已核对信息无误',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-one-server/app/TbOrder/confirmOrder',
+							method: 'POST',
+							data: { orderId: this.item.id },
+							success: res => {
+								uni.showToast({ title: '订单确认成功' });
+								setTimeout(() => {
+									uni.switchTab({ url: '/pages/index/index' });
+								}, 1000);
+							}
+						});
 					}
-				});
-			}
+				}
+			});
 		}
 	}
 };
@@ -144,6 +142,19 @@ export default {
 page {
 	background-color: $pg;
 }
+.cmain{
+	padding-bottom: 100px;
+}
+.expand {
+	overflow: hidden;
+}
+.more {
+	text-align: center;
+	padding: 10px 10px 15px 10px;
+	.icon {
+		padding-right: 3px;
+	}
+}
 .ctt {
 	text-align: center;
 	font-weight: bold;

+ 343 - 0
pages/market/one/leader/handleThree.vue

@@ -0,0 +1,343 @@
+<template>
+	<view>
+		<view class="cmain">
+			<view class="box order_detail" style="padding: 13px">
+				<u-steps :current="current">
+					<u-steps-item title="订单确认"></u-steps-item>
+					<u-steps-item title="互助委托确认"></u-steps-item>
+					<u-steps-item title="进口申报确认"></u-steps-item>
+				</u-steps>
+			</view>
+			<view class="box order_detail">
+				<view v-if="current == 0">
+					<view class="item ctt">订单确认</view>
+				</view>
+				<view v-if="current == 1">
+					<view class="item ctt">互助委托书</view>
+					<view class="item desc">边民 {{ item.buyUserName }}(身份证号:4509231***12)委托代理边民互市(进口/入境)商品交易(进口/入境)商品交易信息如下:</view>
+				</view>
+				<view v-if="current == 2">
+					<view class="item ctt">进口申报确认</view>
+				</view>
+				<view class="expand" v-if="current == 0" :style="{height:expand?'auto':'300px'}">
+					<view class="item">
+						<text class="label">订单编号</text>
+						<text class="desc omit">{{ item.tradeNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">结算单号</text>
+						<text class="desc omit">{{ item.settleBillNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">预申报编号</text>
+						<text class="desc omit">{{ item.platSeqNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">买家</text>
+						<text class="desc omit">{{ item.buyUserName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">车牌号</text>
+						<text class="desc">{{ item.veNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">¥ {{ item.goodsNames }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品单位</text>
+						<text class="desc">¥ {{ item.goodsUnit }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商铺名称</text>
+						<text class="desc">¥ {{ item.shopName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报金额</text>
+						<text class="desc">¥ {{ item.totalPrice }}</text>
+					</view>
+					<view class="item">
+						<text class="label">净重</text>
+						<text class="desc">{{ item.netWeight }}</text>
+					</view>
+					<view class="item">
+						<text class="label">毛重</text>
+						<text class="desc">¥ {{ item.grossWeight }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报数量</text>
+						<text class="desc">{{ item.buyQty }}</text>
+					</view>
+					<view class="item">
+						<text class="label">交易地区名称</text>
+						<text class="desc">¥ {{ item.tradeAreaName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">进出口预申报单号</text>
+						<text class="desc">¥ {{ item.preIeportNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">批次预录入号</text>
+						<text class="desc">{{ item.preNo }}</text>
+					</view>
+				</view>
+				<view class="expand" v-else :style="{height:expand?'auto':'300px'}">
+					<view class="item">
+						<text class="label">业务编号</text>
+						<text class="desc omit">{{ item2.platSeqNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">预录入编号</text>
+						<text class="desc">{{ item2.preNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">关联进境申报单编号</text>
+						<text class="desc">{{ item2.itrdclDeclareId }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报人类型</text>
+						<text class="desc">{{ item2.declareType }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报人姓名</text>
+						<text class="desc">{{ item2.declareName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报人身份证号</text>
+						<text class="desc">{{ item2.ciphertextIdno }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '2'">
+						<text class="label">商铺编码</text>
+						<text class="desc">{{ item2.shopNo }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '2'">
+						<text class="label">商铺名称</text>
+						<text class="desc">{{ item2.shopName }}</text>
+					</view>
+
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">{{ item2.goodsNames }}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品额度</text>
+						<text class="desc">{{ item2.gLimit }}</text>
+					</view>
+
+					<view class="item">
+						<text class="label">总金额</text>
+						<text class="desc">{{ item2.sumAmt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">总毛重</text>
+						<text class="desc">{{ item2.sumGrossWt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">总净重</text>
+						<text class="desc">{{ item2.sumNetWt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">币制</text>
+						<text class="desc">{{ item2.currCode }}</text>
+					</view>
+					<view class="item">
+						<text class="label">件数</text>
+						<text class="desc">{{ item2.packNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">车牌号</text>
+						<text class="desc">{{ item2.veNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">运输方式</text>
+						<text class="desc">{{ item2.trafMode }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
+						<text class="label" v-if="item2.declareType == '3'">互助组备案编号</text>
+						<text class="label" v-if="item2.declareType == '4'">合作社备案编号</text>
+						<text class="desc">¥ {{ item2.orgPutrecNo }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
+						<text class="label" v-if="item2.declareType == '3'">互助组名称</text>
+						<text class="label" v-if="item2.declareType == '4'">合作社名称</text>
+						<text class="desc">¥ {{ item2.orgName }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '4'">
+						<text class="label">合作社信用代码</text>
+						<text class="desc">¥ {{ item2.orgScc }}</text>
+					</view>
+					<view class="item">
+						<text class="label">监管场所</text>
+						<text class="desc">{{ item2.fieldName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">贸易国别</text>
+						<text class="desc">{{ item2.tradeCountry }}</text>
+					</view>
+					<view class="item">
+						<text class="label">企业编码</text>
+						<text class="desc">{{ item2.entCode }}</text>
+					</view>
+					<view class="item">
+						<text class="label">企业名称</text>
+						<text class="desc">{{ item2.entName }}</text>
+					</view>
+				</view>
+				<view class="more" @click="expand = !expand">
+					<text class="icon">&#xe649;</text>
+					<text>{{expand?'收起':'更多信息'}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="btn" @click="ok()">确定</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			expand: false, //展开
+			current: 0,
+			item: {},
+			item2: {},
+			orderId: '',
+			peopleConfirmStatus: '',
+			cooperEntrustStatus: '',
+			applyConfirmStatus: ''
+		};
+	},
+	onLoad(e) {
+		if (e.orderId && e.peopleConfirmStatus && e.cooperEntrustStatus && e.applyConfirmStatus) {
+			this.orderId = e.orderId;
+			this.peopleConfirmStatus = e.peopleConfirmStatus;
+			this.cooperEntrustStatus = e.cooperEntrustStatus;
+			this.applyConfirmStatus = e.applyConfirmStatus;
+
+			if(this.peopleConfirmStatus == 0) {
+				this.current = 0;
+				this.getData1();
+			} else if(this.peopleConfirmStatus == 1 && this.cooperEntrustStatus == 0) {
+				this.current = 1;
+				this.getData2();
+			} else if(this.peopleConfirmStatus == 1 && this.cooperEntrustStatus == 1 && this.applyConfirmStatus == 0) {
+				this.current = 2;
+				this.getData2();
+			}
+		}
+	},
+	methods: {
+		getData1() {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/orderDetail',
+				data: { orderId: this.orderId },
+				success: res => {
+					this.item = res.data.data;
+				}
+			});
+		},
+		getData2() {
+			this.http.request({
+				url: '/level-one-server/app/TbImportOrder/importOrderDetail',
+				data: { orderId: this.orderId },
+				success: res => {
+					this.item2 = res.data.data;
+				}
+			});
+		},
+		ok() {
+			//根据不同的步骤提交不同的url或者状态参数
+			if (this.current == 0) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/confirmOrder',
+								method: 'POST',
+								data: { orderId: this.item.id },
+								success: res => {
+									uni.showToast({ title: '订单确认成功' });
+									this.current = 1;
+									uni.setNavigationBarTitle({ title: '互助委托确认' });
+								}
+							});
+						}
+					}
+				});
+			}
+			if (this.current == 1) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/cooperOrder',
+								method: 'POST',
+								data: { orderId: this.item.id },
+								success: res => {
+									uni.showToast({ title: '互助委托确认成功' });
+									this.current = 2;
+									uni.setNavigationBarTitle({ title: '进口申报确认' });
+								}
+							});
+						}
+					}
+				});
+			}
+			if (this.current == 2) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-one-server/app/TbOrder/applyOrder',
+								method: 'POST',
+								data: { orderId: this.item.id },
+								success: res => {
+									uni.showToast({ title: '进口申报确认成功' });
+									setTimeout(() => {
+										uni.switchTab({ url: '/pages/index/index' });
+									}, 1000);
+								}
+							});
+						}
+					}
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.cmain{
+	padding-bottom: 100px;
+}
+.expand {
+	overflow: hidden;
+}
+.more {
+	text-align: center;
+	padding: 10px 10px 15px 10px;
+	.icon {
+		padding-right: 3px;
+	}
+}
+.ctt {
+	text-align: center;
+	font-weight: bold;
+}
+</style>