Browse Source

优化订单列表展示

xian 4 years ago
parent
commit
ddf7e9b0ea

+ 12 - 10
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -6,10 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <!-- 新增需求引入js、css -->
+    <link href="${path}/common/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
@@ -59,12 +61,12 @@
     <title>客诉基本信息</title>
 </head>
 <body>
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i>
+<#--<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i>
     <a class="btn radius r"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
-</nav>
+</nav>-->
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div class="row cl">
@@ -74,7 +76,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">跟进客服:</th>
@@ -110,7 +112,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">微信昵称:</th>
@@ -133,7 +135,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">开箱损:</th>
@@ -163,7 +165,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
                 <tr>
                     <th width="10">所在省份:</th>
@@ -187,7 +189,7 @@
             <div class="formControls col-9">
             </div>
         </div>-->
-        <table class="table table-border table-bg table-bordered"   id="tableHtml" style="margin-top: 15px;">
+        <table class="table table-bordered"   id="tableHtml" style="margin-top: 15px;">
             <thead>
             <tr>
                 <th>销售</th>
@@ -281,7 +283,7 @@
             <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if> style="display: none;">
                 <span id="postage" style="color: red"></span>
                 <div id="postageInformation">
-                    <table class="table table-border table-bg table-bordered" >
+                    <table class="table table-bordered" >
                         <thead>
                         <tr>
                             <th>邮费id</th>
@@ -320,7 +322,7 @@
                 </div>
             </div>
             <div <#if procMethod.procMethodIsSend == 1>class="tabCon"</#if>style="display: none;">
-                   <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+                   <table class="table table-bordered" style="margin-top: 10px;">
                        <thead>
                            <tr>
                                <th width="20">订单编号</th>

File diff suppressed because it is too large
+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl


+ 15 - 7
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/customer_signclosed_list.ftl

@@ -3,7 +3,9 @@
 <head>
     <meta charset="UTF-8">
     <title></title>
-<#include "/base/list_base.ftl">
+    <#include "/base/list_base.ftl">
+    <!-- 新增需求引入js、css -->
+    <link href="${path}/common/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
@@ -41,11 +43,11 @@
     </style>
 </head>
 <body>
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+<#--<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">/</span> RST管理
     <span class="c-gray en">/</span> 待联系寄回信息列表
     <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
-</nav>
+</nav>-->
 <div class="page-container">
     <div class="text-c">
         <form name="form1" action="${path}/admin/signclosed/select_signclosed_list" method="post">
@@ -55,11 +57,11 @@
             <input class="my-input" style="width: 120px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
             <input class="my-input" style="width: 120px;" type="hidden" name="isBinding" value="${isBinding!}"/>
 
-            <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
+            <button style="cursor:pointer;margin-bottom: 10px" type="submit" class="btn">搜索</button>
         </form>
     </div>
     <div class="mt-20">
-        <table class="table table-border table-bordered table-bg table-hover table-sort">
+        <table class="table table-bordered table-hover table-sort">
             <thead>
             <tr class="text-c">
                 <th width="100">客诉编号</th>
@@ -95,9 +97,15 @@
                             <#if (signclosed.signclosedProductInfoList?size > 0)>
                                 <#list signclosed.signclosedProductInfoList as info>
                                     <#if info.signclosedProductType == 1 >
-                                        <span class="label label-success radius" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                        <span class="label label-success radius" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''}) x ${info.productNum!''}">
+                                            ${info.productName!''}(${info.colorName!''}) X ${info.productNum!''}
+                                        </span>
+                                        <br>
                                     <#else >
-                                        <span class="label label-success radius" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                        <span class="label label-success radius" title="${info.productName!''} x ${info.productNum!''}">${info.productName!''} x ${info.productNum!''}>
+                                            ${info.productName!''} x ${info.productNum!''}
+                                        </span>
+                                        <br>
                                     </#if>
                                 </#list>
                             <#else >

+ 42 - 74
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -7,6 +7,8 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
     <meta http-equiv="Cache-Control" content="no-siteapp"/>
     <#include "/base/add_base.ftl">
