Quellcode durchsuchen

去掉了多余的一些东西

mao_ym vor 2 Jahren
Ursprung
Commit
a55c15f0fe
40 geänderte Dateien mit 345 neuen und 805 gelöschten Zeilen
  1. 56 46
      sa-view/tb-driver/tb-driver-add.html
  2. 3 11
      sa-view/tb-driver/tb-driver-info.html
  3. 5 49
      sa-view/tb-driver/tb-driver-list.html
  4. 62 47
      sa-view/tb-enterprise/tb-enterprise-add.html
  5. 1 17
      sa-view/tb-enterprise/tb-enterprise-info.html
  6. 7 67
      sa-view/tb-enterprise/tb-enterprise-list.html
  7. 1 7
      sa-view/tb-goods-type/tb-goods-type-add.html
  8. 1 8
      sa-view/tb-goods-type/tb-goods-type-info.html
  9. 3 10
      sa-view/tb-goods-type/tb-goods-type-list.html
  10. 0 2
      sa-view/tb-goods-units/tb-goods-units-add.html
  11. 0 1
      sa-view/tb-goods-units/tb-goods-units-info.html
  12. 1 3
      sa-view/tb-goods-units/tb-goods-units-list.html
  13. 2 2
      sa-view/tb-goods/tb-goods-add.html
  14. 3 4
      sa-view/tb-goods/tb-goods-info.html
  15. 3 16
      sa-view/tb-goods/tb-goods-list.html
  16. 7 20
      sa-view/tb-group/tb-group-add.html
  17. 3 10
      sa-view/tb-group/tb-group-info.html
  18. 5 12
      sa-view/tb-group/tb-group-list.html
  19. 1 9
      sa-view/tb-logistics/tb-logistics-add.html
  20. 1 9
      sa-view/tb-logistics/tb-logistics-info.html
  21. 3 11
      sa-view/tb-logistics/tb-logistics-list.html
  22. 2 17
      sa-view/tb-orders/tb-orders-add.html
  23. 1 8
      sa-view/tb-orders/tb-orders-info.html
  24. 2 33
      sa-view/tb-orders/tb-orders-list.html
  25. 9 22
      sa-view/tb-people/tb-people-add.html
  26. 3 10
      sa-view/tb-people/tb-people-info.html
  27. 10 58
      sa-view/tb-people/tb-people-list.html
  28. 10 31
      sa-view/tb-purchaser/tb-purchaser-add.html
  29. 3 11
      sa-view/tb-purchaser/tb-purchaser-info.html
  30. 5 41
      sa-view/tb-purchaser/tb-purchaser-list.html
  31. 34 30
      sa-view/tb-shop/tb-shop-add.html
  32. 2 14
      sa-view/tb-shop/tb-shop-info.html
  33. 16 43
      sa-view/tb-shop/tb-shop-list.html
  34. 15 20
      sa-view/tb-trade-area/tb-trade-area-add.html
  35. 0 8
      sa-view/tb-trade-area/tb-trade-area-info.html
  36. 1 16
      sa-view/tb-trade-area/tb-trade-area-list.html
  37. 46 41
      sa-view/tb-vehicle/tb-vehicle-add.html
  38. 3 9
      sa-view/tb-vehicle/tb-vehicle-info.html
  39. 14 31
      sa-view/tb-vehicle/tb-vehicle-list.html
  40. 1 1
      static/sa.js

+ 56 - 46
sa-view/tb-driver/tb-driver-add.html

@@ -28,33 +28,50 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<!-- <sa-item type="num" name="主键" v-model="m.id" br></sa-item> -->
-						<sa-item type="text" name="姓名" v-model="m.name" br></sa-item>
-						<sa-item type="num" name="年龄" v-model="m.age" br></sa-item>
-						<sa-item type="enum" name="性别性别" v-model="m.sex" :jv="{1: '男', 2: '女'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="手机号" v-model="m.phone" br></sa-item>
-						<sa-item type="text" name="联系地址" v-model="m.address" br></sa-item>
-						<!-- <sa-item type="text" name="银行卡号" v-model="m.bankCode" br></sa-item> -->
-						<!-- <sa-item type="text" name="银行名称" v-model="m.bankName" br></sa-item> -->
-						<sa-item type="text" name="身份证号" v-model="m.idCard" br></sa-item>
-			<!-- 			<sa-item type="img-list" name="身份证照片" v-model="m.idCardImg" br></sa-item>
-						<sa-item type="text" name="驾驶证号" v-model="m.drivingLicenseId" br></sa-item>
-						<sa-item type="img-list" name="驾驶证照片" v-model="m.drivingLicenseImg" br></sa-item>
-						<sa-item type="text" name="车辆行驶证号" v-model="m.vehicleDrivingId" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="姓名" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="num" name="年龄" v-model="m.age" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="性别" v-model="m.sex" :jv="{1: '男', 2: '女'}" jtype="3" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="手机号" v-model="m.phone" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="联系地址" v-model="m.address" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="身份证号" v-model="m.idCard" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="驾驶证号" v-model="m.drivingLicenseId" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="datetime" name="注册时间" v-model="m.registerTime" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="车辆行驶证号" v-model="m.vehicleDrivingId" br></sa-item>
+							</el-col>
+						</el-row>
 						<sa-item type="img-list" name="车辆行驶证照片" v-model="m.vehicleDrivingImg" br></sa-item>
-						<sa-item type="img-list" name="车辆前脸照" v-model="m.vehicleImg" br></sa-item> -->
-						<!-- <sa-item type="text" name="注册时间" v-model="m.registerTime" br></sa-item> -->
-				<!-- 		<sa-item type="text" name="是否被锁定" v-model="m.isLock" br></sa-item>
-						<sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建者名称" v-model="m.createName" br></sa-item> -->
-						<!-- date-create字段: m.createTime - 创建时间
-						<!-- <sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item> -->
-						<!-- date-update字段: m.updateTime - 更新时间 -->
-						<!-- <sa-item type="enum" name="审核状态" v-model="m.auditStatus" :jv="{0: '待审核,1'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="审核人" v-model="m.auditBy" br></sa-item>
-						<sa-item type="text" name="审核时间" v-model="m.auditTime" br></sa-item>
-						<sa-item type="text" name="审核不通过原因" v-model="m.nopassReason" br></sa-item> --> -->
+						<sa-item type="img-list" name="车辆前脸照" v-model="m.vehicleImg" br></sa-item>
+						<sa-item type="img-list" name="驾驶证照片" v-model="m.drivingLicenseImg" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -92,12 +109,12 @@
 							// bankName: '',		// 银行名称
 							idCard: '',		// 身份证号
 							// idCardImg: '',		// 身份证照片
-							// drivingLicenseId: '',		// 驾驶证号
-							// drivingLicenseImg: '',		// 驾驶证照片
-							// vehicleDrivingId: '',		// 车辆行驶证号
-							// vehicleDrivingImg: '',		// 车辆行驶证照片
-							// vehicleImg: '',		// 车辆前脸照
-							// registerTime: '',		// 注册时间
+							drivingLicenseId: '',		// 驾驶证号
+							drivingLicenseImg: '',		// 驾驶证照片
+							vehicleDrivingId: '',		// 车辆行驶证号
+							vehicleDrivingImg: '',		// 车辆行驶证照片
+							vehicleImg: '',		// 车辆前脸照
+							registerTime: '',		// 注册时间
 							// isLock: '',		// 是否被锁定
 							// createBy: '',		// 创建者id
 							// createName: '',		// 创建者名称
@@ -124,21 +141,14 @@
 						sa.checkNull(m.address, '请输入 [联系地址]');
 						// sa.checkNull(m.bankCode, '请输入 [银行卡号]');
 						// sa.checkNull(m.bankName, '请输入 [银行名称]');
-						// sa.checkNull(m.idCard, '请输入 [身份证号]');
+						sa.checkNull(m.idCard, '请输入 [身份证号]');
 						// sa.checkNull(m.idCardImg, '请输入 [身份证照片]');
-						// sa.checkNull(m.drivingLicenseId, '请输入 [驾驶证号]');
-						// sa.checkNull(m.drivingLicenseImg, '请输入 [驾驶证照片]');
-						// sa.checkNull(m.vehicleDrivingId, '请输入 [车辆行驶证号]');
-						// sa.checkNull(m.vehicleDrivingImg, '请输入 [车辆行驶证照片]');
-						// sa.checkNull(m.vehicleImg, '请输入 [车辆前脸照]');
-						// sa.checkNull(m.registerTime, '请输入 [注册时间]');
-						// sa.checkNull(m.isLock, '请输入 [是否被锁定]');
-						// sa.checkNull(m.createBy, '请输入 [创建者id]');
-						// sa.checkNull(m.createName, '请输入 [创建者名称]');
-						// // sa.checkNull(m.createTime, '请输入 [创建时间]');
-						// sa.checkNull(m.updateBy, '请输入 [更新者id]');
-						// sa.checkNull(m.updateName, '请输入 [更新者名称]');
-						// // sa.checkNull(m.updateTime, '请输入 [更新时间]');
+						sa.checkNull(m.drivingLicenseId, '请输入 [驾驶证号]');
+						sa.checkNull(m.drivingLicenseImg, '请输入 [驾驶证照片]');
+						sa.checkNull(m.vehicleDrivingId, '请输入 [车辆行驶证号]');
+						sa.checkNull(m.vehicleDrivingImg, '请输入 [车辆行驶证照片]');
+						sa.checkNull(m.vehicleImg, '请输入 [车辆前脸照]');
+						sa.checkNull(m.registerTime, '请输入 [注册时间]');
 						// // sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 						// sa.checkNull(m.auditStatus, '请输入 [审核状态]');
 						// sa.checkNull(m.auditBy, '请输入 [审核人]');

+ 3 - 11
sa-view/tb-driver/tb-driver-info.html

@@ -26,10 +26,9 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="姓名" br>{{m.name}}</sa-info>
 						<sa-info type="num" name="年龄" :value="m.age" br></sa-info>
-						<sa-info type="enum" name="性别性别" :value="m.sex" :jv="{1: '男', 2: '女'}" br></sa-info>
+						<sa-info type="enum" name="性别" :value="m.sex" :jv="{1: '男', 2: '女'}" br></sa-info>
 						<sa-info name="手机号" br>{{m.phone}}</sa-info>
 						<sa-info name="联系地址" br>{{m.address}}</sa-info>
 						<sa-info name="银行卡号" br>{{m.bankCode}}</sa-info>
