Browse Source

输入框提示,界面修改

lzm 3 years ago
parent
commit
cf72727efd

+ 2 - 2
sp-admin/sa-frame/sa-code.js

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

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

@@ -26,8 +26,8 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="text" name="车牌号" v-model="m.cardNo" br></sa-item>
-						<sa-item type="text" name="规格" v-model="m.cardSize" br></sa-item>
+						<sa-item type="text" name="车牌号" v-model="m.cardNo" placeholder="请输入车牌号" br></sa-item>
+						<sa-item type="text" name="规格" v-model="m.cardSize" placeholder="请输入规格" br></sa-item>
 						<sa-item type="enum" name="当前状态" v-model="m.status" :jv="{1: '境外', 2: '境内'}" jtype="3" br></sa-item>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>

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

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

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

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

+ 7 - 4
sp-admin/sa-view/tb-costomer/tb-costomer-add.html

@@ -28,10 +28,10 @@
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
 						<el-row>
-							<sa-item type="text" name="客户名称" v-model="m.name" br></sa-item>
-							<sa-item type="text" name="联系人" v-model="m.dutyPeople" br></sa-item>
-							<sa-item type="text" name="联系号码" v-model="m.phone" br></sa-item>
-							<sa-item type="enum" name="结账方式" v-model="m.payType" :jv="{2: '月结', 1: '现结'}" jtype="1" br></sa-item>
+							<sa-item type="text" name="公司名称" v-model="m.name" placeholder="请输入客户名称" br></sa-item>
+							<sa-item type="text" name="联系人" v-model="m.dutyPeople" placeholder="请输入联系人" br></sa-item>
+							<sa-item type="text" name="联系电话" v-model="m.phone" placeholder="请输入联系号码" br></sa-item>
+							<sa-item type="enum" name="结算类型" v-model="m.payType" :jv="{2: '月结', 1: '现结'}" jtype="1" br></sa-item>
 						<!-- 	<div class="c-item br">
 								<label class="c-label"><label style="color: red">*</label>地区:</label>
 								<el-cascader size="mini" placeholder="请选择" v-model="m.address_arry"
@@ -91,6 +91,9 @@
 						sa.checkNull(m.name, '请输入 [客户名称]');
 						sa.checkNull(m.phone, '请输入 [联系号码]');
 						sa.checkNull(m.dutyPeople, '请输入 [负责人]');
+						if(!(/^1[34578]\d{9}$/.test(m.phone))){
+							sa.check(true, '请输入正确的 [联系号码]')
+						}
 						// this.m.addressIds = this.m.address_arry.join(',');
 						// sa.checkNull(m.addressIds, '请选择 [地址信息]');
 						// 开始增加或修改

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

@@ -25,16 +25,16 @@
 					<el-form v-if="m">
 						<el-row>
 							<el-col span="12">
-								<sa-info name="名称" br>{{m.name}}</sa-info>
-								<sa-info name="联系号码" br>{{m.phone}}</sa-info>
-								<sa-info name="负责人" br>{{m.dutyPeople}}</sa-info>
+								<sa-info name="公司名称" br>{{m.name}}</sa-info>
+								<sa-info name="联系电话" br>{{m.phone}}</sa-info>
+								<sa-info name="联系人" br>{{m.dutyPeople}}</sa-info>
 								<!-- <sa-info name="地址" br>{{m.addressStr}}</sa-info> -->
 								<sa-info type="img" name="营业执照" :value="m.businessLicence" br></sa-info>
 							</el-col>
 							<el-col span="12">
-								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '否', 1: '是'}" br></sa-info>
+								<sa-info type="enum" name="状态" :value="m.status" :jv="{0: '禁用', 1: '启用'}" br></sa-info>
 								<sa-info name="创建时间" br>{{m.creareTime}}</sa-info>
-								<sa-info type="enum" name="审核状态" :value="m.judgeStatus" :jv="{1: '未审核'}" br></sa-info>
+								<sa-info type="enum" name="审核状态" :value="m.judgeStatus" :jv="{1: '未审核', 2: '审核通过', 3:'审核不通过'}" br></sa-info>
 								<sa-info name="审核时间" br>{{m.judgeTime}}</sa-info>
 								<sa-info name="审核意见" br>{{m.judgeContent}}</sa-info>
 							</el-col>
