Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

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

@@ -73,13 +73,13 @@
                     <div class="radio-box">
                         <input type="radio" id="tel-3" name="signclosedType" value="3">
                         <label for="tel-3">其他</label>
-                        <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="选择其他时有值" id="signclosedTypeName" name="signclosedTypeName">
+                        <input type="text" style="width: 114px;margin-left: 10px;" class="input-text" placeholder="选择其他时有值" id="signclosedTypeName" name="signclosedTypeName">
                     </div>
                 </div>
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回物流：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal">
+                <div class="formControls col-2 col-sm-2 skin-minimal">
                     <span class="select-box">
                     <select name="signclosedLogistics" class="select">
                         <option value="">请选择物流公司</option>
@@ -101,28 +101,31 @@
                     </select>
                     </span>
                 </div>
-                <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text" style="" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+                </div>
             </div>
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件人信息：</label>
-                <div class="formControls col-4 col-sm-4 skin-minimal">
-                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
-                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text"  class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                </div>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
 
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件区域：</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal">
+                <div class="formControls col-2 col-sm-2 skin-minimal">
                     <span class="select-box">
                     <select name="signclosedAddrProvinces" id="province" class="select">
 
-
                     </select>
                      </span>
                 </div>
-                    <div class="formControls col-3 col-sm-3 skin-minimal">
+                <div class="formControls col-2 col-sm-2 skin-minimal">
                     <span class="select-box">
                     <select name="signclosedAddrCity" id="city" class="select">
 
@@ -136,7 +139,7 @@
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收产品：</label>
                 <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
                     <div>
-                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 826px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 826px;float: left;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
                     </div>
 
                     <table class="table table-border table-bg table-bordered" style="width: 826px;">
@@ -173,8 +176,8 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
-                   <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                   <input type="text" style="margin-left: 10px;" class="input-text my-input-date Wdate" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>