Home Explore Help
Register Sign In
qzyReal
/
market-admin-ui
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

页面整理

qzyReal 1 year ago
parent
763b6adb10
commit
ccf0f54d78
12 changed files with 74 additions and 221 deletions
Split View Show Diff Stats
  1. 2 2
      login.html
  2. 1 1
      sa-frame/menu-list-sp.js
  3. 2 54
      sa-frame/menu-list.js
  4. 19 0
      sa-view/app-role/app-role-list.html
  5. 1 1
      sa-view/tb-fee-item-record/tb-fee-item-record-add.html
  6. 1 1
      sa-view/tb-fee-item-record/tb-fee-item-record-info.html
  7. 14 37
      sa-view/tb-fee-item-record/tb-fee-item-record-list.html
  8. 9 45
      sa-view/tb-order/tb-order-list.html
  9. 10 21
      sa-view/tb-people-profit-record/tb-people-profit-record-list.html
  10. 12 56
      sa-view/tb-two-market-orders/tb-two-market-orders-list.html
  11. 1 1
      static/sa.css
  12. 2 2
      static/sa.js

+ 2 - 2
login.html
View File 

@@ -180,8 +180,8 @@
 
 
 			// 所有参考属性
 
 			var page_title = '你好，欢迎登录系统'; // 页面标题
 
-			var key = 'sa'; // 默认的账号
 
-			var password = '123456'; // 默认的password
 
+			var key = ''; // 默认的账号
 
+			var password = ''; // 默认的password
 
 			var logo = 'sa-frame/admin-logo.png'; // logo地址，为空字符串则不显示
 
 			var codeKey = '';
 
 			var pKey = '';

+ 1 - 1
sa-frame/menu-list-sp.js
View File 

