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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -87,9 +87,6 @@
 <div class="page-container">
 
     <div class="text-c">
-        <form name="form1" action="${path}/admin/detect/select_detect_list" method="post">
-            <button type="button" style="cursor:pointer;float: left;margin-right: 5px;" class="my-btn-search" onclick="add_detect('${path}/admin/detect/to_add_detect');">新增维修</button>
-            <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_remark('每日检测下载','${path}/admin/detect/to_download_detection','570','450');">每日检测下载</button>
         <form name="form1" action="${path}/admin/detect/select_detect_list" method="post" style="border: 1px solid rgba(0,0,0,.1);background: #fff;padding: 10px;border-radius: 5px;text-align: left;">
             <button type="button" style="cursor:pointer;float: left;margin-right: 5px;" class="my-btn-search" onclick="add_detect('${path}/admin/detect/to_add_detect');">新建品检</button>
             <button type="button" style="cursor:pointer;float: left;margin-right: 15px;" class="my-btn-search" onclick="add_remark('每日检测下载','${path}/admin/detect/to_download_detection','570','450');">每日检测下载</button>

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

@@ -190,7 +190,7 @@ function setSelectCustomer(customerId){
                             detectStateName = "原机退回，待发货";
                         }
                         html += '<tr class="text-c">' +
-                            ' <td><input type="checkbox" name="detectId" value="'+detet.detectId+'"><label></td>' +
+                            ' <td><input type="radio" name="detectId" value="'+detet.detectId+'"><label></td>' +
                             ' <td>'+ cufte(detet.detectNumber) +'</td>' +
                             ' <td>'+ detectStateName +'</td>' +
                             ' <td>'+ cufte(detet.productName) +'</td>' +