Merge branch 'master' of http://47.101.143.145:8090/77975466/pco

# Conflicts:
#	app/pages/customer-management/customer-management.vue
#	sp-server/app.pid
#	sp-server/src/main/java/com/pj/project/tb_business/TbBusinessController.java
#	sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

app/pages/business-entering/business-detail.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="box">
 			<view class="top">
-				<text class="title">业务录入</text>
+				<text class="title">业务详情</text>
 			</view>
 			<view class="item">
 				<view class="l">企业名称：</view>
@@ -16,52 +16,47 @@
 					{{form.cardNo}}
 				</view>
 			</view>
-			<view class="item" v-if="form.realInTime">
-				<view class="l">入场时间：</view>
-				<view class="r">
-					{{form.realInTime}}
-				</view>
-			</view>
-			<view class="item" v-if="form.outDayTime">
-				<view class="l">出场时间：</view>
+			<view class="item">
+				<view class="l">规格(米)：</view>
 				<view class="r">
-					{{form.outDayTime}}
+					{{form.cardSize}}
 				</view>
 			</view>
-			<view class="item" v-if="form.partTime">
-				<view class="l">停车时长：</view>
+			<view class="item">
+				<view class="l">载重(吨)：</view>
 				<view class="r">
-					{{form.partTime}}(分)
+					{{form.netWeight}}
 				</view>
 			</view>
-			<view class="item" v-if="form.partMoney">
-				<view class="l">停车费用：</view>
+			<view class="item">
+				<view class="l">货物：</view>
 				<view class="r">
-					{{form.partMoney}}(分)
+					{{form.goodsName}}
 				</view>
 			</view>
-			<view class="item">
-				<view class="l">规格(米)：</view>
+			<view class="item" v-if="form.realInTime">
+				<view class="l" style="flex: 6;">境外车入场时间：</view>
 				<view class="r">
-					{{form.cardSize}}
+					{{form.realInTime}}
 				</view>
 			</view>
-			<view class="item">
-				<view class="l">载重(吨)：</view>
+			<view class="item" v-if="form.outDayTime">
+				<view class="l" style="flex: 6;">境外车离场时间：</view>
 				<view class="r">
-					{{form.netWeight}}
+					{{form.outDayTime}}
 				</view>
 			</view>
+		
 			<view class="item">
-				<view class="l">货物：</view>
+				<view class="l">中国司机：</view>
 				<view class="r">
-					{{form.goodsName}}
+					{{form.driverName}}
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">预计入场：</view>
+				<view class="l">联系号码：</view>
 				<view class="r">
-					{{form.expectInDay}}
+					{{form.driverPhone}}
 				</view>
 			</view>
 			<view class="item">
@@ -71,22 +66,22 @@
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">中国司机：</view>
+				<view class="l" style="flex: 6;">中国车入场时间：</view>
 				<view class="r">
-					{{form.driverName}}
+					{{form.chinaCarInTime}}
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">联系号码：</view>
+				<view class="l" style="flex: 6;">中国车离场时间：</view>
 				<view class="r">
-					{{form.driverPhone}}
+					{{form.chinaCarOutTime}}
 				</view>
 			</view>
 			<view class="item-line">
 				业务项
 			</view>
 			<view class="item" v-for="item in form.items" :key="item.id">
-				<view class="l">{{item.itemTypeName}}：</view>
+				<view class="l" style="flex: 6;">{{item.itemTypeName}}：</view>
 				<view class="r">
 					{{item.itemName}}({{item.itemPrice}}x{{item.num}}={{item.total}}元)
 				</view>
@@ -106,6 +101,27 @@
 					<text v-if="form.payStatus==3">已支付(已确认)</text>
 				</text>
 			</view>
