修改了换新，维修等页面

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

@@ -120,9 +120,12 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div id="backGoodsProduct" class="update-parts"></div>
+                <div id="backGoodsProduct" class="update-parts" style="float: left;width: 410px;margin-right: 10px;"></div>
                 <input type="hidden" id="closed_products" name="closed_products" />
                 <input type="hidden" id="closed_fittings" name="closed_fittings" />
+                <div style="float: left;">
+                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+                </div>
             </div>
         </div>
         <div class="cl">
@@ -284,7 +287,7 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 color_numbers += productId + ':' + colorId + ":" + number + ",";
-                txt_product += '<span>'+ productName + '*' + number + '台</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ productName + '*' + number + '台</span>';
             }
         });
         $("#addProduct").find(".input-fittings-number").each(function(){
@@ -296,10 +299,9 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 fittings_numbers += productId + ':' + fittingsId + ":" + number + ",";
-                txt_product += '<span>'+ fittingsName + '*' + number + '件</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ fittingsName + '*' + number + '件</span>';
             }
         })
-        txt_product += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
         $('#backGoodsProduct').html(txt_product);
         $('#closed_products').val(color_numbers);
         $('#closed_fittings').val(fittings_numbers);
@@ -367,15 +369,14 @@
                     var backProduct = '';
                     if (backGoods.closedProdcues != null && backGoods.closedProdcues.length > 0) {
                         $.each(backGoods.closedProdcues,function(index,element){
-                            backProduct += '<span>'+ this.closedProductName + '*' + this.closedProdcueNumber + '</span>';
+                            backProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedProductName + '*' + this.closedProdcueNumber + '</span>';
                         })
                     }
                     if (backGoods.closedFittings != null && backGoods.closedFittings.length > 0) {
                         $.each(backGoods.closedFittings,function(index,element){
-                            backProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                            backProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
                         })
                     }
-                    backProduct += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
                     $('#backGoodsProduct').html(backProduct);
                 }
             },

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

@@ -119,9 +119,16 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div id="noreasonBackProduct" class="update-parts"></div>
+                <div id="noreasonBackProduct" class="update-parts" style="float: left;width: 410px;margin-right: 10px;"></div>
                 <input type="hidden" id="closed_products" name="closed_products" />
                 <input type="hidden" id="closed_fittings" name="closed_fittings" />
+                <div style="float: left;">
+                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+                </div>
+            </div>
+        </div>
+        <div class="cl">
+            <div class="formControls col-2 col-sm-2 text-r">
             </div>
             <div class="formControls col-9 col-sm-9" id="produceSelect" style="padding-top: 10px;display: none;">
                 <div>
@@ -140,10 +147,6 @@
                 </table>
             </div>
         </div>
-        <div class="cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-            </div>
-        </div>
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>备注信息</strong>
@@ -282,7 +285,7 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 color_numbers += productId + ':' + colorId + ":" + number + ",";
-                txt_product += '<span>'+ productName + '*' + number + '台</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ productName + '*' + number + '台</span>';
             }
         });
         $("#addProduct").find(".input-fittings-number").each(function(){
@@ -294,10 +297,9 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 fittings_numbers += productId + ':' + fittingsId + ":" + number + ",";
-                txt_product += '<span>'+ fittingsName + '*' + number + '件</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ fittingsName + '*' + number + '件</span>';
             }
         })
-        txt_product += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
         $('#noreasonBackProduct').html(txt_product);
         $('#closed_products').val(color_numbers);
         $('#closed_fittings').val(fittings_numbers);
@@ -365,15 +367,14 @@
                     var noreasonProduct = '';
                     if (noreasonBack.closedProdcues != null && noreasonBack.closedProdcues.length > 0) {
                         $.each(noreasonBack.closedProdcues,function(index,element){
-                            noreasonProduct += '<span>'+ this.closedProductName + '*' + this.closedProdcueNumber + '</span>';
+                            noreasonProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedProductName + '*' + this.closedProdcueNumber + '</span>';
                         })
                     }
                     if (noreasonBack.closedFittings != null && noreasonBack.closedFittings.length > 0) {
                         $.each(noreasonBack.closedFittings,function(index,element){
-                            noreasonProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                            noreasonProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
                         })
                     }
