Browse Source

客诉样式

qihanjiao 6 years ago
parent
commit
d92c13212a

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/base/page_util.ftl

@@ -84,7 +84,7 @@
     	</span>
 
             <span class="btn" style="cursor: default;">共<a class="active">${page.pages}</a>页</span>
-            <span class="btn" style="cursor: default;">到<a class="active" style="max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${page.pageNo}" class="input-text radius" style="width: 36px;height:22px;text-align: center;" maxlength="3"/></a>页</span>
+            <span class="btn" style="cursor: default;">到<a class="active" style="margin: 0 10px; max-height: 36px;min-height: 34px"><input type="text" id="pageCode" value="${page.pageNo}" class="input-text radius" style="width: 36px;height:22px;text-align: center;" maxlength="3"/></a>页</span>
             <span class="btn btn-lowblue radius"><a href="javascript:_go();" class="active">确定</a></span>
             <a href="#" style="overflow:hidden" class="active"></a>
         </div>

+ 9 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -20,7 +20,15 @@
         .my-textarea{padding: 5px 10px;width: 77%;border:1px solid rgba(0,0,0,.1);margin-left: 12.5%;}
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
+        .my-select {
+            border: 1px solid rgba(0,0,0,.1);
+            padding: 6px 50px 6px 15px;
+            height: 34px;
+            -webkit-appearance: none;
+            appearance: none;
+            background: url(/common/images/pts/select-11.png) right center no-repeat;
+            background-size: auto 100%;
+        }
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .huanhang{ float:left}