+			<view class="item" >
+				<view class="l" style="flex: 6;">境外车停车费：</view>
+				<view class="r">
+					{{form.partMoney}}
+					<text>(元)</text>
+				</view>
+			</view>
+			<view class="item">
+				<view class="l" style="flex: 6;">中国车停车费：</view>
+				<view class="r">
+					{{form.chinaPartMoney}}
+					<text>(元)</text>
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">业务费：</view>
+				<view class="r">
+					{{form.itemPrice}}
+					<text>(元)</text>
+				</view>
+			</view>
 			<view class="hj">
 				总费用：{{form.totalMoney}}元
 			</view>
@@ -162,7 +178,7 @@
 
 	.hj {
 		padding: 50rpx;
-		font-size: 40rpx;
+		font-size: 30rpx;
 		color: red;
 		font-weight: bold;
 	}

app/pages/business-order/sureOrder.vue

@@ -1,21 +1,44 @@
 <template>
 	<view>
 		<view class="box">
+			<view class="item" >
+				<view class="l">订单号：</view>
+				<view class="r">
+					{{form.no}}
+				</view>
+			</view>
+			<view class="item-line">
+				业务项
+			</view>
+			<view class="item" v-for="item in form.items" :key="item.id">
+				<view class="l" style="flex: 6;">{{item.itemTypeName}}：</view>
+				<view class="r">
+					{{item.itemName}}({{item.itemPrice}}x{{item.num}}={{item.total}}元)
+				</view>
+			</view>
 			<view class="item">
-				<view class="l">业务费用：</view>
+				<view class="l" style="flex: 6;">业务费：</view>
+				<view class="r">
+					{{form.itemPrice}}
+					<text>(元)</text>
+				</view>
+			</view>
+			<view class="item" >
+				<view class="l" style="flex: 6;">境外车停车费：</view>
 				<view class="r">
-					{{form.itemPrice}}元
+					{{form.partMoney}}
+					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">停车费用：</view>
+				<view class="l" style="flex: 6;">中国车停车费：</view>
 				<view class="r">
-					<text v-if="form.partMoney">{{form.partMoney}}</text>
-					<text v-else>-</text>
+					{{form.chinaPartMoney}}
+					<text>(元)</text>
 				</view>
 			</view>
 			<view class="item">
-				<view class="l">合计费用：</view>
+				<view class="l" style="flex: 6;">合计费用：</view>
 				<view class="r">
 					{{form.totalMoney}}元
 				</view>
@@ -68,6 +91,10 @@
 	page {
 		background-color: #fff;
 	}
-
+.item-line {
+		color: #a2a2a2;
+		padding: 5px 0 10px 29px;
+		border-bottom: 1px solid #E5E5E5;
+	}
 	@import '@/common/common.scss'
 </style>

app/utils/request.js

@@ -1,5 +1,5 @@
-const server = 'http://192.168.3.217:8099/pro';
-// const server = 'http://47.101.143.145/pro';
+// const server = 'http://192.168.3.217:8099/pro';
+const server = 'http://47.101.143.145/pro';
 import common from '../common/js/common.js';
 
 function get(url, data) {

sp-admin/sa-frame/menu-list.js

@@ -86,15 +86,15 @@ var menuList =	[
 			},
 		]
 	},
-	{
-		id: 'tb-notices',
-		name: '消息管理',
-		icon: 'el-icon-folder-opened',
-		info: '消息表表数据的维护',
-		childList: [
-			{id: 'tb-notices-list', name: '消息列表', url: 'sa-view/tb-notices/tb-notices-list.html'},
-		]
-	},
+	// {
+	// 	id: 'tb-notices',
+	// 	name: '消息管理',
+	// 	icon: 'el-icon-folder-opened',
+	// 	info: '消息表表数据的维护',
+	// 	childList: [
+	// 		{id: 'tb-notices-list', name: '消息列表', url: 'sa-view/tb-notices/tb-notices-list.html'},
+	// 	]
+	// },
 
 	// {
 	// 	id: 'tb-driver',

sp-admin/sa-view/tb-business/tb-business-info.html

@@ -41,29 +41,31 @@
 								</sa-info>
 								<sa-info name="出场时间" br>{{m.outDayTime}}</sa-info>
 								<!-- <sa-info name="停车时长" br>{{m.partTime}}（分）</sa-info> -->