@@ -42,17 +41,10 @@
 						<sa-info type="img-list" name="车辆行驶证照片" :value="m.vehicleDrivingImg" br></sa-info>
 						<sa-info type="img-list" name="车辆前脸照" :value="m.vehicleImg" br></sa-info>
 						<sa-info name="注册时间" br>{{m.registerTime}}</sa-info>
-						<sa-info name="是否被锁定" br>{{m.isLock}}</sa-info>
-						<sa-info name="创建者id" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建者名称" br>{{m.createName}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
-						<sa-info name="更新者id" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
-						<sa-info type="enum" name="审核状态" :value="m.auditStatus" :jv="{0: '待审核,1'}" br></sa-info>
+						<!-- <sa-info type="enum" name="审核状态" :value="m.auditStatus" :jv="{0: '待审核,1'}" br></sa-info>
 						<sa-info name="审核人" br>{{m.auditBy}}</sa-info>
 						<sa-info name="审核时间" br>{{m.auditTime}}</sa-info>
-						<sa-info name="审核不通过原因" br>{{m.nopassReason}}</sa-info>
+						<sa-info name="审核不通过原因" br>{{m.nopassReason}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 5 - 49
sa-view/tb-driver/tb-driver-list.html

@@ -21,32 +21,11 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="姓名" v-model="p.name"></sa-item>
-					<sa-item type="num" name="年龄" v-model="p.age"></sa-item>
-					<sa-item type="enum" name="性别性别" v-model="p.sex"
-						:jv="{1: '男', 2: '女'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="手机号" v-model="p.phone"></sa-item>
-					<sa-item type="text" name="联系地址" v-model="p.address"></sa-item>
-					<sa-item type="text" name="银行卡号" v-model="p.bankCode"></sa-item>
-					<sa-item type="text" name="银行名称" v-model="p.bankName"></sa-item>
-					<sa-item type="text" name="身份证号" v-model="p.idCard"></sa-item>
 					<sa-item type="text" name="驾驶证号" v-model="p.drivingLicenseId"></sa-item>
 					<sa-item type="text" name="车辆行驶证号" v-model="p.vehicleDrivingId"></sa-item>
-					<sa-item type="text" name="注册时间" v-model="p.registerTime"></sa-item>
-					<sa-item type="text" name="是否被锁定" v-model="p.isLock"></sa-item>
-					<sa-item type="text" name="创建者id" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建者名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item>
-					<!-- 未识别类型:删除状态: p.deleteStatus 请检查配置 -->
-					<sa-item type="enum" name="审核状态" v-model="p.auditStatus"
-						:jv="{0: '待审核,1'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="审核人" v-model="p.auditBy"></sa-item>
-					<sa-item type="text" name="审核时间" v-model="p.auditTime"></sa-item>
-					<sa-item type="text" name="审核不通过原因" v-model="p.nopassReason"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -57,33 +36,19 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="name" ></sa-td>
 					<sa-td name="年龄" prop="age" type="num"></sa-td>
-					<sa-td name="性别性别" prop="sex" type="enum" :jv="{1: '男', 2: '女'}"></sa-td>
+					<sa-td name="性别" prop="sex" type="enum" :jv="{1: '男', 2: '女'}"></sa-td>
 					<sa-td name="手机号" prop="phone" ></sa-td>
 					<sa-td name="联系地址" prop="address" ></sa-td>
-					<sa-td name="银行卡号" prop="bankCode" ></sa-td>
-					<sa-td name="银行名称" prop="bankName" ></sa-td>
 					<sa-td name="身份证号" prop="idCard" ></sa-td>
-					<sa-td name="身份证照片" prop="idCardImg" type="img-list"></sa-td>
+					<!-- <sa-td name="身份证照片" prop="idCardImg" type="img-list"></sa-td> -->
 					<sa-td name="驾驶证号" prop="drivingLicenseId" ></sa-td>
 					<sa-td name="驾驶证照片" prop="drivingLicenseImg" type="img-list"></sa-td>
-					<sa-td name="车辆行驶证号" prop="vehicleDrivingId" ></sa-td>
+					<sa-td name="车辆行驶证号" prop="vehicleDrivingId" width="120px" ></sa-td>
 					<sa-td name="车辆行驶证照片" prop="vehicleDrivingImg" type="img-list"></sa-td>
 					<sa-td name="车辆前脸照" prop="vehicleImg" type="img-list"></sa-td>
-					<sa-td name="注册时间" prop="registerTime" ></sa-td>
-					<sa-td name="是否被锁定" prop="isLock" ></sa-td>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者名称" prop="createName" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></sa-td>
-					<sa-td name="审核状态" prop="auditStatus" type="enum" :jv="{0: '待审核,1'}"></sa-td>
-					<sa-td name="审核人" prop="auditBy" ></sa-td>
-					<sa-td name="审核时间" prop="auditTime" ></sa-td>
-					<sa-td name="审核不通过原因" prop="nopassReason" ></sa-td>
+					<sa-td name="注册时间" prop="registerTime" ></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>
@@ -117,15 +82,6 @@
 						drivingLicenseId: '',		// 驾驶证号
 						vehicleDrivingId: '',		// 车辆行驶证号
 						registerTime: '',		// 注册时间
-						isLock: '',		// 是否被锁定
-						createBy: '',		// 创建者id
-						createName: '',		// 创建者名称
-						updateBy: '',		// 更新者id
-						updateName: '',		// 更新者名称
-						auditStatus: '',		// 审核状态(0=待审核,1=已通过,2=不通过)
-						auditBy: '',		// 审核人
-						auditTime: '',		// 审核时间
-						nopassReason: '',		// 审核不通过原因
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

+ 62 - 47
sa-view/tb-enterprise/tb-enterprise-add.html

@@ -29,35 +29,66 @@
                     <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.id" br></sa-item>
-						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
-						<sa-item type="text" name="国别" v-model="m.nationality" br></sa-item>
-						<sa-item type="enum" name="商户分类" v-model="m.type" :jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="法人" v-model="m.legalPerson" br></sa-item>
-						<sa-item type="text" name="身份证号" v-model="m.idCard" br></sa-item>
-						<sa-item type="text" name="手机号码" v-model="m.contact" br></sa-item>
-						<sa-item type="img-list" name="营业执照" v-model="m.businessLicense" br></sa-item>
-						<sa-item type="text" name="所在铺位ID" v-model="m.shopId" br></sa-item>
-						<sa-item type="enum" name="所在铺位名称" v-model="m.shopName" :jv="{1: '100-2'}" jtype="4" br></sa-item>
-						<sa-item type="enum" name="银行编号" v-model="m.bankNo" :jv="{CMB: '招商银行'}" jtype="4" br></sa-item>
-						<sa-item type="text" name="" v-model="m.bankName" br></sa-item>
-						<sa-item type="text" name="银行账号" v-model="m.bankAccount" br></sa-item>
-						<sa-item type="text" name="税号" v-model="m.dutyParagraph" br></sa-item>
-						<sa-item type="text" name="" v-model="m.addressIds" br></sa-item>
-						<sa-item type="text" name="" v-model="m.address" br></sa-item>
-						<sa-item type="text" name="" v-model="m.agreement" br></sa-item>
-						<sa-item type="text" name="" v-model="m.judgeStatus" br></sa-item>
-						<sa-item type="text" name="" v-model="m.judgeContent" br></sa-item>
-						<sa-item type="text" name="" v-model="m.judgeTime" br></sa-item>
-						<sa-item type="text" name="" v-model="m.registerTime" br></sa-item>
-						<sa-item type="text" name="" v-model="m.personId" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="国别" v-model="m.nationality" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="商户分类" v-model="m.type" :jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}" jtype="3" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="法人" v-model="m.legalPerson" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="身份证号" v-model="m.idCard" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="手机号码" v-model="m.contact" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="税号" v-model="m.dutyParagraph" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="所在铺位ID" v-model="m.shopId" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="所在铺位名称" v-model="m.shopName" :jv="{1: '100-2'}" jtype="4" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="enum" name="银行编号" v-model="m.bankNo" :jv="{CMB: '招商银行'}" jtype="4" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="银行名称" v-model="m.bankName" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="银行账号" v-model="m.bankAccount" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="img-list" name="营业执照" v-model="m.businessLicense" 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>
@@ -120,35 +151,19 @@
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						sa.checkNull(m.id, '请输入 []');
 						sa.checkNull(m.name, '请输入 [名称]');
 						sa.checkNull(m.nationality, '请输入 [国别]');
 						sa.checkNull(m.type, '请输入 [商户分类]');
 						sa.checkNull(m.legalPerson, '请输入 [法人]');
 						sa.checkNull(m.idCard, '请输入 [身份证号]');
 						sa.checkNull(m.contact, '请输入 [手机号码]');
-						sa.checkNull(m.businessLicense, '请输入 [营业执照]');
+						// sa.checkNull(m.businessLicense, '请上传 [营业执照]');
 						sa.checkNull(m.shopId, '请输入 [所在铺位ID]');
 						sa.checkNull(m.shopName, '请输入 [所在铺位名称]');
 						sa.checkNull(m.bankNo, '请输入 [银行编号]');
-						sa.checkNull(m.bankName, '请输入 []');
+						sa.checkNull(m.bankName, '请输入 [银行名称]');
 						sa.checkNull(m.bankAccount, '请输入 [银行账号]');
 						sa.checkNull(m.dutyParagraph, '请输入 [税号]');
-						sa.checkNull(m.addressIds, '请输入 []');
-						sa.checkNull(m.address, '请输入 []');
-						sa.checkNull(m.agreement, '请输入 []');
-						sa.checkNull(m.judgeStatus, '请输入 []');
-						sa.checkNull(m.judgeContent, '请输入 []');
-						sa.checkNull(m.judgeTime, '请输入 []');
-						sa.checkNull(m.registerTime, '请输入 []');
-						sa.checkNull(m.personId, '请输入 []');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.createBy, '请输入 [创建人编号]');
-						sa.checkNull(m.createName, '请输入 [创建人名称]');
-						sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
-						sa.checkNull(m.updateName, '请输入 [更新人名称]');
-						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加

+ 1 - 17
sa-view/tb-enterprise/tb-enterprise-info.html

@@ -26,7 +26,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="" br>{{m.id}}</sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="国别" br>{{m.nationality}}</sa-info>
 						<sa-info type="enum" name="商户分类" :value="m.type" :jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}" br></sa-info>
@@ -37,24 +36,9 @@
 						<sa-info name="所在铺位ID" br>{{m.shopId}}</sa-info>
 						<sa-info type="enum" name="所在铺位名称" :value="m.shopName" :jv="{1: '100-2'}" br></sa-info>
 						<sa-info type="enum" name="银行编号" :value="m.bankNo" :jv="{CMB: '招商银行'}" br></sa-info>