+    <!-- 新增需求引入js、css -->
+    <link href="${path}/common/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
@@ -16,8 +18,8 @@
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
         .ac_results li {border:1px solid #fff}
         .ac_results li a span {float:right}
-        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        /*.select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}*/
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
@@ -33,13 +35,12 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .msg-phone{height: 35px;line-height: 35px;}
         .col-sm-1{width: 150px;}
-
         .all_down{text-decoration: underline;color: #f00;}
     </style>
     <title>添加订单 - 订单管理 - RST</title>
 </head>
 <body>
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+<nav style="margin-bottom: 0px;padding: 0px 0px 0px 20px;" class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">/</span> 订单管理
     <span class="c-gray en">/</span> 添加订单
     <a class="btn radius r"
@@ -47,7 +48,7 @@
     <a class="btn radius r"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
-<article class="page-container" style="padding: 10px;">
+<article class="page-container" style="padding: 10px;padding-top: 0px;">
     <div class="pd-20 cl">
         <form action="${path}/admin/salesOrder/add_salesOrder" method="post" class="form form-horizontal" id="form-order-add"  onkeydown="if(event.keyCode==13)return false;">
 
@@ -62,28 +63,26 @@
             <div class="row cl" style="">
                 <label class="form-label col-1 col-sm-1">订单类型:</label>
                 <div class="formControls col-2 col-sm-2" style="">
-                    <span class="select-box">
-                        <select class="select" id="salesOrderStatus" name="salesOrderStatus" >
-                            <option value="1" >正常订单</option>
-                            <#if admin.adminDept == 3 || admin.adminDept == 1><option value="2" >售后订单</option></#if>
-                        </select>
-				    </span>
+                    <select class="select" style="height: 31px;" id="salesOrderStatus" name="salesOrderStatus" >
+                        <option value="1" >正常订单</option>
+                        <#if admin.adminDept == 3 || admin.adminDept == 1><option value="2" >售后订单</option></#if>
+                    </select>
                 </div>
             </div>
             <div class="row cl" id="salesCustomer" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-2 col-sm-2" style="margin-left: 11.3%;width: 100%;color: #c00;">
+                <div class="formControls col-2 col-sm-2" style="margin-left: 9.6%;width: 100%;color: #c00;">
                     <div class="formControls col-1 col-sm-1" id="selectCustomer" style="display: none;">
                         <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn" onclick="add_customer()" value="选择客诉">
                     </div>
-                    <span id="salesCustomerIdHtml"></span>
+                    <span style="margin-left: 10px;" id="salesCustomerIdHtml"></span>
                     <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="">
                 </div>
 
                 <div class="row cl" id="" style="">
                     <label class="form-label col-1 col-sm-1"></label>
                     <div class="formControls col-7 col-sm-7">
-                        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;margin-left: 14px;display: none;" id="all_detect_product">
+                        <table class="table table-bg table-bordered" style="margin-top: 10px;margin-left: 14px;display: none;" id="all_detect_product">
                             <thead>
                                 <tr class="text-c">
                                     <th style="text-align: center;" width="30" >请选择要发货的机器</th>
@@ -104,75 +103,46 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">选填:</label>
                 <div class="formControls col-2 col-sm-2" style="">
-                    <input type="text" class="input-text trim_input" value=""  placeholder="填写交易号,可不填" id="salesDealCode" name="salesDealCode">
+                    <input type="text" style="height: 31px" class="input-text trim_input" placeholder="填写交易号,可不填" id="salesDealCode" name="salesDealCode">
                 </div>
                 <div class="formControls col-2 col-sm-2" style="">
-                    <input type="text" class="input-text trim_input" value="" placeholder="填写批次编号,可不填" id="salesBatchId" name="salesBatchId">
+                    <input type="text" style="height: 31px" class="input-text trim_input" placeholder="填写批次编号,可不填" id="salesBatchId" name="salesBatchId">
                 </div>
             </div>
 
                 <div class="row cl sales_channel" id="" style="">
                     <label class="form-label col-1 col-sm-1">销售渠道:</label>
                     <div class="formControls col-2 col-sm-2" style="">
-                    <span class="select-box">
-                        <select class="select init_company" name="salesCompanyId" id="salesCompanyId" defValue="">
-                        </select>
-				    </span>
+                        <select style="height: 31px" class="select init_company" name="salesCompanyId" id="salesCompanyId" defValue=""></select>
                     </div>
-                    <#--<div class="formControls col-2 col-sm-2">
-                        <span class="select-box">
-                            <select class="chosen init_store"  name="salesStoreId"  id="store_1">
-                            </select>
-                        </span>
-                    </div>-->
                     <div class="formControls col-2 col-sm-2" style="margin-top: 4px;">
-
-                        <select id="salesStoreId" name="salesStoreId" class="chosen">
-
-                        </select>
-
+                        <select style="height: 31px" id="salesStoreId" name="salesStoreId" class="chosen"></select>
                     </div>
-                    <#--<div class="formControls col-2 col-sm-2">
-                        <input id="store_1" name="maktMaktx" class="input-text" list="datalist_1" value="" placeholder="输入店铺关键字或双击" datatype="*1-20"  />
-                            <datalist class="select init_store" id="datalist_1">
-
-                            </datalist>
-                            <input type="hidden" id="salesStoreId" name="salesStoreId">
-                    </div>-->
                 </div>
 
             <div class="row cl" id="" style="">
                 <label class="form-label col-1 col-sm-1">用户信息:</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="salesAddressName" name="salesAddressName" datatype="*1-16" errormsg="联系人格式不正确!" >
+                    <input style="height: 31px" type="text" class="input-text" value="" placeholder="填写收件人姓名" id="salesAddressName" name="salesAddressName" datatype="*1-16" errormsg="联系人格式不正确!" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="salesAddressTel" name="salesAddressTel" datatype="*1-20" errormsg="联系人电话格式不正确!">
+                    <input style="height: 31px" type="text" class="input-text" value="" placeholder="填写收件人手机号" id="salesAddressTel" name="salesAddressTel" datatype="*1-20" errormsg="联系人电话格式不正确!">
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="收件人邮政编码" id="salesAddressPostcode" name="salesAddressPostcode" datatype="*1-6" errormsg="收件人邮政编码格式不正确!">
+                    <input style="height: 31px" type="text" class="input-text" value="" placeholder="收件人邮政编码" id="salesAddressPostcode" name="salesAddressPostcode" datatype="*1-6" errormsg="收件人邮政编码格式不正确!">
                 </div>
             </div>
 
           <div class="row cl address_info" id="" style="">
                 <label class="form-label col-1 col-sm-1">地址信息:</label>
                 <div class="formControls col-2 col-sm-2" >
-                    <span class="select-box">
-                        <select class="select init_province" id="addressProvince"  >
-                        </select>
-				    </span>
+                    <select style="height: 31px" class="select init_province" id="addressProvince"></select>
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                        <select  class="select init_city" id="addressCity"   >
-                        </select>
-                    </span>
+                    <select style="height: 31px" class="select init_city" id="addressCity"></select>
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                        <select  class="select init_country" id="addressCountry" >
-                        </select>
-				    </span>
+                    <select style="height: 31px" class="select init_country" id="addressCountry" ></select>
                 </div>
             </div>
 
@@ -192,19 +162,17 @@
             <div class="row cl" id="" style="">
                 <label class="form-label col-1 col-sm-1">支付时间:</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" placeholder="购买日期" id="salesPayTime"  name="payTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '%y-%M-%d'})"  readonly="readonly">
