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

# Conflicts:
#	app/pages/business-order/business-order.vue
#	sp-admin/sa-frame/sa-code.js

app/apis/api.js

@@ -59,5 +59,23 @@ export default {
 	},
 	confirmPay(data){
 		return ajax.postForm('/TbBusiness/pay',data)
-	}
+	},
+	adminSetIn(data){
+		return ajax.postForm('/TbBusiness/adminSetIn',data)
+	},
+	adminSetOut(data){
+		return ajax.postForm('/TbBusiness/adminOut',data)
+	},
+	deleteBusiness (data){
+		return ajax.postForm('/TbBusiness/delete',data)
+	},
+	getBusinessPeople(data){
+		return ajax.get('/TbBusinessPeople/getList',data)
+	},
+	getCustomerById(data){
+		return ajax.get('/TbCostomer/getById',data)
+	},
+	editCustomer(data){
+		return ajax.postForm('/TbCostomer/update',data)
+	},
 }

app/common/js/common.js

@@ -65,5 +65,18 @@ export default {
 			this.$common.toast('请输入正确邮箱格式')
 		}
 		return reg.test(email)
+	},
+	removeNull(obj){
+		var newObj = {};
+		if(obj != undefined && obj != null) {
+			for(var key in obj) {
+				if(obj[key] === undefined || obj[key] === null || obj[key] === '') {
+					// 
+				} else {
+					newObj[key] = obj[key];
+				}
+			}
+		}
+		return newObj;
 	}
 }

app/pages.json

@@ -37,6 +37,24 @@
             }
             
         }
