Procházet zdrojové kódy

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

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java
liujiankang před 5 roky
rodič
revize
ac5f38cb11

+ 4 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -457,8 +457,11 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                         Product product = productMapper.getProduce(productInfo.getSignclosedProductId());
                         if (product.getProductIsDetection() == 1) {
                             ComplaintDetectInfo  info = new ComplaintDetectInfo();
+                            //生成维修编号
+                            String number = detectNumber();
+                            info.setDetectNumber(number);
                             info.setDetectState(40);
-                            info.setDetectSource(1);
+                            info.setDetectSource(2);
                             info.setProductId(productInfo.getSignclosedProductId());
                             info.setProductColorId(productInfo.getSignclosedProductColor());
                             info.setSignclosedId(record.getSignclosedId());

+ 2 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -135,7 +135,8 @@
     ac.city signclosedAddrCityName,
     ad.district signclosedAddrAreaName,
     qd.describe_title customerIdDescribe,
-    li.logistics_name signclosedLogisticsName
+    li.logistics_name signclosedLogisticsName,
+    cs.signclosed_company_id signclosedCompanyId
     FROM
     tb_rst_complaint_signclosed cs
     LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id

+ 37 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_detail.ftl

@@ -233,6 +233,43 @@
         <div class="row cl">
             <label class="form-label col-3">
                 <div class="tit-2">
+                    客户信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">业务员:</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.salesmanAdminName??>${detectinfo.salesmanAdminName!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span></span></td>
+                <td width="10"></td>
+            </tr>
+            <tr>
+                <th width="10">客户姓名:</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectName??>${detectinfo.detectName!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10">客户电话:</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectTel??>${detectinfo.detectTel!''}</#if></span></td>
+                <td width="10"></td>
+            </tr>
+            <tr>
+                <th width="10">客户问题:</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionName??>${detectinfo.questionName!''}</#if></span></td>
+                <td width="10"></td>
+                <th width="10">问题回复:</th>
+                <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionProfile??>${detectinfo.questionProfile!''}</#if></span></td>
+                <td width="10"></td>
+            </tr>
+            </thead>
+        </table>
+        <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
                     检测信息
                 </div>
             </label>

+ 4 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/customer_signclosed_list.ftl

@@ -135,13 +135,15 @@
                              <a style="text-decoration:none" href="javascript:;" title="关联客诉"
                               onclick="associated_customer('关联客诉','${path}/admin/signclosed/to_associated_customer?signclosedId=${signclosed.signclosedId!''}','770','550');">
                                  <i>关联客诉</i>
-                             </a>
+                             </a><br>
                         </#if>
-                        <#if signclosed.signclosedCompanyId == 1 || signclosed.signclosedCompanyId == 2>
+                        <#if signclosed.signclosedCompanyId??>
+                            <#if signclosed.signclosedCompanyId == 1 || signclosed.signclosedCompanyId == 2>
                              <a style="text-decoration:none" href="javascript:;" title="优尼雅客户"
                               onclick="into_Yny(${signclosed.signclosedId!''});">
                                  <i>优尼雅客户</i>
                              </a>
+                            </#if>
                         </#if>
                     </td>
                 </tr>

+ 27 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order_new.ftl

@@ -474,13 +474,14 @@
                              + '<td style=" width: 265px;">' + result.returnMsg.values[i] + '</td>'
                              + '<td style="text-align: left;">'
                              + '<label>'
-                             + '<select class="my-select order_store_select" name="" id="" style="height: 30px;width: 180px;margin: 0px;">';
+                             + '<select class="chosen" name="states" id="" style="height: 30px;width: 180px;margin: 0px;">';
                         for (var j = 0; j < result.returnMsg.stores.length; j++) {
                             temp += '<option value="' + result.returnMsg.values[i] + '_' + result.returnMsg.stores[j].storeId + '" >' + result.returnMsg.stores[j].storeName + '</option>'
                         }
                         temp += '</select></label>'
                              + '</td>'
                              + '</tr>';
+
                     }
                     $("#selectStore").html(temp);
             }
@@ -656,7 +657,7 @@
         window.location.href = error_path;
     }
 
-    $('.chosen').chosen({
+    /*$('.chosen').chosen({
         no_results_text: "没有找到结果!",//搜索无结果时显示的提示
         search_contains:true,   //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
         allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许,选中选项会有一个x号可以删除选项
@@ -675,6 +676,29 @@
     $('.chosen2').chosen({
         search_contains:false,
         enable_split_word_search: true //分词搜索,选项词可通过空格或'[]'分隔。search_contains为false时才能看出效果
-    });
+    });*/
+    chonsens();
+    function chonsens() {
+        $('.chosen').chosen({
+            no_results_text: "没有找到结果!",//搜索无结果时显示的提示
+            search_contains:true,   //关键字模糊搜索。设置为true,只要选项包含搜索词就会显示;设置为false,则要求从选项开头开始匹配
+            allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许,选中选项会有一个x号可以删除选项
+            disable_search: false, //禁用搜索。设置为true,则无法搜索选项。
+            disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
+            inherit_select_classes: true, //是否继承原下拉框的样式类,此处设为继承
+            placeholder_text_single: '选择国家', //单选选择框的默认提示信息,当选项为空时会显示。如果原下拉框设置了data-placeholder,会覆盖这里的值。
+            width: '227px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度,也会被width覆盖。
+            max_shown_results: 1000, //下拉框最大显示选项数量
+            display_disabled_options: false,
+            single_backstroke_delete: false, //false表示按两次删除键才能删除选项,true表示按一次删除键即可删除
+            case_sensitive_search: false, //搜索大小写敏感。此处设为不敏感
+            group_search: false, //选项组是否可搜。此处搜索不可搜
+            include_group_label_in_selected: true //选中选项是否显示选项分组。false不显示,true显示。默认false。
+        });
+        $('.chosen2').chosen({
+            search_contains:false,
+            enable_split_word_search: true //分词搜索,选项词可通过空格或'[]'分隔。search_contains为false时才能看出效果
+        });
+    }
 </script>
 </html>