-								<sa-info name="停车费用（元）" br>{{m.partMoney}}</sa-info>
+								<sa-info name="货物" br>{{m.goodsName}}</sa-info>
 								<sa-info name="载重" br>{{m.netWeight}}（吨）</sa-info>
-								<sa-info name="录入时间" br>{{m.createTime}}</sa-info>
-								<sa-info name="录入人" br>{{m.createBy}}</sa-info>
 								<sa-info type="enum" name="支付状态" :value="m.payStatus"
 									:jv="{1: '未支付', 2: '已支付未确认', 3: '已支付已确认'}" br></sa-info>
 								<sa-info name="支付人" br>{{m.payBy}}</sa-info>
+								<sa-info name="支付时间" br>{{m.payTime}}</sa-info>
+								<sa-info type="img-list" name="支付凭证" :value="m.payTicket" br></sa-info>
+
 							</el-col>
 							<el-col span="12">
-								<sa-info name="货物" br>{{m.goodsName}}</sa-info>
+
+								<sa-info name="录入时间" br>{{m.createTime}}</sa-info>
+								<sa-info name="录入人" br>{{m.createBy}}</sa-info>
 								<sa-info name="中国车牌" br>{{m.chinaCarNo}}</sa-info>
 								<sa-info name="中国司机" br>{{m.driverName}}</sa-info>
 								<sa-info name="联系号码" br>{{m.driverPhone}}</sa-info>
 								<sa-info name="入场时间" br>{{m.chinaCarInTime}}</sa-info>
 								<sa-info name="出场时间" br>{{m.chinaCarOutTime}}</sa-info>
-								<!-- <sa-info name="停车时长" br>{{m.partTime}}（分）</sa-info> -->
-								<sa-info name="停车费用（元）" br>{{m.chinaPartMoney}}</sa-info>
-								<sa-info name="业务费用（元）" br>{{m.itemPrice}}</sa-info>
-								<sa-info name="合计费用（元）" br>{{m.totalMoney}}</sa-info>
-								<sa-info name="支付时间" br>{{m.payTime}}</sa-info>
-								<sa-info type="img-list" name="支付凭证" :value="m.payTicket" br></sa-info>
 								<sa-info name="确认时间" br>{{m.confirmInputTime}}</sa-info>
 								<sa-info name="确认人" br>{{m.confirmInputBy}}</sa-info>
+								<sa-info name="境外车停车费" br>{{m.partMoney}}（元）</sa-info>
+								<sa-info name="中国车停车费用" br>{{m.chinaPartMoney}}（元）</sa-info>
+								<sa-info name="业务费用" br>{{m.itemPrice}}（元）</sa-info>
+								<sa-info name="合计费用" br>{{m.totalMoney}}（元）</sa-info>
+
 							</el-col>
 						</el-row>
 						<el-row>
@@ -72,7 +74,7 @@
 									<div slot="title">
 										具体业务项
 										<label
-											style="color: red; font-weight: bold;margin-left: 20px;">总费用：({{m.itemPrice}}元)</label>
+											style="color: red; font-weight: bold;margin-left: 20px;">合计：({{m.itemPrice}}元)</label>
 									</div>
 									<el-table :data="tableData" style="width: 100%">
 										<el-table-column prop="itemTypeName" label="业务分类" width="180">

sp-admin/sa-view/tb-business/tb-business-list.html

@@ -41,7 +41,7 @@
 					<!-- 	<el-button size="mini" type="primary" v-if="perCode.indexOf('tb-business-confirm')!=-1"
 						@click="confirmBatch()">确认</el-button> -->
 					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
-					<el-button size="mini" type="danger" @click="deleteByIds()">删除</el-button>
+					<!-- <el-button size="mini" type="danger" @click="deleteByIds()">删除</el-button> -->
 					<!-- <el-button size="mini" type="warning" icon="el-icon-download" @click="sa.exportExcel()">导出</el-button> -->
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</div>
@@ -85,7 +85,10 @@
 								@click="inFn(s.row)">确认入场
 							</el-button>
 							<el-button class="c-btn" type="primary"