@@ -44,8 +44,8 @@
 			</div>
 			<!-- ------- 底部按钮 ------- -->
 			<div class="s-foot">
-				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
-				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+				<el-button type="success" @click="sa.closeCurrIframe()">关闭</el-button>
+<!--				<el-button @click="sa.closeCurrIframe()">取消</el-button>-->
 			</div>
 		</div>
 		<script>

+ 11 - 17
sp-admin/sa-view/tb-costomer/tb-costomer-list.html

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

+ 15 - 19
sp-admin/sa-view/tb-costomer/tb-costomer-maintain.html

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

+ 24 - 18
sp-admin/sa-view/tb-item/tb-item-add.html

@@ -26,24 +26,30 @@
                     <div class="c-title" v-if="id == 0">数据添加</div>
 					<div class="c-title" v-else>数据修改</div>
 					<el-form v-if="m">
-						<sa-item type="text" name="项目编号" v-model="m.itemCode" placeholder="请输入项目编号" br></sa-item>
-						<sa-item type="text" name="项目名称" v-model="m.itemName" placeholder="请输入项目名称" br></sa-item>
-						<div class="c-item">
-							<label class="c-label">项目类型:</label>
-							<el-select v-model="m.typeId" style="width: 120px;"  placeholder="请选择项目类型">
-								<el-option
-										v-for="type in itemTypeList"
-										:key="type.id"
-										:label="type.name"
-										:value="type.id">
-								</el-option>
-							</el-select>
-						</div>
-						<sa-item type="num" name="项目金额(元)" v-model="m.price" placeholder="请输入项目金额" br></sa-item>
-						<sa-item type="text" name="金额单位" v-model="m.unit" placeholder="请输入金额单位,如:元/车" br></sa-item>
-						<sa-item type="num" name="车长(米)" v-model="m.carLength" placeholder="请输入车长" br></sa-item>
-						<sa-item type="num" name="最大载重(吨)" v-model="m.maxWeight" placeholder="请输入最大载重" br></sa-item>
-<!--						<sa-item type="enum" name="当前状态" v-model="m.status" :jv="{1: '启用', 0: '禁用'}" jtype="3" br></sa-item>-->
+						<el-row>
+							<el-col span="12">
+								<sa-item type="text" name="项目编号" v-model="m.itemCode" placeholder="请输入项目编号" br></sa-item>
+								<sa-item type="text" name="项目名称" v-model="m.itemName" placeholder="请输入项目名称" br></sa-item>
+								<div class="c-item">
+									<label class="c-label">项目类型:</label>
+									<el-select v-model="m.typeId" style="width: 120px;"  placeholder="请选择项目类型">
+										<el-option
+												v-for="type in itemTypeList"
+												:key="type.id"
+												:label="type.name"
+												:value="type.id">
+										</el-option>
+									</el-select>
+								</div>
+								<sa-item type="num" name="项目金额(元)" v-model="m.price" placeholder="请输入项目金额" br></sa-item>
+								<sa-item type="text" name="金额单位" v-model="m.unit" placeholder="请输入金额单位,如:元/车" br></sa-item>
+							</el-col>
+							<el-col span="12">
+								<sa-item type="num" name="车长(米)" v-model="m.carLength" placeholder="请输入车长" br></sa-item>
+								<sa-item type="num" name="最大载重(吨)" v-model="m.maxWeight" placeholder="请输入最大载重" br></sa-item>
+								<!--<sa-item type="enum" name="当前状态" v-model="m.status" :jv="{1: '启用', 0: '禁用'}" jtype="3" br></sa-item>-->
+							</el-col>
+						</el-row>
 						<sa-item name="" class="s-ok" br>
 							<el-button type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 						</sa-item>

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

@@ -45,8 +45,8 @@
 			</div>
 			<!-- ------- 底部按钮 ------- -->
 			<div class="s-foot">
-				<el-button type="success" @click="sa.closeCurrIframe()">确定</el-button>
-				<el-button @click="sa.closeCurrIframe()">取消</el-button>
+				<el-button type="success" @click="sa.closeCurrIframe()">关闭</el-button>
+<!--				<el-button @click="sa.closeCurrIframe()">取消</el-button>-->
 			</div>
 		</div>
 		<script>

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

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