首页 发现 帮助
注册 登录
qzyReal
/
market-admin-ui
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

页面修改

linbl 1 月之前
父节点
edce8662af
当前提交
7a13c6edb8
共有 9 个文件被更改，包括 120 次插入 和 26 次删除
分列视图 显示文件统计
  1. 2 2
      sa-view/ht-settlement-error/ht-trade-settlement-order.html
  2. 26 4
      sa-view/ht-trade-settlement/ht-trade-settlement-list.html
  3. 2 2
      sa-view/ht-trade-settlement/ht-trade-settlement-order.html
  4. 39 3
      sa-view/ht-trade-settlement/tb-order-deductionByVeNo.html
  5. 38 2
      sa-view/ht-trade-settlement/tb-order-sendCXB001ByVeNo.html
  6. 3 3
      sa-view/listing-management/listing-management-order.html
  7. 4 4
      sa-view/tb-import-order/tb-import-order-list.html
  8. 3 3
      sa-view/tb-order/tb-order-info.html
  9. 3 3
      sa-view/tb-order/tb-order-list.html

+ 2 - 2
sa-view/ht-settlement-error/ht-trade-settlement-order.html
查看文件 

@@ -33,12 +33,12 @@
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td type="index" width="30px"></sa-td>
 
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
 					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 
 					<sa-td name="边民" prop="buyUserName" ></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
-					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
-					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
+					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
 					<sa-td name="上架金额" prop="upPrice" >
 
 					</sa-td>

+ 26 - 4
sa-view/ht-trade-settlement/ht-trade-settlement-list.html
查看文件 

@@ -13,6 +13,11 @@
 
 		<script src="../../static/kj/jquery.min.js"></script>
 
 		<script src="../../static/kj/layer/layer.js"></script>
 
 		<script src="../../static/sa.js"></script>
 
+		<style>
 
+			.el-dialog__body {
 
+				padding: 0 20px 30px 20px
 
+			}
 
+		</style>
 
 	</head>
 
 	<body>
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
@@ -52,9 +57,16 @@
 
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="primary"  @click="getOrder(s.row)">边民订单</el-button>
 
 							<span>
 
-								<el-button v-if="s.row.hzsConfirmStatus===0 &&sa.isAuth('ht-trade-settlement-hzsconfirm')"
 
-										   class="c-btn" type="warning" @click="hzsConfirm(s.row)">互助社确认</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="warning">互助社确认</el-button>
 
+								<el-button v-if="s.row.hzsConfirmStatus===0 &&sa.isAuth('ht-trade-settlement-hzsconfirm')" class="c-btn" type="info" @click="hzsConfirm(s.row)">互助社确认</el-button>
 
+								<el-button v-else :disabled="true" class="c-btn" type="info">互助社确认</el-button>
 
+							</span>
 
+							<span>
 
+								<el-button v-if="sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
 
+								<el-button v-else :disabled="true"                class="c-btn" type="warning">按车订单扣款</el-button>
 
+							</span>
 
+							<span>
 
+								<el-button v-if="sa.isAuth('tb-order-sendCXB001')" class="c-btn" type="warning" @click="ToSendCXB001ByVeNo(s.row)">按车推送结关</el-button>
 
+								<el-button v-else :disabled="true"                 class="c-btn" type="warning">按车推送结关</el-button>
 
 							</span>
 
 						</template>
 
 					</el-table-column>
 
@@ -108,7 +120,17 @@
 
 								this.f5();
 
 							}.bind(this))
 
 						}.bind(this));
 
-					}
 
+					},
 
+					ToDeductionByVeNo(data) {
 
+						let veNo = data.veNo;
 
+						let id = data.id;
 
+						sa.showIframe('按车订单扣款【'+veNo+'】', 'tb-order-deductionByVeNo.html?veNo=' + veNo + '&id='+id, '1660px', '97%');
 
+					},
 