-							 v-if="currentCustomerId=='1'&&s.row.complete==1&&s.row.payStatus>1"
+							 v-if="currentCustomerId=='1'&&s.row.complete==1
+							 &&s.row.payStatus>1
+							 &&s.row.adminConfirmPay==1
+							 &&s.row.adminConfirmOut==0"
 								@click="outFn(s.row)">确认离场
 							</el-button>
 							<el-button class="c-btn" type="success"
@@ -121,9 +124,13 @@
 			</el-dialog>
 			<el-dialog title="确认账单" :visible.sync="confirm.visible" width="30%">
 				<div class="confirm-info">
+					<sa-info name="订单号" br>{{confirm.form.no}}</sa-info>
+					<sa-info :name="item.itemTypeName" br v-for="item in confirm.form.items">
+						{{item.itemPrice}}x{{item.num}}={{item.total}}元
+					</sa-info>
+					<sa-info name="业务费用" br>{{confirm.form.itemPrice}}（元）</sa-info>
 					<sa-info name="停车费用" br>{{confirm.form.partMoney+confirm.form.chinaPartMoney}}（元）</sa-info>
-					<sa-info name="业务费用（元）" br>{{confirm.form.itemPrice}}</sa-info>
-					<sa-info name="合计费用（元）" br>{{confirm.form.totalMoney}}</sa-info>
+					<sa-info name="合计费用" br>{{confirm.form.totalMoney}}（元）</sa-info>
 				</div>
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="confirm.visible = false">取 消</el-button>
@@ -381,11 +388,15 @@
 						}.bind(this))
 					},
 					confirmFn(data) {
-						Object.assign(this.confirm, {
-							visible: true,
-							form: data,
-						})
-						this.confirm.form.ids = data.id;
+						sa.ajax('/TbBusinessItem/getList',{businessId:data.id},function(resp){
+							data.items=resp.data;
+							Object.assign(this.confirm, {
+								visible: true,
+								form: data,
+							})
+							console.log(data);
+							this.confirm.form.ids = data.id;
+						}.bind(this));
 					},
 					sureConfirmFn() {
 						sa.ajax('/TbBusiness/confirm', {

sp-server/app.pid

@@ -1 +1 @@
-18884
+21520

sp-server/src/main/java/com/pj/project/tb_business/TbBusiness.java

@@ -186,6 +186,7 @@ public class TbBusiness extends Model<TbBusiness> implements Serializable {
     private Integer adminConfirmPay;
     private Date adminConfirmPayTime;
     private String adminConfirmPayBy;
+    private int adminConfirmOut=0;
     //结账方式（1=现结,2=月结）[j]
     private int customerType;
     private String chinaCarNo;

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessController.java

@@ -225,6 +225,7 @@ public class TbBusinessController {
         }
         business.setChinaCarOutTime(chinaCarOutTime);
         tbBusinessService. calculationPartMoney("中国车",business);
+        business.setAdminConfirmOut(1);
         tbBusinessService.updateById(business);
         //更新境外车出场记录
         tbPassRecordService.addOrUpdate(business.getId(), business.getCustomerId(), business.getCustomerName(),

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -103,7 +103,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
         if (checkCarNo(t.getCardNo()) != null&&StrUtil.isEmpty(t.getId())) {
             return AjaxJson.getError("该车辆【" + t.getCardNo() + "】有未完成业务");
         }
-
         t.setCreateBy(StpUserUtil.getAdmin().getName());
         createCar(t);
         createCarUnit(t);

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemMapper.xml

@@ -43,7 +43,7 @@
 	
 	<!-- 公共查询sql片段 -->
 	<sql id="select_sql">
-		select id, business_id, item_code, item_price, item_name, status, operate_time, operaror 
+		select *
 		from tb_business_item 
 	</sql>