-						<sa-info name="" br>{{m.bankName}}</sa-info>
+						<sa-info name="银行名称" br>{{m.bankName}}</sa-info>
 						<sa-info name="银行账号" br>{{m.bankAccount}}</sa-info>
 						<sa-info name="税号" br>{{m.dutyParagraph}}</sa-info>
-						<sa-info name="" br>{{m.addressIds}}</sa-info>
-						<sa-info name="" br>{{m.address}}</sa-info>
-						<sa-info name="" br>{{m.agreement}}</sa-info>
-						<sa-info name="" br>{{m.judgeStatus}}</sa-info>
-						<sa-info name="" br>{{m.judgeContent}}</sa-info>
-						<sa-info name="" br>{{m.judgeTime}}</sa-info>
-						<sa-info name="" br>{{m.registerTime}}</sa-info>
-						<sa-info name="" br>{{m.personId}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 					</el-form>
 				</div>
 			</div>

+ 7 - 67
sa-view/tb-enterprise/tb-enterprise-list.html

@@ -20,40 +20,11 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="" v-model="p.id"></sa-item>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
-					<sa-item type="text" name="国别" v-model="p.nationality"></sa-item>
 					<sa-item type="enum" name="商户分类" v-model="p.type"
-						:jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="法人" v-model="p.legalPerson"></sa-item>
-					<sa-item type="text" name="身份证号" v-model="p.idCard"></sa-item>
-					<sa-item type="text" name="手机号码" v-model="p.contact"></sa-item>
-					<sa-item type="text" name="所在铺位ID" v-model="p.shopId"></sa-item>
-					<sa-item type="enum" name="所在铺位名称" v-model="p.shopName"
-						:jv="{1: '100-2'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="银行编号" v-model="p.bankNo"
-						:jv="{CMB: '招商银行'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="" v-model="p.bankName"></sa-item>
-					<sa-item type="text" name="银行账号" v-model="p.bankAccount"></sa-item>
-					<sa-item type="text" name="税号" v-model="p.dutyParagraph"></sa-item>
-					<sa-item type="text" name="" v-model="p.addressIds"></sa-item>
-					<sa-item type="text" name="" v-model="p.address"></sa-item>
-					<sa-item type="text" name="" v-model="p.agreement"></sa-item>
-					<sa-item type="text" name="" v-model="p.judgeStatus"></sa-item>
-					<sa-item type="text" name="" v-model="p.judgeContent"></sa-item>
-					<sa-item type="text" name="" v-model="p.judgeTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.registerTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.personId"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
+						:jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}" jtype="3" def="不限"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -64,35 +35,19 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="" prop="id" ></sa-td>
 					<sa-td name="名称" prop="name" ></sa-td>
 					<sa-td name="国别" prop="nationality" ></sa-td>
 					<sa-td name="商户分类" prop="type" type="enum" :jv="{自营商铺: '自营商铺', 劳务商铺: '劳务商铺'}"></sa-td>
 					<sa-td name="法人" prop="legalPerson" ></sa-td>
 					<sa-td name="身份证号" prop="idCard" ></sa-td>
-					<sa-td name="手机号码" prop="contact" ></sa-td>
+					<sa-td name="手机号码" width="100px" prop="contact" ></sa-td>
 					<sa-td name="营业执照" prop="businessLicense" type="img-list"></sa-td>
 					<sa-td name="所在铺位ID" prop="shopId" ></sa-td>
-					<sa-td name="所在铺位名称" prop="shopName" type="enum" :jv="{1: '100-2'}"></sa-td>
-					<sa-td name="银行编号" prop="bankNo" type="enum" :jv="{CMB: '招商银行'}"></sa-td>
-					<sa-td name="" prop="bankName" ></sa-td>
+					<sa-td name="所在铺位名称" width="120px" prop="shopName" type="enum" :jv="{1: '100-2'}"></sa-td>
+					<sa-td name="银行编号" width="120px" prop="bankNo" type="enum" :jv="{CMB: '招商银行'}"></sa-td>
+					<sa-td name="银行名称" prop="bankName" ></sa-td>
 					<sa-td name="银行账号" prop="bankAccount" ></sa-td>
 					<sa-td name="税号" prop="dutyParagraph" ></sa-td>
