批次添加四个颜色

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsBatchController.java

@@ -47,7 +47,7 @@ public class AdminPtsBatchController {
     @Autowired
     private MachineVersionService machineVersionService;
 
-    private String[] BATCH_COLOR = {"黑色","白色","金色","红色","蓝色","绿色","橙色","黄色","青色","紫色"};
+    private String[] BATCH_COLOR = {"黑色","白色","金色","红色","蓝色","绿色","橙色","黄色","青色","紫色","蔷薇粉","云烟紫","琉璃绿","亚麻灰"};
 
     /**
      * 获取batch列表

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -134,6 +134,9 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">客户信息：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text" class="input-text trim_input" placeholder="微信昵称" id="customerWechatName" name="customerWechatName" value="">
+                </div>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
                     <input type="text" class="input-text trim_input" placeholder="用户姓名" id="customerName" name="customerName" value="">
                 </div>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
@@ -187,25 +190,26 @@
             </div>
 
             <div class="row cl">
-            <#--处理描述 - 客诉备注-->
-                <label class="form-label col-1 col-sm-1">问题描述：</label>
+                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题回复：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <span>问题描述详情，内部使用，不会对外公布。</span>
-                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
+                    <input type="hidden" name="questionId" id="questionId" value="">
+                    <script id="describeContentText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
-                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
+                    <input type="hidden" name="describeContent" id="describeContent" value="">
                 </div>
             </div>
 
             <div class="row cl">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题回复：</label>
+            <#--处理描述 - 客诉备注-->
+                <label class="form-label col-1 col-sm-1">问题描述：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="hidden" name="questionId" id="questionId" value="">
-                    <script id="describeContentText" type="text/plain" style="width:983px;height:250px;"></script>
+                    <span>问题描述详情，内部使用，不会对外公布。</span>
+                    <script id="describeHandleDescText" type="text/plain" style="width:983px;height:250px;"></script>
                     </script>
-                    <input type="hidden" name="describeContent" id="describeContent" value="">
+                    <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
                 </div>
             </div>
+
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -142,7 +142,7 @@
 </article>
 <script type="text/javascript">
     /*颜色枚举值*/
-    var colorAll = ['黑色','白色',"金色",'红色','蓝色','绿色','橙色','黄色','青色','紫色'];
+    var colorAll = ['黑色','白色','金色','红色','蓝色','绿色','橙色','黄色','青色','紫色','蔷薇粉','云烟紫','琉璃绿','亚麻灰'];
 
 
     /*修改批次时，获取之前的批次编号，添加页面为空*/