收费管理改为信息设置下，字段修改

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

@@ -75,18 +75,18 @@ var menuList =	[
 		icon: 'el-icon-folder-opened',
 		info: '信息设置',
 		childList: [
-
-		]
-	},
-	{
-		id: 'tb-item',
-		name: '收费标准管理',
-		icon: 'el-icon-folder-opened',
-		info: '收费标准表数据的维护',
-		childList: [
-			{id: 'tb-item-list', name: '收费标准', url: 'sa-view/tb-item/tb-item-list.html'},
+			{
+				id: 'tb-item',
+				name: '收费标准管理',
+				icon: 'el-icon-folder-opened',
+				info: '收费标准表数据的维护',
+				childList: [
+					{id: 'tb-item-list', name: '收费标准', url: 'sa-view/tb-item/tb-item-list.html'},
+				]
+			},
 		]
 	},
+
 	// {
 	// 	id: 'tb-driver',
 	// 	name: '司机管理',

sp-admin/sa-view/tb-item/tb-item-add.html

@@ -26,11 +26,11 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="text" name="项目编号" v-model="m.itemCode" br></sa-item>
-						<sa-item type="text" name="项目名称" v-model="m.itemName" br></sa-item>
+						<sa-item type="text" name="项目编号" v-model="m.itemCode" placeholder="请输入项目编号" br></sa-item>
+						<sa-item type="text" name="项目名称" v-model="m.itemName" placeholder="请输入项目名称" br></sa-item>
 						<div class="c-item">
 							<label class="c-label">项目类型：</label>
-							<el-select v-model="m.typeId" style="width: 120px;"  placeholder="请选择">
+							<el-select v-model="m.typeId" style="width: 120px;"  placeholder="请选择项目类型">
 								<el-option
 										v-for="type in itemTypeList"
 										:key="type.id"
@@ -39,10 +39,11 @@
 								</el-option>
 							</el-select>
 						</div>
-						<sa-item type="num" name="项目金额(元)" v-model="m.price" br></sa-item>
-						<sa-item type="text" name="单位" v-model="m.unit" br></sa-item>
-<!--						<sa-item type="enum" name="是否必须" v-model="m.need" :jv="{1: '否', 2: '是'}" jtype="3" br></sa-item>-->
-<!--						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>-->
+						<sa-item type="num" name="项目金额(元)" v-model="m.price" placeholder="请输入项目金额" br></sa-item>
+						<sa-item type="text" name="金额单位" v-model="m.unit" placeholder="请输入金额单位，如：元/车" br></sa-item>
+						<sa-item type="num" name="车长(米)" v-model="m.carLength" placeholder="请输入车长" br></sa-item>
+						<sa-item type="num" name="最大载重(吨)" v-model="m.maxWeight" placeholder="请输入最大载重" br></sa-item>
+<!--						<sa-item type="enum" name="当前状态" v-model="m.status" :jv="{1: '启用', 0: '禁用'}" jtype="3" br></sa-item>-->
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -72,6 +73,9 @@
 						itemCode: '',
 						price: '',
 						unit: '',
+						carLength: '',	//车长
+						maxWeight: '',	//最大载重
+						status: '',		//转态
 					},		// 实体对象
 					itemTypeList: [],
 				},
@@ -86,6 +90,9 @@
 							itemCode: '',	//项目编号
 							price: '',		//费用
 							unit: '',		//单位
+							carLength: '',	//车长
+							maxWeight: '',	//最大载重
+							status: 1,		//转态
 						}
 					},
 					// 提交数据 
@@ -97,15 +104,16 @@
 						sa.checkNull(m.itemName, '请输入 [项目名称]');
 						sa.checkNull(m.typeId, '请选择 [项目类型]');
 						sa.checkNull(m.price, '请输入 [项目金额]');
+						sa.checkNull(m.unit, '请输入 [金额单位]');
+						sa.checkNull(m.carLength, '请输入 [车长]');
+						sa.checkNull(m.maxWeight, '请输入 [最大载重]');
 
-						console.log(m.typeId);
 						let typeList = this.itemTypeList;
 						let typeId = m.typeId;
 						let typeName = '';
 						for (let i in typeList) {
 							if(typeId == typeList[i].id){
 								typeName = typeList[i].name;
-								console.log("if:"+typeName);
 							}
 						}
 						m.typeName = typeName;

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

@@ -23,13 +23,23 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-
-						<sa-info name="项目编号" br>{{m.itemCode}}</sa-info>
-						<sa-info name="项目名称" br>{{m.itemName}}</sa-info>
-						<sa-info name="项目类型" br>{{m.typeName}}</sa-info>
-						<sa-info name="项目金额" br>{{m.price}}</sa-info>
-
-
+						<el-row>
+							<el-col span="12">
+								<sa-info name="项目编号" br>{{m.itemCode}}</sa-info>
+								<sa-info name="项目名称" br>{{m.itemName}}</sa-info>
+								<sa-info name="项目类型" br>{{m.typeName}}</sa-info>
+								<sa-info name="项目金额(元)" br>{{m.price}}</sa-info>
+							</el-col>
+							<el-col span="12">
+								<sa-info name="金额单位" br>{{m.unit}}</sa-info>
+								<sa-info name="车长(米)" br>{{m.carLength}}</sa-info>
+								<sa-info name="最大载重(吨)" br>{{m.maxWeight}}</sa-info>
+								<sa-info name="状态" br>
+									<span v-if="m.status == 1">启用</span>
+									<span v-if="m.status == 0">禁用</span>
+								</sa-info>
+							</el-col>
+						</el-row>
 					</el-form>
 				</div>
 			</div>

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

