|
|
@@ -1,41 +1,65 @@
|
|
|
<!DOCTYPE html>
|
|
|
<html>
|
|
|
<head>
|
|
|
-
|
|
|
<title>收付款管理</title>
|
|
|
#parse("sys/header.html")
|
|
|
|
|
|
-
|
|
|
- <style>
|
|
|
-
|
|
|
+ <style type="text/css">
|
|
|
+ #saomiao{
|
|
|
+ padding-right: 30px;
|
|
|
+ }
|
|
|
+ #saomiao input{
|
|
|
+ margin-top:20px;
|
|
|
+ height: 70px;
|
|
|
+ width: 100%;
|
|
|
+ border: 3px solid #62e2f5
|
|
|
+ }
|
|
|
+ .goods-button{
|
|
|
+ border: #e5a032;
|
|
|
+ background-color: #e5a032;
|
|
|
+ font-size: 1.3em;
|
|
|
+ margin-left: 20px;
|
|
|
+ }
|
|
|
</style>
|
|
|
<link rel="stylesheet" href="${rc.contextPath}/statics/plugins/jqgrid/ui.jqgrid-bootstrap.css">
|
|
|
+ <!--<link rel="stylesheet" href="${rc.contextPath}/statics/css/sale.css">-->
|
|
|
</head>
|
|
|
<body>
|
|
|
-
|
|
|
-
|
|
|
<div id="rrapp" v-cloak>
|
|
|
- <div v-show="showList">
|
|
|
- <Row :gutter="16">
|
|
|
- <ul class="nav navbar-top-links navbar-right">
|
|
|
- <li >
|
|
|
- <span> 门店：{{storeName}}</span>
|
|
|
- </li>
|
|
|
- <li><span><i class="fa fa-user-circle" ></i> 收银员：{{sysUserInfo.username}}</span></li>
|
|
|
- <li><a @click="logout"><i class="fa fa fa-sign-out"></i> 退出</a></li>
|
|
|
- </ul>
|
|
|
- </Row>
|
|
|
- </div>
|
|
|
|
|
|
- <div class="container-fluid">
|
|
|
+ <header class="main-header">
|
|
|
+ <div class="container-fluid">
|
|
|
+ <div class="row" style="border:0;margin-bottom:10px">
|
|
|
+ <div class="col-md-3 logodiv">
|
|
|
+ <!--center-block-->
|
|
|
+ <img src="${rc.contextPath}/statics/img/logotest2.jpg" class="img-rounded img-responsive" style="height: 70px;">
|
|
|
+ </div>
|
|
|
+ <div class="col-md-9" style="background-color: #f0f0f0;margin:0px;padding: 0px" >
|
|
|
+ <div v-show="showList">
|
|
|
+ <Row :gutter="16">
|
|
|
+ <ul class="nav navbar-top-links navbar-right" style="font-size: 1.3em;">
|
|
|
+ <li >
|
|
|
+ <span style="margin-right: 40px"> 门店：<b>{{storeName}}</b></span>
|
|
|
+ </li>
|
|
|
+ <li><span style="margin-right: 35px"><i class="fa fa-user-circle" ></i> 收银员：<b>{{sysUserInfo.username}}</b></span></li>
|
|
|
+ <li><a @click="logout" style="font-size: 1em"><i class="fa fa fa-sign-out"></i> 退出</a></li>
|
|
|
+ </ul>
|
|
|
+ </Row>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </header>
|
|
|
+
|
|
|
+ <div class="container-fluid" style="margin-top: 15px">
|
|
|
<div id="content" class="row-fluid">
|
|
|
<div class="col-md-3">
|
|
|
<ul class="list-unstyled">
|
|
|
<li >
|
|
|
- <i-input v-model="prodBarcode" @on-enter="query" placeholder="输入或扫码商品条形码"/>
|
|
|
+ <i-input v-model="prodBarcode" @on-enter="query" placeholder="输入或扫码商品条形码" id="saomiao" />
|
|
|
</li>
|
|
|
- <li style="margin-top: 50px;">
|
|
|
- <div v-show="goodsDetail">
|
|
|
+ <li style="margin-top: 50px;" >
|
|
|
+ <div v-show="goodsDetail" style="font-size: 1.2em">
|
|
|
<img style="height: 400px;width: 400px;" :src="goods.primaryPicUrl" class="img-rounded"/>
|
|
|
<h3 style="margin: 8px;">{{goods.name}}</h3>
|
|
|
<p style="margin: 8px;">单价： {{goods.retailPrice}}</p>
|
|
|
@@ -48,21 +72,23 @@
|
|
|
</div>
|
|
|
</li>
|
|
|
</ul>
|
|
|
-
|
|
|
</div>
|
|
|
- <div class="col-md-6">
|
|
|
+ <div class="col-md-6" style="padding: 0px;padding-bottom: 10%;background-color: #f0f0f0">
|
|
|
<ul class="list-unstyled">
|
|
|
- <li style="height: 500px;">
|
|
|
+ <!--<li style="height: 500px;border:1px solid #F5DCB3">-->
|
|
|
+ <li style="height: 600px">
|
|
|
<table id="cbec" class="table .table-striped">
|
|
|
- <tr style="border: white;background-color: orange">
|
|
|
- <th>跨境商品名称</th>
|
|
|
- <th>规格</th>
|
|
|
+ <!--<tr style="border: white;background-color: orange">-->
|
|
|
+ <!--#E5BB71 #F5DCB3 #FB554E #FFA498-->
|
|
|
+ <tr style="border: white;background-color: #F5DCB3;font-size: 1.3em" >
|
|
|
+ <th style="width: 371px">跨境商品名称</th>
|
|
|
+ <th >规格</th>
|
|
|
<th>单价</th>
|
|
|
<!--<th>税费</th>-->
|
|
|
<th>数量</th>
|
|
|
<th>操作</th>
|
|
|
</tr>
|
|
|
- <tr v-for="(item,i) in goodsList" v-if="item.name">
|
|
|
+ <tr v-for="(item,i) in goodsList" v-if="item.name" style="font-size: 1.3em">
|
|
|
<td><h3>{{item.name}}</h3></td>
|
|
|
<td> {{item.specification}}</td>
|
|
|
<td> {{item.retailPrice}}</td>
|
|
|
@@ -76,7 +102,6 @@
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
-
|
|
|
</li>
|
|
|
<!--<li style="height: 300px;">
|
|
|
<table id="general" class="table .table-striped">
|
|
|
@@ -85,15 +110,13 @@
|
|
|
<th>规格</th>
|
|
|
<th>单价</th>
|
|
|
<th>数量</th>
|
|
|
- <th>操作</th>
|
|
|
+ <th>操作</th>getStoresByMerch
|
|
|
</tr>
|
|
|
-
|
|
|
</table>
|
|
|
</li>-->
|
|
|
-
|
|
|
<li style="height: 100px;">
|
|
|
- <i-button type="warning" @click="clearGoodsList"><i class="fa fa-pencil-square-o"></i> 清空商品列表</i-button>
|
|
|
- <i-button data-toggle="modal" @click="toOrderSubmit" type="warning" ><i class="fa fa-pencil-square-o"></i> 提交订单</i-button>
|
|
|
+ <i-button type="warning" @click="clearGoodsList" class="goods-button"><i class="fa fa-pencil-square-o"></i> 清空商品列表</i-button>
|
|
|
+ <i-button data-toggle="modal" @click="toOrderSubmit" type="warning" class="goods-button" ><i class="fa fa-pencil-square-o"></i> 提交订单</i-button>
|
|
|
|
|
|
<div class="modal fade" id="myModal" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
|
|
<div class="modal-dialog">
|
|
|
@@ -106,11 +129,11 @@
|
|
|
<form>
|
|
|
<div class="form-group">
|
|
|
<label for="customName" class="control-label">姓名:</label>
|
|
|
- <input type="text" class="form-control" v-bind:value="customname" ref="customName" id="customName">
|
|
|
+ <input type="text" class="form-control" ref="customName" id="customName">
|
|
|
</div>
|
|
|
<div class="form-group">
|
|
|
<label for="customIDCard" class="control-label">身份证:</label>
|
|
|
- <input type="text" class="form-control" v-bind:value="customidcard" ref="customIDCard" id="customIDCard" />
|
|
|
+ <input type="text" class="form-control" ref="customIDCard" id="customIDCard" />
|
|
|
</div>
|
|
|
<div class="form-group">
|
|
|
<label for="customPhone" class="control-label">手机号:</label>
|
|
|
@@ -138,7 +161,6 @@
|
|
|
<div class="modal-body">
|
|
|
<form>
|
|
|
<div class="form-group">
|
|
|
-<!-- <input type="text" class="form-control" ref="payCode" id="payCode" />-->
|
|
|
<i-input id="payCode" @on-enter="submitOrder" ref="payCode" placeholder="请输入付款码"/>
|
|
|
</div>
|
|
|
|
|
|
@@ -152,14 +174,16 @@
|
|
|
</div>
|
|
|
</li>
|
|
|
</ul>
|
|
|
+
|
|
|
+
|
|
|
</div>
|
|
|
<div class="col-md-3">
|
|
|
- <h2 class="text-center">取货码</h2>
|
|
|
- <div class="row" >
|
|
|
+ <h2 class="text-center" style="border: white;background-color: #F5DCB3;padding: 8px" >取货码</h2><br/>
|
|
|
+ <div class="row" style="border: white;background-color: #f0f0f0">
|
|
|
<div class="col-xs-4 col-sm-4" v-for="(item,i) in pickUpCodeList" style="margin-bottom: 8px;">
|
|
|
- <i-button data-toggle="modal" data-target="#orderDetail" type="warning" @click="queryOrderDetail(item.orderSn)" v-if="item.pickUpCodeStatus == 0" ><i class="fa fa-pencil-square-o"></i> {{item.pickUpCodeSn}}</i-button>
|
|
|
- <i-button data-toggle="modal" data-target="#orderDetail" type="info" @click="queryOrderDetail(item.orderSn)" v-if="item.pickUpCodeStatus == 1" ><i class="fa fa-pencil-square-o"></i> {{item.pickUpCodeSn}}</i-button>
|
|
|
- <i-button data-toggle="modal" data-target="#orderDetail" type="success" @click="queryOrderDetail(item.orderSn)" v-if="item.pickUpCodeStatus == 2" ><i class="fa fa-pencil-square-o"></i> {{item.pickUpCodeSn}}</i-button>
|
|
|
+ <i-button data-toggle="modal" data-target="#orderDetail" style="width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn)" v-if="item.pickUpCodeStatus == 0" > {{item.pickUpCodeSn}}</i-button>
|
|
|
+ <i-button data-toggle="modal" data-target="#orderDetail" style="background-color:#83e7b4;width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn)" v-if="item.pickUpCodeStatus == 1" >{{item.pickUpCodeSn}}</i-button>
|
|
|
+ <i-button data-toggle="modal" data-target="#orderDetail" style="background-color:#808080;width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn)" v-if="item.pickUpCodeStatus == 2" >{{item.pickUpCodeSn}}</i-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -244,11 +268,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
</div>
|
|
|
-
|
|
|
<script src="${rc.contextPath}/js/sale/sale.js?_${date.systemTime}"></script>
|
|
|
<script src="https://cdn.staticfile.org/jquery/2.1.1/jquery.min.js"></script>
|
|
|
<script src="${rc.contextPath}/statics/libs/bootstrap.min.js"></script>
|
hhq