+					ToSendCXB001ByVeNo(data) {
 
+						let veNo = data.veNo;
 
+						let id = data.id;
 
+						sa.showIframe('按车推送结关【'+veNo+'】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo + '&id='+id, '1660px', '97%');
 
+					},
 
 				},
 
 				created: function() {
 
 					this.f5();

+ 2 - 2
sa-view/ht-trade-settlement/ht-trade-settlement-order.html
查看文件 

@@ -45,12 +45,12 @@
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td type="index" width="30px"></sa-td>
 
+					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 
 					<sa-td name="边民" prop="buyUserName"></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
-					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
 					<sa-td name="确认状态" prop="totalPrice">
 
 						<template slot-scope="s">
 
@@ -177,4 +177,4 @@
 
 			})
 
 		</script>
 
 	</body>
 
-</html>
 
+</html>

+ 39 - 3
sa-view/tb-order/tb-order-deductionByVeNo.html → sa-view/ht-trade-settlement/tb-order-deductionByVeNo.html
查看文件 

@@ -13,12 +13,40 @@
 
 		<script src="../../static/kj/jquery.min.js"></script>
 
 		<script src="../../static/kj/layer/layer.js"></script>
 
 		<script src="../../static/sa.js"></script>
 
+		<style>
 
+			hr {
 
+				border: none;          /* 移除默认边框 */
 
+				height: 1px;           /* 设置高度 */
 
+				background-color: gainsboro;/* 设置颜色 */
 
+				margin: 5px 0;        /* 设置上下外边距 */
 
+			}
 
+		</style>
 
 	</head>
 
 	<body>
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 			<div class="c-panel">
 
+				<el-form v-if="bigData">
 
+					<div style="color: red;font-weight: bold">请核对当前进境结算单信息，以下列表为未执行扣款的订单：</div>
 
+					<el-row style="margin-left: 200px;">
 
+						<el-col span="8">
 
+							<sa-info name="车牌号" br>{{bigData.veNo}}</sa-info>
 
+							<sa-info name="预申报编号" br>{{bigData.platSeqNo}}</sa-info>
 
+							<sa-info name="商品名称" br>{{bigData.goodsNames}}</sa-info>
 
+						</el-col>
 
+						<el-col span="8">
 
+							<sa-info name="总毛重(kg)" br>{{bigData.sumGrossWt}}</sa-info>
 
+							<sa-info name="总净重(kg)" br>{{bigData.sumNetWt}}</sa-info>
 
+							<sa-info name="总金额" br>{{bigData.sumAmt}}</sa-info>
 
+						</el-col>
 
+						<el-col span="8">
 
+							<sa-info name="互市区" br>{{bigData.fieldName}}</sa-info>
 
+							<sa-info name="创建时间" br>{{bigData.createTime}}</sa-info>
 
+						</el-col>
 
+					</el-row>
 
+				</el-form>
 
+				<hr>
 
 				<el-form ref="form" @submit.native.prevent>
 
-					<el-button type="success" icon="el-icon-info" @click="deductionByVeNo()">按车补扣款</el-button>
 
+					<el-button type="success" icon="el-icon-info" @click="deductionByVeNo()">按车扣款</el-button>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
@@ -28,7 +56,7 @@
 
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
-					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
+					<sa-td name="总重量" prop="netWt" ></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
 					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
 
 					<sa-td name="订单状态" prop="upStatus" >
 
@@ -70,11 +98,15 @@
 
 				components: {
 
 					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
 
 					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 
 				},
 
 				el: '.vue-box',
 
 				data: {
 
 					veNo: sa.p('veNo', 0),
 
+					id: sa.p('id', 0),
 
+					bigData: [],
 
 					p: { // 查询参数
 
+						id: sa.p('id', 0),
 
 						veNo: sa.p('veNo', 0),	// 车牌号
 
 						pageNo: 1,		// 当前页
 
 						pageSize: 10,	// 页大小
 
@@ -90,7 +122,7 @@
 
 							return;
 
 						}
 
 						sa.confirm('是否执行当前列表订单的扣款操作', function() {
 
-							sa.ajax('/level-one-server/TbOrder/deductionByVeNo?veNo=' + this.veNo, function(res) {
 
+							sa.ajax('/level-one-server/TbOrder/deductionByVeNo?veNo=' + this.veNo + '&id='+this.id, function(res) {
 
 								sa.alert('操作成功', this.clean);
 
 							}.bind(this))
 
 						}.bind(this));
 
@@ -109,6 +141,10 @@
 
 				},
 
 				created: function() {
 
 					this.f5();
 
+					sa.ajax('/level-one-server/HtTradeSettlement/getById', {id : this.id}, function(res) {
 
+						this.bigData = res.data; // 数据
 
+						sa.f5TableHeight();		// 刷新表格高度
 
+					}.bind(this));
 
 					sa.onInputEnter();
 
 				}
 
 			})

