页面优化

sa-frame/menu-list-sp.js

@@ -99,7 +99,8 @@ window.menuList.unshift({
 		icon: 'el-icon-setting',
 		parent: true,
 		info: '有关系统的一些配置',
-		childList: [{
+		childList: [
+			{
 				id: 'sp-cfg-app',
 				name: '系统对公配置',
 				url: 'sa-view-sp/sp-cfg/app-cfg.html'

sa-view/app-role/app-role-list.html

@@ -28,7 +28,7 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="角色名称" prop="roleName" ></sa-td>
-					<sa-td type="switch" name="状态" prop="status" :jv="{1: '启用[green]', 0: '禁用[#ff4949]'}" @change="s => updateStatus(s.row)" width="120px"></sa-td>
+					<sa-td type="switch" name="注册" prop="status" :jv="{1: '启用[green]', 0: '禁用[#ff4949]'}" @change="s => updateStatus(s.row)" width="120px"></sa-td>
 					<sa-td name="类型" prop="userType" type="enum" :jv="{1: '普通边民', 2: '边民组长', 3: '收购商', 4: '司机', 5: '外籍商户', 6: '合作社'}"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="120px">
 						<template slot-scope="s">

sa-view/app-user/app-user-pass.html

@@ -29,11 +29,9 @@
 			<!-- ------- 内容部分 ------- -->
 			<div class="s-body">
 				<div class="c-panel">
-					<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.password" br></sa-item>
-						<sa-item type="text" name="重复密码" v-model="m.again" br></sa-item>
+					<el-form>
+						<sa-item type="password"  name="新密码" v-model="m.password" br></sa-item>
+						<sa-item type="password"  name="重复密码" v-model="m.again" br></sa-item>
 					</el-form>
 				</div>
 			</div>
@@ -51,13 +49,17 @@
 				el: '.vue-box',
 				data: {
 					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
-					m: null, // 实体对象
+					m: {
+						password:'',
+						again:''
+					}, // 实体对象
 				},
 				methods: {
 					// 创建一个 默认Model
 					createModel: function() {
 						return {
-							
+							password:'',
+							again:''
 						}
 					},
 					// 提交数据
@@ -70,6 +72,10 @@
 							sa.alert('两次输入不一致');
 							return;
 						}
+						if(m.password.length<8){
+							sa.alert('密码长度不能小于8');
+							return;
+						}
 						sa.ajax('/sp-admin/AppUser/pass', m, function(res) {
 							sa.alert('修改成功', this.clean);
 						}.bind(this));
@@ -87,8 +93,7 @@
 				mounted: function() {
 					// 初始化数据
 					sa.ajax('/sp-admin/AppUser/getById?id=' + this.id, function(res) {
-						this.m = res.data;
-						this.m.password='';
+						this.m.id=res.data.id;
 					}.bind(this))
 				}
 			})

sa-view/ht-trade-settlement/ht-trade-settlement-list.html

@@ -29,22 +29,22 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
-					<sa-td name="预申报编号" prop="platSeqNo" width="110px"></sa-td>
-					<sa-td name="申报单编号" prop="declareId" width="110px"></sa-td>
+					<sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td>
+					<sa-td name="申报单编号" prop="declareId" width="160px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
-					<sa-td name="互市区" prop="fieldName" ></sa-td>
-					<sa-td name="商铺名称" prop="shopName" ></sa-td>
-					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
+					<sa-td name="互市区" prop="fieldName" width="160"></sa-td>
+					<sa-td name="商铺名称" prop="shopName"  width="160"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames"  width="160"></sa-td>
 					<sa-td name="总金额" prop="sumAmt" ></sa-td>
-					<sa-td name="总毛重" prop="sumGrossWt" ></sa-td>
-					<sa-td name="总净重" prop="sumNetWt" ></sa-td>
+					<sa-td name="总毛重(kg)" prop="sumGrossWt" ></sa-td>
+					<sa-td name="总净重(kg)" prop="sumNetWt" ></sa-td>
 					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 					<sa-td name="币制" prop="currCode" ></sa-td>
 					<sa-td name="件数" prop="packNo" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="提运单号" prop="billNo" ></sa-td>
-					<sa-td name="航次号" prop="voyageNo" ></sa-td>
-					<sa-td name="单证代码" prop="preNo" ></sa-td>
+					<sa-td name="提运单号" prop="billNo"  width="160"></sa-td>
+					<sa-td name="航次号" prop="voyageNo"  width="160"></sa-td>
+					<sa-td name="单证代码" prop="preNo"  width="160"></sa-td>
 					<el-table-column label="操作" width="140px" fixed="right" >
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>

sa-view/tb-goods/tb-goods-list.html

@@ -39,9 +39,7 @@
 					<sa-td type="index" name="序号"></sa-td>
 					<sa-td name="商品名称" prop="name" ></sa-td>
 					<sa-td name="商品编号" prop="code" ></sa-td>
-					<sa-td name="主图" prop="avatar" type="img"></sa-td>
 					<sa-td name="分类名称" prop="thrItemName" ></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>
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">

sa-view/tb-import-goods/tb-import-goods-list.html

@@ -28,28 +28,21 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="业务编号" prop="platSeqNo" ></sa-td>
-					<sa-td name="商品序号" prop="gNo" ></sa-td>
-					<sa-td name="商品编码" prop="codeTs" ></sa-td>
-					<sa-td name="商品名称" prop="gName" ></sa-td>
+					<sa-td name="业务编号" prop="platSeqNo" width="200"></sa-td>
+					<sa-td name="商品序号" prop="gNo" width="160"></sa-td>
+					<sa-td name="商品编码" prop="codeTs" width="120"></sa-td>
+					<sa-td name="商品名称" prop="gName" width="120"></sa-td>
 					<sa-td name="规格型号" prop="gModel" ></sa-td>
 					<sa-td name="申报数量" prop="gQty" ></sa-td>
-					<sa-td name="第一数量" prop="qty1" ></sa-td>
-					<sa-td name="商品第二数量" prop="qty2" ></sa-td>
-					<sa-td name="商品毛重" prop="grossWt" ></sa-td>
-					<sa-td name="商品净重" prop="netWt" ></sa-td>
-					<sa-td name="商品产销国" prop="originCountry" ></sa-td>
-					<sa-td name="申报计量单位:参见计量单位参数表" prop="gUnit" ></sa-td>
-					<sa-td name="商品第一计量单位" prop="unit1" ></sa-td>
-					<sa-td name="商品第二计量单位" prop="unit2" ></sa-td>
-					<sa-td name="商品申报单价" prop="declPrice" ></sa-td>
+					<sa-td name="毛重(kg)" prop="grossWt" ></sa-td>
+					<sa-td name="净重(kg)" prop="netWt" ></sa-td>
+					<sa-td name="产销国" prop="originCountry" ></sa-td>
+					<sa-td name="申报单价" prop="declPrice" ></sa-td>
 					<sa-td name="申报总价" prop="declTotal" ></sa-td>
-					<sa-td name="储存条件:1常温2冷藏3冷冻" prop="storageEnvm" ></sa-td>
+					<sa-td name="储存条件" prop="storageEnvm" ></sa-td>
 					<sa-td name="商品用途" prop="useTo" ></sa-td>
 					<sa-td name="商铺编码" prop="shopNo" ></sa-td>
 					<sa-td name="商铺名称" prop="shopName" ></sa-td>
-					<sa-td name="检疫检疫代码" prop="ciqCode" ></sa-td>
-					<sa-td name="检疫检疫名称" prop="ciqName" ></sa-td>
 					<sa-td name="包装类型" prop="wrapType" ></sa-td>
 					<el-table-column label="操作" fixed="right"  width="240px">
 						<template slot-scope="s">

sa-view/tb-import-order/tb-import-order-list.html

@@ -28,15 +28,14 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
-					<sa-td name="业务编号" prop="platSeqNo" ></sa-td>
-					<sa-td name="预录入编号" prop="preNo" ></sa-td>
+					<sa-td name="业务编号" prop="platSeqNo" width="160"></sa-td>
+					<sa-td name="预录入编号" prop="preNo" width="160"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
-					<sa-td name="申报人身份证号" prop="ciphertextIdno" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="监管场所名称" prop="fieldName" ></sa-td>
-					<sa-td name="总金额" prop="sumAmt" ></sa-td>
-					<sa-td name="总毛重" prop="sumGrossWt" ></sa-td>
-					<sa-td name="总净重" prop="sumNetWt" ></sa-td>
+					<sa-td name="场所名称" prop="fieldName" ></sa-td>
+					<sa-td name="总金额(kg)" prop="sumAmt" width="120"></sa-td>
+					<sa-td name="总毛重(kg)" prop="sumGrossWt" width="120"></sa-td>
+					<sa-td name="总净重(kg)" prop="sumNetWt" width="120"></sa-td>
 					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 					<sa-td name="币制" prop="currCode" ></sa-td>
 					<sa-td name="件数" prop="packNo" ></sa-td>
@@ -46,12 +45,10 @@
 					<sa-td name="申报状态" prop="declStatus" ></sa-td>
 					<sa-td name="申报时间" prop="declTime" ></sa-td>
 					<sa-td name="回执时间" prop="rcptTime" ></sa-td>
-					<sa-td name="审核备注" prop="auditRemark" ></sa-td>
-					<sa-td name="商铺备案编号" prop="shopPutrecNo" ></sa-td>
-					<sa-td name="边民id" prop="borderId" ></sa-td>
+					<sa-td name="商铺编号" prop="shopPutrecNo" ></sa-td>
 					<sa-td name="企业编码" prop="entCode" ></sa-td>
 					<sa-td name="企业名称" prop="entName" ></sa-td>
-					<el-table-column label="操作" fixed="right"  width="240px">
+					<el-table-column label="操作" fixed="right"  width="140px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 						</template>

sa-view/tb-orders/tb-orders-list.html

@@ -34,13 +34,13 @@
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
 					<sa-td name="商品名称" prop="goodsName" width="280px"></sa-td>
 					<sa-td name="商品来源" prop="goodsFrom" ></sa-td>
-					<sa-td name="互市区" prop="tradeAreaName" width="120px"></sa-td>
-					<sa-td name="买家" prop="purchaserName" ></sa-td>
-					<sa-td name="卖家" prop="shipperName" ></sa-td>
+					<sa-td name="互市区" prop="tradeAreaName" width="200px"></sa-td>
+					<sa-td name="买家" prop="purchaserName" width="200px"></sa-td>
+					<sa-td name="卖家" prop="shipperName" width="160px"></sa-td>
 					<sa-td name="转售金额" prop="resalePrice" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
 					<sa-td name="订状态" prop="orderFinish" type="enum" :jv="{0: '未完成', 1: '已完成'}" @change="s => updateOrderFinish(s.row)"></sa-td>
-					<el-table-column label="操作" width="100px">
+					<el-table-column label="操作" width="100px" fixed="right"  >
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 							<!-- <el-button v-if="sa.isAuth('tb-orders-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>

sa-view/tb-purchaser/tb-purchaser-judge.html

@@ -42,6 +42,7 @@
 					<sa-td name="审核状态" prop="judgeStatus">
 						<template slot-scope="scope">
 							<el-tag type="danger" v-if="scope.row.judgeStatus==0">未审核</el-tag>
+							<el-tag type="green" v-if="scope.row.judgeStatus==1">审核通过</el-tag>
 							<el-tag type="danger" v-if="scope.row.judgeStatus==2">审核驳回</el-tag>
 						</template>
 					</sa-td>

sa-view/tb-shop/tb-shop-info.html

@@ -33,10 +33,6 @@
 									<label class="c-label">编号：</label>
 									<span>{{m.shopNo}}</span>
 								</div>
-								<div class="c-item br">
-									<label class="c-label">区域：</label>
-										<span>{{m.area}}</span>
-								</div>
 							</el-col>
 							<el-col span="12">
 								
@@ -48,10 +44,6 @@
 									<label class="c-label">入住商户：</label>
 										<span>{{m.enterpriseName}}</span>
 								</div>
-								<div class="c-item br">
-									<label class="c-label">备注：</label>
-									<span>{{m.remark}}</span>
-								</div>
 							</el-col>
 						</el-row>
 					</el-form>

sa-view/tb-shop/tb-shop-list.html

@@ -43,10 +43,28 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
 					<el-table-column align="center" label="序号" type="index" width="45px"></el-table-column>
-					<el-table-column align="center" label="名称" prop="shopName"></el-table-column>
+					<el-table-column align="center" label="名称" prop="shopName" width="130"></el-table-column>
+					<el-table-column align="center" prop="tradeAreaName" label="所在互市区"> </el-table-column>
 					<el-table-column align="center" label="编号" prop="shopNo"></el-table-column>
-					<el-table-column align="center" prop="tradeAreaName" label="所属互市区"> </el-table-column>
-					<el-table-column align="center" prop="enterpriseName" label="入驻商家"> </el-table-column>
+					<el-table-column align="center" label="类型" prop="shopType">
+					<template slot-scope='s'>
+						<b v-if="s.row.shopType==1">国内商铺</b>
+						<b v-if="s.row.shopType==2">国外商铺</b>
+					</template>
+					</el-table-column>
+					<el-table-column align="center" label="状态" prop="shopType">
+					<template slot-scope='s'>
+						<b v-if="s.row.status==1">启用</b>
+						<b v-if="s.row.status==2">停用</b>
+						<b v-if="s.row.status==2">注销</b>
+					</template>
+					</el-table-column>
+					<el-table-column align="center" prop="shopSccd" label="统一信用号" width="180"> </el-table-column>
+					<el-table-column align="center" prop="enterpriseName" label="商家名称"> </el-table-column>
+					<el-table-column align="center" prop="ownerTel" label="铺主联系方式"> </el-table-column>
+					<el-table-column align="center" prop="agentName" label="代理人"> </el-table-column>
+					<el-table-column align="center" prop="agentTel" label="代理人联系"> </el-table-column>
+					<el-table-column align="center" prop="createTime" label="创建时间"  width="160"> </el-table-column>
 					<el-table-column align="center" label="操作" fixed="right" width="240px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看

static/sa.js

@@ -20,7 +20,7 @@ var sa = {
 	}
 	// 正式生产环境
 	var cfg_prod = {
-		api_url: 'https://dxkaa1.gxbtka.com/pro',
+		api_url: 'https://111',
 		web_url: 'http://www.baidu.com'
 	}
 	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境