-					<sa-td name="" prop="addressIds" ></sa-td>
-					<sa-td name="" prop="address" ></sa-td>
-					<sa-td name="" prop="agreement" ></sa-td>
-					<sa-td name="" prop="judgeStatus" ></sa-td>
-					<sa-td name="" prop="judgeContent" ></sa-td>
-					<sa-td name="" prop="judgeTime" ></sa-td>
-					<sa-td name="" prop="registerTime" ></sa-td>
-					<sa-td name="" prop="personId" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
-					<sa-td name="创建人名称" prop="createName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="更新人编号" prop="updateBy" ></sa-td>
-					<sa-td name="更新人名称" prop="updateName" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(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>
@@ -124,24 +79,9 @@
 						shopId: '',		// 所在铺位ID
 						shopName: '',		// 所在铺位名称(1=100-2)
 						bankNo: '',		// 银行编号(CMB= 招商银行)
-						bankName: '',		//
+						bankName: '',		// 银行名称
 						bankAccount: '',		// 银行账号
 						dutyParagraph: '',		// 税号
-						addressIds: '',		//
-						address: '',		//
-						agreement: '',		//
-						judgeStatus: '',		//
-						judgeContent: '',		//
-						judgeTime: '',		//
-						registerTime: '',		//
-						personId: '',		//
-						createTime: '',		// 创建时间
-						createBy: '',		// 创建人编号
-						createName: '',		// 创建人名称
-						updateTime: '',		// 更新时间
-						updateBy: '',		// 更新人编号
-						updateName: '',		// 更新人名称
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

+ 1 - 7
sa-view/tb-goods-type/tb-goods-type-add.html

@@ -31,13 +31,7 @@
 						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
 						<sa-item type="text" name="排序" v-model="m.sort" br></sa-item>
 						<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" 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>

+ 1 - 8
sa-view/tb-goods-type/tb-goods-type-info.html

@@ -26,17 +26,10 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="排序" br>{{m.sort}}</sa-info>
 						<sa-info name="编号" br>{{m.no}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 3 - 10
sa-view/tb-goods-type/tb-goods-type-list.html

@@ -20,20 +20,13 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 					<sa-item type="text" name="排序" v-model="p.sort"></sa-item>
 					<sa-item type="text" name="编号" v-model="p.no"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
+					<!-- <sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
+						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item> -->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">

+ 0 - 2
sa-view/tb-goods-units/tb-goods-units-add.html

@@ -28,7 +28,6 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="商品主键" v-model="m.id" br></sa-item>
 						<sa-item type="text" name="商品单位编号" v-model="m.unitsNo" br></sa-item>
 						<sa-item type="text" name="管理商品的单位,比如吨、kg、个、柜;主要字段,名称,编号" v-model="m.units" br></sa-item>
 						<sa-item name="" class="s-ok" br>
@@ -67,7 +66,6 @@
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						sa.checkNull(m.id, '请输入 [商品主键]');
 						sa.checkNull(m.unitsNo, '请输入 [商品单位编号]');
 						sa.checkNull(m.units, '请输入 [管理商品的单位,比如吨、kg、个、柜;主要字段,名称,编号]');
 

+ 0 - 1
sa-view/tb-goods-units/tb-goods-units-info.html

@@ -25,7 +25,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="商品主键" :value="m.id" br></sa-info>
 						<sa-info name="商品单位编号" br>{{m.unitsNo}}</sa-info>
 						<sa-info name="管理商品的单位,比如吨、kg、个、柜;主要字段,名称,编号" br>{{m.units}}</sa-info>
 					</el-form>

+ 1 - 3
sa-view/tb-goods-units/tb-goods-units-list.html

@@ -20,9 +20,8 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="商品主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="商品单位编号" v-model="p.unitsNo"></sa-item>
 					<sa-item type="text" name="管理商品的单位,比如吨、kg、个、柜;主要字段,名称,编号" v-model="p.units"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
@@ -35,7 +34,6 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="unitsNo" ></sa-td>
 					<sa-td name="管理商品的单位,比如吨、kg、个、柜;主要字段,名称,编号" prop="units" ></sa-td>
 					<el-table-column label="操作" fixed="right"  width="240px">

+ 2 - 2
sa-view/tb-goods/tb-goods-add.html

@@ -36,9 +36,9 @@
 						<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
 						<sa-item type="text" name="原产地" v-model="m.source" br></sa-item>
 						<sa-item type="enum" name="状态" v-model="m.status" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="" v-model="m.unit" br></sa-item>
+						<!-- <sa-item type="text" name="" v-model="m.unit" br></sa-item>
 						<sa-item type="text" name="" v-model="m.singlePrice" br></sa-item>
-						<sa-item type="text" name="" v-model="m.taxNo" br></sa-item>
+						<sa-item type="text" name="" v-model="m.taxNo" br></sa-item> -->
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>

+ 3 - 4
sa-view/tb-goods/tb-goods-info.html

@@ -25,7 +25,7 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
+						<sainfo type="num" name="主键" :value="m.id" br></sainfo>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info type="img" name="主图" :value="m.avatar" br></sa-info>
 						<sa-info name="分类ID字符串(可多选)" br>{{m.typeIds}}</sa-info>
@@ -34,10 +34,9 @@
 						<sa-info name="备注" br>{{m.remark}}</sa-info>
 						<sa-info name="原产地" br>{{m.source}}</sa-info>
 						<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="" br>{{m.unit}}</sa-info>
+						<!-- <sa-info name="" br>{{m.unit}}</sa-info>
 						<sa-info name="" br>{{m.singlePrice}}</sa-info>
-						<sa-info name="" br>{{m.taxNo}}</sa-info>
+						<sa-info name="" br>{{m.taxNo}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 3 - 16
sa-view/tb-goods/tb-goods-list.html

@@ -20,21 +20,10 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
-					<sa-item type="text" name="分类ID字符串(可多选)" v-model="p.typeIds"></sa-item>
 					<sa-item type="text" name="分类名称" v-model="p.typeNames"></sa-item>
-					<sa-item type="text" name="编号" v-model="p.code"></sa-item>
-					<sa-item type="text" name="备注" v-model="p.remark"></sa-item>
-					<sa-item type="text" name="原产地" v-model="p.source"></sa-item>
-					<sa-item type="enum" name="状态" v-model="p.status"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.unit"></sa-item>
-					<sa-item type="text" name="" v-model="p.singlePrice"></sa-item>
-					<sa-item type="text" name="" v-model="p.taxNo"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -45,7 +34,6 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="name" ></sa-td>
 					<sa-td name="主图" prop="avatar" type="img"></sa-td>
 					<sa-td name="分类ID字符串(可多选)" prop="typeIds" ></sa-td>
@@ -54,10 +42,9 @@
 					<sa-td name="备注" prop="remark" ></sa-td>
 					<sa-td name="原产地" prop="source" ></sa-td>
 					<sa-td name="状态" prop="status" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateStatus(s.row)"></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="" prop="unit" ></sa-td>
+					<!-- <sa-td name="" prop="unit" ></sa-td>
 					<sa-td name="" prop="singlePrice" ></sa-td>
-					<sa-td name="" prop="taxNo" ></sa-td>
+					<sa-td name="" prop="taxNo" ></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>

+ 7 - 20
sa-view/tb-group/tb-group-add.html

@@ -28,23 +28,17 @@
                     <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.id" br></sa-item>
+						<!-- 
 						<sa-item type="text" name="" v-model="m.addressIds" br></sa-item>
 						<sa-item type="text" name="" v-model="m.address" br></sa-item>
-						<sa-item type="text" name="" v-model="m.detailAddress" br></sa-item>
+						<sa-item type="text" name="" v-model="m.detailAddress" br></sa-item> -->
 						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
 						<sa-item type="text" name="组长ID" v-model="m.leaderId" br></sa-item>
 						<sa-item type="text" name="组长名" v-model="m.leaderName" br></sa-item>
 						<sa-item type="text" name="组长电话" v-model="m.leaderPhone" br></sa-item>
 						<sa-item type="text" name="" v-model="m.code" br></sa-item>
 						<sa-item type="text" name="当天该组剩余额度" v-model="m.leftPrice" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" 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,23 +66,16 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		//
-							addressIds: '',		//
-							address: '',		//
-							detailAddress: '',		//
+							// addressIds: '',		//
+							// address: '',		//
+							// detailAddress: '',		//
 							name: '',		// 名称
 							leaderId: '',		// 组长ID
 							leaderName: '',		// 组长名
 							leaderPhone: '',		// 组长电话
 							code: '',		//
 							leftPrice: '',		// 当天该组剩余额度
-							createTime: '',		// 创建时间
-							createBy: '',		// 创建人编号
-							createName: '',		// 创建人名称
-							updateTime: '',		// 更新时间
-							updateBy: '',		// 更新人编号
-							updateName: '',		// 更新人名称
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用)
+							// deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						}
 					},
 					// 提交数据

+ 3 - 10
sa-view/tb-group/tb-group-info.html

@@ -25,23 +25,16 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info name="" br>{{m.id}}</sa-info>
-						<sa-info name="" br>{{m.addressIds}}</sa-info>
+						<!-- <sa-info name="" br>{{m.addressIds}}</sa-info>
 						<sa-info name="" br>{{m.address}}</sa-info>
-						<sa-info name="" br>{{m.detailAddress}}</sa-info>
+						<sa-info name="" br>{{m.detailAddress}}</sa-info> -->
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="组长ID" br>{{m.leaderId}}</sa-info>
 						<sa-info name="组长名" br>{{m.leaderName}}</sa-info>
 						<sa-info name="组长电话" br>{{m.leaderPhone}}</sa-info>
 						<sa-info name="" br>{{m.code}}</sa-info>
 						<sa-info name="当天该组剩余额度" br>{{m.leftPrice}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 5 - 12
sa-view/tb-group/tb-group-list.html

@@ -20,26 +20,19 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="" v-model="p.id"></sa-item>
-					<sa-item type="text" name="" v-model="p.addressIds"></sa-item>
+					<!-- <sa-item type="text" name="" v-model="p.addressIds"></sa-item>
 					<sa-item type="text" name="" v-model="p.address"></sa-item>
-					<sa-item type="text" name="" v-model="p.detailAddress"></sa-item>
+					<sa-item type="text" name="" v-model="p.detailAddress"></sa-item> -->
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 					<sa-item type="text" name="组长ID" v-model="p.leaderId"></sa-item>
 					<sa-item type="text" name="组长名" v-model="p.leaderName"></sa-item>
 					<sa-item type="text" name="组长电话" v-model="p.leaderPhone"></sa-item>
 					<sa-item type="text" name="" v-model="p.code"></sa-item>
 					<sa-item type="text" name="当天该组剩余额度" v-model="p.leftPrice"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
+					<!-- <sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
+						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item> -->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">

+ 1 - 9
sa-view/tb-logistics/tb-logistics-add.html

@@ -28,8 +28,6 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="物流表主键" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="订单表ID" v-model="m.ordersId" br></sa-item>
 						<sa-item type="text" name="申报订单号" v-model="m.declarationNumber" br></sa-item>
 						<sa-item type="enum" name="订单待确认" v-model="m.prepare" :jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" jtype="3" br></sa-item>
 						<sa-item type="text" name="订单确认时间" v-model="m.prepareTime" br></sa-item>
@@ -44,13 +42,7 @@
 						<sa-item type="enum" name="收购商确认" v-model="m.confirmReceipt" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
 						<sa-item type="text" name="收货方确认时间" v-model="m.confirmReceiptTime" br></sa-item>
 						<sa-item type="enum" name="订单状态已完成" v-model="m.orderFinish" :jv="{0: '进行中', 1: '已完成'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" 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>

+ 1 - 9
sa-view/tb-logistics/tb-logistics-info.html

@@ -25,8 +25,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="物流表主键" :value="m.id" br></sa-info>
-						<sa-info name="订单表ID" br>{{m.ordersId}}</sa-info>
 						<sa-info name="申报订单号" br>{{m.declarationNumber}}</sa-info>
 						<sa-info type="enum" name="订单待确认" :value="m.prepare" :jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" br></sa-info>
 						<sa-info name="订单确认时间" br>{{m.prepareTime}}</sa-info>
@@ -41,13 +39,7 @@
 						<sa-info type="enum" name="收购商确认" :value="m.confirmReceipt" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 						<sa-info name="收货方确认时间" br>{{m.confirmReceiptTime}}</sa-info>
 						<sa-info type="enum" name="订单状态已完成" :value="m.orderFinish" :jv="{0: '进行中', 1: '已完成'}" br></sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 3 - 11
sa-view/tb-logistics/tb-logistics-list.html

@@ -20,10 +20,8 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="物流表主键" v-model="p.id"></sa-item>
-					<sa-item type="text" name="订单表ID" v-model="p.ordersId"></sa-item>
 					<sa-item type="text" name="申报订单号" v-model="p.declarationNumber"></sa-item>
 					<sa-item type="enum" name="订单待确认" v-model="p.prepare"
 						:jv="{0: '待确认', 1: '订单已确认', 2: '订单确认失败'}" jtype="2" def="不限"></sa-item>
@@ -45,14 +43,8 @@
 					<sa-item type="text" name="收货方确认时间" v-model="p.confirmReceiptTime"></sa-item>
 					<sa-item type="enum" name="订单状态已完成" v-model="p.orderFinish"
 						:jv="{0: '进行中', 1: '已完成'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
+					<!-- <sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
+						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item> -->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">

+ 2 - 17
sa-view/tb-orders/tb-orders-add.html

@@ -28,9 +28,7 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="货运订单管理表主键" v-model="m.id" br></sa-item>
 						<sa-item type="text" name="订单编号" v-model="m.orderNo" br></sa-item>
-						<sa-item type="text" name="商品id" v-model="m.goodsId" br></sa-item>
 						<sa-item type="text" name="商品名称" v-model="m.goodsName" br></sa-item>
 						<sa-item type="text" name="商品来源" v-model="m.goodsFrom" br></sa-item>
 						<sa-item type="text" name="发货商电话" v-model="m.shipperPhone" br></sa-item>
@@ -44,13 +42,7 @@
 						<sa-item type="text" name="收货人电话号码" v-model="m.consigneePhone" br></sa-item>
 						<sa-item type="text" name="申报订单号" v-model="m.declarationNumber" br></sa-item>
 						<sa-item type="enum" name="订单状态已完成" v-model="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" 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>
@@ -78,7 +70,6 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 货运订单管理表主键
 							orderNo: '',		// 订单编号
 							goodsId: '',		// 商品id
 							goodsName: '',		// 商品名称
@@ -94,13 +85,7 @@
 							consigneePhone: '',		// 收货人电话号码
 							declarationNumber: '',		// (预留字段) 申报订单号
 							orderFinish: '',		// 订单状态已完成 (0=禁用,1=启用)
-							createTime: '',		// 创建时间
-							createBy: '',		// 创建人编号
-							createName: '',		// 创建人名称
-							updateTime: '',		// 更新时间
-							updateBy: '',		// 更新人编号
-							updateName: '',		// 更新人名称
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用)
+							// deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						}
 					},
 					// 提交数据

+ 1 - 8
sa-view/tb-orders/tb-orders-info.html

@@ -25,7 +25,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="货运订单管理表主键" :value="m.id" br></sa-info>
 						<sa-info name="订单编号" br>{{m.orderNo}}</sa-info>
 						<sa-info name="商品id" br>{{m.goodsId}}</sa-info>
 						<sa-info name="商品名称" br>{{m.goodsName}}</sa-info>
@@ -41,13 +40,7 @@
 						<sa-info name="收货人电话号码" br>{{m.consigneePhone}}</sa-info>
 						<sa-info name="申报订单号" br>{{m.declarationNumber}}</sa-info>
 						<sa-info type="enum" name="订单状态已完成" :value="m.orderFinish" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 2 - 33
sa-view/tb-orders/tb-orders-list.html

@@ -20,33 +20,10 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="货运订单管理表主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="订单编号" v-model="p.orderNo"></sa-item>
-					<sa-item type="text" name="商品id" v-model="p.goodsId"></sa-item>
 					<sa-item type="text" name="商品名称" v-model="p.goodsName"></sa-item>