+ 38 - 2
sa-view/tb-order/tb-order-sendCXB001ByVeNo.html → sa-view/ht-trade-settlement/tb-order-sendCXB001ByVeNo.html
查看文件 

@@ -13,12 +13,40 @@
 
 		<script src="../../static/kj/jquery.min.js"></script>
 
 		<script src="../../static/kj/layer/layer.js"></script>
 
 		<script src="../../static/sa.js"></script>
 
+		<style>
 
+			hr {
 
+				border: none;          /* 移除默认边框 */
 
+				height: 1px;           /* 设置高度 */
 
+				background-color: gainsboro;/* 设置颜色 */
 
+				margin: 5px 0;        /* 设置上下外边距 */
 
+			}
 
+		</style>
 
 	</head>
 
 	<body>
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 			<div class="c-panel">
 
+				<el-form v-if="bigData">
 
+					<div style="color: red;font-weight: bold">请核对当前进境结算单信息，以下列表为未结关的订单：</div>
 
+					<el-row style="margin-left: 200px;">
 
+						<el-col span="8">
 
+							<sa-info name="车牌号" br>{{bigData.veNo}}</sa-info>
 
+							<sa-info name="预申报编号" br>{{bigData.platSeqNo}}</sa-info>
 
+							<sa-info name="商品名称" br>{{bigData.goodsNames}}</sa-info>
 
+						</el-col>
 
+						<el-col span="8">
 
+							<sa-info name="总毛重(kg)" br>{{bigData.sumGrossWt}}</sa-info>
 
+							<sa-info name="总净重(kg)" br>{{bigData.sumNetWt}}</sa-info>
 
+							<sa-info name="总金额" br>{{bigData.sumAmt}}</sa-info>
 
+						</el-col>
 
+						<el-col span="8">
 
+							<sa-info name="互市区" br>{{bigData.fieldName}}</sa-info>
 
+							<sa-info name="创建时间" br>{{bigData.createTime}}</sa-info>
 
+						</el-col>
 
+					</el-row>
 
+				</el-form>
 
+				<hr>
 
 				<el-form ref="form" @submit.native.prevent>
 
-					<el-button type="success" icon="el-icon-info" @click="sendCXB001ByVeNo()">按车推结关</el-button>
 
+					<el-button type="success" icon="el-icon-info" @click="sendCXB001ByVeNo()">按车推送结关</el-button>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
@@ -28,7 +56,7 @@
 
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
-					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 
+					<sa-td name="总重量" prop="netWt" ></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
 
 					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
 
 					<sa-td name="订单状态" prop="upStatus" >
 
@@ -70,11 +98,14 @@
 
 				components: {
 
 					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
 
 					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 
+					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 
 				},
 
 				el: '.vue-box',
 
 				data: {
 
 					veNo: sa.p('veNo', 0),
 
+					id: sa.p('id', 0),
 
 					p: { // 查询参数
 
+						id: sa.p('id', 0),
 
 						veNo: sa.p('veNo', 0),	// 车牌号
 
 						pageNo: 1,		// 当前页
 
 						pageSize: 10,	// 页大小
 
@@ -82,6 +113,7 @@
 
 					},
 
 					dataCount: 0,
 
 					dataList: [], // 数据集合
 
+					bigData: [],
 
 				},
 
 				methods: {
 
 					sendCXB001ByVeNo() {
 
@@ -109,6 +141,10 @@
 
 				},
 
 				created: function() {
 
 					this.f5();
 
+					sa.ajax('/level-one-server/HtTradeSettlement/getById', {id : this.id}, function(res) {
 
+						this.bigData = res.data; // 数据
 
+						sa.f5TableHeight();		// 刷新表格高度
 
+					}.bind(this));
 
 					sa.onInputEnter();
 
 				}
 
 			})

