首页 发现 帮助
登录
hexiugang
/
iamberry-common-parent
关注 3
点赞 3
派生 1
文件 工单管理 0 合并请求 0 Wiki
浏览代码

客诉样式

qihanjiao 6 年之前
父节点
d63245589d
当前提交
bac9dfec3b
共有 2 个文件被更改，包括 29 次插入 和 19 次删除
分列视图 显示文件统计
  1. 18 8
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl
  2. 11 11
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

+ 18 - 8
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl
查看文件 

@@ -9,6 +9,10 @@
 
 <#include "/base/add_base.ftl">
 
     <title>添加检测记录 - H-ui.filter v2.4</title>
 
     <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;}
 
+        .tit-2{position: relative;font-size: 16px;padding-left: 10px;color: #50a2ea;display: inline-block;}
 
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
         .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
 
@@ -42,10 +46,16 @@
 
 <body>
 
 <article class="page-container">
 
     <form class="form form-horizontal" id="form-admin-add">
 
-
 
         <div class="row cl">
 
-            <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>所属公司：</label>
 
-            <div class="formControls col-7 col-sm-7">
 
+            <label class="form-label col-3">
 
+                <div class="tit-2">检测信息</div>
 
+            </label>
 
+            <div class="formControls col-9">
 
+            </div>
 
+        </div>
 
+        <div class="row cl">
 
+            <label class="form-label col-3 col-sm-3" style="padding-right: 10px;"><span class="c-red">*</span>所属公司：</label>
 
+            <div class="formControls col-9 col-sm-9" style="padding-left: 5px;">
 
             <#if companyInfoList?? &&  (companyInfoList?size > 0) >
 
                 <#list companyInfoList as companyInfo>
 
                     <div class="radio-box">
 
@@ -59,13 +69,13 @@
 
 
         <div class="input-box">
 
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>客诉编号：</label>
 
-            <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
 
-                <input class="my-input" type="text" style="width: 50.5%;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
 
+            <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
 
+                <input class="my-input" type="text" style="width:510px;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
 
             </div>
 
         </div>
 
         <div class="input-box">
 
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>检测产品：</label>
 
-            <div class="formControls col-8 col-sm-8 huanhang" style="margin: 10px 0px 10px -10px;">
 
+            <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;padding-left: 0;">
 
                 <select id="productId" name="productId" class="my-select" style="width: 158px;">
 
                     <#if (productList?size > 0)>
 
                             <#list productList as product>
 
@@ -190,12 +200,12 @@
 
             <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注信息：</label>
 
             <div class="formControls col-xs-9 col-sm-9">
 
                 <div class="radio-box">
 
-                    <textarea rows="3" style="width: 186%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectItemDesc" id="detectItemDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
 
+                    <textarea rows="3" style="width: 500px;margin-left: -15px;margin-top: 8px;" cols="20" name="detectItemDesc" id="detectItemDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
 
                 </div>
 
             </div>
 
         </div>
 
         <div class="input-box" style="margin-left: 30%">
 
-            <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
 
+            <button type="button" class="my-btn-submit" onclick="add();" style="margin-top: 50px;">确认提交</button>
 
         </div>
 
     </form>
 
 </article>

+ 11 - 11
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl
查看文件 

@@ -230,41 +230,41 @@
 
                     </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" style="font-size: 20px;">&#xe615;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe6df;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe669;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe6ea;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe62f;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe642;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe695;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe631;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe609;</i>
 
+                            <i class="Hui-iconfont">&#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" style="font-size: 20px;">&#xe60c;</i>
 
+                            <i class="Hui-iconfont">&#xe60c;</i>
 
                         </a>
 
                         <a style="text-decoration:none" href="javascript:;" title="更正订单"
 
                            onclick="acorrect_order(${order.salesId!''});">
 
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6f7;</i>
 
+                            <i class="Hui-iconfont" >&#xe6f7;</i>
 
                         </a>
 
                         <#if order.procTypeId??>
 
                             <#if order.procTypeId != '3'>