@@ -667,7 +667,7 @@ window.menuList.unshift({
 
 				}, ]
 
 			},
 
 			{
 
-				id: 'tb-fee-item-record-list',
 
+				id: 'tb-fee-item-record',
 
 				name: '收费记录',
 
 				icon: 'el-icon-folder-opened',
 
 				url: 'sa-view/tb-fee-item-record/tb-fee-item-record-list.html'

+ 2 - 54
sa-frame/menu-list.js
View File 

@@ -15,58 +15,6 @@
 
 // }
 
 
 // 定义菜单列表 
-var menuList = [{
 
-			id: 'tb-fee-item-record',
 
-			name: '收费记录',
 
-			icon: 'el-icon-folder-opened',
 
-			parent: true,
 
-			info: '费项订单表数据的维护',
 
-			childList: [
 
-				childList: [{
 
-						id: 'tb-fee-item-record-add',
 
-						name: '费项订单添加',
 
-						isShow: false
 
-					},
 
-					{
 
-						id: 'tb-fee-item-record-edit',
 
-						name: '费项订单更新',
 
-						isShow: false
 
-					},
 
-					{
 
-						id: 'tb-fee-item-record-del',
 
-						name: '费项订单删除',
 
-						isShow: false
 
-					},
 
-				]
 
-			},
 
-		]
 
-	},
 
-	{
 
-		id: 'tb-people-profit-record',
 
-		name: '边民收益记录',
 
-		icon: 'el-icon-folder-opened',
 
-		parent: true,
 
-		info: '边民收益记录表数据的维护',
 
-		childList: [{
 
-			id: 'tb-people-profit-record-list',
 
-			name: '边民收益记录-列表',
 
-			url: 'sa-view/tb-people-profit-record/tb-people-profit-record-list.html',
 
-			childList: [{
 
-					id: 'tb-people-profit-record-add',
 
-					name: '边民收益记录添加',
 
-					isShow: false
 
-				},
 
-				{
 
-					id: 'tb-people-profit-record-edit',
 
-					name: '边民收益记录更新',
 
-					isShow: false
 
-				},
 
-				{
 
-					id: 'tb-people-profit-record-del',
 
-					name: '边民收益记录删除',
 
-					isShow: false
 
-				},
 
-			]
 
-		}, ]
 
-	},
 
+var menuList =	[
 
+	
 ]

+ 19 - 0
sa-view/app-role/app-role-list.html
View File 

@@ -28,6 +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 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">
 
@@ -90,6 +91,24 @@
 
 					add: function(data) {
 
 						sa.showIframe('新增数据', 'app-role-add.html?id=-1', '1000px', '90%');
 
 					},
 
+					// 修改用户的状态
 
+					updateStatus: function(data) {
 
+						if(data.id == sa.$sys.getCurrUser().id) {
 
+							data.status = 3 - data.status;
 
+							return sa.alert('不能自己封禁自己');
 
+						}
 
+						var is_ok = false;	// 记录是否成功
 
+						var ajax = sa.ajax('/sp-admin/AppRole/updateStatus', {id: data.id, status: data.status}, function(res) {
 
+							sa.msg('修改成功');
 
+							is_ok = true;
 
+						}.bind(this));
 
+						// 如果未能修改成功, 则回滚
 
+						$.when(ajax).done(function() {
 
+							if(is_ok == false) {
 
+								data.status = 3 - data.status;
 
+							}
 
+						})
 
+					},
 
 					// 删除
 
 					del: function(data) {
 
 						sa.confirm('是否删除，此操作不可撤销', function() {

+ 1 - 1
sa-view/tb-fee-item-record/tb-fee-item-record-add.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html>
 
 	<head>
 
-		<title>费项订单-添加/修改</title>
 
+		<title>收费记录-添加/修改</title>
 
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
 		<!-- 所有的 css js 资源 -->

+ 1 - 1
sa-view/tb-fee-item-record/tb-fee-item-record-info.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html>
 
 	<head>
 
-		<title>费项订单-详情</title>
 
+		<title>收费记录-详情</title>
 
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
 		<!-- 所有的 css js 资源 -->

+ 14 - 37
sa-view/tb-fee-item-record/tb-fee-item-record-list.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html>
 
 	<head>
 
-		<title>费项订单-列表</title>
 
+		<title>收费记录-列表</title>
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
 		<!-- 所有的 css & js 资源 -->
 
@@ -20,29 +20,27 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
+					<sa-item type="text" name="订单号" v-model="p.orderNo"></sa-item>
 
 					<sa-item type="text" name="收费项目" v-model="p.itemName"></sa-item>
 
 					<sa-item type="text" name="收费企业" v-model="p.companyName"></sa-item>
 
-					<sa-item type="text" name="订单号" v-model="p.levelTwoOrderNo"></sa-item>
 
-					<sa-item type="enum" name="划拨状态" v-model="p.payStatus" 
+					<sa-item type="enum" name="支付/划拨状态" v-model="p.payStatus" 
 						:jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}" jtype="4" def="不限"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
+						<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
-					<sa-td type="index" name="序号"></sa-td>
 
+					<sa-td type="selection"></sa-td>
 
 					<sa-td name="订单号" prop="orderNo" ></sa-td>
 
 					<sa-td name="收费类型类型" prop="feeType" type="enum" :jv="{1: '按交易额收取', 2: '按次收取'}"></sa-td>
 
 					<sa-td name="类型对应的数值" prop="feeNum" ></sa-td>
 
 					<sa-td name="收费项目" prop="itemName" ></sa-td>
 
 					<sa-td name="收费金额" prop="itemPrice" ></sa-td>
 
 					<sa-td name="收费企业" prop="companyName" ></sa-td>
 
-					<sa-td name="二级订单单号" prop="levelTwoOrderNo" ></sa-td>
 
+					<sa-td name="商品单号" prop="levelTwoOrderNo" ></sa-td>
 
 					<sa-td name="创建时间" prop="createTime" ></sa-td>
 
-					<sa-td name="划拨时间" prop="payTime" ></sa-td>
 
-					<sa-td name="划拨状态" prop="payStatus" type="enum" :jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}"></sa-td>
 
-					<sa-td name="支付备注" prop="payRemark" ></sa-td>
 
+					<sa-td name="支付/划拨时间" prop="payTime" ></sa-td>
 
+					<sa-td name="支付/划拨状态" prop="payStatus" type="enum" :jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}"></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>
 
@@ -85,8 +83,14 @@
 
 					},
 
 					dataCount: 0,
 
 					dataList: [], // 数据集合 