+		,{
+		    "path" : "pages/business-entering/business-detail",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": ""//业务录入
+				//"navigationStyle":"custom"
+		    }
+		    
+		}
+		,{
+		    "path" : "pages/customer-management/customer-list",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": ""//业务录入
+				//"navigationStyle":"custom"
+		    }
+		    
+		}
         ,{
             "path" : "pages/business-order/business-order",
             "style" :                                                                                    

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

@@ -0,0 +1,184 @@
+<template>
+	<view>
+		<view class="box">
+			<view class="top">
+				<text class="title">业务录入</text>
+			</view>
+			<view class="item">
+				<view class="l">企业名称：</view>
+				<view class="r">
+					{{form.customerName}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">境外车牌：</view>
+				<view class="r">
+					{{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="r">
+					{{form.outDayTime}}
+				</view>
+			</view>
+			<view class="item" v-if="form.partTime">
+				<view class="l">停车时长：</view>
+				<view class="r">
+					{{form.partTime}}(分)
+				</view>
+			</view>
+			<view class="item" v-if="form.partMoney">
+				<view class="l">停车费用：</view>
+				<view class="r">
+					{{form.partMoney}}(分)
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">规格(米)：</view>
+				<view class="r">
+					{{form.cardSize}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">载重(吨)：</view>
+				<view class="r">
+					{{form.netWeight}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">货物：</view>
+				<view class="r">
+					{{form.goodsName}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">预计入场：</view>
+				<view class="r">
+					{{form.expectInDay}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">中国车牌号：</view>
+				<view class="r">
+					{{form.chinaCarNo}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">中国司机：</view>
+				<view class="r">
+					{{form.driverName}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">联系号码：</view>
+				<view class="r">
+					{{form.driverPhone}}
+				</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="r">
+					{{item.itemName}}({{item.itemPrice}}x{{item.num}}={{item.total}}元)
+				</view>
+			</view>
+			<view class="item">
+				<text class="p1">订单状态:</text>
+				<text class="p2">
+					<text v-if="form.confirmInput==0">未确认</text>
+					<text v-else>已确认</text>
+				</text>
+			</view>
+			<view class="item">
+				<text class="p1">支付状态:</text>
+				<text class="p2">
+					<text v-if="form.payStatus==1">未支付</text>
+					<text v-if="form.payStatus==2">已支付(未确认)</text>
+					<text v-if="form.payStatus==3">已支付(已确认)</text>
+				</text>
+			</view>
+			<view class="hj">
+				总费用：{{form.totalMoney}}元
+			</view>
+		</view>
+		<u-button type="primary" text="返回" @click="backFn"></u-button>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				form: {}
+			}
+		},
+		onShow() {},
+
+		onLoad(options) {
+			this.id = options.id;
+		},
+		onShow() {
+			this.getBusinessById();
+		},
+		methods: {
+			backFn() {
+				this.$common.back();
+			},
+			getBusinessById() {
+				this.$api.getBusinessById({
+					id: this.id
+				}).then(resp => {
+					this.form = resp.data;
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.hs-item {
+		text-align: center;
+	}
+
+	.item-line {
+		color: #a2a2a2;
+		padding: 5px 0 10px 29px;
+		border-bottom: 1px solid #E5E5E5;
+	}
+
+	.hj {
+		padding: 50rpx;
+		font-size: 40rpx;
+		color: red;
+		font-weight: bold;
+	}
+
+	.save-btn {
+		background-color: #ff4200;
+		height: 88rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin: 60rpx;
+		color: #fff;
+		font-size: 30rpx;
+		font-weight: bold;
+		border-radius: 10rpx;
+	}
+
+	@import '@/common/common.scss'
+</style>

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

@@ -51,16 +51,6 @@
 					<u-input placeholder="输入车牌号" @input="carInputFn" v-model="form.cardNo" />
 				</view>
 			</view>
-			<!-- 	<view class="item">
-				<view class="l">国别：</view>
-				<view class="r">
-					<picker class="p-picker" id="gj" @change="bindPickerChange($event)" :value="country.index"
-						:range="country.list" range-key="name">
-						<text class="p-text">{{country.list[country.index]}}</text>
-						<u-icon class="p-icon" name="arrow-down-fill" size="20"></u-icon>
-					</picker>
-				</view>
-			</view> -->
 			<view class="item">
 				<view class="l">规格(米)：</view>
 				<view class="r">
@@ -88,14 +78,14 @@
 				<view class="r">
 					<view class="r">
 						<uni-datetime-picker placeholder="请选择" type="datetime" v-model="form.expectInDay"
-							start="2021-11-30" end="2090-6-20" />
+							@close="closeFn" />
 					</view>
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">中国车牌号：</view>
 				<view class="r">
-					<u-input placeholder="司机身份证号码" @input="handler()" v-model="form.chinaCarNo" />
+					<u-input placeholder="中国车牌号" @input="handler()" v-model="form.chinaCarNo" />
 				</view>
 			</view>
 			<view class="item">
@@ -128,7 +118,7 @@
 						{{item.items.filter(obj=>obj.itemName==item.itemName)[0].price*item.num}}元
 					</view>
 					<u-icon name="plus" style="position: absolute;right: 10rpx;"
-						v-if="item.itemName&&item.name.indexOf('核酸')!==-1" @click="addHsFn(item.itemName)"></u-icon>
+						v-if="item.itemName&&item.name.indexOf('人员核酸检测')!==-1" @click="addHsFn(item.itemName)"></u-icon>
 				</view>
 			</view>
 			<view class="hj" v-show="totalPrice>0">
@@ -233,8 +223,19 @@
 				}
 			}
 		},
+		onLoad(optsions) {
+			this.form.id = optsions.id;
+
+		},
 		onShow() {
 			this.customerId = uni.getStorageSync('customerId');
+			if (!this.form.id) {
+				setTimeout(() => {
+					this.checkStore();
+				}, 1000)
+			}
+
+
 		},
 		computed: {
 			totalPrice() {
@@ -262,15 +263,66 @@
 			this.getCarList();
 			this.getDriverList();
 			this.getGoodsList();
-		},
-		mounted() {
-			setTimeout(() => {
-				this.checkStore();
-			}, 1000)
+			if (this.form.id) {
+				this.$common.showLoading('加载中...')
+				setTimeout(() => {
+					this.getBusinessById();
+				}, 800)
+			}
 		},
 		methods: {
+			closeFn(data) {
+				console.log(data);
+			},
+			getBusinessById() {
+				this.$api.getBusinessById({
+					id: this.form.id
+				}).then(resp => {
+					let data = resp.data;
+					this.form = data;
+					this.customer.index = this.customer.customerList.map(obj => obj.name).indexOf(data
+						.customerName);
+					this.goods.index = this.goods.goodsList.map(o => o.name).indexOf(data.goodsName);
+					let items = data.items;
+					let names = items.map(obj => obj.itemTypeName);
+					let itemTypeList = this.itemList.filter(obj => names.indexOf(obj.name) !== -1);
+					for (let i in itemTypeList) {
+						let type = itemTypeList[i];
+						for (let j in items) {
+							let item = items[j];
+							if (item.itemTypeId == type.id) {
+								type.itemName = item.itemName;
+								type.num = item.num
+								break;
+							}
+						}
+					}
+					setTimeout(() => {
+						this.car.carInput = false;
+					}, 50)
+				})
+			},
 			addHsFn() {
 				this.hs.visible = true;
+				if (this.form.id) {
+					this.$api.getBusinessPeople({
+						businessId: this.form.id
+					}).then(resp => {
+						let list = resp.data;
+						let index = 0;
+						let r = [];
+						for (let i in list) {
+							r.push({
+								name: list[i].name,
+								phone: list[i].phone,
+								index: index,
+								id: list[i].id
+							})
+							index++;
+						}
+						this.hs.list = r;
+					})
+				}
 			},
 			showHsModal() {
 				Object.assign(this.modal, {
@@ -488,7 +540,6 @@
 						let item = type.items[j];
 						if (type.itemName == item.itemName) {
 							type.itemId = item.id;
-							console.log(1121)
 							break;
 						}
 					}
@@ -498,6 +549,7 @@
 					})
 				}
 				this.form.itemJson = JSON.stringify(list);
+				this.form.items = null;
 				if (this.customerId == '1') {
 					this.form.customerId = this.customer.customerList[this.customer.index].id;
 				} else {
@@ -508,7 +560,8 @@
 			},
 			saveFn() {
 				if (this.check()) {
-					this.$api.saveBusiness(this.form).then(resp => {
+					let obj = this.$common.removeNull(this.form);
+					this.$api.saveBusiness(obj).then(resp => {
 						if (resp.code == 200) {
 							uni.removeStorageSync('business_' + this.customerId);
 							this.$common.toast('录入成功');

app/pages/business-order/business-order.vue

@@ -41,7 +41,7 @@
 						</text>
 					</view>
 					<view class="item">
-						<text class="p1">确认状态:</text>
+						<text class="p1">账单确认:</text>
 						<text class="p2">
 							<text v-if="businessItem.confirmInput==0">未确认</text>
 							<text v-else>已确认</text>
@@ -59,15 +59,29 @@
 				<view class="b">
 					<view class="btn b3" v-if="businessItem.confirmInput==0
 								&&businessItem.payStatus==1
+								&&businessItem.outDayTime!=null
 								&&perList.indexOf('tb-business-confirm')!=-1
 								&&customemrId!='1'" @click="sureZdFn(businessItem)">
 						确认账单</view>
-					<view class="btn b3" v-if="businessItem.confirmInput==1&&businessItem.payStatus<3" @click="fkFn(businessItem)">
-						确认支付</view>
+					<view class="btn b3" v-if="perList.indexOf('tb-business-pay')!=-1
+								&&businessItem.payStatus==1&&businessItem.confirmInput==1&&customemrId!='1'" @click="fkFn(businessItem)">
+						马上支付</view>
+						<view class="btn b3" v-if="perList.indexOf('tb-business-pay')!=-1&&
+									customemrId=='1'&&businessItem.payStatus<3&&businessItem.outDayTime!=null" @click="fkFn(businessItem)">
+							确认支付</view>
 					<view class="btn b1" v-if="customemrId=='1'&&businessItem.realInTime==null"
 						@click="rcFn(businessItem)">确认入场</view>
-					<view class="btn b1" v-if="customemrId=='1'&&businessItem.outDayTime==null&&businessItem.realInTime!=null" @click="cc(index)">确认出场</view>
-					<view class="btn b3" v-if="businessItem.btnShow==2" @click="zd(index)">确认账单</view>
+					<view class="btn b1" v-if="customemrId=='1'&&businessItem.outDayTime==null&&businessItem.realInTime!=null" @click="cc(businessItem)">确认出场</view>
+					<view class="btn b1" v-if="customemrId=='1'
+							&&businessItem.confirmInput==0
+							&&businessItem.realInTime==null
+							&&businessItem.outDayTime==null" @click="editFn(businessItem)">修改</view>
+					<view class="btn b3" @click="toDetail(businessItem)">详情</view>
+					<view class="btn b4" v-if="businessItem.payStatus==1
+								&&businessItem.confirmInput==0
+								&&businessItem.realInTime==null
+								&&businessItem.outDayTime==null
+								&&perList.indexOf('tb-business-add')!=-1" @click="deleteFn(businessItem)">删除</view>
 				</view>
 			</view>
 		</view>
@@ -117,12 +131,39 @@
 			this.getBusinessList();
 		},
 		methods: {
+			toDetail(data){
+				this.$common.to('/pages/business-entering/business-detail?id='+data.id)
+			},
+			editFn(data){
+				this.$common.to('/pages/business-entering/business-entering?id='+data.id)
+			},
+			deleteFn(data){
+				let that=this;
+			 uni.showModal({
+			 	title:"警告",
+				content:"是否删除该业务？",
+				success(res) {
+					if(res.confirm){
+						that.$api.deleteBusiness({id:data.id}).then(resp=>{
+							that.$common.toast('已删除');
+							that.getBusinessList();
+						})
+					}
+				}
+			 })	
+			},
 			sureZdFn(data){
 				this.$common.to('/pages/business-order/sureOrder?id='+data.id)
 			},
 			fkFn(data) {
 				this.$common.to('/pages/business-order/surePay?id='+data.id)
 			},
+			rcFn(data) {
+				this.$common.to('/pages/business-order/sureIn?id='+data.id)
+			},
+			cc(data) {
+			this.$common.to('/pages/business-order/sureOut?id='+data.id)
+			},
 			getBusinessList() {
 				this.$api.getBusinessList(this.p).then(resp => {
 					this.status = 'loadmore';
@@ -151,11 +192,7 @@
 					this.getBusinessList();
 				})
 			},
-			rcFn(data) {
-				this.rc.id = data.id
-				this.rc.visible = true;
-				this.rc.showTime = false;
-			},
+		
 			rcconfirm() {
 				if (!this.rc.inChannel) {
 					this.$common.toast('请填写入场通道');
@@ -166,9 +203,7 @@
 					this.getBusinessList();
 				})
 			},
-			cc() {
-				this.$refs.ccpopup.open('center')
-			},
+		
 			ccconfirm(index) {
 				console.log('出场')
 				this.$refs.ccpopup.close()
@@ -304,6 +339,10 @@
 					color: #0080ff;
 					border: 1rpx solid #0080ff;
 				}
+				.b4 {
+					background-color: #ff0000;
+					color: #fff;
+				}
 			}
 		}
 	}

app/pages/business-order/sureIn.vue

@@ -0,0 +1,84 @@
+<template>
+	<view>
+		<view class="box">
+			<view class="item">
+				<view class="l">订单号：</view>
+				<view class="r">
+					{{form.no}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">车牌号：</view>
+				<view class="r">
+					{{form.cardNo}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">入场通道：</view>
+				<view class="r">
+					<u-input  placeholder="入场通道" v-model="form.inChannel" />
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">入场时间：</view>
+				<view class="r">
+					<uni-datetime-picker placeholder="入场时间" type="datetime" v-model="form.realInTime" start="2021-11-30"
+						end="2090-6-20" />
+				</view>
+			</view>
+		</view>
+		<u-button type="primary" @click="confirmFn">确认</u-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				form: {
+					partMoney: 0
+				},
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+		},
+		onShow() {
+			this.getBusinessById();
+		},
+		methods: {
+			getBusinessById() {
+				this.$api.getBusinessById({
+					id: this.id
+				}).then(resp => {
+					this.form = resp.data;
+				})
+			},
+			confirmFn() {
+				if(!this.form.inChannel){
+					this.$common.toast('请填写入场通道')
+					return;
+				}
+				if(!this.form.realInTime){
+					this.$common.toast('请选择入场时间')
+					return;
+				}
+				this.$api.adminSetIn(this.form).then(Resp => {
+					this.$common.toast('操作成功');
+					setTimeout(() => {
+						this.$common.back()
+					}, 500)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	@import '@/common/common.scss'
+</style>

app/pages/business-order/sureOut.vue

@@ -0,0 +1,84 @@
+<template>
+	<view>
+		<view class="box">
+			<view class="item">
+				<view class="l">订单号：</view>
+				<view class="r">
+					{{form.no}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">车牌号：</view>
+				<view class="r">
+					{{form.cardNo}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">离场通道：</view>
+				<view class="r">
+					<u-input  placeholder="离场通道" v-model="form.outChannel" />
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">离场时间：</view>
+				<view class="r">
+					<uni-datetime-picker placeholder="离场时间" type="datetime" v-model="form.outDayTime" start="2021-11-30"
+						end="2090-6-20" />
+				</view>
+			</view>
+		</view>
+		<u-button type="primary" @click="confirmFn">确认</u-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				form: {
+					partMoney: 0
+				},
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+		},
+		onShow() {
+			this.getBusinessById();
+		},
+		methods: {
+			getBusinessById() {
+				this.$api.getBusinessById({
+					id: this.id
+				}).then(resp => {
+					this.form = resp.data;
+				})
+			},
+			confirmFn() {
+				if(!this.form.inChannel){
+					this.$common.toast('请填写离场通道')
+					return;
+				}
+				if(!this.form.outDayTime){
+					this.$common.toast('请选择出场时间')
+					return;
+				}
+				this.$api.adminSetOut(this.form).then(Resp => {
+					this.$common.toast('操作成功');
+					setTimeout(() => {
+						this.$common.back()
+					}, 500)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	@import '@/common/common.scss'
+</style>

app/pages/business-order/surePay.vue

@@ -0,0 +1,81 @@
+<template>
+	<view>
+		<view class="box">
+			<view class="item">
+				<view class="l">业务费用：</view>
+				<view class="r">
+					{{form.itemPrice}}元
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">停车费用：</view>
+				<view class="r">
+					<text v-if="form.partMoney">{{form.partMoney}}</text>
+					<text v-else>-</text>
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">合计费用：</view>
+				<view class="r">
+					{{form.totalMoney}}元
+				</view>
+			</view>
+			<view class="item">
+				<view class="l">支付凭据：</view>
+				<view class="r">
+					<view class="img">
+						<u-upload max-count="3" ref="license" :file-list="imgList" :action="uploadImageUrl" width="300" height="200"></u-upload>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-button type="primary" @click="confirmFn">确认</u-button>
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request.js'
+	export default {
+		data() {
+			return {
+				id: '',
+				form: {
+					partMoney: 0
+				},
+				imgList: [],
+				uploadImageUrl: request.server + '/upload/image',
+			}
+		},
+		onLoad(options) {
+			this.id = options.id;
+		},
+		onShow() {
+			this.getBusinessById();
+		},
+		methods: {
+			getBusinessById() {
+				this.$api.getBusinessById({
+					id: this.id
+				}).then(resp => {
+					this.form = resp.data;
+				})
+			},
+			confirmFn(){
+				this.$api.confirmPay({id:this.form.id}).then(Resp=>{
+					this.$common.toast('已支付');
+					setTimeout(()=>{
+						this.$common.back()
+					},500)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	@import '@/common/common.scss'
+</style>

app/pages/enterprise-reg/enterprise-reg.vue

@@ -7,31 +7,35 @@
 			<view class="item">
 				<view class="l">企业名称：</view>
 				<view class="r">
-					<u-input v-model="form.name" placeholder="输入企业名称"/>
+					<u-input v-model="form.name" placeholder="输入企业名称" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">联系人：</view>
 				<view class="r">
-					<u-input v-model="form.dutyPeople" placeholder="输入联系人"/>
+					<u-input v-model="form.dutyPeople" placeholder="输入联系人" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">联系电话：</view>
 				<view class="r">
-					<u-input maxlength="11" v-model="form.phone" placeholder="输入电话号码"/>
+					<u-input maxlength="11" v-model="form.phone" placeholder="输入电话号码" />
 				</view>
 			</view>
 			<view class="item">
 				<view class="l">结算方式：</view>
 				<view class="r">
-					 <radio-group  @change="payChange">
-						 <label class="radio"><radio value="2" checked/>月结</label>
-						 <label class="radio" style="margin-left: 20rpx;"><radio value="1" />现结</label>
-					 </radio-group>
+					<radio-group @change="payChange">
+						<label class="radio" >
+							<radio value="1" checked />现结
+						</label>
+						<label class="radio" style="margin-left: 20rpx;">
+							<radio value="2" />月结
+						</label>
+					</radio-group>
 				</view>
 			</view>
-		<!-- 	<view class="item">
+			<!-- 	<view class="item">
 				<view class="l">验证码：</view>
 				<view class="r">
 					<u-input placeholder="输入验证码"/>
@@ -42,7 +46,8 @@
 				<view class="l">营业执照：</view>
 				<view class="r">
 					<view class="img">
-						<u-upload max-count="1" ref="license" :file-list="imgList" :action="uploadImageUrl" width="300" height="200"></u-upload>
+						<u-upload max-count="1" ref="license" :file-list="imgList" :action="uploadImageUrl" width="300"
+							height="200"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -56,39 +61,39 @@
 	export default {
 		data() {
 			return {
-				imgList:[],
+				imgList: [],
 				uploadImageUrl: request.server + '/upload/image',
-				form:{
-					name:'',
-					dutyPeople:'',
-					phone:'',
-					payType:'1',
-					businessLicence:''
+				form: {
+					name: '',
+					dutyPeople: '',
+					phone: '',
+					payType: '1',
+					businessLicence: ''
 				}
 			}
 		},
 		methods: {
-			payChange(e){
-				this.form.payType=e.detail.value
+			payChange(e) {
+				this.form.payType = e.detail.value
 			},
-			check(){
-				if(!this.form.name){
+			check() {
+				if (!this.form.name) {
 					this.$common.toast('请录入名称');
 					return false;
 				}
-				if(!this.form.dutyPeople){
+				if (!this.form.dutyPeople) {
 					this.$common.toast('请录入负责人');
 					return false;
 				}
-				if(!this.form.phone){
+				if (!this.form.phone) {
 					this.$common.toast('请录入联系号码');
 					return false;
 				}
 				let licenseFiles = this.$refs.license.lists.filter(val => {
 					return val.progress == 100;
 				})
-				if(licenseFiles.length>0){
-					this.form.businessLicence= licenseFiles.map(obj => {
+				if (licenseFiles.length > 0) {
+					this.form.businessLicence = licenseFiles.map(obj => {
 						if (obj.response) {
 							return obj.response.data;
 						} else if (obj.url) {
@@ -96,13 +101,13 @@
 						}
 					}).join(',');
 				}
-			
+
 				return true;
 			},
-			confirm(){
-				if(this.check()){
-					this.$api.register(this.form).then(resp=>{
-						if(resp.code==200){
+			confirm() {
+				if (this.check()) {
+					this.$api.register(this.form).then(resp => {
+						if (resp.code == 200) {
 							this.$common.to('/pages/ok/registerSuccess')
 						}
 					})
@@ -113,8 +118,9 @@
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background-color: #fff;
 	}
+
 	@import '@/common/common.scss'
 </style>

app/pages/index/index.vue

@@ -24,10 +24,14 @@
 			<text class="title">集散区临时消杀场</text>
 		</view>
 		<view class="item-box">
-			<view class="item" hover-class="hover-class" v-for="(indexItem,index) in indexItemList" :key="index"
-				@click="navTo(indexItem)">
+			<view class="item" hover-class="hover-class" 
+			v-for="(indexItem,index) in indexItemList" :key="index"
+				@click="navTo(indexItem)" v-show="indexItem.show">
 				<image class="icon" :src="indexItem.icon"></image>
-				<view class="text">{{indexItem.text}}</view>
+				<view class="text">
+					<text v-if="indexItem.text=='企业管理'&&customerId!='1'">信息管理</text>
+					<text v-else>{{indexItem.text}}</text>
+				</view>
 			</view>
 		</view>
 		<view class="qrcode">
@@ -45,12 +49,13 @@
 				userName: '',
 				companyName: '',
 				customerId:'',
-				qrcoderlc: 'https://shiyupeng.com/data/img/ewm.png',
+				qrcoderlc: '../../static/qrcode.png',
 				indexItemList: [{
 						auth: false,
 						icon: '../../static/home-icon-01.png',
 						text: '企业注册',
 						url: '/pages/enterprise-reg/enterprise-reg',
+						show:uni.getStorageSync('info')?false:true
 					},
 					{
 						auth: true,
@@ -63,19 +68,22 @@
 						auth: true,
 						icon: '../../static/home-icon-03.png',
 						text: '业务订单',
-						url: '/pages/business-order/business-order'
+						url: '/pages/business-order/business-order',
+						show:true
 					},
 					{
 						auth: true,
 						icon: '../../static/home-icon-04.png',
 						text: '企业管理',
-						url: '/pages/customer-management/customer-management'
+						url: '/pages/customer-management/customer-list',
+						show:true
 					},
 					{
 						auth: true,
 						icon: '../../static/home-icon-05.png',
 						text: '出入记录',
-						url: '/pages/inout-record/inout-record'
+						url: '/pages/inout-record/inout-record',
+						show:true
 					}
 				]
 			}
@@ -86,10 +94,11 @@
 		methods: {
 			getStoreInfo() {
 				let info = uni.getStorageSync('info');
+				console.log(info.customerId)
 				if(info){
 					this.isLogin=true;
 					this.userName=info.name;
-					this.customerId=info.customemrId;
+					this.customerId=info.customerId;
 				}
 			},
 			toLogin(){

app/pages/login/login.vue

@@ -5,7 +5,7 @@
 				<text class="title">登录</text>
 			</view>
 			<view class="item">
-				<view class="l">手机号码：</view>
+				<view class="l">登录名：</view>
 				<view class="r">
 					<u-input v-model="form.key" placeholder="登录名"/>
 				</view>

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

@@ -64,11 +64,12 @@
 						<template slot-scope="s">
 							<el-button class="c-btn" type="primary" v-if="s.row.confirmInput==0
 								&&s.row.payStatus==1
+								&&s.row.outDayTime!=null
 								&&perCode.indexOf('tb-business-confirm')!=-1
 								&&currentCustomerId!='1'" @click="confirmFn(s.row)">确认账单</el-button>
 							<el-button class="c-btn" type="success" v-if="perCode.indexOf('tb-business-pay')!=-1
 								&&s.row.payStatus==1&&s.row.confirmInput==1&&currentCustomerId!='1'" @click="payFn(s.row)">
-								确认支付</el-button>
+								马上支付</el-button>
 							<el-button class="c-btn" type="primary"
 								v-if="currentCustomerId=='1'&&s.row.realInTime==null" @click="inFn(s.row)">确认入场
 							</el-button>

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

@@ -46,7 +46,7 @@ public class TbBusinessController {
 
 	/** 删 */  
 	@RequestMapping("delete")
-	@SaCheckPermission(TbBusiness.PERMISSION_CODE)
+	@SaCheckPermission(TbBusiness.PERMISSION_INPUT)
 	@Transactional(rollbackFor = Exception.class)
 	public AjaxJson delete(String id){
 		tbBusinessService.removeById(id);
@@ -159,8 +159,9 @@ public class TbBusinessController {
 		}
 		SoMap so = SoMap.getRequestSoMap();
 		String id=so.getString("id");
+		Date inTime=so.getDateTime("realInTime");
 		TbBusiness tbBusiness=tbBusinessService.getById(id);
-		tbBusiness.setRealInTime(new Date()).setInChannel(so.getString("inChannel"));
+		tbBusiness.setRealInTime(inTime).setInChannel(so.getString("inChannel"));
 		tbBusinessService.updateById(tbBusiness);
 		return AjaxJson.getSuccess();
 	}

sp-server/src/main/resources/application-dev.yml

@@ -45,7 +45,7 @@ spring:
     # 项目自定义配置
     myconfig:
         # 本项目部署到的服务器域名（文件上传等等模块  要用到）
-        domain: http://127.0.0.1:8099
+        domain: http://192.168.3.217:8099
 part-config:
     base-price: 30 #基础费用
     extra-price: 10 #过夜额外收费