Merge remote-tracking branch 'liujiankang/master'

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

@@ -269,7 +269,7 @@
                 </span>
                 <#--<input type="text" class="input-text"  style="width:110px;margin-right: 0;margin-bottom: 10px;"  placeholder="填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">-->
             </div>
-            <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;margin-right: 15px;">
+            <div class="formControls col-2 col-sm-2" style="width:110px;padding:0 0;">
                 <input type="text" class="input-text"  style="width:110px;margin-right: 0;margin-bottom: 10px;"  placeholder="填写供货价格" id="writeSupplyPrice" name="writeSupplyPrice">
             </div>
             <label class="form-label col-2 col-sm-2" style="width:166px;padding:0 0;">
@@ -470,11 +470,11 @@
                     </select>
                 </span>
                 </div>
-                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red">*</span>开户支行：</label>
+                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red normalTicketType">*</span>开户支行：</label>
                 <div style="width: 150px;float: left;margin-left: 10px;">
                     <input type="text" class="input-text trim_input" placeholder="开户支行名称" id="ticketAccountOpeningBranch" name="ticketAccountOpeningBranch" value="">
                 </div>
-                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red">*</span>开票账户：</label>
+                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red normalTicketType">*</span>开票账户：</label>
                 <div style="width: 150px;float: left;margin-left: 10px;">
                     <input type="text" class="input-text trim_input" placeholder="开票账户" id="ticketOpeningAccount" name="ticketOpeningAccount" value="">
                 </div>
@@ -488,13 +488,13 @@
                 <div style="width: 150px;float: left;margin-left: 10px;">
                     <input type="text" class="input-text trim_input" placeholder="纳税人识别号" id="taxpayerIdentificationNum" name="taxpayerIdentificationNum" value="">
                 </div>
-                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red">*</span>开票电话：</label>
+                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red normalTicketType">*</span>开票电话：</label>
                 <div style="width: 150px;float: left;margin-left: 10px;">
                     <input type="text" class="input-text trim_input" placeholder="开票电话" id="ticketOpeningPhone" name="ticketOpeningPhone" value="">
                 </div>
             </div>
             <div class="row cl" style="margin-bottom: 10px;" id="isShowAddress">
-                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red">*</span>企业地址：</label>
+                <label class="form-label col-2 col-sm-2" style="width: 110px;padding-right: 0;text-align: right;"><span class="c-red normalTicketType">*</span>企业地址：</label>
                 <div style="width: 690px;float: left;margin-left: 10px;">
                     <input type="text" class="input-text trim_input" placeholder="企业地址" id="enterpriseAddress" name="enterpriseAddress" value="">
                 </div>
@@ -648,6 +648,13 @@
         }
     }
 
+    function isShowRedStar(ticketType) {
+        if(ticketType == "1"){
+            $(".normalTicketType").show();
+        }else{
+            $(".normalTicketType").hide();
+        }
+    }
     /*初始化省份*/
     function initProvince() {
         //默认查询参数为空