-					<sa-item type="text" name="商品来源" v-model="p.goodsFrom"></sa-item>
-					<sa-item type="text" name="发货商电话" v-model="p.shipperPhone"></sa-item>
-					<sa-item type="text" name="发货商名称" v-model="p.shipperName"></sa-item>
-					<sa-item type="text" name="司机ID" v-model="p.driverId"></sa-item>
-					<sa-item type="text" name="司机名称" v-model="p.driverName"></sa-item>
-					<sa-item type="text" name="司机电话" v-model="p.driverPhone"></sa-item>
-					<sa-item type="text" name="车型ID" v-model="p.carId"></sa-item>
-					<sa-item type="text" name="车型名称" v-model="p.carType"></sa-item>
-					<sa-item type="text" name="收货人名称" v-model="p.consigneeName"></sa-item>
-					<sa-item type="text" name="收货人电话号码" v-model="p.consigneePhone"></sa-item>
-					<sa-item type="text" name="申报订单号" v-model="p.declarationNumber"></sa-item>
-					<sa-item type="enum" name="订单状态已完成" v-model="p.orderFinish"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -57,9 +34,7 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="orderNo" ></sa-td>
-					<sa-td name="商品id" prop="goodsId" ></sa-td>
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 					<sa-td name="商品来源" prop="goodsFrom" ></sa-td>
 					<sa-td name="发货商电话" prop="shipperPhone" ></sa-td>
@@ -73,13 +48,7 @@
 					<sa-td name="收货人电话号码" prop="consigneePhone" ></sa-td>
 					<sa-td name="申报订单号" prop="declarationNumber" ></sa-td>
 					<sa-td name="订单状态已完成" prop="orderFinish" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateOrderFinish(s.row)"></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
-					<sa-td name="创建人名称" prop="createName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="更新人编号" prop="updateBy" ></sa-td>
-					<sa-td name="更新人名称" prop="updateName" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(s.row)"></sa-td>
+					<!-- <sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(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>

+ 9 - 22
sa-view/tb-people/tb-people-add.html

@@ -49,18 +49,12 @@
 						<sa-item type="text" name="详细地址" v-model="m.detailAddress" br></sa-item>
 						<sa-item type="text" name="是否锁定" v-model="m.isLock" br></sa-item>
 						<sa-item type="text" name="当天剩余额度" v-model="m.leftPrice" br></sa-item>
-						<sa-item type="text" name="" v-model="m.judgeStatus" br></sa-item>
+						<!-- <sa-item type="text" name="" v-model="m.judgeStatus" br></sa-item>
 						<sa-item type="text" name="" v-model="m.judgeContent" br></sa-item>
 						<sa-item type="text" name="" v-model="m.registerTime" br></sa-item>
 						<sa-item type="text" name="" v-model="m.judgeTime" br></sa-item>
-						<sa-item type="text" name="" v-model="m.personId" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<sa-item type="text" name="" v-model="m.personId" br></sa-item> -->
+						<!-- <sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" 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>
@@ -88,7 +82,6 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 主键
 							name: '',		// 姓名
 							code: '',		// 边民号
 							sex: '',		// 性别(1=男,2=女)
@@ -111,18 +104,12 @@
 							detailAddress: '',		// 详细地址
 							isLock: '',		// 是否锁定
 							leftPrice: '',		// 当天剩余额度
-							judgeStatus: '',		//
-							judgeContent: '',		//
-							registerTime: '',		//
-							judgeTime: '',		//
-							personId: '',		//
-							createTime: '',		// 创建时间
-							createBy: '',		// 创建人编号
-							createName: '',		// 创建人名称
-							updateTime: '',		// 更新时间
-							updateBy: '',		// 更新人编号
-							updateName: '',		// 更新人名称
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用)
+							// judgeStatus: '',		//
+							// judgeContent: '',		//
+							// registerTime: '',		//
+							// judgeTime: '',		//
+							// personId: '',		//
+							// deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						}
 					},
 					// 提交数据

+ 3 - 10
sa-view/tb-people/tb-people-info.html

@@ -27,7 +27,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="姓名" br>{{m.name}}</sa-info>
 						<sa-info name="边民号" br>{{m.code}}</sa-info>
 						<sa-info type="enum" name="性别" :value="m.sex" :jv="{1: '男', 2: '女'}" br></sa-info>
@@ -50,18 +49,12 @@
 						<sa-info name="详细地址" br>{{m.detailAddress}}</sa-info>
 						<sa-info name="是否锁定" br>{{m.isLock}}</sa-info>
 						<sa-info name="当天剩余额度" br>{{m.leftPrice}}</sa-info>
-						<sa-info name="" br>{{m.judgeStatus}}</sa-info>
+						<!-- <sa-info name="" br>{{m.judgeStatus}}</sa-info>
 						<sa-info name="" br>{{m.judgeContent}}</sa-info>
 						<sa-info name="" br>{{m.registerTime}}</sa-info>
 						<sa-info name="" br>{{m.judgeTime}}</sa-info>
-						<sa-info name="" br>{{m.personId}}</sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<sa-info name="" br>{{m.personId}}</sa-info> -->
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 10 - 58
sa-view/tb-people/tb-people-list.html

@@ -20,46 +20,12 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="姓名" v-model="p.name"></sa-item>
 					<sa-item type="text" name="边民号" v-model="p.code"></sa-item>
-					<sa-item type="enum" name="性别" v-model="p.sex"
-						:jv="{1: '男', 2: '女'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="num" name="年龄" v-model="p.age"></sa-item>
-					<sa-item type="text" name="身份证" v-model="p.idCard"></sa-item>
-					<sa-item type="text" name="手机号码" v-model="p.phone"></sa-item>
-					<sa-item type="text" name="银行编号" v-model="p.bankNo"></sa-item>
-					<sa-item type="text" name="银行卡号" v-model="p.bankCode"></sa-item>
-					<sa-item type="text" name="银行名称" v-model="p.bankName"></sa-item>
 					<sa-item type="enum" name="所属互助组" v-model="p.groupId"
 						:jv="{1: '测试组'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="互助组名称" v-model="p.groupName"></sa-item>
-					<sa-item type="enum" name="是否可用" v-model="p.status"
-						:jv="{0: '否', 1: '是'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="num" name="角色" v-model="p.role"></sa-item>
-					<sa-item type="text" name="经度" v-model="p.lng"></sa-item>
-					<sa-item type="text" name="纬度" v-model="p.lat"></sa-item>
-					<sa-item type="text" name="最后一次下单定位" v-model="p.lastLocation"></sa-item>
-					<sa-item type="text" name="联系地址" v-model="p.address"></sa-item>
-					<sa-item type="text" name="地址ID" v-model="p.addressIds"></sa-item>
-					<sa-item type="text" name="详细地址" v-model="p.detailAddress"></sa-item>
-					<sa-item type="text" name="是否锁定" v-model="p.isLock"></sa-item>
-					<sa-item type="text" name="当天剩余额度" v-model="p.leftPrice"></sa-item>
-					<sa-item type="text" name="" v-model="p.judgeStatus"></sa-item>
-					<sa-item type="text" name="" v-model="p.judgeContent"></sa-item>
-					<sa-item type="text" name="" v-model="p.registerTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.judgeTime"></sa-item>
-					<sa-item type="text" name="" v-model="p.personId"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -70,7 +36,6 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="name" ></sa-td>
 					<sa-td name="边民号" prop="code" ></sa-td>
 					<sa-td name="性别" prop="sex" type="enum" :jv="{1: '男', 2: '女'}"></sa-td>
@@ -94,17 +59,11 @@
 					<sa-td name="是否锁定" prop="isLock" ></sa-td>
 					<sa-td name="当天剩余额度" prop="leftPrice" ></sa-td>
 					<sa-td name="" prop="judgeStatus" ></sa-td>
-					<sa-td name="" prop="judgeContent" ></sa-td>
+					<!-- <sa-td name="" prop="judgeContent" ></sa-td>
 					<sa-td name="" prop="registerTime" ></sa-td>
 					<sa-td name="" prop="judgeTime" ></sa-td>
-					<sa-td name="" prop="personId" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
-					<sa-td name="创建人名称" prop="createName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="更新人编号" prop="updateBy" ></sa-td>
-					<sa-td name="更新人名称" prop="updateName" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(s.row)"></sa-td>
+					<sa-td name="" prop="personId" ></sa-td> -->
+					<!-- <sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(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>
@@ -126,7 +85,6 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						id: '',		// 主键
 						name: '',		// 姓名
 						code: '',		// 边民号
 						sex: '',		// 性别(1=男,2=女)
@@ -148,18 +106,12 @@
 						detailAddress: '',		// 详细地址
 						isLock: '',		// 是否锁定
 						leftPrice: '',		// 当天剩余额度
-						judgeStatus: '',		//
-						judgeContent: '',		//
-						registerTime: '',		//
-						judgeTime: '',		//
-						personId: '',		//
-						createTime: '',		// 创建时间
-						createBy: '',		// 创建人编号
-						createName: '',		// 创建人名称
-						updateTime: '',		// 更新时间
-						updateBy: '',		// 更新人编号
-						updateName: '',		// 更新人名称
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用)
+						// judgeStatus: '',		//
+						// judgeContent: '',		//
+						// registerTime: '',		//
+						// judgeTime: '',		//
+						// personId: '',		//
+						// deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

+ 10 - 31
sa-view/tb-purchaser/tb-purchaser-add.html

@@ -38,15 +38,8 @@
 						<sa-item type="text" name="税号" v-model="m.dutyParagraph" br></sa-item>
 						<sa-item type="text" name="地址编号" v-model="m.addressIds" br></sa-item>
 						<sa-item type="text" name="地址" v-model="m.address" br></sa-item>
-						<sa-item type="enum" name="审核状态" v-model="m.judgeStatus" :jv="{0: '未通过', 1: '已通过'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="审核意见" v-model="m.judgeContent" br></sa-item>
-						<sa-item type="text" name="创建时间" v-model="m.createTime" br></sa-item>
-						<sa-item type="text" name="创建人编号" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建人名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新时间" v-model="m.updateTime" br></sa-item>
-						<sa-item type="text" name="更新人编号" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新人名称" v-model="m.updateName" br></sa-item>
-						<sa-item type="enum" name="删除状态" v-model="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" jtype="3" br></sa-item>
+						<!-- <sa-item type="enum" name="审核状态" v-model="m.judgeStatus" :jv="{0: '未通过', 1: '已通过'}" jtype="3" br></sa-item>
+						<sa-item type="text" name="审核意见" v-model="m.judgeContent" br></sa-item> -->
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -74,7 +67,6 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 主键
 							name: '',		// 名称
 							legalPerson: '',		// 法人
 							idCard: '',		// 身份证号
@@ -86,18 +78,11 @@
 							dutyParagraph: '',		// 税号
 							addressIds: '',		// 地址编号
 							address: '',		// 地址
-							judgeStatus: '',		// 审核状态(0=未通过,1=已通过)
-							judgeContent: '',		// 审核意见
-							judgeTime: '',		// 上次审核时间
-							registerTime: '',		// 注册时间
+							// judgeStatus: '',		// 审核状态(0=未通过,1=已通过)
+							// judgeContent: '',		// 审核意见
+							// judgeTime: '',		// 上次审核时间
 							personId: '',		// 人脸编号