+                    <input style="height: 31px" type="text" placeholder="购买日期" id="salesPayTime"  name="payTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '%y-%M-%d'})"  readonly="readonly">
                 </div>
                 <label class="form-label col-2 col-sm-2">支付方式:</label>
                 <div class="formControls col-2 col-sm-2" style="">
-                    <span class="select-box">
-                        <select class="select" id="salesPayType" name="salesPayType">
-                            <#--1:微信支付 2:现金支付3:已支付定金¥99 4:刷卡支付 5:支付宝支付-->
-                            <option value="1">微信支付</option>
-                            <option value="2">现金支付</option>
-                            <option value="4">刷卡支付</option>
-                            <option value="5">支付宝支付</option>
-                        </select>
-				    </span>
+                    <select style="height: 31px" class="select" id="salesPayType" name="salesPayType">
+                        <#--1:微信支付 2:现金支付3:已支付定金¥99 4:刷卡支付 5:支付宝支付-->
+                        <option value="1">微信支付</option>
+                        <option value="2">现金支付</option>
+                        <option value="4">刷卡支付</option>
+                        <option value="5">支付宝支付</option>
+                    </select>
                 </div>
             </div>
 
@@ -221,7 +189,7 @@
                 <label class="form-label col-1 col-sm-1">产品信息:</label>
                 <div class="formControls col-10 col-sm-10">
                     <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn add-order-button" onclick="add_product()" value="添加产品" >
