xg

CMPlatform/web/templates/client/cuser_rule_create.html

@@ -541,7 +541,7 @@
         var btnMatchHtml1 = "";
         var btnMatchHtml2 = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } if (i >= 5 && i<= 8) {
@@ -785,8 +785,8 @@
     }
 
     function clickMatchBtn2(obj) {
-        var temp_list = ["6", "7", "8", "9"]
-        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)"]
+        var temp_list = ["6", "7", "8", "9", "10", "11", "12"]
+        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)", "采购意向名称", "采购意向内容", "采购意向采购单位"]
         for (i in temp_list) {
             if (matchCode.indexOf(temp_list[i]) > -1) {
                 matchCode.splice(jQuery.inArray(temp_list[i], matchCode), 1)

CMPlatform/web/templates/client/cuser_rule_edit.html

@@ -694,7 +694,7 @@
         var notMatchName = "";
         var clearMatchName = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } if (i >= 5 && i<= 8) {
@@ -1154,17 +1154,7 @@
     }
 
     //匹配方式按钮点击事件
-
     function clickMatchBtn(obj) {
-
-        /*var temp_list = ["6", "7", "8", "9"]
-        for (i in temp_list) {
-            if (matchCode.indexOf(temp_list[i]) > -1) {
-                matchCode.length = 0
-                matchName.length = 0
-                break
-            }
-        }*/
         if ($(obj).hasClass("active-btn-match")) {
             $(obj).removeClass("active-btn-match")
             matchCode.splice($.inArray($(obj).attr("code"), matchCode), 1);
@@ -1182,8 +1172,8 @@
 
 
     function clickMatchBtn2(obj) {
-        var temp_list = ["6", "7", "8", "9"]
-        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)"]
+        var temp_list = ["6", "7", "8", "9", "10", "11", "12"]
+        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)", "采购意向名称", "采购意向内容", "采购意向采购单位"]
         for (i in temp_list) {
             if (matchCode.indexOf(temp_list[i]) > -1) {
                 matchCode.splice(jQuery.inArray(temp_list[i], matchCode), 1)

CMPlatform/web/templates/client/cuser_rule_history_edit.html

@@ -502,7 +502,7 @@
         var btnMatchHtml1 = "";
         var btnMatchHtml2 = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             }else {

CMPlatform/web/templates/client/customer_tag_rule.html

@@ -219,7 +219,7 @@
         var btnMatchHtml2 = "";
         //匹配方式
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2 matchWay" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } else {

CMPlatform/web/templates/client/history_rule_edit.html

@@ -586,7 +586,7 @@
         var notMatchName = "";
         var clearMatchName = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             }else {

CMPlatform/web/templates/client/keywordRule.html

@@ -228,15 +228,6 @@
 
     //匹配方式按钮点击事件
     function clickMatchBtn(obj) {
-
-        /*var temp_list = ["6", "7", "8", "9"]
-        for (i in temp_list) {
-            if (matchCode.indexOf(temp_list[i]) > -1) {
-                matchCode.length = 0
-                matchName.length = 0
-                break
-            }
-        }*/
         if ($(obj).hasClass("active-btn-match")) {
             $(obj).removeClass("active-btn-match")
             matchCode.splice($.inArray($(obj).attr("code"), matchCode), 1);

CMPlatform/web/templates/private/cuser_rule_create.html

@@ -985,14 +985,6 @@
 
     //匹配方式按钮点击事件
     function clickMatchBtn(obj) {
-        /*var temp_list = ["6", "7", "8", "9"]
-        for (i in temp_list) {
-            if (matchCode.indexOf(temp_list[i]) > -1) {
-                matchCode.length = 0
-                matchName.length = 0
-                break
-            }
-        }*/
         if ($(obj).hasClass("active-btn-match")) {
             $(obj).removeClass("active-btn-match")
             matchCode.splice($.inArray($(obj).attr("code"), matchCode), 1);
@@ -1009,8 +1001,8 @@
     }
 
     function clickMatchBtn2(obj) {
-        var temp_list = ["6", "7", "8", "9"]
-        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)"]
+        var temp_list = ["6", "7", "8", "9", "10", "11", "12"]
+        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)", "采购意向名称", "采购意向内容", "采购意向采购单位"]
         for (i in temp_list) {
             if (matchCode.indexOf(temp_list[i]) > -1) {
                 matchCode.splice(jQuery.inArray(temp_list[i], matchCode), 1)

CMPlatform/web/templates/private/cuser_rule_edit.html

@@ -1229,14 +1229,6 @@
 
     //匹配方式按钮点击事件
     function clickMatchBtn(obj) {
-        /*var temp_list = ["6", "7", "8", "9"]
-        for (i in temp_list) {
-            if (matchCode.indexOf(temp_list[i]) > -1) {
-                matchCode.length = 0
-                matchName.length = 0
-                break
-            }
-        }*/
         if ($(obj).hasClass("active-btn-match")) {
             $(obj).removeClass("active-btn-match")
             matchCode.splice($.inArray($(obj).attr("code"), matchCode), 1);

CMPlatform/web/templates/private/cuser_rule_history_edit.html

@@ -547,7 +547,7 @@
         var btnMatchHtml1 = "";
         var btnMatchHtml2 = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } if (i >= 5 && i<= 8) {
@@ -986,8 +986,8 @@
     }
 
     function clickMatchBtn2(obj) {
-        var temp_list = ["6", "7", "8", "9"]
-        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)"]
+        var temp_list = ["6", "7", "8", "9", "10", "11", "12"]
+        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)", "采购意向名称", "采购意向内容", "采购意向采购单位"]
         for (i in temp_list) {
             if (matchCode.indexOf(temp_list[i]) > -1) {
                 matchCode.splice(jQuery.inArray(temp_list[i], matchCode), 1)

CMPlatform/web/templates/private/euser_rule_edit.html

@@ -580,7 +580,7 @@
         var notMatchName = "";
         var clearMatchName = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } else {

CMPlatform/web/templates/private/euser_tag_rule.html

@@ -267,7 +267,7 @@
         var btnMatchHtml2 = "";
         //匹配方式
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2 matchWay" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } else {

CMPlatform/web/templates/private/euser_tag_rule_l.html

@@ -117,7 +117,7 @@
         var btnMatchHtml2 = "";
         //匹配方式
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             }else {

CMPlatform/web/templates/private/history_rule_edit.html

@@ -727,7 +727,7 @@
         var notMatchName = "";
         var clearMatchName = "";
         for (var i in matchTypeMap) {
-            if (i < 5) {
+            if (i < 5 || i > 8) {
                 btnMatchHtml1 += `<input type="button" class="btn btn-default col-md-pull-2" style="margin-left: 10px;margin-top: 10px" onclick="clickMatchBtn(this)"
                             code="${matchTypeMap[i]["code"]}" value="${matchTypeMap[i]["name"]}">`;
             } else {
@@ -1118,114 +1118,79 @@
                     if (s_matchkey_str) {
                         s_matchkey_list = s_matchkey_str.split(",")
                         for (index_ in s_matchkey_list) {
-
                             //定位button 添加属性
                             $("#btnGroupMatch").find("input").each(function () {
                                 if ($(this).attr("code") == s_matchkey_list[index_]) {
                                     if (matchCode.indexOf(s_matchkey_list[index_]) == -1) {
                                         $(this).addClass("active-btn-match");
-
                                         matchCode.push($(this).attr("code"));
                                         matchName.push($(this).val())
                                     }
                                 }
-
                             });
-
                             $("#btnGroupMatch2").find("input").each(function () {
                                 if ($(this).attr("code") == s_matchkey_list[index_]) {
                                     if (matchCode.indexOf(s_matchkey_list[index_]) == -1) {
                                         $(this).addClass("active-btn-match");
-
                                         matchCode.push($(this).attr("code"));
                                         matchName.push($(this).val())
                                     }
                                 }
 
                             });
-
-
                         }
-
                     }
-
-
                 } else if (val == 6) {
                     s_matchkey_str = o_rules[selectIndex[0] - 1]["s_addkeymatch"]
                     if (s_matchkey_str) {
-
                         s_matchkey_list = s_matchkey_str.split(",")
-
                         for (index_ in s_matchkey_list) {
-
                             //定位button 添加属性
                             $("#btnGroupMatch").find("input").each(function () {
-
-
                                 if ($(this).attr("code") == s_matchkey_list[index_]) {
                                     if (matchCode.indexOf(s_matchkey_list[index_]) == -1) {
                                         $(this).addClass("active-btn-match");
-
                                         matchCode.push($(this).attr("code"));
                                         matchName.push($(this).val())
                                     }
                                 }
-
                             });
                             $("#btnGroupMatch2").find("input").each(function () {
-
-
                                 if ($(this).attr("code") == s_matchkey_list[index_]) {
                                     if (matchCode.indexOf(s_matchkey_list[index_]) == -1) {
                                         $(this).addClass("active-btn-match");
-
                                         matchCode.push($(this).attr("code"));
                                         matchName.push($(this).val())
                                     }
                                 }
-
                             });
-
                         }
-
                     }
-
-
                 } else if (val == 8) {
                     s_matchkey_str = o_rules[selectIndex[0] - 1]["s_notkeymatch"]
                     if (s_matchkey_str) {
-
                         s_matchkey_list = s_matchkey_str.split(",")
-
                         for (index_ in s_matchkey_list) {
                             //定位button 添加属性
                             $("#btnGroupMatch").find("input").each(function () {
-
-
                                 if ($(this).attr("code") == s_matchkey_list[index_]) {
                                     if (matchCode.indexOf(s_matchkey_list[index_]) == -1) {
                                         $(this).addClass("active-btn-match");
-
                                         matchCode.push($(this).attr("code"));
                                         matchName.push($(this).val())
                                     }
                                 }
-
                             });
                             $("#btnGroupMatch2").find("input").each(function () {
                                 if ($(this).attr("code") == s_matchkey_list[index_]) {
                                     if (matchCode.indexOf(s_matchkey_list[index_]) == -1) {
                                         $(this).addClass("active-btn-match");
-
                                         matchCode.push($(this).attr("code"));
                                         matchName.push($(this).val())
                                     }
                                 }
-
                             });
-
                         }
-
                     }
                 }
                 $('#modal-select-match').modal("show");
@@ -1253,8 +1218,8 @@
     }
 
     function clickMatchBtn2(obj) {
-        var temp_list = ["6", "7", "8", "9"]
-        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)"]
+        var temp_list = ["6", "7", "8", "9", "10", "11", "12"]
+        var name_list = ["采购单位", "中标单位", "采购单位(正则)", "中标单位(正则)", "采购意向名称", "采购意向内容", "采购意向采购单位"]
         for (i in temp_list) {
             if (matchCode.indexOf(temp_list[i]) > -1) {
                 matchCode.splice(jQuery.inArray(temp_list[i], matchCode), 1)