-							createTime: '',		// 创建时间
-							createBy: '',		// 创建人编号
-							createName: '',		// 创建人名称
-							updateTime: '',		// 更新时间
-							updateBy: '',		// 更新人编号
-							updateName: '',		// 更新人名称
-							deleteStatus: '',		// 删除状态(0=禁用,1=启用)
+							// deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						}
 					},
 					// 提交数据
@@ -116,18 +101,12 @@
 						sa.checkNull(m.dutyParagraph, '请输入 [税号]');
 						sa.checkNull(m.addressIds, '请输入 [地址编号]');
 						sa.checkNull(m.address, '请输入 [地址]');
-						sa.checkNull(m.judgeStatus, '请输入 [审核状态]');
-						sa.checkNull(m.judgeContent, '请输入 [审核意见]');
+						// sa.checkNull(m.judgeStatus, '请输入 [审核状态]');
+						// sa.checkNull(m.judgeContent, '请输入 [审核意见]');
 						// sa.checkNull(m.judgeTime, '请输入 [上次审核时间]');
 						// sa.checkNull(m.registerTime, '请输入 [注册时间]');
-						// sa.checkNull(m.personId, '请输入 [人脸编号]');
-						sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.createBy, '请输入 [创建人编号]');
-						sa.checkNull(m.createName, '请输入 [创建人名称]');
-						sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新人编号]');
-						sa.checkNull(m.updateName, '请输入 [更新人名称]');
-						sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
+						sa.checkNull(m.personId, '请输入 [人脸编号]');
+						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 
 						// 开始增加或修改
 						if(this.id <= 0) {	// 添加

+ 3 - 11
sa-view/tb-purchaser/tb-purchaser-info.html

@@ -26,7 +26,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="法人" br>{{m.legalPerson}}</sa-info>
 						<sa-info name="身份证号" br>{{m.idCard}}</sa-info>
@@ -38,18 +37,11 @@
 						<sa-info name="税号" br>{{m.dutyParagraph}}</sa-info>
 						<sa-info name="地址编号" br>{{m.addressIds}}</sa-info>
 						<sa-info name="地址" br>{{m.address}}</sa-info>
-						<sa-info type="enum" name="审核状态" :value="m.judgeStatus" :jv="{0: '未通过', 1: '已通过'}" br></sa-info>
+						<!-- <sa-info type="enum" name="审核状态" :value="m.judgeStatus" :jv="{0: '未通过', 1: '已通过'}" br></sa-info>
 						<sa-info name="审核意见" br>{{m.judgeContent}}</sa-info>
-						<sa-info type="datetime" name="上次审核时间" :value="m.judgeTime" br></sa-info>
-						<sa-info type="datetime" name="注册时间" :value="m.registerTime" br></sa-info>
+						<sa-info type="datetime" name="上次审核时间" :value="m.judgeTime" br></sa-info> -->
 						<sa-info type="num" name="人脸编号" :value="m.personId" br></sa-info>
-						<sa-info name="创建时间" br>{{m.createTime}}</sa-info>
-						<sa-info name="创建人编号" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建人名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新时间" br>{{m.updateTime}}</sa-info>
-						<sa-info name="更新人编号" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新人名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
+						<!-- <sa-info type="enum" name="删除状态" :value="m.deleteStatus" :jv="{0: '禁用', 1: '启用'}" br></sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 5 - 41
sa-view/tb-purchaser/tb-purchaser-list.html

@@ -22,29 +22,8 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<div class="c-title">检索参数</div>
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 					<sa-item type="text" name="法人" v-model="p.legalPerson"></sa-item>
-					<sa-item type="text" name="身份证号" v-model="p.idCard"></sa-item>
-					<sa-item type="text" name="手机号码" v-model="p.contact"></sa-item>
-					<sa-item type="text" name="银行编号" v-model="p.bankNo"></sa-item>
-					<sa-item type="text" name="银行名称" v-model="p.bankName"></sa-item>
-					<sa-item type="text" name="银行账号" v-model="p.bankAccount"></sa-item>
-					<sa-item type="text" name="税号" v-model="p.dutyParagraph"></sa-item>
-					<sa-item type="text" name="地址编号" v-model="p.addressIds"></sa-item>
-					<sa-item type="text" name="地址" v-model="p.address"></sa-item>
-					<sa-item type="enum" name="审核状态" v-model="p.judgeStatus"
-						:jv="{0: '未通过', 1: '已通过'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="审核意见" v-model="p.judgeContent"></sa-item>
-					<sa-item type="num" name="人脸编号" v-model="p.personId"></sa-item>
-					<sa-item type="text" name="创建时间" v-model="p.createTime"></sa-item>
-					<sa-item type="text" name="创建人编号" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建人名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新时间" v-model="p.updateTime"></sa-item>
-					<sa-item type="text" name="更新人编号" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新人名称" v-model="p.updateName"></sa-item>
-					<sa-item type="enum" name="删除状态" v-model="p.deleteStatus"
-						:jv="{0: '禁用', 1: '启用'}" jtype="2" def="不限"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -55,7 +34,6 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="name" ></sa-td>
 					<sa-td name="法人" prop="legalPerson" ></sa-td>
 					<sa-td name="身份证号" prop="idCard" ></sa-td>
@@ -67,18 +45,11 @@
 					<sa-td name="税号" prop="dutyParagraph" ></sa-td>
 					<sa-td name="地址编号" prop="addressIds" ></sa-td>
 					<sa-td name="地址" prop="address" ></sa-td>
-					<sa-td name="审核状态" prop="judgeStatus" type="enum" :jv="{0: '未通过', 1: '已通过'}"></sa-td>
+					<!-- <sa-td name="审核状态" prop="judgeStatus" type="enum" :jv="{0: '未通过', 1: '已通过'}"></sa-td>
 					<sa-td name="审核意见" prop="judgeContent" ></sa-td>
 					<sa-td name="上次审核时间" prop="judgeTime" type="datetime"></sa-td>
-					<sa-td name="注册时间" prop="registerTime" type="datetime"></sa-td>
+					<sa-td name="注册时间" prop="registerTime" type="datetime"></sa-td> -->
 					<sa-td name="人脸编号" prop="personId" type="num"></sa-td>
-					<sa-td name="创建时间" prop="createTime" ></sa-td>
-					<sa-td name="创建人编号" prop="createBy" ></sa-td>
-					<sa-td name="创建人名称" prop="createName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" ></sa-td>
-					<sa-td name="更新人编号" prop="updateBy" ></sa-td>
-					<sa-td name="更新人名称" prop="updateName" ></sa-td>
-					<sa-td name="删除状态" prop="deleteStatus" type="switch" :jv="{0: '禁用', 1: '启用'}" @change="s => updateDeleteStatus(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>
@@ -100,7 +71,7 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						id: '',		// 主键
+						// id: '',		// 主键
 						name: '',		// 名称
 						legalPerson: '',		// 法人
 						idCard: '',		// 身份证号
@@ -111,16 +82,9 @@
 						dutyParagraph: '',		// 税号
 						addressIds: '',		// 地址编号
 						address: '',		// 地址
-						judgeStatus: '',		// 审核状态(0=未通过,1=已通过)
-						judgeContent: '',		// 审核意见
+						// judgeStatus: '',		// 审核状态(0=未通过,1=已通过)
+						// judgeContent: '',		// 审核意见
 						personId: '',		// 人脸编号
-						createTime: '',		// 创建时间
-						createBy: '',		// 创建人编号
-						createName: '',		// 创建人名称
-						updateTime: '',		// 更新时间
-						updateBy: '',		// 更新人编号
-						updateName: '',		// 更新人名称
-						deleteStatus: '',		// 删除状态(0=禁用,1=启用)
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

+ 34 - 30
sa-view/tb-shop/tb-shop-add.html

@@ -28,23 +28,33 @@
                     <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.enterpriseId" br></sa-item>
-						<sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建者名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item>
-						<!-- date-create字段: m.createTime - 创建时间 -->
-						<sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item>
-						<!-- date-update字段: m.updateTime - 更新时间 -->
-						<sa-item type="text" name="" v-model="m.tradeAreaId" br></sa-item>
-						<sa-item type="text" name="" v-model="m.tradeAreaName" br></sa-item>
-						<sa-item type="text" name="" v-model="m.address" br></sa-item>
-						<sa-item type="text" name="" v-model="m.addressIds" br></sa-item>
-						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
-						<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
-						<sa-item type="enum" name="区域" v-model="m.area" :jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" jtype="3" br></sa-item>
-						<sa-item type="enum" name="是否可用" v-model="m.status" :jv="{0: '否', 1: '是'}" jtype="3" br></sa-item>
-						<sa-item type="text" name="" v-model="m.remark" br></sa-item>
-						<sa-item type="text" name="" v-model="m.enterpriseName" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="编号" v-model="m.no" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="enum" name="区域" v-model="m.area" :jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" jtype="3" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="enum" name="是否可用" v-model="m.status" :jv="{0: '否', 1: '是'}" jtype="3" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="备注" v-model="m.remark" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="商家名称" v-model="m.enterpriseName" 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>
@@ -98,23 +108,17 @@
 						// 表单校验
 						let m = this.m;
 						// sa.checkNull(m.id, '请输入 [主键]');
-						sa.checkNull(m.enterpriseId, '请输入 []');
-						sa.checkNull(m.createBy, '请输入 [创建者id]');
-						sa.checkNull(m.createName, '请输入 [创建者名称]');
-						sa.checkNull(m.updateName, '请输入 [更新者名称]');
-						// sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新者id]');
-						// sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						sa.checkNull(m.tradeAreaId, '请输入 []');
-						sa.checkNull(m.tradeAreaName, '请输入 []');
-						sa.checkNull(m.address, '请输入 []');
-						sa.checkNull(m.addressIds, '请输入 []');
+						// sa.checkNull(m.enterpriseId, '请输入 []');;
+						// sa.checkNull(m.tradeAreaId, '请输入 []');
+						// sa.checkNull(m.tradeAreaName, '请输入 []');
+						// sa.checkNull(m.address, '请输入 []');
+						// sa.checkNull(m.addressIds, '请输入 []');
 						sa.checkNull(m.name, '请输入 [名称]');
 						sa.checkNull(m.no, '请输入 [编号]');
 						sa.checkNull(m.area, '请输入 [区域]');
 						sa.checkNull(m.status, '请输入 [是否可用]');
-						sa.checkNull(m.remark, '请输入 []');
-						sa.checkNull(m.enterpriseName, '请输入 []');
+						sa.checkNull(m.remark, '请输入 [备注]');
+						sa.checkNull(m.enterpriseName, '请输入 [商家名称]');
 						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 
 						// 开始增加或修改

+ 2 - 14
sa-view/tb-shop/tb-shop-info.html

@@ -25,24 +25,12 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
-						<sa-info name="" br>{{m.enterpriseId}}</sa-info>
-						<sa-info name="创建者id" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建者名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
-						<sa-info name="更新者id" br>{{m.updateBy}}</sa-info>
-						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
-						<sa-info name="" br>{{m.tradeAreaId}}</sa-info>
-						<sa-info name="" br>{{m.tradeAreaName}}</sa-info>
-						<sa-info name="" br>{{m.address}}</sa-info>
-						<sa-info name="" br>{{m.addressIds}}</sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
 						<sa-info name="编号" br>{{m.no}}</sa-info>
 						<sa-info type="enum" name="区域" :value="m.area" :jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" br></sa-info>
 						<sa-info type="enum" name="是否可用" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
-						<sa-info name="" br>{{m.remark}}</sa-info>
-						<sa-info name="" br>{{m.enterpriseName}}</sa-info>
+						<sa-info name="备注" br>{{m.remark}}</sa-info>
+						<sa-info name="商家名称" br>{{m.enterpriseName}}</sa-info>
 					</el-form>
 				</div>
 			</div>

+ 16 - 43
sa-view/tb-shop/tb-shop-list.html

@@ -20,27 +20,12 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
-					<sa-item type="text" name="" v-model="p.enterpriseId"></sa-item>
-					<sa-item type="text" name="创建者id" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建者名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item>
-					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="" v-model="p.tradeAreaId"></sa-item>
-					<sa-item type="text" name="" v-model="p.tradeAreaName"></sa-item>
-					<sa-item type="text" name="" v-model="p.address"></sa-item>
-					<sa-item type="text" name="" v-model="p.addressIds"></sa-item>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
 					<sa-item type="text" name="编号" v-model="p.no"></sa-item>
 					<sa-item type="enum" name="区域" v-model="p.area"
-						:jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="enum" name="是否可用" v-model="p.status"
-						:jv="{0: '否', 1: '是'}" jtype="2" def="不限"></sa-item>
-					<sa-item type="text" name="" v-model="p.remark"></sa-item>
-					<sa-item type="text" name="" v-model="p.enterpriseName"></sa-item>
-					<!-- 未识别类型:删除状态: p.deleteStatus 请检查配置 -->
+						:jv="{A区: 'A区', B区: 'B区', C区: 'C区'}" jtype="3" def="不限"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -51,24 +36,12 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="enterpriseId" ></sa-td>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者名称" prop="createName" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></sa-td>
-					<sa-td name="" prop="tradeAreaId" ></sa-td>
-					<sa-td name="" prop="tradeAreaName" ></sa-td>
-					<sa-td name="" prop="address" ></sa-td>
-					<sa-td name="" prop="addressIds" ></sa-td>
 					<sa-td name="名称" prop="name" ></sa-td>
 					<sa-td name="编号" prop="no" ></sa-td>
 					<sa-td name="区域" prop="area" type="enum" :jv="{A区: 'A区', B区: 'B区', C区: 'C区'}"></sa-td>
 					<sa-td name="是否可用" prop="status" type="switch" :jv="{0: '否', 1: '是'}" @change="s => updateStatus(s.row)"></sa-td>
-					<sa-td name="" prop="remark" ></sa-td>
-					<sa-td name="" prop="enterpriseName" ></sa-td>
+					<sa-td name="备注" prop="remark" ></sa-td>
+					<sa-td name="商家名称" prop="enterpriseName" ></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>
@@ -90,22 +63,22 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						id: '',		// 主键
-						enterpriseId: '',		//
-						createBy: '',		// 创建者id
-						createName: '',		// 创建者名称
-						updateName: '',		// 更新者名称
-						updateBy: '',		// 更新者id
-						tradeAreaId: '',		//
-						tradeAreaName: '',		//
-						address: '',		//
-						addressIds: '',		//
+						// id: '',		// 主键
+						// enterpriseId: '',		//
+						// createBy: '',		// 创建者id
+						// createName: '',		// 创建者名称
+						// updateName: '',		// 更新者名称
+						// updateBy: '',		// 更新者id
+						// tradeAreaId: '',		//
+						// tradeAreaName: '',		//
+						// address: '',		//
+						// addressIds: '',		//
 						name: '',		// 名称
 						no: '',		// 编号
 						area: '',		// 区域(A区=A区,B区=B区,C区=C区)
 						status: '',		// 是否可用(0=否,1=是)
-						remark: '',		//
-						enterpriseName: '',		//
+						remark: '',		//备注
+						enterpriseName: '',		//商家名称
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

+ 15 - 20
sa-view/tb-trade-area/tb-trade-area-add.html

@@ -28,17 +28,21 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="主键" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
-						<sa-item type="text" name="" v-model="m.addressIds" br></sa-item>
-						<sa-item type="text" name="地址详情" v-model="m.detailAddress" br></sa-item>
-						<sa-item type="text" name="地址" v-model="m.address" br></sa-item>
-						<!-- date-create字段: m.createTime - 创建时间 -->
-						<sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建者名称" v-model="m.createName" br></sa-item>
-						<sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item>
-						<!-- date-update字段: m.updateTime - 更新时间 -->
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="名称" v-model="m.name" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="地址详情" v-model="m.detailAddress" br></sa-item>
+							</el-col>
+						</el-row>
+						
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="地址" v-model="m.address" 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>
@@ -84,18 +88,9 @@
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.name, '请输入 [名称]');
-						sa.checkNull(m.addressIds, '请输入 []');
 						sa.checkNull(m.detailAddress, '请输入 [地址详情]');
 						sa.checkNull(m.address, '请输入 [地址]');
