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

# Conflicts:
#	app/pages/enterprise-reg/enterprise-reg.vue
#	sp-admin/sa-view/tb-costomer/tb-costomer-add.html
#	sp-admin/sa-view/tb-costomer/tb-costomer-info.html
#	sp-admin/sa-view/tb-costomer/tb-costomer-list.html

app/pages.json

@@ -154,7 +154,8 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-
+		"backgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#0080ff",
+		"navigationBarTextStyle":"white"
 	}
 }

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

@@ -46,8 +46,18 @@
 				<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> -->
+						<uni-file-picker
+						    v-model="imageValue"
+						    fileMediatype="image"
+						    mode="grid"
+							limit="1"
+						    @select="select"
+						    @progress="progress"
+						    @success="success"
+						    @fail="fail"
+							:image-styles="imageStyles"
+						/>
 					</view>
 				</view>
 			</view>
@@ -62,6 +72,18 @@
 		data() {
 			return {
 				imgList: [],
+				imageValue:[],
+				imageStyles:{
+					width:150,
+					height:100,
+					border:{
+						color:"#eee",
+						width:1,
+						style:'dashed',
+						radius:'5px'
+					}
+				},
+				imgList:[],
 				uploadImageUrl: request.server + '/upload/image',
 				form: {
 					name: '',
@@ -75,6 +97,26 @@
 		methods: {
 			payChange(e) {
 				this.form.payType = e.detail.value
+			// 获取上传状态
+			select(e){
+				console.log('选择文件：',e)
+			},
+			// 获取上传进度
+			progress(e){
+				console.log('上传进度：',e)
+			},
+
+			// 上传成功
+			success(e){
+				console.log('上传成功')
+			},
+
+			// 上传失败
+			fail(e){
+				console.log('上传失败：',e)
+			},
+			payChange(e){
+				this.form.payType=e.detail.value
 			},
 			check() {
 				if (!this.form.name) {

app/pages/inout-record/inout-record.vue

@@ -5,9 +5,9 @@
 				<text class="title">出入记录</text>
 			</view>
 		</view>
-		<u-sticky offset-top="0">
+		<!-- <u-sticky offset-top="0">
 			<u-tabs :list="tabs" @change="change" :current="current" :is-scroll="false"></u-tabs>
-		</u-sticky>
+		</u-sticky> -->
 		<view class="card-box">
 			<view class="card" v-for="(recordItem,index) in recordItemList" :key="index">
 				<view class="t">

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-frame/sa-code.js

@@ -22,8 +22,8 @@ sa.ajax('/AccAdmin/fristOpenAdmin', function(res) {
 	
 	// 配置 
 	sa_admin.title = "场站管理后台";
-	sa_admin.logo = 'sa-frame/admin-logo.png';    // 设置logo图标地址 
-	sa_admin.icon = "sa-frame/admin-logo.png";    // 设置logo图标地址 
+	sa_admin.logo = '';    // 设置logo图标地址
+	sa_admin.icon = "";    // 设置logo图标地址
 	
 	
 	// 当前用户信息 

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

@@ -26,8 +26,8 @@
                     <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.cardNo" br></sa-item>
-						<sa-item type="text" name="规格" v-model="m.cardSize" br></sa-item>
+						<sa-item type="text" name="车牌号" v-model="m.cardNo" placeholder="请输入车牌号" br></sa-item>
+						<sa-item type="text" name="规格" v-model="m.cardSize" placeholder="请输入规格" br></sa-item>
 						<sa-item type="enum" name="当前状态" v-model="m.status" :jv="{1: '境外', 2: '境内'}" jtype="3" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>

sp-admin/sa-view/tb-costomer/customer-admin-add.html

@@ -26,9 +26,9 @@
 						<el-input type="password"></el-input>
 					</div>
 					<!-- 表单 -->
-					<sa-item type="text" name="用户名" v-model="m.name" br></sa-item>
-					<sa-item type="password" name="密码" v-model="m.password" br></sa-item>
-					<sa-item type="password" name="再输一次" v-model="m.againPassword" br></sa-item>
+					<sa-item type="text" name="用户名" v-model="m.name" placeholder="请输入用户名" br></sa-item>
+					<sa-item type="password" name="密码" v-model="m.password" placeholder="请输入密码" br></sa-item>
+					<sa-item type="password" name="再输一次" v-model="m.againPassword" placeholder="请再输一次密码" br></sa-item>
 					<sa-item name="角色" br>
 						<el-select v-model="m.roleIds" multiple>
 							<el-option label="请选择" :value="0" disabled></el-option>

sp-admin/sa-view/tb-costomer/customer-admin-list.html

@@ -27,13 +27,7 @@
 					<sa-item type="text" name="登录名" v-model="p.name"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<br>
-					<sa-item name="综合排序" class="s-radio-text">
-						<el-radio-group v-model="p.sort_type">
-							<el-radio :label="0">最近添加</el-radio>
-							<el-radio :label="2">最近登录</el-radio>
-							<el-radio :label="3">登录次数</el-radio>
-						</el-radio-group>
-					</sa-item>
+
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
 				<sa-item type="fast-btn" show="add,delete,reset"></sa-item>

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

@@ -28,10 +28,10 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<el-row>
-							<sa-item type="text" name="客户名称" v-model="m.name" br></sa-item>
-							<sa-item type="text" name="联系人" v-model="m.dutyPeople" br></sa-item>
-							<sa-item type="text" name="联系号码" v-model="m.phone" br></sa-item>
-							<sa-item type="enum" name="结算方式" v-model="m.payType" :jv="{2: '月结', 1: '现结'}" jtype="1" br></sa-item>
+							<sa-item type="text" name="公司名称" v-model="m.name" placeholder="请输入客户名称" br></sa-item>
+							<sa-item type="text" name="联系人" v-model="m.dutyPeople" placeholder="请输入联系人" br></sa-item>
+							<sa-item type="text" name="联系电话" v-model="m.phone" placeholder="请输入联系号码" br></sa-item>
+							<sa-item type="enum" name="结算类型" v-model="m.payType" :jv="{2: '月结', 1: '现结'}" jtype="1" br></sa-item>
 						<!-- 	<div class="c-item br">
 								<label class="c-label"><label style="color: red">*</label>地区：</label>
 								<el-cascader size="mini" placeholder="请选择" v-model="m.address_arry"

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

@@ -29,9 +29,10 @@
 						<el-row>
 							<el-col span="12">
 								<sa-info name="公司名称" br>{{m.name}}</sa-info>
-								<sa-info type="img" name="营业执照" :value="m.businessLicence" br></sa-info>
+								<sa-info name="联系电话" br>{{m.phone}}</sa-info>
 								<sa-info name="联系人" br>{{m.dutyPeople}}</sa-info>
-								<sa-info name="联系号码" br>{{m.phone}}</sa-info>
+								<!-- <sa-info name="地址" br>{{m.addressStr}}</sa-info> -->
+								<sa-info type="img" name="营业执照" :value="m.businessLicence" br></sa-info>
 								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 							</el-col>
 							<el-col span="12">
@@ -58,7 +59,7 @@
 				},
 				el: '.vue-box',
 				data: {
-					id: sa.p('id', 0), // 获取数据ID 
+					id: sa.p('id', 0), // 获取数据ID
 					m: null
 				},
 				methods: {},

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

@@ -21,8 +21,8 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
-					<sa-item type="text" name="联系号码" v-model="p.phone"></sa-item>
+					<sa-item type="text" name="公司名称" v-model="p.name"></sa-item>
+					<sa-item type="text" name="联系电话" v-model="p.phone"></sa-item>
 					<sa-item type="text" name="联系人" v-model="p.dutyPeople"></sa-item>
 					<div class="c-item">
 						<label class="c-label">审核状态：</label>
@@ -34,25 +34,27 @@
 						</el-select>
 					</div>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
+					<br />
+
 				</el-form>
 				<el-button type="primary" icon="el-icon-plus" @click="add()" v-if="currentCustomerId=='1'">新增
 				</el-button>
-				<el-button type="success" icon="el-icon-view" @click="getBySelect()">查看</el-button>
+<!--				<el-button type="success" icon="el-icon-view" @click="getBySelect()">查看</el-button>-->
 				<el-button type="danger" icon="el-icon-delete" @click="deleteByIds()" v-if="currentCustomerId=='1'">删除
 				</el-button>
 				<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td type="selection"></sa-td>
-					<sa-td name="名称" prop="name"></sa-td>
+					<sa-td name="公司名称" prop="name"></sa-td>
 					<sa-td name="联系人" prop="dutyPeople"></sa-td>
-					<sa-td name="联系号码" prop="phone"></sa-td>
+					<sa-td name="联系电话" prop="phone"></sa-td>
 					<sa-td name="结算类型" prop="payType" type="enum" :jv="{1: '现结', 2: '月结'}"></sa-td>
 					<!-- <sa-td name="地址" prop="addressStr" ></sa-td> -->
 					<sa-td name="营业执照" prop="businessLicence" type="img"></sa-td>
 					<sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用[#ff0000]', 1: '启用[#005500]'}"
 						@change="s => updateStatus(s.row)"></sa-td>
-					<sa-td name="创建时间" prop="creareTime"></sa-td>
+<!--					<sa-td name="创建时间" prop="creareTime"></sa-td>-->
 					<sa-td name="审核状态" prop="judgeStatus" type="enum" :jv="{1: '未审核', 2: '已通过', 3: '不通过'}"></sa-td>
 					<sa-td name="审核时间" prop="judgeTime" width="160px"></sa-td>
 					<el-table-column label="操作" fixed="right" width="320px">
@@ -174,7 +176,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-costomer-info.html?id=' + data.id, '600px', '90%');
+						sa.showIframe('数据详情', 'tb-costomer-info.html?id=' + data.id, '800px', '60%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {
@@ -186,7 +188,7 @@
 					},
 					// 修改
 					update: function(data) {
-						sa.showIframe('修改数据', 'tb-costomer-add.html?id=' + data.id, '1000px', '90%');
+						sa.showIframe('修改数据', 'tb-costomer-add.html?id=' + data.id, '500px', '70%');
 					},
 					// 新增
 					add: function(data) {

sp-admin/sa-view/tb-costomer/tb-costomer-maintain.html

@@ -20,34 +20,30 @@
     <!-- ------------- 检索参数 ------------- -->
     <div class="c-title">检索参数</div>
     <el-form ref="form" :model='p' @submit.native.prevent>
-      <sa-item type="text" name="名称" v-model="p.name"></sa-item>
-      <sa-item type="text" name="联系号码" v-model="p.phone"></sa-item>
-      <sa-item type="text" name="负责人" v-model="p.dutyPeople"></sa-item>
+      <sa-item type="text" name="公司名称" v-model="p.name"></sa-item>
+      <sa-item type="text" name="联系电话" v-model="p.phone"></sa-item>
+      <sa-item type="text" name="联系" v-model="p.dutyPeople"></sa-item>
       <el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
       <br />
-      <sa-item name="综合排序">
-        <el-radio-group v-model="p.sortType" class="s-radio-text">
-          <el-radio :label="0">默认</el-radio>
-          <el-radio :label="2">名称</el-radio>
-          <el-radio :label="8">创建时间</el-radio>
-        </el-radio-group>
-      </sa-item>
     </el-form>
     <el-button type="primary" icon="el-icon-plus" @click="add()" v-if="currentCustomerId=='1'">新增</el-button>
-    <el-button type="success" icon="el-icon-view" @click="getBySelect()" >查看</el-button>
+<!--    <el-button type="success" icon="el-icon-view" @click="getBySelect()" >查看</el-button>-->
     <el-button type="danger" icon="el-icon-delete" @click="deleteByIds()" v-if="currentCustomerId=='1'">删除</el-button>
     <el-button type="info"  icon="el-icon-refresh"  @click="sa.f5()">重置</el-button>
     <!-- ------------- 数据列表 ------------- -->
     <el-table class="data-table" ref="data-table" :data="dataList" >
       <sa-td type="selection"></sa-td>
-      <sa-td name="名称" prop="name" ></sa-td>
-      <sa-td name="联系号码" prop="phone" ></sa-td>
-      <sa-td name="负责人" prop="dutyPeople" ></sa-td>
+      <sa-td name="公司名称" prop="name"></sa-td>
+      <sa-td name="联系人" prop="dutyPeople"></sa-td>
+      <sa-td name="联系电话" prop="phone"></sa-td>
       <sa-td name="结算类型" prop="payType" type="enum" :jv="{1: '现结', 2: '月结'}"></sa-td>
-      <sa-td name="地址" prop="addressStr" ></sa-td>
+      <!-- <sa-td name="地址" prop="addressStr" ></sa-td> -->
       <sa-td name="营业执照" prop="businessLicence" type="img"></sa-td>
-      <sa-td name="是否启用" prop="status" type="switch" :jv="{0: '否[#ff0000]', 1: '是[#005500]'}" @change="s => updateStatus(s.row)"></sa-td>
-      <sa-td name="创建时间" prop="creareTime" ></sa-td>
+      <sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用[#ff0000]', 1: '启用[#005500]'}"
+             @change="s => updateStatus(s.row)"></sa-td>
+<!--      <sa-td name="创建时间" prop="creareTime"></sa-td>-->
+      <sa-td name="审核状态" prop="judgeStatus" type="enum" :jv="{1: '未审核', 2: '已通过', 3: '不通过'}"></sa-td>
+      <sa-td name="审核时间" prop="judgeTime" width="160px"></sa-td>
       <el-table-column label="操作" fixed="right"  width="280px">
         <template slot-scope="s">
           <el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
@@ -108,7 +104,7 @@
       },
       // 查看
       get: function(data) {
-        sa.showIframe('数据详情', 'tb-costomer-info.html?id=' + data.id, '1050px', '90%');
+        sa.showIframe('数据详情', 'tb-costomer-info.html?id=' + data.id, '800px', '60%');
       },
       // 查看 - 根据选中的
       getBySelect: function(data) {
@@ -120,7 +116,7 @@
       },
       // 修改
       update: function(data) {
-        sa.showIframe('修改数据', 'tb-costomer-add.html?id=' + data.id, '1000px', '90%');
+        sa.showIframe('修改数据', 'tb-costomer-add.html?id=' + data.id, '500px', '70%');
       },
       // 新增
       add: function(data) {

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

@@ -26,23 +26,30 @@
                     <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>
-						<div class="c-item">
-							<label class="c-label">项目类型：</label>
-							<el-select v-model="m.typeId" style="width: 120px;"  placeholder="请选择">
-								<el-option
-										v-for="type in itemTypeList"
-										:key="type.id"
-										:label="type.name"
-										:value="type.id">
-								</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>-->
+						<el-row>
+							<el-col span="12">
+								<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-option
+												v-for="type in itemTypeList"
+												:key="type.id"
+												:label="type.name"
+												:value="type.id">
+										</el-option>
+									</el-select>
+								</div>
+								<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>
+							</el-col>
+							<el-col span="12">
+								<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>-->
+							</el-col>
+						</el-row>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -72,6 +79,9 @@
 						itemCode: '',
 						price: '',
 						unit: '',
+						carLength: '',	//车长
+						maxWeight: '',	//最大载重
+						status: '',		//转态
 					},		// 实体对象
 					itemTypeList: [],
 				},
@@ -86,6 +96,9 @@
 							itemCode: '',	//项目编号
 							price: '',		//费用
 							unit: '',		//单位
+							carLength: '',	//车长
+							maxWeight: '',	//最大载重
+							status: 1,		//转态
 						}
 					},
 					// 提交数据 
@@ -97,15 +110,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,20 +23,30 @@
 			<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>
 			<!-- ------- 底部按钮 ------- -->
 			<div class="s-foot">
-				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
-				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+				<el-button type="success" @click="sa.closeCurrIframe()">关闭</el-button>
+<!--				<el-button @click="sa.closeCurrIframe()">取消</el-button>-->
 			</div>
 		</div>
 		<script>

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>
@@ -99,7 +98,7 @@
 					},
 					// 查看
 					get: function(data) {
-						sa.showIframe('数据详情', 'tb-item-info.html?id=' + data.id, '1050px', '90%');
+						sa.showIframe('数据详情', 'tb-item-info.html?id=' + data.id, '600px', '60%');
 					},
 					// 查看 - 根据选中的
 					getBySelect: function(data) {
@@ -111,11 +110,11 @@
 					},
 					// 修改
 					update: function(data) {
-						sa.showIframe('修改数据', 'tb-item-add.html?id=' + data.id, '1000px', '90%');
+						sa.showIframe('修改数据', 'tb-item-add.html?id=' + data.id, '800px', '70%');
 					},
 					// 新增
 					add: function(data) {
-						sa.showIframe('新增数据', 'tb-item-add.html?id=-1', '1000px', '90%');
+						sa.showIframe('新增数据', 'tb-item-add.html?id=-1', '800px', '70%');
 					},
 					// 删除
 					del: function(data) {
@@ -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">-->

sp-server/logs/pco/log_debug.log

@@ -5009,3 +5009,85 @@
 2022-01-24 18:53:12.455|WARN [                     main]c.b.m.core.injector.AbstractMethod      |-Line:323:[com.pj.project.tb_goods.TbGoodsMapper.update] Has been loaded by XML or SqlProvider or Mybatis's Annotation, so ignoring this injection for [class com.baomidou.mybatisplus.core.injector.methods.Update]
 2022-01-24 18:53:13.476|INFO [                     main]o.a.coyote.http11.Http11NioProtocol     |-Line:173:Starting ProtocolHandler ["http-nio-8099"]
 2022-01-24 18:53:13.500|INFO [                     main]com.pj.SpServerApplication              |-Line:61 :Started SpServerApplication in 3.436 seconds (JVM running for 4.189)
+2022-01-24 19:06:23.924|INFO [     http-nio-8099-exec-1]o.a.c.c.C.[Tomcat].[localhost].[/pro]   |-Line:173:Initializing Spring DispatcherServlet 'dispatcherServlet'
+2022-01-24 19:06:24.783|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:06:24.783|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/AccAdmin/fristOpenAdmin	p-> {}
+2022-01-24 19:06:25.451|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.668s, 返回：{"code":200,"msg":"ok","data":{"admin":{"id":10002,"customerId":"1","name":"admin","avatar":"http://sa-admin.dev33.cn/sa-frame/admin-logo.png","password":"********","pw":"admin","phone":null,"roleId":"2","status":1,"createByAid":-1,"createTime":1641988176000,"loginTime":1643049152000,"loginIp":"192.168.3.217","loginCount":116,"roleName":"管理员"},"per_list":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"app_cfg":null},"dataCount":-1}
+2022-01-24 19:06:25.809|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:06:25.810|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbBusiness/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:06:25.820|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:06:25.821|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/SpRolePermission/getPcodeByCurrRid	p-> {}
+2022-01-24 19:06:25.824|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:06:25.825|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:06:25.837|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.017s, 返回：{"code":200,"msg":"ok","data":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"dataCount":-1}
+2022-01-24 19:06:25.868|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.044s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:06:25.937|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.128s, 返回：{"code":200,"msg":"ok","data":[{"id":"1485548309600706562","customerId":"1484801911615811586","customerName":"测试客户","no":"2022012417413862","cardNo":"124233","countryName":"越南车","cardSize":13.5,"netWeight":123.0,"goodsName":"干杂货","goodsCode":"","driverName":"112","driverId":"1485548309533597697","driverPhone":"13434556786","driverIdCard":"","payTicket":"http://192.168.3.217:8099/upload/image/2022/01-24/16430210513072010364520.png","expectInDay":1642971600000,"realInDay":null,"realInTime":1642968120000,"inChannel":"","payStatus":3,"payTime":null,"payType":1,"payBy":"","outDayTime":1643019763000,"outChannel":"","partMoney":30,"chinaPartMoney":0.00,"partTime":860,"chinaCarPartTime":null,"itemPrice":1530.00,"totalMoney":1560.00,"createTime":1643017292000,"createBy":"admin","confirmInput":1,"confirmInputTime":1643020336000,"confirmInputBy":"test","adminConfirmPay":1,"adminConfirmPayTime":1643021060000,"adminConfirmPayBy":"admin","customerType":1,"chinaCarNo":"桂A03948","chinaCarInChannel":"","chinaCarOutChannel":"","chinaCarInTime":1643061600000,"chinaCarOutTime":1643019767000,"complete":1,"itemJson":null,"peopleJson":null,"items":[]}],"dataCount":1,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:09:41.639|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:09:41.639|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/AccAdmin/fristOpenAdmin	p-> {}
+2022-01-24 19:09:41.670|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.031s, 返回：{"code":200,"msg":"ok","data":{"admin":{"id":10002,"customerId":"1","name":"admin","avatar":"http://sa-admin.dev33.cn/sa-frame/admin-logo.png","password":"********","pw":"admin","phone":null,"roleId":"2","status":1,"createByAid":-1,"createTime":1641988176000,"loginTime":1643049152000,"loginIp":"192.168.3.217","loginCount":116,"roleName":"管理员"},"per_list":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"app_cfg":null},"dataCount":-1}
+2022-01-24 19:09:41.872|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:09:41.872|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:09:41.872|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/SpRolePermission/getPcodeByCurrRid	p-> {}
+2022-01-24 19:09:41.872|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbBusiness/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:09:41.877|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:09:41.878|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:09:41.882|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.005s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:09:41.888|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.016s, 返回：{"code":200,"msg":"ok","data":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"dataCount":-1}
+2022-01-24 19:09:41.891|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.019s, 返回：{"code":200,"msg":"ok","data":[{"id":"1485548309600706562","customerId":"1484801911615811586","customerName":"测试客户","no":"2022012417413862","cardNo":"124233","countryName":"越南车","cardSize":13.5,"netWeight":123.0,"goodsName":"干杂货","goodsCode":"","driverName":"112","driverId":"1485548309533597697","driverPhone":"13434556786","driverIdCard":"","payTicket":"http://192.168.3.217:8099/upload/image/2022/01-24/16430210513072010364520.png","expectInDay":1642971600000,"realInDay":null,"realInTime":1642968120000,"inChannel":"","payStatus":3,"payTime":null,"payType":1,"payBy":"","outDayTime":1643019763000,"outChannel":"","partMoney":30,"chinaPartMoney":0.00,"partTime":860,"chinaCarPartTime":null,"itemPrice":1530.00,"totalMoney":1560.00,"createTime":1643017292000,"createBy":"admin","confirmInput":1,"confirmInputTime":1643020336000,"confirmInputBy":"test","adminConfirmPay":1,"adminConfirmPayTime":1643021060000,"adminConfirmPayBy":"admin","customerType":1,"chinaCarNo":"桂A03948","chinaCarInChannel":"","chinaCarOutChannel":"","chinaCarInTime":1643061600000,"chinaCarOutTime":1643019767000,"complete":1,"itemJson":null,"peopleJson":null,"items":[]}],"dataCount":1,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:11:08.449|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:11:08.450|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/AccAdmin/fristOpenAdmin	p-> {}
+2022-01-24 19:11:08.467|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.018s, 返回：{"code":200,"msg":"ok","data":{"admin":{"id":10002,"customerId":"1","name":"admin","avatar":"http://sa-admin.dev33.cn/sa-frame/admin-logo.png","password":"********","pw":"admin","phone":null,"roleId":"2","status":1,"createByAid":-1,"createTime":1641988176000,"loginTime":1643049152000,"loginIp":"192.168.3.217","loginCount":116,"roleName":"管理员"},"per_list":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"app_cfg":null},"dataCount":-1}
+2022-01-24 19:11:08.697|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:11:08.697|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:11:08.698|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbBusiness/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:11:08.698|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/SpRolePermission/getPcodeByCurrRid	p-> {}
+2022-01-24 19:11:08.703|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:11:08.703|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:11:08.710|INFO [     http-nio-8099-exec-2]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.007s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:11:08.713|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.016s, 返回：{"code":200,"msg":"ok","data":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"dataCount":-1}
+2022-01-24 19:11:08.723|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.026s, 返回：{"code":200,"msg":"ok","data":[{"id":"1485548309600706562","customerId":"1484801911615811586","customerName":"测试客户","no":"2022012417413862","cardNo":"124233","countryName":"越南车","cardSize":13.5,"netWeight":123.0,"goodsName":"干杂货","goodsCode":"","driverName":"112","driverId":"1485548309533597697","driverPhone":"13434556786","driverIdCard":"","payTicket":"http://192.168.3.217:8099/upload/image/2022/01-24/16430210513072010364520.png","expectInDay":1642971600000,"realInDay":null,"realInTime":1642968120000,"inChannel":"","payStatus":3,"payTime":null,"payType":1,"payBy":"","outDayTime":1643019763000,"outChannel":"","partMoney":30,"chinaPartMoney":0.00,"partTime":860,"chinaCarPartTime":null,"itemPrice":1530.00,"totalMoney":1560.00,"createTime":1643017292000,"createBy":"admin","confirmInput":1,"confirmInputTime":1643020336000,"confirmInputBy":"test","adminConfirmPay":1,"adminConfirmPayTime":1643021060000,"adminConfirmPayBy":"admin","customerType":1,"chinaCarNo":"桂A03948","chinaCarInChannel":"","chinaCarOutChannel":"","chinaCarInTime":1643061600000,"chinaCarOutTime":1643019767000,"complete":1,"itemJson":null,"peopleJson":null,"items":[]}],"dataCount":1,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:12:04.197|INFO [     http-nio-8099-exec-7]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:04.197|INFO [     http-nio-8099-exec-7]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/AccAdmin/fristOpenAdmin	p-> {}
+2022-01-24 19:12:04.217|INFO [     http-nio-8099-exec-7]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.02s, 返回：{"code":200,"msg":"ok","data":{"admin":{"id":10002,"customerId":"1","name":"admin","avatar":"http://sa-admin.dev33.cn/sa-frame/admin-logo.png","password":"********","pw":"admin","phone":null,"roleId":"2","status":1,"createByAid":-1,"createTime":1641988176000,"loginTime":1643049152000,"loginIp":"192.168.3.217","loginCount":116,"roleName":"管理员"},"per_list":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"app_cfg":null},"dataCount":-1}
+2022-01-24 19:12:04.579|INFO [     http-nio-8099-exec-8]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:04.580|INFO [     http-nio-8099-exec-8]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbBusiness/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:12:04.587|INFO [    http-nio-8099-exec-10]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:04.587|INFO [    http-nio-8099-exec-10]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/SpRolePermission/getPcodeByCurrRid	p-> {}
+2022-01-24 19:12:04.591|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:04.591|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:12:04.592|INFO [     http-nio-8099-exec-8]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.013s, 返回：{"code":200,"msg":"ok","data":[{"id":"1485548309600706562","customerId":"1484801911615811586","customerName":"测试客户","no":"2022012417413862","cardNo":"124233","countryName":"越南车","cardSize":13.5,"netWeight":123.0,"goodsName":"干杂货","goodsCode":"","driverName":"112","driverId":"1485548309533597697","driverPhone":"13434556786","driverIdCard":"","payTicket":"http://192.168.3.217:8099/upload/image/2022/01-24/16430210513072010364520.png","expectInDay":1642971600000,"realInDay":null,"realInTime":1642968120000,"inChannel":"","payStatus":3,"payTime":null,"payType":1,"payBy":"","outDayTime":1643019763000,"outChannel":"","partMoney":30,"chinaPartMoney":0.00,"partTime":860,"chinaCarPartTime":null,"itemPrice":1530.00,"totalMoney":1560.00,"createTime":1643017292000,"createBy":"admin","confirmInput":1,"confirmInputTime":1643020336000,"confirmInputBy":"test","adminConfirmPay":1,"adminConfirmPayTime":1643021060000,"adminConfirmPayBy":"admin","customerType":1,"chinaCarNo":"桂A03948","chinaCarInChannel":"","chinaCarOutChannel":"","chinaCarInTime":1643061600000,"chinaCarOutTime":1643019767000,"complete":1,"itemJson":null,"peopleJson":null,"items":[]}],"dataCount":1,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:12:04.593|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.002s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:12:04.593|INFO [    http-nio-8099-exec-10]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.006s, 返回：{"code":200,"msg":"ok","data":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"dataCount":-1}
+2022-01-24 19:12:10.108|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:10.108|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/AccAdmin/fristOpenAdmin	p-> {}
+2022-01-24 19:12:10.117|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.009s, 返回：{"code":200,"msg":"ok","data":{"admin":{"id":10002,"customerId":"1","name":"admin","avatar":"http://sa-admin.dev33.cn/sa-frame/admin-logo.png","password":"********","pw":"admin","phone":null,"roleId":"2","status":1,"createByAid":-1,"createTime":1641988176000,"loginTime":1643049152000,"loginIp":"192.168.3.217","loginCount":116,"roleName":"管理员"},"per_list":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"app_cfg":null},"dataCount":-1}
+2022-01-24 19:12:10.393|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:10.393|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbBusiness/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:12:10.399|INFO [     http-nio-8099-exec-6]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:10.400|INFO [     http-nio-8099-exec-6]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/SpRolePermission/getPcodeByCurrRid	p-> {}
+2022-01-24 19:12:10.404|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:10.404|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:12:10.410|INFO [     http-nio-8099-exec-6]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.011s, 返回：{"code":200,"msg":"ok","data":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"dataCount":-1}
+2022-01-24 19:12:10.410|INFO [     http-nio-8099-exec-4]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.017s, 返回：{"code":200,"msg":"ok","data":[{"id":"1485548309600706562","customerId":"1484801911615811586","customerName":"测试客户","no":"2022012417413862","cardNo":"124233","countryName":"越南车","cardSize":13.5,"netWeight":123.0,"goodsName":"干杂货","goodsCode":"","driverName":"112","driverId":"1485548309533597697","driverPhone":"13434556786","driverIdCard":"","payTicket":"http://192.168.3.217:8099/upload/image/2022/01-24/16430210513072010364520.png","expectInDay":1642971600000,"realInDay":null,"realInTime":1642968120000,"inChannel":"","payStatus":3,"payTime":null,"payType":1,"payBy":"","outDayTime":1643019763000,"outChannel":"","partMoney":30,"chinaPartMoney":0.00,"partTime":860,"chinaCarPartTime":null,"itemPrice":1530.00,"totalMoney":1560.00,"createTime":1643017292000,"createBy":"admin","confirmInput":1,"confirmInputTime":1643020336000,"confirmInputBy":"test","adminConfirmPay":1,"adminConfirmPayTime":1643021060000,"adminConfirmPayBy":"admin","customerType":1,"chinaCarNo":"桂A03948","chinaCarInChannel":"","chinaCarOutChannel":"","chinaCarInTime":1643061600000,"chinaCarOutTime":1643019767000,"complete":1,"itemJson":null,"peopleJson":null,"items":[]}],"dataCount":1,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:12:10.410|INFO [     http-nio-8099-exec-3]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.006s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:12:12.399|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:12.400|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:12:12.401|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:12.402|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:12:12.407|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.006s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:12:12.424|INFO [     http-nio-8099-exec-1]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.025s, 返回：{"code":200,"msg":"ok","data":[{"id":"1484809046772838402","name":"广西泽泽科技","phone":"13838522436","dutyPeople":"中通","addressIds":"","addressStr":"","businessLicence":"http://192.168.3.217:8099/upload/image/2022/01-22/1642851257584694679293.png","status":1,"creareTime":1642841038000,"judgeStatus":3,"judgeTime":1642841057000,"judgeContent":"平台创建，直接通过","payType":2},{"id":"1484801911615811586","name":"测试客户","phone":"13434554245","dutyPeople":"他3333","addressIds":"","addressStr":"","businessLicence":"","status":1,"creareTime":1642839337000,"judgeStatus":2,"judgeTime":1642839337000,"judgeContent":"平台创建，直接通过","payType":1},{"id":"1484788472398901249","name":"广西人定胜天科技","phone":"13737112525","dutyPeople":"吕红格","addressIds":"","addressStr":"","businessLicence":"","status":1,"creareTime":1642836133000,"judgeStatus":2,"judgeTime":1642836267000,"judgeContent":"审核通过","payType":1}],"dataCount":3,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:12:17.630|INFO [     http-nio-8099-exec-6]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:17.631|INFO [     http-nio-8099-exec-6]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getById	p-> {"id":"1484809046772838402"}
+2022-01-24 19:12:17.637|INFO [     http-nio-8099-exec-6]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.007s, 返回：{"code":200,"msg":"ok","data":{"id":"1484809046772838402","name":"广西泽泽科技","phone":"13838522436","dutyPeople":"中通","addressIds":"","addressStr":"","businessLicence":"http://192.168.3.217:8099/upload/image/2022/01-22/1642851257584694679293.png","status":1,"creareTime":1642841038000,"judgeStatus":3,"judgeTime":1642841057000,"judgeContent":"平台创建，直接通过","payType":2},"dataCount":-1}
+2022-01-24 19:12:41.476|INFO [     http-nio-8099-exec-8]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:41.477|INFO [     http-nio-8099-exec-8]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/AccAdmin/fristOpenAdmin	p-> {}
+2022-01-24 19:12:41.488|INFO [     http-nio-8099-exec-8]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.012s, 返回：{"code":200,"msg":"ok","data":{"admin":{"id":10002,"customerId":"1","name":"admin","avatar":"http://sa-admin.dev33.cn/sa-frame/admin-logo.png","password":"********","pw":"admin","phone":null,"roleId":"2","status":1,"createByAid":-1,"createTime":1641988176000,"loginTime":1643049152000,"loginIp":"192.168.3.217","loginCount":116,"roleName":"管理员"},"per_list":["auth","role-list","admin-list","admin-add","tb-costomer","tb-costomer-list","tb-business","tb-business-list","tb-business-add","tb-business-confirm","tb-business-pay"],"app_cfg":null},"dataCount":-1}
+2022-01-24 19:12:41.720|INFO [    http-nio-8099-exec-10]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:41.721|INFO [    http-nio-8099-exec-10]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getList	p-> {"sortType":"0","pageNo":"1","pageSize":"10"}
+2022-01-24 19:12:41.727|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:41.728|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getCurrentCustomerId	p-> {}
+2022-01-24 19:12:41.730|INFO [    http-nio-8099-exec-10]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.01s, 返回：{"code":200,"msg":"ok","data":[{"id":"1484809046772838402","name":"广西泽泽科技","phone":"13838522436","dutyPeople":"中通","addressIds":"","addressStr":"","businessLicence":"http://192.168.3.217:8099/upload/image/2022/01-22/1642851257584694679293.png","status":1,"creareTime":1642841038000,"judgeStatus":3,"judgeTime":1642841057000,"judgeContent":"平台创建，直接通过","payType":2},{"id":"1484801911615811586","name":"测试客户","phone":"13434554245","dutyPeople":"他3333","addressIds":"","addressStr":"","businessLicence":"","status":1,"creareTime":1642839337000,"judgeStatus":2,"judgeTime":1642839337000,"judgeContent":"平台创建，直接通过","payType":1},{"id":"1484788472398901249","name":"广西人定胜天科技","phone":"13737112525","dutyPeople":"吕红格","addressIds":"","addressStr":"","businessLicence":"","status":1,"creareTime":1642836133000,"judgeStatus":2,"judgeTime":1642836267000,"judgeContent":"审核通过","payType":1}],"dataCount":3,"pageNo":1,"pageSize":10,"startIndex":0,"pageCount":1}
+2022-01-24 19:12:41.730|INFO [     http-nio-8099-exec-9]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.003s, 返回：{"code":200,"msg":"ok","data":"1","dataCount":-1}
+2022-01-24 19:12:43.398|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :----------------------------------------------------------------
+2022-01-24 19:12:43.399|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :IP: 192.168.3.217	r-> /pro/TbCostomer/getById	p-> {"id":"1484809046772838402"}
+2022-01-24 19:12:43.403|INFO [     http-nio-8099-exec-5]com.pj.utils.LogUtil                    |-Line:18 :本次请求耗时：0.005s, 返回：{"code":200,"msg":"ok","data":{"id":"1484809046772838402","name":"广西泽泽科技","phone":"13838522436","dutyPeople":"中通","addressIds":"","addressStr":"","businessLicence":"http://192.168.3.217:8099/upload/image/2022/01-22/1642851257584694679293.png","status":1,"creareTime":1642841038000,"judgeStatus":3,"judgeTime":1642841057000,"judgeContent":"平台创建，直接通过","payType":2},"dataCount":-1}

sp-server/src/main/java/com/pj/project/tb_item/TbItem.java

@@ -62,6 +62,7 @@ public class TbItem extends Model<TbItem> implements Serializable {
     private String unit;
     private double carLength;
     private double maxWeight;
+    private int status;
 
 
 }

sp-server/src/main/java/com/pj/project/tb_item/TbItemController.java

@@ -76,16 +76,15 @@ public class TbItemController {
 		List<TbItem> list = tbItemService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
-	
-	
-	/** 改 - 是否必须(1=否,2=是) */  
-	@RequestMapping("updateNeed")
-	@SaCheckPermission(TbItem.PERMISSION_CODE)
-	public AjaxJson updateNeed(Long id, String value){
-		int line = SP.publicMapper.updateColumnById(TbItem.TABLE_NAME, "need", value, id);
-		return AjaxJson.getByLine(line);
-	}
+
+    /** 改 - 状态(0=否,1=是) */
+    @RequestMapping("updateStatus")
+    @SaCheckPermission(TbItem.PERMISSION_CODE)
+    public AjaxJson updateStatus(String id, int value){
+        int line = SP.publicMapper.updateColumnById(TbItem.TABLE_NAME, "status", value, id);
+        return AjaxJson.getByLine(line);
+    }
+
 	
 	
 	// ------------------------- 前端接口 -------------------------

sp-server/src/main/java/com/pj/project/tb_item/TbItemMapper.xml

@@ -5,8 +5,8 @@
     <!-- 增 [G] -->
     <insert id="add">
 		insert into 
-		tb_item (id, type_id, type_name, item_code, item_name, price, unit)
-		values (#{id}, #{typeId}, #{typeName}, #{itemCode}, #{itemName}, #{price}, #{unit})
+		tb_item (id, type_id, type_name, item_code, item_name, price, unit, car_length, max_weight, status)
+		values (#{id}, #{typeId}, #{typeName}, #{itemCode}, #{itemName}, #{price}, #{unit}, #{carLength}, #{maxWeight}, #{status})
 	</insert>
 
     <!-- 删 -->
@@ -24,7 +24,10 @@
 		item_code = #{itemCode},
 		item_name = #{itemName},
 		price = #{price},
-		unit = #{unit}
+		unit = #{unit},
+		car_length =  #{carLength},
+		max_weight = #{maxWeight},
+		status = #{status}
 		where id = #{id}
 	</update>
 
@@ -41,6 +44,9 @@
         <result property="itemName" column="item_name" />
         <result property="price" column="price" />
         <result property="unit" column="unit" />
+        <result property="carLength" column="car_length" />
+        <result property="maxWeight" column="max_weight" />
+        <result property="status" column="status" />
     </resultMap>
 
     <!-- 公共查询sql片段 -->
@@ -48,42 +54,46 @@
 		select *
 		from tb_item
 	</sql>
-	
+
 	<!-- 查 - 根据id -->
 	<select id="getById" resultMap="model">
 		<include refid="select_sql"></include>
 		where id = #{id}
 	</select>
-	
+
 	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
 	<select id="getList" resultMap="model">
 		<include refid="select_sql"></include>
 		<where>
 			<if test=' this.has("id") '> and id = #{id} </if>
-			<if test=' this.has("itemCode") '> and item_code = #{itemCode} </if>
-			<if test=' this.has("itemName") '> and item_name = #{itemName} </if>
+            <if test=' this.has("typeId") '> and type_id = #{typeId} </if>
+            <if test=' this.has("typeName") '> and type_name = #{typeName} </if>
+            <if test=' this.has("itemCode") '> and item_code = #{itemCode} </if>
+            <if test=' this.has("itemName") '> and item_name like concat('%', #{itemName} ,'%') </if>
 			<if test=' this.has("price") '> and price = #{price} </if>
 			<if test=' this.has("status") '> and status = #{status} </if>
 		</where>
 		order by
 		<choose>
-			<when test='sortType == 1'> id desc </when>
-			<when test='sortType == 2'> item_code desc </when>
-			<when test='sortType == 3'> item_name desc </when>
-			<when test='sortType == 4'> price desc </when>
-			<when test='sortType == 5'> need desc </when>
+            <when test='sortType == 1'> id desc </when>
+            <when test='sortType == 2'> type_id desc </when>
+            <when test='sortType == 3'> type_name desc </when>
+            <when test='sortType == 4'> item_code desc </when>
+            <when test='sortType == 5'> item_name desc </when>
+            <when test='sortType == 6'> price desc </when>
+            <when test='sortType == 7'> unit desc </when>
 			<otherwise> id desc </otherwise>
 		</choose>
 	</select>
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
 
     <!-- 查 - 根据id -->
     <select id="getById" resultMap="model">