修改bug文档bug

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

@@ -459,7 +459,7 @@
              <div class="row cl" id="customerDescDiv">
                  <label class="form-label col-1 col-sm-1">备注：</label>
                  <div class="col-5 col-sm-5">
-                     <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;"></textarea>
+                     <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 340px;height: 100px;"></textarea>
                  </div>
               </div>
             <div class="row cl" id="updateProduct" style="display: none;">

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

@@ -538,9 +538,9 @@
                 </div>
             </div>
             <div class="row cl" id="customerDescDiv">
-                <label class="form-label col-1 col-sm-1">备注：</label>
-                <div class="col-2 col-sm-2 col-offset-3">
-                    <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;margin-left: -279px;">${customerInfo.customerDesc!''}</textarea>
+                 <label class="form-label col-1 col-sm-1">备注：</label>
+                 <div class="col-5 col-sm-5">
+                    <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 340px;height: 100px;">${customerInfo.customerDesc!''}</textarea>
                 </div>
             </div>
             <div class="row cl" id="sendAddressByPhone" style="display: none;">

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

@@ -88,6 +88,7 @@
                                     <option value="stars">星晨急便</option>
                                     <option value="jd">京东快递</option>
                                     <option value="dbkd">德邦快递</option>
+                                    <option value="01">其他</option>
                                     <option value="02">上门送货</option>
                                     <option value="lianhaowuliu">联昊通</option>
                                 </select>

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

@@ -138,6 +138,7 @@
                     <option value="stars">星晨急便</option>
                     <option value="jd">京东快递</option>
                     <option value="dbkd">德邦快递</option>
+                    <option value="01">其他</option>
                     <option value="02">上门送货</option>
                     <option value="lianhaowuliu">联昊通</option>
 				</select>

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

@@ -103,6 +103,7 @@
                                     <option value="stars">星晨急便</option>
                                     <option value="jd">京东快递</option>
                                     <option value="dbkd">德邦快递</option>
+                                    <option value="01">其他</option>
                                     <option value="02">上门送货</option>
                                     <option value="lianhaowuliu">联昊通</option>
                                 </select>

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

@@ -105,6 +105,7 @@
                                     <option value="stars">星晨急便</option>
                                     <option value="jd">京东快递</option>
                                     <option value="dbkd">德邦快递</option>
+                                    <option value="01">其他</option>
                                     <option value="02">上门送货</option>
                                     <option value="lianhaowuliu">联昊通</option>
                                 </select>

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -1,4 +1,8 @@
 /**
+ * 初始化销售渠道
+ */
+getCompany();
+/**
  *TDS 城市加载
  *问题回复选择
  *加载三个文本域
@@ -201,6 +205,7 @@ var isSolveTitleMsg = {
 
 /*===============================正则表达式  -- start -- =============================== */
 var phoneReg = /^[1][3,4,5,7,8][0-9]{9}$/;
+var phoneReg2 = /(^[0-9]{3,4}\-[0-9]{3,8}$)|(^[0-9]{3,8}$)|(^\([0-9]{3,4}\)[0-9]{3,8}$)|(^0{0,1}13[0-9]{9}$)/;
 /*===============================正则表达式  -- end -- =============================== */
 
 /*=============================== 页面加载完成启动事件  -- start -- =============================== */
@@ -436,12 +441,12 @@ function initProcessResult(type){
             case 1:
                 otherHied();
                 visitByType(1);
-                getCompany();
+                //getCompany();
                 break;
             case 2:
                 otherHied();
                 visitByType(2);
-                getCompany();
+                //getCompany();
                 break;
             default:
                 break;
@@ -474,12 +479,12 @@ function initProcessResult(type){
             case 1:
                 otherHied();
                 visitByType(1);
-                getCompany();
+                //getCompany();
                 break;
             case 2:
                 otherHied();
                 visitByType(2); //需要回访
-                getCompany();
+                //getCompany();
                 break;
             case 3: //换新
                 result = isSolve.renewed;
@@ -1036,6 +1041,7 @@ function setSelectOrder(orderId){
     $("#companyId").val(companyId);
     $("#storeId").val(storeId);
     $("#orderId").val(orderId);
+    getCompany();
 }
 
 /**
@@ -1445,9 +1451,8 @@ function getCompany(companyId){
 
                 if(typeof(companyId) != "undefined"){
                     $("#selectCompany option[value='" + companyId + "']").attr("selected","true");
-                    if(isUpdate){ //修改页面需要自动获取店铺
-                        setStore(companyId,$("#selectStore"));       //获取店铺
-                    }
+                    setStore(companyId,$("#selectStore"));       //获取店铺
+
                 }
             }
         },
@@ -1565,10 +1570,10 @@ function addCustomerReady(){
                 vailErrorMsg($(this),"手机号码格式不正确");
                 phoneFlag = false;
             }
-            if (!phoneReg.test(phone)) {
+            /*if (!phoneReg.test(phone)) {
                 vailErrorMsg($(this),"手机号码格式不正确");
                 phoneFlag = false;
-            }
+            }*/
         }
     })