-						// sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.createBy, '请输入 [创建者id]');
-						sa.checkNull(m.createName, '请输入 [创建者名称]');
-						sa.checkNull(m.updateBy, '请输入 [更新者id]');
-						sa.checkNull(m.updateName, '请输入 [更新者名称]');
-						// sa.checkNull(m.updateTime, '请输入 [更新时间]');
-						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
 
 						// 开始增加或修改
 						this.m.createTime = undefined;		// 不提交属性:创建时间

+ 0 - 8
sa-view/tb-trade-area/tb-trade-area-info.html

@@ -25,17 +25,9 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="名称" br>{{m.name}}</sa-info>
-						<sa-info name="" br>{{m.addressIds}}</sa-info>
 						<sa-info name="地址详情" br>{{m.detailAddress}}</sa-info>
 						<sa-info name="地址" br>{{m.address}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
-						<sa-info name="创建者id" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建者名称" br>{{m.createName}}</sa-info>
-						<sa-info name="更新者id" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
 					</el-form>
 				</div>
 			</div>

+ 1 - 16
sa-view/tb-trade-area/tb-trade-area-list.html

@@ -20,17 +20,10 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="名称" v-model="p.name"></sa-item>
-					<sa-item type="text" name="" v-model="p.addressIds"></sa-item>
-					<sa-item type="text" name="地址详情" v-model="p.detailAddress"></sa-item>
 					<sa-item type="text" name="地址" v-model="p.address"></sa-item>
-					<sa-item type="text" name="创建者id" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建者名称" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item>
 					<!-- 未识别类型:删除状态: p.deleteStatus 请检查配置 -->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
@@ -42,17 +35,9 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="name" ></sa-td>
-					<sa-td name="" prop="addressIds" ></sa-td>
 					<sa-td name="地址详情" prop="detailAddress" ></sa-td>
 					<sa-td name="地址" prop="address" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者名称" prop="createName" ></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></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>

+ 46 - 41
sa-view/tb-vehicle/tb-vehicle-add.html

@@ -28,25 +28,45 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="num" name="主键" v-model="m.id" br></sa-item>
-						<sa-item type="text" name="车牌" v-model="m.vehiclePlate" br></sa-item>
-						<sa-item type="text" name="所有人" v-model="m.owner" br></sa-item>
-						<sa-item type="text" name="车辆类型" v-model="m.vehicleType" br></sa-item>
-						<sa-item type="text" name="类型父id" v-model="m.parentId" br></sa-item>
-						<sa-item type="text" name="车辆尺寸" v-model="m.vehicleSize" br></sa-item>
-						<sa-item type="text" name="车辆品牌型号" v-model="m.vehicleModel" br></sa-item>
-						<sa-item type="text" name="核定载质量" v-model="m.vehicleLoad" br></sa-item>
-						<sa-item type="text" name="车辆自重" v-model="m.vehicleWeight" br></sa-item>
-						<sa-item type="text" name="创建者id" v-model="m.createBy" br></sa-item>
-						<sa-item type="text" name="创建者姓名" v-model="m.createName" br></sa-item>
-						<!-- date-create字段: m.createTime - 创建时间 -->
-						<sa-item type="text" name="更新者id" v-model="m.updateBy" br></sa-item>
-						<sa-item type="text" name="更新者名称" v-model="m.updateName" br></sa-item>
-						<!-- date-update字段: m.updateTime - 更新时间 -->
-						<sa-item type="enum" name="审核状态" v-model="m.auditStatus" :jv="{0: '待审核,1'}" jtype="3" br></sa-item>
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="车牌" v-model="m.vehiclePlate" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="所有人" v-model="m.owner" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="车辆类型" v-model="m.vehicleType" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="车辆尺寸" v-model="m.vehicleSize" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="车辆品牌型号" v-model="m.vehicleModel" br></sa-item>
+							</el-col>
+							<el-col :span="12">
+								<sa-item type="text" name="核定载质量" v-model="m.vehicleLoad" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="50">
+							<el-col :span="12">
+								<sa-item type="text" name="车辆自重" v-model="m.vehicleWeight" br></sa-item>
+							</el-col>
+						</el-row>
+
+						<!-- <sa-item type="text" name="类型父id" v-model="m.parentId" br></sa-item> -->
+					
+						<!-- <sa-item type="enum" name="审核状态" v-model="m.auditStatus" :jv="{0: '待审核,1'}" jtype="3" br></sa-item>
 						<sa-item type="text" name="审核人" v-model="m.auditBy" br></sa-item>
 						<sa-item type="text" name="审核不通过原因" v-model="m.nopassReason" br></sa-item>
-						<sa-item type="text" name="审核时间" v-model="m.auditTime" br></sa-item>
+						<sa-item type="text" name="审核时间" v-model="m.auditTime" br></sa-item> -->
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>
@@ -74,7 +94,6 @@
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							id: '',		// 主键
 							vehiclePlate: '',		// 车牌
 							owner: '',		// 所有人
 							vehicleType: '',		// 车辆类型
@@ -83,43 +102,29 @@
 							vehicleModel: '',		// 车辆品牌型号
 							vehicleLoad: '',		// 核定载质量
 							vehicleWeight: '',		// 车辆自重
-							createBy: '',		// 创建者id
-							createName: '',		// 创建者姓名
-							// createTime: '',		// 创建时间
-							updateBy: '',		// 更新者id
-							updateName: '',		// 更新者名称
-							// updateTime: '',		// 更新时间
-							// deleteStatus: '',		// 删除状态
-							auditStatus: '',		// 审核状态(0=待审核,1=已通过,2=不通过)
-							auditBy: '',		// 审核人
-							nopassReason: '',		// 审核不通过原因
-							auditTime: '',		// 审核时间
+							// auditStatus: '',		// 审核状态(0=待审核,1=已通过,2=不通过)
+							// auditBy: '',		// 审核人
+							// nopassReason: '',		// 审核不通过原因
+							// auditTime: '',		// 审核时间
 						}
 					},
 					// 提交数据
 					ok: function(){
 						// 表单校验
 						let m = this.m;
-						sa.checkNull(m.id, '请输入 [主键]');
 						sa.checkNull(m.vehiclePlate, '请输入 [车牌]');
 						sa.checkNull(m.owner, '请输入 [所有人]');
 						sa.checkNull(m.vehicleType, '请输入 [车辆类型]');
-						sa.checkNull(m.parentId, '请输入 [类型父id]');
+						// sa.checkNull(m.parentId, '请输入 [类型父id]');
 						sa.checkNull(m.vehicleSize, '请输入 [车辆尺寸]');
 						sa.checkNull(m.vehicleModel, '请输入 [车辆品牌型号]');
 						sa.checkNull(m.vehicleLoad, '请输入 [核定载质量]');
 						sa.checkNull(m.vehicleWeight, '请输入 [车辆自重]');
-						sa.checkNull(m.createBy, '请输入 [创建者id]');
-						sa.checkNull(m.createName, '请输入 [创建者姓名]');
-						// sa.checkNull(m.createTime, '请输入 [创建时间]');
-						sa.checkNull(m.updateBy, '请输入 [更新者id]');
-						sa.checkNull(m.updateName, '请输入 [更新者名称]');
-						// sa.checkNull(m.updateTime, '请输入 [更新时间]');
 						// sa.checkNull(m.deleteStatus, '请输入 [删除状态]');
-						sa.checkNull(m.auditStatus, '请输入 [审核状态]');
-						sa.checkNull(m.auditBy, '请输入 [审核人]');
-						sa.checkNull(m.nopassReason, '请输入 [审核不通过原因]');
-						sa.checkNull(m.auditTime, '请输入 [审核时间]');
+						// sa.checkNull(m.auditStatus, '请输入 [审核状态]');
+						// sa.checkNull(m.auditBy, '请输入 [审核人]');
+						// sa.checkNull(m.nopassReason, '请输入 [审核不通过原因]');
+						// sa.checkNull(m.auditTime, '请输入 [审核时间]');
 
 						// 开始增加或修改
 						this.m.createTime = undefined;		// 不提交属性:创建时间

+ 3 - 9
sa-view/tb-vehicle/tb-vehicle-info.html

@@ -25,7 +25,6 @@
 			<div class="s-body">
 				<div class="c-panel">
 					<el-form v-if="m">
-						<sa-info type="num" name="主键" :value="m.id" br></sa-info>
 						<sa-info name="车牌" br>{{m.vehiclePlate}}</sa-info>
 						<sa-info name="所有人" br>{{m.owner}}</sa-info>
 						<sa-info name="车辆类型" br>{{m.vehicleType}}</sa-info>
@@ -34,16 +33,11 @@
 						<sa-info name="车辆品牌型号" br>{{m.vehicleModel}}</sa-info>
 						<sa-info name="核定载质量" br>{{m.vehicleLoad}}</sa-info>
 						<sa-info name="车辆自重" br>{{m.vehicleWeight}}</sa-info>
-						<sa-info name="创建者id" br>{{m.createBy}}</sa-info>
-						<sa-info name="创建者姓名" br>{{m.createName}}</sa-info>
-						<sa-info type="datetime" name="创建时间" :value="m.createTime" br></sa-info>
-						<sa-info name="更新者id" br>{{m.updateBy}}</sa-info>
-						<sa-info name="更新者名称" br>{{m.updateName}}</sa-info>
-						<sa-info type="datetime" name="更新时间" :value="m.updateTime" br></sa-info>
-						<sa-info type="enum" name="审核状态" :value="m.auditStatus" :jv="{0: '待审核,1'}" br></sa-info>
+					
+						<!-- <sa-info type="enum" name="审核状态" :value="m.auditStatus" :jv="{0: '待审核,1'}" br></sa-info>
 						<sa-info name="审核人" br>{{m.auditBy}}</sa-info>
 						<sa-info name="审核不通过原因" br>{{m.nopassReason}}</sa-info>
-						<sa-info name="审核时间" br>{{m.auditTime}}</sa-info>
+						<sa-info name="审核时间" br>{{m.auditTime}}</sa-info> -->
 					</el-form>
 				</div>
 			</div>

+ 14 - 31
sa-view/tb-vehicle/tb-vehicle-list.html

@@ -20,27 +20,17 @@
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
-				<div class="c-title">检索参数</div>
+				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="num" name="主键" v-model="p.id"></sa-item>
 					<sa-item type="text" name="车牌" v-model="p.vehiclePlate"></sa-item>
 					<sa-item type="text" name="所有人" v-model="p.owner"></sa-item>
 					<sa-item type="text" name="车辆类型" v-model="p.vehicleType"></sa-item>
-					<sa-item type="text" name="类型父id" v-model="p.parentId"></sa-item>
-					<sa-item type="text" name="车辆尺寸" v-model="p.vehicleSize"></sa-item>
-					<sa-item type="text" name="车辆品牌型号" v-model="p.vehicleModel"></sa-item>
-					<sa-item type="text" name="核定载质量" v-model="p.vehicleLoad"></sa-item>
-					<sa-item type="text" name="车辆自重" v-model="p.vehicleWeight"></sa-item>
-					<sa-item type="text" name="创建者id" v-model="p.createBy"></sa-item>
-					<sa-item type="text" name="创建者姓名" v-model="p.createName"></sa-item>
-					<sa-item type="text" name="更新者id" v-model="p.updateBy"></sa-item>
-					<sa-item type="text" name="更新者名称" v-model="p.updateName"></sa-item>
 					<!-- 未识别类型:删除状态: p.deleteStatus 请检查配置 -->
-					<sa-item type="enum" name="审核状态" v-model="p.auditStatus"
+					<!-- <sa-item type="enum" name="审核状态" v-model="p.auditStatus"
 						:jv="{0: '待审核,1'}" jtype="2" def="不限"></sa-item>
 					<sa-item type="text" name="审核人" v-model="p.auditBy"></sa-item>
 					<sa-item type="text" name="审核不通过原因" v-model="p.nopassReason"></sa-item>
-					<sa-item type="text" name="审核时间" v-model="p.auditTime"></sa-item>
+					<sa-item type="text" name="审核时间" v-model="p.auditTime"></sa-item> -->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 				</el-form>
 				<div class="fast-btn">
@@ -51,7 +41,6 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<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="vehiclePlate" ></sa-td>
 					<sa-td name="所有人" prop="owner" ></sa-td>
 					<sa-td name="车辆类型" prop="vehicleType" ></sa-td>
@@ -60,16 +49,10 @@
 					<sa-td name="车辆品牌型号" prop="vehicleModel" ></sa-td>
 					<sa-td name="核定载质量" prop="vehicleLoad" ></sa-td>
 					<sa-td name="车辆自重" prop="vehicleWeight" ></sa-td>
-					<sa-td name="创建者id" prop="createBy" ></sa-td>
-					<sa-td name="创建者姓名" prop="createName" ></sa-td>
-					<sa-td name="创建时间" prop="createTime" type="datetime"></sa-td>
-					<sa-td name="更新者id" prop="updateBy" ></sa-td>
-					<sa-td name="更新者名称" prop="updateName" ></sa-td>
-					<sa-td name="更新时间" prop="updateTime" type="datetime"></sa-td>
-					<sa-td name="审核状态" prop="auditStatus" type="enum" :jv="{0: '待审核,1'}"></sa-td>
+					<!-- <sa-td name="审核状态" prop="auditStatus" type="enum" :jv="{0: '待审核,1'}"></sa-td>
 					<sa-td name="审核人" prop="auditBy" ></sa-td>
 					<sa-td name="审核不通过原因" prop="nopassReason" ></sa-td>
-					<sa-td name="审核时间" prop="auditTime" ></sa-td>
+					<sa-td name="审核时间" prop="auditTime" ></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>
@@ -91,7 +74,7 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
-						id: '',		// 主键
+						// id: '',		// 主键
 						vehiclePlate: '',		// 车牌
 						owner: '',		// 所有人
 						vehicleType: '',		// 车辆类型
@@ -100,14 +83,14 @@
 						vehicleModel: '',		// 车辆品牌型号
 						vehicleLoad: '',		// 核定载质量
 						vehicleWeight: '',		// 车辆自重
-						createBy: '',		// 创建者id
-						createName: '',		// 创建者姓名
-						updateBy: '',		// 更新者id
-						updateName: '',		// 更新者名称
-						auditStatus: '',		// 审核状态(0=待审核,1=已通过,2=不通过)
-						auditBy: '',		// 审核人
-						nopassReason: '',		// 审核不通过原因
-						auditTime: '',		// 审核时间
+						// createBy: '',		// 创建者id
+						// createName: '',		// 创建者姓名
+						// updateBy: '',		// 更新者id
+						// updateName: '',		// 更新者名称
+						// auditStatus: '',		// 审核状态(0=待审核,1=已通过,2=不通过)
+						// auditBy: '',		// 审核人
+						// nopassReason: '',		// 审核不通过原因
+						// auditTime: '',		// 审核时间
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式

+ 1 - 1
static/sa.js

@@ -9,7 +9,7 @@ var sa = {
 (function(){
 	// 公司开发环境
 	var cfg_dev = {
-		api_url: 'http://127.0.0.1:8080',	// 所有ajax请求接口父地址
+		api_url: 'http://192.168.88.34:8080',	// 所有ajax请求接口父地址
 		web_url: 'http://www.baidu.com'		// 此项目前台地址 (此配置项非必须)
 	}
 	// 服务器测试环境