-                    <table class="table table-border table-bordered table-bg table-hover table-sort" style="margin-top: 10px;display: none" id="all_add_product">
+                    <table class="table table-bordered table-bg table-hover table-sort" style="margin-top: 10px;display: none" id="all_add_product">
                         <thead>
                             <tr class="text-c" id="table1">
                                 <th style="text-align: center;" width="40" >产品名称</th>
@@ -250,28 +218,28 @@
             <div class="row cl" id="" style="">
                 <label class="form-label col-1 col-sm-1" style="display: none">总金额:</label>
                 <div class="formControls col-2 col-sm-2" style="display: none">
-                    <input type="text" class="input-text" value="" placeholder="总金额" datatype="*" errormsg="必须要输入总金额!" id="salesAmountTest" name="salesAmountTest"  >
+                    <input style="height: 31px" type="text" class="input-text" value="" placeholder="总金额" datatype="*" errormsg="必须要输入总金额!" id="salesAmountTest" name="salesAmountTest"  >
                 </div>
                 <label class="form-label col-2 col-sm-2">实付金额:</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="0" placeholder="实付金额" datatype="*" errormsg="必须要输入实付金额!" id="salesPayMoneyTest" name="salesPayMoneyTest"  >
+                    <input style="height: 31px" type="text" class="input-text" value="0" placeholder="实付金额" datatype="*" errormsg="必须要输入实付金额!" id="salesPayMoneyTest" name="salesPayMoneyTest"  >
                 </div>
                 <div class="formControls col-2 col-sm-2" style="display: none">
-                    <input type="text" class="input-text" value="0" placeholder="优惠金额" datatype="*" errormsg="必须要输入优惠金额!" id="salesDiscountMoneyTest" name="salesDiscountMoneyTest"  >
+                    <input style="height: 31px" type="text" class="input-text" value="0" placeholder="优惠金额" datatype="*" errormsg="必须要输入优惠金额!" id="salesDiscountMoneyTest" name="salesDiscountMoneyTest"  >
                 </div>
 
                 <div class="formControls col-1 col-sm-1">
-                    <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn add-order-button" onclick="calculatePrice()" value="计算产品总价" >
+                    <input style="color: #32a3d8;border: 1px solid #32a3d8;height: 31px" type="button" class="btn add-order-button" onclick="calculatePrice()" value="计算产品总价" >
                 </div>
 
                 <div class="formControls col-1 col-sm-1">
-                    <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn add-order-button" onclick="sharePrice()" value="分摊实付金额" >
+                    <input style="color: #32a3d8;border: 1px solid #32a3d8;height: 31px" type="button" class="btn add-order-button" onclick="sharePrice()" value="分摊实付金额" >
                 </div>
             </div>
 
-            <input type="hidden" class="input-text" value="0" placeholder="待付金额" id="salesWaitMoneyTest" name="salesWaitMoneyTest"  >
-            <input type="hidden" class="input-text" value="0" placeholder="本次支付金额" id="salesLastMoneyTest" name="salesLastMoneyTest"  >
-            <input type="hidden" class="input-text" value="0" placeholder="邮费" id="salesShippingFeeTest" name="salesShippingFeeTest"  >
+            <input style="height: 31px" type="hidden" class="input-text" value="0" placeholder="待付金额" id="salesWaitMoneyTest" name="salesWaitMoneyTest"  >
+            <input style="height: 31px" type="hidden" class="input-text" value="0" placeholder="本次支付金额" id="salesLastMoneyTest" name="salesLastMoneyTest"  >
+            <input style="height: 31px" type="hidden" class="input-text" value="0" placeholder="邮费" id="salesShippingFeeTest" name="salesShippingFeeTest"  >
 
             <input type="hidden"  id="salesAmount" name="salesAmount" value="0" >
             <input type="hidden"  id="salesPayMoney" name="salesPayMoney" value="0" >
@@ -281,7 +249,7 @@
             <input type="hidden"  id="salesShippingFee" name="salesShippingFee"  value="0">
 
             <input type="hidden"  id="salesWarrantyStatus" name="salesWarrantyStatus" title="没有售后"  value="0">