@@ -37,18 +37,17 @@
 					<br />
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
-				<sa-item type="fast-btn" show="add,get,delete,reset"></sa-item>
+				<sa-item type="fast-btn" show="add,delete,reset"></sa-item>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-<!--					<sa-td name="主键" prop="id" type="num"></sa-td>-->
 					<sa-td name="项目编号" prop="itemCode" ></sa-td>
 					<sa-td name="项目类型" prop="typeName" ></sa-td>
 					<sa-td name="项目名称" prop="itemName" width="300px" ></sa-td>
 					<sa-td name="项目金额(元)" prop="price" ></sa-td>
 					<sa-td name="单位" prop="unit" ></sa-td>
-<!--					<sa-td name="是否必须" prop="need" type="switch" :jv="{1: '否', 2: '是'}" @change="s => updateNeed(s.row)"></sa-td>-->
-<!--					<sa-td name="创建时间" prop="createTime" ></sa-td>-->
+<!--					<sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用[#ff0000]', 1: '启用[#005500]'}"-->
+<!--						   @change="s => updateStatus(s.row)"></sa-td>-->
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
@@ -144,22 +143,25 @@
 							}.bind(this))
 						}.bind(this));
 					},
-					// // 改 - 是否必须(1=否,2=是)
-					// updateNeed: function(data) {
-					// 	// 声明变量记录是否成功
-					// 	var isOk = false;
-					// 	var oldValue = data.need;
-					// 	var ajax = sa.ajax('/TbItem/updateNeed', {id: data.id, value: data.need}, function(res) {
-					// 		isOk = true;
-					// 		sa.msg('修改成功');
-					// 	}.bind(this));
-					// 	// 如果未能修改成功, 则回滚
-					// 	$.when(ajax).done(function() {
-					// 		if(isOk == false) {
-					// 			data.status = oldValue;
-					// 		}
-					// 	})
-					// },
+					// 改 - 状态(0=否,1=是)
+					updateStatus: function(data) {
+						// 声明变量记录是否成功
+						var isOk = false;
+						var oldValue = data.status;
+						var ajax = sa.ajax('/TbItem/updateStatus', {
+							id: data.id,
+							value: data.status
+						}, function(res) {
+							isOk = true;
+							sa.msg('修改成功');
+						}.bind(this));
+						// 如果未能修改成功, 则回滚
+						$.when(ajax).done(function() {
+							if (isOk == false) {
+								data.status = oldValue;
+							}
+						})
+					},
 				},
 				created: function() {
 					this.f5();

sp-admin/sa-view/tb-pass-record/tb-pass-record-list.html

@@ -20,27 +20,25 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="客户名称" v-model="p.customerName"></sa-item>
-					<sa-item type="text" name="车牌号" v-model="p.cardNo"></sa-item>
-<!--					<sa-item type="text" name="进境时间" v-model="p.inTime"></sa-item>-->
-<!--					<sa-item type="text" name="离境时间" v-model="p.outTime"></sa-item>-->
-<!--					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>-->
+					<sa-item type="text" name="企业名称" v-model="p.customerName"></sa-item>
+					<sa-item type="text" name="车牌号码" v-model="p.cardNo"></sa-item>
+
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br />
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
-				<sa-item type="fast-btn" show="get,reset"></sa-item>
+				<sa-item type="fast-btn" show="reset"></sa-item>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 <!--					<sa-td name="主键" prop="id" type="num"></sa-td>-->
 <!--					<sa-td name="业务id" prop="businessId" ></sa-td>-->
 <!--					<sa-td name="客户id" prop="customerId" ></sa-td>-->
-					<sa-td name="客户名称" prop="customerName" ></sa-td>
-					<sa-td name="车牌号" prop="cardNo" ></sa-td>
+					<sa-td name="企业名称" prop="customerName" ></sa-td>
+					<sa-td name="车牌号码" prop="cardNo" ></sa-td>
+					<sa-td name="入场时间" prop="inTime" ></sa-td>
+					<sa-td name="出场时间" prop="outTime" ></sa-td>
 					<sa-td name="状态" prop="status" type="enum" :jv="{1: '未入场', 2: '已入场', 3: '已出场'}"></sa-td>
-					<sa-td name="进境时间" prop="inTime" ></sa-td>
-					<sa-td name="离境时间" prop="outTime" ></sa-td>
 					<sa-td name="更新时间" prop="updateTime" ></sa-td>
 <!--					<el-table-column label="操作" fixed="right"  width="240px">-->
 <!--						<template slot-scope="s">-->