+					feeItemList:[]
 
 				},
 
 				methods: {
 
+					getItemList: function() {
 
+						sa.ajax('/level-two-server/TbFeeItem/getList', {pageSize:50}, function(res) {
 
+							this.feeItemList = res.data; // 数据
 
+						}.bind(this));
 
+					},
 
 					// 刷新
 
 					f5: function() {
 
 						sa.ajax('/level-two-server/TbFeeItemRecord/getList', sa.removeNull(this.p), function(res) {
 
@@ -115,33 +119,6 @@
 
 					add: function(data) {
 
 						sa.showIframe('新增数据', 'tb-fee-item-record-add.html?id=-1', '1000px', '90%');
 
 					},
 
-					// 删除
 
-					del: function(data) {
 
-						sa.confirm('是否删除，此操作不可撤销', function() {
 
-							sa.ajax('/level-two-server/TbFeeItemRecord/delete?id=' + data.id, function(res) {
 
-								sa.arrayDelete(this.dataList, data);
 
-								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
 
-						}.bind(this));
 
-					},
 
-					// 批量删除
 
-					deleteByIds: function() {
 
-						// 获取选中元素的id列表 
-						let selection = this.$refs['data-table'].selection;
 
-						let ids = sa.getArrayField(selection, 'id');
 
-						if(selection.length == 0) {
 
-							return sa.msg('请至少选择一条数据')
 
-						}
 
-						// 提交删除 
-						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
 
-							sa.ajax('/level-two-server/TbFeeItemRecord/deleteByIds', {ids: ids.join(',')}, function(res) {
 
-								sa.arrayDelete(this.dataList, selection);
 
-								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
 
-						}.bind(this));
 
-					},
 
 				},
 
 				created: function() {
 
 					this.f5();

+ 9 - 45
sa-view/tb-order/tb-order-list.html
View File 

@@ -20,64 +20,28 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<!-- <div class="c-title">检索参数</div> -->
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="订单号" v-model="p.tradeNo"></sa-item>
 
+					<sa-item type="text" name="订单号" v-model="p.tradeNo" width="7em"></sa-item>
 
 					<sa-item type="text" name="买家" v-model="p.buyUserName"></sa-item>
 
-					<sa-item type="text" name="商家名称" v-model="p.enterpriseName"></sa-item>
 
+					<sa-item type="text" name="商家名称" v-model="p.enterpriseName" width="7em"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
-				<div class="fast-btn">
 
-					<el-button v-if="sa.isAuth('tb-order-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
-					<sa-td type="selection"></sa-td>
 
-					<!-- <sa-td name="" prop="tradeAreaId" ></sa-td>
 
-					<sa-td name="" prop="tradeAreaName" ></sa-td>
 
-					<sa-td name="" prop="addressIds" ></sa-td>
 
-					<sa-td name="" prop="saleMainId" ></sa-td> -->
 
-					<sa-td name="订单号" prop="tradeNo" ></sa-td>
 
-					<sa-td name="买家ID" prop="buyUserId" type="num"></sa-td>
 
+					<sa-td type="index" name="序号"></sa-td>
 
+					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
 
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
 
-					<sa-td name="购买用户类型" prop="buyUserType" type="num"></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
 
-					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
-					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames" width="280"></sa-td>
 
+					<sa-td name="总重量(kg)" prop="totalWeight" ></sa-td>
 
+					<sa-td name="总金额(元)" prop="totalPrice" ></sa-td>
 
 					<sa-td name="交易时间" prop="tradeTime" type="datetime"></sa-td>
 
 					<sa-td name="交易状态" prop="tradeStatus" type="enum" :jv="{0: '未支付', 1: '已支付'}"></sa-td>
 
-					<sa-td name="支付方式" prop="payType" ></sa-td>
 
-					<sa-td name="结算时间" prop="settleTime" ></sa-td>
 
-					<sa-td name="当前结算金额" prop="realPrice" ></sa-td>
 
-					<sa-td name="应结金额" prop="shouldPrice" ></sa-td>
 
-					<sa-td name="对账人" prop="settleUserId" ></sa-td>
 
-					<sa-td name="对账人员" prop="recordUserId" ></sa-td>
 
-					<sa-td name="对账时间" prop="recordTime" ></sa-td>
 
-					<sa-td name="是否对账" prop="record" ></sa-td>
 
-					<sa-td name="退款原因" prop="refundReason" ></sa-td>
 
-					<sa-td name="退款时间" prop="refundTime" ></sa-td>
 
-					<!-- <sa-td name="" prop="receiveName" ></sa-td>
 
-					<sa-td name="" prop="receivePhone" ></sa-td>
 
-					<sa-td name="" prop="receiveAddress" ></sa-td> -->
 
 					<sa-td name="出互市区时间" prop="outTime" ></sa-td>
 
-					<sa-td name="商品名称字符串" prop="goodsNames" ></sa-td>
 
-					<sa-td name="是否申报" prop="apply" ></sa-td>
 
-					<sa-td name="申报时间" prop="applyTime" ></sa-td>
 
-					<sa-td name="申报结果" prop="applyResult" ></sa-td>
 
-					<!-- <sa-td name="" prop="applyFailReason" ></sa-td> -->
 
-					<sa-td name="分配方式" prop="distribution" type="enum" :jv="{0: '均分', 1: '自选数量'}"></sa-td>
 
-					<sa-td name="是否确认" prop="confirm" type="enum" :jv="{0: '否', 1: '是'}"></sa-td>
 
-					<sa-td name="是否接单" prop="pick" ></sa-td>
 
-					<sa-td name="接单时间" prop="pickTime" ></sa-td>
 
 					<sa-td name="店铺名称" prop="shopName" ></sa-td>
 
-					<sa-td name="是否发货" prop="send" ></sa-td>
 
-					<sa-td name="发货时间" prop="sendTime" ></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">
 
+					<el-table-column label="操作" fixed="right"  width="100px">
 
 						<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-order-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
-							<el-button v-if="sa.isAuth('tb-order-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
@@ -98,7 +62,7 @@
 
 						buyUserName: '',		// 买家 
 						enterpriseName: '',		// 商家名称 
 						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
+						pageSize: 20,	// 页大小 
 						sortType: 0		// 排序方式 
 					},
 
 					dataCount: 0,

+ 10 - 21
sa-view/tb-people-profit-record/tb-people-profit-record-list.html
View File 

@@ -20,31 +20,27 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="边民姓名" v-model="p.peopleName"></sa-item>
 
-					<sa-item type="text" name="订单号" v-model="p.levelTwoOrderNo"></sa-item>
 
-					<sa-item type="enum" name="划拨状态" v-model="p.payStatus" 
+					<sa-item type="text" name="边民姓名" v-model="p.peopleName" width="7em"></sa-item>
 
+					<sa-item type="text" name="商品订单号" v-model="p.levelTwoOrderNo" width="7em"></sa-item>
 
+					<sa-item type="enum" name="支付状态" v-model="p.payStatus" 
 						:jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}" jtype="4" def="不限"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="index" name="序号"></sa-td>
 
 					<sa-td name="边民姓名" prop="peopleName" ></sa-td>
 
-					<sa-td name="订单号" prop="levelTwoOrderNo" ></sa-td>
 
+					<sa-td name="商品订单号" prop="levelTwoOrderNo" ></sa-td>
 
 					<sa-td name="收益金额" prop="price" ></sa-td>
 
 					<sa-td name="收益类型" prop="profitType" ></sa-td>
 
 					<sa-td name="收益数值" prop="profitNum" ></sa-td>
 
 					<sa-td name="创建时间" prop="createTime" ></sa-td>
 
-					<sa-td name="划拨时间" prop="payTime" ></sa-td>
 
-					<sa-td name="划拨状态" prop="payStatus" type="enum" :jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}"></sa-td>
 
-					<sa-td name="支付备注" prop="payRemark" ></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="240px">
 
+					<sa-td name="支付/划拨时间" prop="payTime" ></sa-td>
 
+					<sa-td name="支付/划拨状态" prop="payStatus" type="enum" :jv="{0: '未划拨', 1: '划拨成功', 2: '划拨失败'}"></sa-td>
 
+					<el-table-column label="操作" fixed="right"  width="100px">
 
 						<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-people-profit-record-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
-							<el-button v-if="sa.isAuth('tb-people-profit-record-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
@@ -64,17 +60,10 @@
 
 						id: '',		// 主键 
 						peopleId: '',		// 边民ID 
 						peopleName: '',		// 边民姓名 
-						levelTwoOrderId: '',		// 二级市场订单ID 
 						levelTwoOrderNo: '',		// 二级市场订单号 
-						price: '',		// 收益金额 
-						profitType: '',		// 收益类型(0=均分,1=按笔数算,2=交易比例) 
-						profitNum: '',		// 收益数值 
-						createTime: '',		// 创建时间 
-						payTime: '',		// 支付/划拨时间 
 						payStatus: '',		// 支付/划拨状态(0=未划拨,1=划拨成功,2=划拨失败) 
-						payRemark: '',		// 支付备注 
 						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
+						pageSize: 20,	// 页大小 
 						sortType: 0		// 排序方式 
 					},
 
 					dataCount: 0,
 
@@ -112,7 +101,7 @@
 
 					// 删除
 
 					del: function(data) {
 
 						sa.confirm('是否删除，此操作不可撤销', function() {
 
-							sa.ajax('/level-two-server/TbPeopleProfitRecord/delete?id=' + data.id, function(res) {
 
+							sa.ajax('/TbPeopleProfitRecord/delete?id=' + data.id, function(res) {
 
 								sa.arrayDelete(this.dataList, data);
 
 								sa.ok('删除成功');
 
 								sa.f5TableHeight();		// 刷新表格高度 
@@ -129,7 +118,7 @@
 
 						}
 
 						// 提交删除 
 						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
 
-							sa.ajax('/level-two-server/TbPeopleProfitRecord/deleteByIds', {ids: ids.join(',')}, function(res) {
 
+							sa.ajax('/TbPeopleProfitRecord/deleteByIds', {ids: ids.join(',')}, function(res) {
 
 								sa.arrayDelete(this.dataList, selection);
 
 								sa.ok('删除成功');
 
 								sa.f5TableHeight();		// 刷新表格高度

+ 12 - 56
sa-view/tb-two-market-orders/tb-two-market-orders-list.html
View File 

@@ -20,43 +20,26 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="订单编号" v-model="p.orderNo"></sa-item>
 
-					<sa-item type="text" name="商品名称" v-model="p.goodsName"></sa-item>
 
+					<sa-item type="text" name="订单编号" v-model="p.orderNo" width="7em"></sa-item>
 
+					<sa-item type="text" name="商品名称" v-model="p.goodsName" width="7em"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
-				<div class="fast-btn">
 
-					<el-button v-if="sa.isAuth('tb-orders-add')" size="mini" type="primary" @click="add()">新增</el-button>
 
-					<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>
 
-				</div>
 
+			
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
-					<sa-td type="selection"></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 type="index" name="序号"></sa-td>
 
+					<sa-td name="订单编号" prop="orderNo" width="180"></sa-td>
 
+					<sa-td name="所属互市区" prop="tradeAreaName" ></sa-td>
 
+					<sa-td name="商品名称" prop="goodsName" width="280"></sa-td>
 
 					<sa-td name="商品来源" prop="goodsFrom" ></sa-td>
 
-					<sa-td name="发货商电话" prop="shipperPhone" ></sa-td>
 
-					<sa-td name="发货商名称" prop="shipperName" ></sa-td>
 
-					<!-- <sa-td name="司机ID" prop="driverId" ></sa-td> -->
 
-					<sa-td name="司机名称" prop="driverName" ></sa-td>
 
-					<sa-td name="司机电话" prop="driverPhone" ></sa-td>
 
-					<!-- <sa-td name="车型ID" prop="carId" ></sa-td> -->
 
-					<sa-td name="车型名称" prop="carType" ></sa-td>
 
+					<sa-td name="卖家电话" prop="shipperPhone" ></sa-td>
 
+					<sa-td name="卖家名称" prop="shipperName" ></sa-td>
 
 					<sa-td name="收货人名称" prop="consigneeName" ></sa-td>
 
 					<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="loadingAddress" ></sa-td>
 
-					<sa-td name="卸货地址" prop="unloadingAddress" ></sa-td>
 
-					<sa-td name="备注" prop="comment" ></sa-td>
 
-					<!-- <sa-td name="贸易区域id" prop="tradeAreaId" ></sa-td> -->
 
-					<sa-td name="贸易区域名称" prop="tradeAreaName" ></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="240px">
 
+					<el-table-column label="操作" fixed="right"  width="200px">
 
 						<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>
 
-							<el-button v-if="sa.isAuth('tb-orders-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
@@ -94,7 +77,7 @@
 
 						// tradeAreaId: '',		// 贸易区域id 
 						tradeAreaName: '',		// 贸易区域名称 
 						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
+						pageSize: 20,	// 页大小 
 						sortType: 0		// 排序方式 
 					},
 
 					dataCount: 0,
 
@@ -103,7 +86,7 @@
 
 				methods: {
 
 					// 刷新
 
 					f5: function() {
 
-						sa.ajax('/TbOrders/getList', sa.removeNull(this.p), function(res) {
 
+						sa.ajax('/level-two-server/TbOrders/getList', sa.removeNull(this.p), function(res) {
 
 							this.dataList = res.data; // 数据
 
 							this.dataCount = res.dataCount; // 数据总数 
 							sa.f5TableHeight();		// 刷新表格高度 
@@ -129,33 +112,6 @@
 
 					add: function(data) {
 
 						sa.showIframe('新增数据', 'tb-orders-add.html?id=-1', '1000px', '90%');
 
 					},
 
-					// 删除
 
-					del: function(data) {
 
-						sa.confirm('是否删除，此操作不可撤销', function() {
 
-							sa.ajax('/TbOrders/delete?id=' + data.id, function(res) {
 
-								sa.arrayDelete(this.dataList, data);
 
-								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
 
-						}.bind(this));
 
-					},
 
-					// 批量删除
 
-					deleteByIds: function() {
 
-						// 获取选中元素的id列表 
-						let selection = this.$refs['data-table'].selection;
 
-						let ids = sa.getArrayField(selection, 'id');
 
-						if(selection.length == 0) {
 
-							return sa.msg('请至少选择一条数据')
 
-						}
 
-						// 提交删除 
-						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
 
-							sa.ajax('/TbOrders/deleteByIds', {ids: ids.join(',')}, function(res) {
 
-								sa.arrayDelete(this.dataList, selection);
 
-								sa.ok('删除成功');
 
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
 
-						}.bind(this));
 
-					},
 
 					// 改 - 订单状态已完成 (0=禁用,1=启用)
 
 					updateOrderFinish: function(data) {
 
 						// 声明变量记录是否成功

+ 1 - 1
static/sa.css
View File 

@@ -138,7 +138,7 @@ input::-webkit-inner-spin-button {
 
 .c-item {min-width: 270px; min-height: 32px; line-height: 32px; padding-right: 10px; display: inline-block; margin: 0.5em 0;}
 
 .c-item.br{display: block; margin: 14px 0;}
 
 /* label样式 */
 
-.c-item .c-label{width: 6em; color: #333; padding-right: 4px; display: inline-block; text-align: right; vertical-align: top;}
 
+.c-item .c-label{width: 6.5em; color: #333; padding-right: 4px; display: inline-block; text-align: right; vertical-align: top;}
 
 /* input宽度等样式调整 */
 
 .c-item .el-input{width: 178px;}
 
 /* 禁用input的样式 */

+ 2 - 2
static/sa.js
View File 

@@ -15,7 +15,7 @@ var sa = {
 
 	}
 
 	// 服务器测试环境
 
 	var cfg_test = {
 
-		api_url: 'https://pco.aseanbusiness.cn/pro',
 
+		api_url: 'http://hs-server.aseanbusiness.cn',
 
 		web_url: 'http://www.baidu.com'
 
 	}
 
 	// 正式生产环境
 
@@ -23,7 +23,7 @@ var sa = {
 
 		api_url: 'https://dxkaa1.gxbtka.com/pro',
 
 		web_url: 'http://www.baidu.com'
 
 	}
 
-	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境
 
+	sa.cfg = cfg_test; // 最终环境 , 上线前请选择正确的环境
 
 })();