+ 20 - 14
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -8,10 +8,16 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);
+            padding: 6px 20px 6px 15px;
+            height: 34px;
+            -webkit-appearance: none;
+            appearance: none;
+            background: url(${path}/common/images/pts/select-11.png) right center no-repeat;
+            background-size: auto 100%;}
+        .my-btn-search{border: 1px solid #50a2ea;padding: 1px 25px;background-color: #fff;color: #50a2ea;height: 32px;}
         .barcodeImg{margin:10px 0px}
-        .table-bg thead th{background-color: #e2f6ff;}
+        .table-bg thead th{background-color: #f7fafd;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .txt2{
@@ -54,16 +60,16 @@
         .yulia-name .before{position: absolute;left: 0;width: 3cm;height: 0;border: 0.0625rem solid #000;top: 0.5625rem;}
         .yulia-name .after{position: absolute;right: 0;width: 3cm;height: 0.125rem;border: 0.0625rem solid #000;top: 0.5625rem;}
         .table2 {margin:1cm 0 0.7cm 1cm;width: 19cm;border: 0.0625rem solid #000;border-collapse: collapse;text-align: left;}
-        .table2 th{font-size: 0.875rem;font-weight: 500;}
+        .table2 th{font-size: 0.875rem;font-weight: 500;background: #f7fafd;}
         .table2 thead tr th,
         .table2 tbody tr td {font-size: 0.75rem;padding:0.5rem 0;text-indent: 1.2rem; color: #333;border: 0.0625rem solid #000;border-collapse: collapse;background-color: #fff;height: 1.2cm;}
     </style>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> RST管理
-    <span class="c-gray en">&gt;</span> 维修列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <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>
 <div class="page-container">
     <div class="text-c">
@@ -149,7 +155,7 @@
                     <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>
-                            待检测机器
+                            <span class="c-red">待检测机器</span>
                         </#if>
                         <#if detect.detectState == 30>
                             待用户确认
@@ -158,10 +164,10 @@
                             用户同意维修(待维修)
                         </#if>
                         <#if detect.detectState == 32>
-                            维修完成
+                            <span class="c-success">维修完成</span>
                         </#if>
                         <#if detect.detectState == 33>
-                            用户不维修(原机退回)
+                            <span class="c-success">用户不维修(原机退回)</span>
                         </#if>
                         <#if detect.detectState == 34>
                             待客服确认维修
@@ -170,7 +176,7 @@
                             客服确认维修,(待维修)
                         </#if>
                         <#if detect.detectState == 36>
-                            维修完成
+                            <span class="c-success">维修完成</span>
                         </#if>
                         <#if detect.detectState == 37>
                             机器无故障,原机退回
@@ -188,7 +194,7 @@
                             不能翻新,待报废
                         </#if>
                         <#if detect.detectState == 23>
-                            已报废回收
+                            <span class="c-success">已报废回收</span>
                         </#if>
                     </td>
                     <td class="text-c" width="100">
@@ -219,7 +225,7 @@
                     <td class="text-c" width="100"><div  title="${detect.detectNalysis!}">${detect.detectNalysis!'-'}</div></td>
                     <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
                     <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>
-                    <td class="text-c" width="100"><span class="label txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #4149FF;">查看详情</a></#if></#if></td>
+                    <td class="text-c" width="100"><span class="label txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if></td>
                     <td class="text-c" width="100">${detect.detectDesc!'-'}</td>
                     <td class="text-c" width="100">${detect.detectCustomerDesc!'-'}</td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
@@ -234,7 +240,7 @@
                             <i class="Hui-iconfont">&#xe609;</i>
                         </a>-->
                         <#if detect.detectState == 1>
-                            <a style="text-decoration:none" href="javascript:;" title="完成检测"
+                            <a style="text-decoration:none;color: #50a2ea" href="javascript:;" title="完成检测"
                                onclick="update_info('完成检测','${path}/admin/detect/to_update_complete?detectId=${detect.detectId!''}','670','550');">
                                 <i class="Hui-iconfont">完成检测</i><br>
                             </a>

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventoryLog_list.ftl

@@ -33,9 +33,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 库存管理
-    <span class="c-gray en">&gt;</span> 库存日志列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 库存管理
+    <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>
 <div class="page-container">
     <div class="text-c">

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/cm/postage/postage_list.ftl

@@ -29,9 +29,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 客诉管理
-    <span class="c-gray en">&gt;</span> 邮费转账列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 客诉管理
+    <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>
 <div class="page-container">
     <div class="text-c">

+ 5 - 6
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -42,7 +42,8 @@
         .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
         .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
         .time-line-list>li:first-child .arrow{display: none;}
-        .table-bg th{background-color: #e2f6ff;}
+        .table-bg th{background-color: #f7fafd;height: 40px;}
+        .table-bg td{height: 40px;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
@@ -52,11 +53,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 客诉管理
-    <span class="c-gray en">&gt;</span> 添加签收
-    <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
-       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 客诉管理
+    <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>
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">

+ 3 - 5
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -52,11 +52,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 客诉管理
-    <span class="c-gray en">&gt;</span> 完成签收
-    <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
-       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 客诉管理
+    <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>
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">

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

@@ -8,10 +8,19 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .my-select {
+            border: 1px solid rgba(0,0,0,.1);
+            padding: 6px 50px 6px 15px;
+            height: 34px;
+            -webkit-appearance: none;
+            appearance: none;
+            background: url(/common/images/pts/select-11.png) right center no-repeat;
+            background-size: auto 100%;
+        }
+        .my-btn-search{    border: 1px solid #50a2ea;padding: 1px 25px;background-color: #fff;color: #50a2ea;height: 32px;}
         .barcodeImg{margin:10px 0px}
-        .table-bg thead th{background-color: #e2f6ff;}
+        .table-bg thead th{background-color: #f7fafd;height: 40px;}
+        .table-bg tr td{height: 40px;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
@@ -28,14 +37,14 @@
              white-space: nowrap;
              text-overflow: ellipsis;
          }
-
+        .label-default{background-color: #e6e6e6; color: #50a2ea;}
     </style>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> RST管理
-    <span class="c-gray en">&gt;</span> 待联系寄回信息列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <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>
 <div class="page-container">
     <div class="text-c">
@@ -101,9 +110,9 @@
                     </td>
                     <td class="text-c" width="100"><#if signclosed.signclosedIsReceiving??>
                         <#if signclosed.signclosedIsReceiving == 1>
-                            已签收
+                            <span class="c-success">已签收</span>
                         <#elseif signclosed.signclosedIsReceiving == 2>
-                            未签收
+                            <span class="c-red">未签收</span>
                         </#if>
                     </#if></td>
                     <td class="text-c" width="100">${signclosed.signclosedAddrProvincesName!}-${signclosed.signclosedAddrCityName!}-${signclosed.signclosedAddrAreaName!}</td>

+ 20 - 19
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -9,9 +9,10 @@
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
-        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .my-btn-search{    border: 1px solid #50a2ea;padding: 1px 25px;background-color: #fff;color: #50a2ea;height: 32px;}
         .barcodeImg{margin:10px 0px}
-        .table-bg thead th{background-color: #e2f6ff;}
+        .table-bg thead th{background-color: #f7fafd;height: 40px;}
+        .table-bg tr td{height: 40px;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
@@ -28,23 +29,23 @@
              white-space: nowrap;
              text-overflow: ellipsis;
          }
-
+        .label-default{background-color: #e6e6e6; color: #50a2ea;}
     </style>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> RST管理
-    <span class="c-gray en">&gt;</span> 签收列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <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>
 <div class="page-container">
     <div class="text-c">
         <form name="form1" action="${path}/admin/signclosed/select_signclosed_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_signclosed('${path}/admin/signclosed/to_add_signclosed');">新建签收</button>
-            <input class="my-input" style="width: 120px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
-            <input class="my-input" style="width: 120px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
-            <input class="my-input" style="width: 120px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
-            <input class="my-input" style="width: 120px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
+            <input class="my-input" style="width: 120px;text-indent: 1em;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
+            <input class="my-input" style="width: 120px;text-indent: 1em;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
+            <input class="my-input" style="width: 120px;text-indent: 1em;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
+            <input class="my-input" style="width: 120px;text-indent: 1em;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
             <#--<select class="my-select" name="signclosedType" style="height: 30px;width: 150px">
                 <option value ="">签收类型</option>
                 <option value ="1" <#if signclosedType??><#if signclosedType == 1>selected="selected"</#if></#if>>客诉寄回</option>
@@ -56,7 +57,7 @@
                 <option value ="1" <#if signclosedObjectsState??><#if signclosedObjectsState == 1>selected="selected"</#if></#if>>正常签收</option>
                 <option value ="2" <#if signclosedObjectsState??><#if signclosedObjectsState == 2>selected="selected"</#if></#if>>物件不对</option>
             </select>-->
-            <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
+            <button style="cursor:pointer;width: 100px;" type="submit" class="btn btn-primary">查询</button>
         </form>
     </div>
     <div class="mt-20">
@@ -84,15 +85,15 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as signclosed>
                 <tr>
-                    <td class="text-c" width="70">${signclosed.signclosedId!}</td>
+                    <td class="text-c" width="70" style="color: #50a2ea;">${signclosed.signclosedId!}</td>
                     <td class="text-c" width="70">${signclosed.signclosedCustomerId!}</td>
                     <td class="text-c" width="100">${signclosed.customerIdDescribe!}</td>
                     <td class="text-c" width="100">
                         <#if signclosed.signclosedIsReceiving??>
                             <#if signclosed.signclosedIsReceiving == 1>
-                                待签收
+                                <span class="c-red">待签收</span>
                             <#elseif signclosed.signclosedIsReceiving == 2>
-                                已签收
+                                <span class="c-success">已签收</span>
                             </#if>
                         </#if>
                     </td>
@@ -145,9 +146,9 @@
                             <#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-default radius" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${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!''}件</span><br>
+                                        <span class="label label-default radius" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件</span><br>
                                     <#--</#if>-->
                                 </#list>
                             <#else >
@@ -174,7 +175,7 @@
                     <td class="td-manage text-c">
                         <a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
-                            <i class="Hui-iconfont">&#xe692;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe692;</i>
                         </a>
                        <#-- <a style="text-decoration:none" href="javascript:;" title="打印"
                            onclick="print_aftermarket(${signclosed.signclosedId!''});">
@@ -183,7 +184,7 @@
 
                             <a style="text-decoration:none" href="javascript:;" title="修改寄件人信息"
                                onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosed.signclosedId!''}','570','450');">
-                                <i class="Hui-iconfont">&#xe60c;</i>
+                                <i class="Hui-iconfont" style="font-size: 20px;">&#xe60c;</i>
                             </a><#--
                             <a style="text-decoration:none" href="javascript:;" title="转入品检"
                                onclick="into_complaint('转入品检','${path}/admin/signclosed/to_into_complaint?signclosedId=${signclosed.signclosedId!''}','770','600');">
@@ -199,7 +200,7 @@
                             <#if signclosed.signclosedIsReceiving == 1>
                                 <a style="text-decoration:none" href="javascript:;" title="签收"
                                    onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosed.signclosedId!''}');">
-                                    <i class="Hui-iconfont">签收</i>
+                                    <i class="Hui-iconfont" style="color: #50a2ea;">签收</i>
                                 </a>
                             </#if>
                         </#if>

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

@@ -16,8 +16,21 @@
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .table-bg thead th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
-        .my-order{left: 0px;cursor:pointer; position: absolute;border-bottom: 1px solid rgb(255, 255, 255);float: left;width: 110px;height: 36px;}
-
+        .my-order{border: 1px solid #50a2ea;
+            padding: 1px 25px;
+            height: 36px;
+            background-color: #fff;
+            color: #50a2ea;}
+        .my-select {
+            border: 1px solid rgba(0,0,0,.1);
+            padding: 6px 50px 6px 15px;
+            height: 34px;
+            -webkit-appearance: none;
+            appearance: none;
+            background: url(/common/images/pts/select-11.png) right center no-repeat;
+            background-size: auto 100%;
+        }
+        .label-default{background-color: #e6e6e6; color: #50a2ea;}
         .radio-box input[type=radio]{position: relative;-webkit-appearance: none;appearance: none;cursor: pointer;width: 17px;height: 17px;border: 1px solid #333;border-radius: 50%;}
         .radio-box input[type=radio]:focus {outline: none;}
         .radio-box input[type=radio]:checked{background: #fff;}
@@ -26,9 +39,9 @@
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 订单管理
-    <span class="c-gray en">&gt;</span> 订单列表
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+    <span class="c-gray en">/</span> 订单管理
+    <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>
 
 <!--  录入订单 -->
@@ -42,28 +55,28 @@
                 <button type="button" style="height: 30px;top: 60px;display: none;" class="my-btn-search my-order" id="addOrderExcel" onclick="upFiles();">Excel导入</button>
             </div>
 
-            <div style="width: 90%;text-align: left;margin-left: 10%;">
+            <div style="width: 90%;margin-left: 10%;">
                 <#if identity != 2>
-                    <select class="select" name="salesIsDownload" id="salesIsDownload" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <select class="my-select" name="salesIsDownload" id="salesIsDownload" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
                         <option value ="">导出状态</option>
                         <option value ="2" <#if salesOrder.salesIsDownload??><#if salesOrder.salesIsDownload == 2 >selected="selected"</#if></#if>>已导出</option>
                         <option value ="1" <#if salesOrder.salesIsDownload??><#if salesOrder.salesIsDownload == 1 >selected="selected"</#if></#if>>未导出</option>
                     </select>
                 </#if>
-                <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                <select class="my-select" name="salesShippingStatus" id="salesShippingStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">发货状态</option>
                     <option value ="0" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 0 >selected="selected"</#if></#if>>未发货</option>
                     <option value ="11" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 11 >selected="selected"</#if></#if>>已通知配货</option>
                     <option value ="1" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 1 >selected="selected"</#if></#if>>已打单</option>
                 </select>
 
-                <select class="select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                <select class="my-select" name="salesDeliver" id="salesDeliver" style="height: 31px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">出库状态</option>
                     <option <#if (salesOrder.salesDeliver)??><#if salesOrder.salesDeliver == 1>selected="selected"</#if></#if> value ="1" >未出库</option>
                     <option <#if (salesOrder.salesDeliver)??><#if salesOrder.salesDeliver == 2>selected="selected"</#if></#if> value ="2" >已出库</option>
                 </select>
 
-                <select class="select" name="salesStatus" id="salesStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                <select class="my-select" name="salesStatus" id="salesStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">订单状态</option>
                     <option value ="0" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 0 >selected="selected"</#if></#if>>未确认</option>
                     <option value ="1" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 1 >selected="selected"</#if></#if>>确认</option>
@@ -71,7 +84,7 @@
                     <option value ="3" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 3 >selected="selected"</#if></#if>>作废</option>
                 </select>
 
-                <select class="select" name="salesStoreId" id="salesStoreId" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
+                <select class="my-select" name="salesStoreId" id="salesStoreId" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
                     <option value="">店铺</option>
                     <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
                         <#list listStoreInfo as info>
@@ -79,14 +92,14 @@
                         </#list>
                     </#if>
                 </select>
-                <select class="select" name="colorId" id="colorId" style="height: 31px;width: 150px">
+                <select class="my-select" name="colorId" id="colorId" style="height: 31px;width: 150px">
                         <option value="">产品名称(颜色)</option>
                     <#list productColorList as productColor>
                         <option <#if (salesOrder.colorId)??><#if salesOrder.colorId == productColor.colorId>selected="selected"</#if></#if> value="${productColor.colorId}">${productColor.productName}(${productColor.colorName})</option>
                     </#list>
                 </select>
 
-                <select class="select" name="salesPostFirm" id="salesPostFirm" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
+                <select class="my-select" name="salesPostFirm" id="salesPostFirm" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
                     <option value="">快递公司</option>
                     <#if logisticsInfoList?? &&  (logisticsInfoList?size > 0) >
                         <#list logisticsInfoList as logisticsInfo>
@@ -99,18 +112,18 @@
 
             </div>
             <#--Efast add end-->
-            <div style="width: 90%;text-align: left;margin-left: 10%;">
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesOrderId!}" placeholder="订单号" name="salesOrderId" id="salesOrderId">
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
-
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesPostNum!}" placeholder="快递单号" name="salesPostNum" id="salesPostNum">
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
+            <div style="width: 90%;margin-left: 10%;">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesOrderId!}" placeholder="订单号" name="salesOrderId" id="salesOrderId">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;text-indent: 1em;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesDealCode!}" placeholder="交易号" name="salesDealCode" id="salesDealCode">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
+
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesPostNum!}" placeholder="快递单号" name="salesPostNum" id="salesPostNum">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
                 <#--<input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.itemProductName!}" placeholder="产品" name="itemProductName" id="itemProductName">-->
-                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
-                <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="">搜索</button>
-                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="order_excel">下载Efast格式订单</button>
+                <input type="text" class="my-input trim_input"  style="margin-top: -3px;width:118px;text-indent: 1em;margin-right: 0px;height: 28px;padding: 0px;" value="${salesOrder.salesAddressInfo!}" placeholder="收货人地址" name="salesAddressInfo" id="salesAddressInfo">
+                <button type="submit" class="btn" style="border: 1px solid #50a2ea;background-color: #fff; color: #50a2ea;-webkit-transform:translateY(-5%);height: 30px;" id="">搜索</button>
+                <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff; color: #50a2ea;-webkit-transform:translateY(-5%);height: 30px;" id="order_excel">下载Efast格式订单</button>
                 <#--<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 30px;" id="send_sms" onclick="sendEms();">发送售后短信</button>-->
             </div>
         </form>
@@ -207,7 +220,7 @@
                     <td style="text-align: left;">
                         <#if order.salesOrderItemList ??>
                             <#list order.salesOrderItemList as d>
-                                <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
+                                <span class="label label-default radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
                             </#list>
                         </#if>
                     </td>
@@ -215,43 +228,43 @@
                         ${(order.salesCreateTime?string("yy-MM-dd"))!''}</br>
                         ${(order.salesCreateTime?string("HH:mm:ss"))!''}
                     </td>
-                    <td class="operating_td">
+                    <td class="operating_td" style="min-width: 100px;">
                         <a class="confirm_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="确认订单" alt="确认订单" onclick="confirm_one(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe615;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe615;</i>
                         </a>
                         <a class="edit_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="修改订单" alt="修改订单" onclick="sales_order_update(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe6df;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6df;</i>
                         </a>
                         <a class="allocation_logistics_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe669;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe669;</i>
                         </a>
 
                         <a class="split_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="拆分订单" onclick="split_order(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe6ea;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6ea;</i>
                         </a>
 
                         <a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="chooseWarehouse(${order.salesId})">
-                            <i class="Hui-iconfont">&#xe62f;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe62f;</i>
                         </a>
                         <a class="manual_ship_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="手动发货" onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${order.salesId}','570','450');">
-                            <i class="Hui-iconfont">&#xe642;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe642;</i>
                         </a>
                         <a class="order_details_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="订单详情" alt="订单详情" onclick="sales_order_detail(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe695;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe695;</i>
                         </a>
                         <a class="invalid_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="作废订单" onclick="invalidation_order(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe631;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe631;</i>
                         </a>
                         <a class="del_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="删除订单" onclick="delSalesOrder(${order.salesId!''})">
-                            <i class="Hui-iconfont">&#xe609;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe609;</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="distribution_postFirm('修改备注','${path}/admin/salesOrder/to_update_order_remark?salesId=${order.salesId!''}','570','450');">
-                            <i class="Hui-iconfont">&#xe60c;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe60c;</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="更正订单"
                            onclick="acorrect_order(${order.salesId!''});">
-                            <i class="Hui-iconfont">&#xe6f7;</i>
+                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6f7;</i>
                         </a>
                         <#if order.procTypeId??>
                             <#if order.procTypeId != '3'>
@@ -283,11 +296,11 @@
 
         <#if identity != 2>
             <div style="float: left;margin-top: 20px;">
-                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
-                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配物流</button>
-                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="chooseWarehouse(null)">通知配货</button>
-                <button type="button" onClick="upFiles2();"  class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;">上传发货信息</button>
-                <button onClick="downloadOrderPage();" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" type="button" title="下载订单">下载订单</button>
+                <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
+                <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="distribution_express(null)">分配物流</button>
+                <button type="button" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="chooseWarehouse(null)">通知配货</button>
+                <button type="button" onClick="upFiles2();"  class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;">上传发货信息</button>
+                <button onClick="downloadOrderPage();" class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 35px;" type="button" title="下载订单">下载订单</button>
             </div>
         </#if>
     </div>