-            <span style="color: #dd0000;margin-left: 190px;margin-top: 20px;"><strong>请认真填写实付金额,如果不知道实际销售价格,请联系业务员获取</strong></span>
+            <span style="color: #dd0000;margin-left: 16.8%;margin-top: 20px;"><strong>请认真填写实付金额,如果不知道实际销售价格,请联系业务员获取</strong></span>
             <div class="row cl">
                 <label class="form-label col-3">
                     <div class="tit-2">备注信息</div>
@@ -307,7 +275,7 @@
             </div>
 
             <div class="row cl">
-                <div class="col-2 col-sm-2 col-offset-3">
+                <div class="col-2 col-sm-2 col-offset-3" style="margin-left: 11%;">
                     <button class="btn btn-block btn-primary size-XL" type="submit" >确认录入</button>
                 </div>
             </div>

+ 13 - 11
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -6,10 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
     <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
+    <!-- 新增需求引入js、css -->
+    <link href="${path}/common/lib/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
@@ -52,7 +54,7 @@
     <title>订单详细信息</title>
 </head>
 <body>
-
+<#--
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">/</span> 订单管理
     <span class="c-gray en">/</span> 订单详细信息
@@ -60,7 +62,7 @@
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
-</nav>
+</nav>-->
 
 
 <article class="cl pd-20">
@@ -72,7 +74,7 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">订单编号:</th>
@@ -146,7 +148,7 @@
             </div>
         </div>
             <#--<label class="form-label col-2 col-sm-2">购买产品信息:</label>-->
-                <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+                <table class="table table-bordered" style="margin-top: 10px;">
                     <tr class="text-c">
                         <th>产品名称</th>
                         <th>产品颜色</th>
@@ -188,7 +190,7 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">收货人姓名:</th>
@@ -216,7 +218,7 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <th width="10">发货仓库:</th>
@@ -276,7 +278,7 @@
             </div>
         </div>
 
-        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <table class="table table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
                 <td>${order.salesAdminRemark!'暂无后台信息'}</td>
@@ -294,7 +296,7 @@
                 </div>
             </div>
 
-            <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <table class="table table-bordered" style="margin-top: 10px;">
                 <tr class="text-c">
                     <th>更正人</th>
                     <th>类型</th>
@@ -347,7 +349,7 @@
                 </div>
             </div>
 
-            <table class="table table-border table-bg table-bordered" >
+            <table class="table table-bordered" >
                 <thead>
                 <tr>
                     <th>维修编号</th>
@@ -470,7 +472,7 @@
                 </div>
             </div>
 
-            <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <table class="table table-bordered" style="margin-top: 10px;">
                 <tr class="text-c">
                     <th>操作人</th>
                     <th>操作时间</th>

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -47,9 +47,9 @@
     <div  id="form-download">
 
         <div style="position: relative;float: left;display: block;width: 9%;height: 30px;" id="addOrderDiv" >
-            <button type="button" style="height: 30px;top: 0px;cursor:pointer;" class="my-btn-search my-order" id="addOrderType" >&nbsp;录入订单</button>
-            <button type="button" style="height: 30px;top: 30px;display: none;cursor:pointer;" class="my-btn-search my-order" id="addOrderManual" onclick="toAddOrderManual();">&nbsp;手动录入</button>
-            <button type="button" style="height: 30px;top: 60px;display: none;cursor:pointer;" class="my-btn-search my-order" id="addOrderExcel" onclick="upFiles();">Excel导入</button>
+            <button type="button" style="width: 80%;height: 30px;top: 0px;cursor:pointer;" class="my-btn-search my-order btn" id="addOrderType" >&nbsp;录入订单</button>
+            <button type="button" style="width: 80%;height: 30px;top: 30px;display: none;cursor:pointer;" class="my-btn-search my-order btn" id="addOrderManual" onclick="toAddOrderManual();">&nbsp;手动录入</button>
+            <button type="button" style="width: 80%;height: 30px;top: 60px;display: none;cursor:pointer;" class="my-btn-search my-order btn" id="addOrderExcel" onclick="upFiles();">Excel导入</button>
         </div>
 
         <form action="${path}/admin/salesOrder/list_order_page" method="post" style="margin-left: 9%;text-align: left;">