-                    noreasonProduct += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
                     $('#noreasonBackProduct').html(noreasonProduct);
                 }
             },

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

@@ -118,9 +118,12 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div class="update-parts" id="renewedProduct"></div>
+                <div class="update-parts" id="renewedProduct" style="float: left;width: 410px;margin-right: 10px;"></div>
                 <input type="hidden" id="closed_products" name="closed_products" />
                 <input type="hidden" id="closed_fittings" name="closed_fittings" />
+                <div style="float: left;">
+                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+                </div>
             </div>
         </div>
         <div class="cl">
@@ -429,7 +432,7 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 color_numbers += productId + ':' + colorId + ":" + number + ",";
-                txt_product += '<span>'+ productName + '*' + number + '台</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ productName + '*' + number + '台</span>';
             }
         });
         $("#addProduct").find(".input-fittings-number").each(function(){
@@ -441,10 +444,9 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 fittings_numbers += productId + ':' + fittingsId + ":" + number + ",";
-                txt_product += '<span>'+ fittingsName + '*' + number + '件</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ fittingsName + '*' + number + '件</span>';
             }
         })
-        txt_product += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
         $('#renewedProduct').html(txt_product);
         $('#closed_products').val(color_numbers);
         $('#closed_fittings').val(fittings_numbers);
@@ -506,15 +508,14 @@
                     var renewedProduct = '';
                     if (renewed.closedProdcues != null && renewed.closedProdcues.length > 0) {
                         $.each(renewed.closedProdcues,function(index,element){
-                            renewedProduct += '<span>'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
+                            renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
                         })
                     }
                     if (renewed.closedFittings != null && renewed.closedFittings.length > 0) {
                         $.each(renewed.closedFittings,function(index,element){
-                            renewedProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
+                            renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
-                    renewedProduct += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
                     $('#renewedId').val(renewed.renewedId);
                     $('input[name="renewedBackStatus"]').each(function(){
                         if (this.value == renewed.renewedBackStatus) {

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

@@ -119,9 +119,12 @@
                 <strong>寄回产品</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <div class="update-parts" id="repairProduct"></div>
+                <div class="update-parts" id="repairProduct" style="float: left;width: 410px;margin-right: 10px;"></div>
                 <input type="hidden" id="closed_products" name="closed_products" />
                 <input type="hidden" id="closed_fittings" name="closed_fittings" />
+                <div style="float: left;">
+                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+                </div>
             </div>
         </div>
         <div class="cl">
@@ -430,7 +433,7 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 color_numbers += productId + ':' + colorId + ":" + number + ",";
-                txt_product += '<span>'+ productName + '*' + number + '台</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ productName + '*' + number + '台</span>';
             }
         });
         $("#addProduct").find(".input-fittings-number").each(function(){
@@ -442,10 +445,9 @@
                 //var colorName = $(this).parent().find(".input-color-name").val();
                 //封装更换的所有产品
                 fittings_numbers += productId + ':' + fittingsId + ":" + number + ",";
-                txt_product += '<span>'+ fittingsName + '*' + number + '件</span>';
+                txt_product += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ fittingsName + '*' + number + '件</span>';
             }
         })
-        txt_product += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
         $('#repairProduct').html(txt_product);
         $('#closed_products').val(color_numbers);
         $('#closed_fittings').val(fittings_numbers);
@@ -506,15 +508,14 @@
                     var repairProduct = '';
                     if (repair.closedProdcues != null && repair.closedProdcues.length > 0) {
                         $.each(repair.closedProdcues,function(index,element){
-                            repairProduct += '<span>'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
+                            repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
                         })
                     }
                     if (repair.closedFittings != null && repair.closedFittings.length > 0) {
                         $.each(repair.closedFittings,function(index,element){
-                            repairProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
+                            repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
-                    repairProduct += '<button type="button" style="cursor:pointer; float: right;" class="my-btn-search" onclick="showProductList();">修改产品</button>';
                     $('#repairId').val(repair.repairId);
                     $('input[name="repairBackStatus"]').each(function(){
                         if (this.value == repair.repairBackStatus) {