+ 3 - 3
sa-view/listing-management/listing-management-order.html
查看文件 

@@ -90,12 +90,12 @@
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td type="selection"></sa-td>
 
+					<sa-td name="车牌号" prop="veNo"></sa-td>
 
 					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 
 					<sa-td name="买家" prop="buyUserName"></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
-					<sa-td name="总重量" prop="totalWeight"></sa-td>
 
-					<sa-td name="车牌号" prop="veNo"></sa-td>
 
+					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
 					<sa-td name="上架金额(元)" prop="upPrice"></sa-td>
 
 					<sa-td name="是否上架" prop="upStatus">
 
@@ -351,4 +351,4 @@
 
 			})
 
 		</script>
 
 	</body>
 
-</html>
 
+</html>

+ 4 - 4
sa-view/tb-import-order/tb-import-order-list.html
查看文件 

@@ -33,15 +33,15 @@
 
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
 
 					<!--<sa-td name="申报人身份证号" prop="ciphertextIdno" width="140px"></sa-td>-->
 
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
 
-					<sa-td name="互市区" prop="fieldName" width="120px"></sa-td>
 
+					<sa-td name="互市区" prop="fieldName" width="160px"></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="currCode" ></sa-td>
 
 					<sa-td name="件数" prop="packNo" ></sa-td>
 
 					<sa-td name="运输批次号" prop="manifestId" width="150px"></sa-td>
 
 					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
 
-					<el-table-column label="操作" fixed="right"  width="120px">
 
+					<el-table-column label="操作" fixed="right"  width="80px">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
 						</template>

+ 3 - 3
sa-view/tb-order/tb-order-info.html
查看文件 

@@ -70,7 +70,7 @@
 
 							</tr>
 
 							<tr>
 
 								<th>总重量</th>
 
-								<td>{{m.totalWeight}}</td>
 
+								<td>{{m.netWt}}</td>
 
 								<th>总金额</th>
 
 								<td>{{m.totalPrice}}</td>
 
 							</tr>
 
@@ -97,7 +97,7 @@
 
 				},
 
 				el: '.vue-box',
 
 				data: {
 
-					id: sa.p('id', 0),	// 获取数据ID 
+					id: sa.p('id', 0),	// 获取数据ID
 
 					m: null
 
 				},
 
 				methods: {
 
@@ -111,7 +111,7 @@
 
 					}.bind(this))
 
 				}
 
 			})
 
-			
+
 
 		</script>
 
 	</body>
 
 </html>

+ 3 - 3
sa-view/tb-order/tb-order-list.html
查看文件 

@@ -100,7 +100,7 @@
 
 							<span>
 
 								<el-button v-if="s.row.sxb010Status!=1
 
 												&&s.row.peopleConfirmStatus===1 && s.row.applyConfirmStatus===1
 
-												&&sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="deduction(s.row)">订单扣款</el-button>
 
+												&&sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="deductionHandle(s.row)">订单扣款</el-button>
 
 								<el-button v-else :disabled="true" class="c-btn" type="warning">订单扣款</el-button>
 
 							</span>
 
 							<span>
 
@@ -225,7 +225,7 @@
 
 						}.bind(this));
 
 					},
 
 
-					deduction(data) {
 
+					deductionHandle(data) {
 
 						sa.confirm('是否执行订单扣款操作', function() {
 
 							sa.ajax('/level-one-server/TbOrder/deduction?id=' + data.id, function(res) {
 
 								sa.ok('操作成功');
 
@@ -341,4 +341,4 @@
 
 			})
 
 		</script>
 
 	</body>
 
-</html>
 
+</html>