xiugai

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -147,13 +147,15 @@ $(function(){
             return
         }else{
             for(var i in buyerArr){
-                if(buyerArr[i] === keyWord){
-                    weui.toast('采购单位重复了', {
-                        duration: 2000,
-                        className: 'text-overflow100',
-                        callback: function(){}
-                    });
-                    return
+                if(keyWord !== buyer){
+                    if(buyerArr[i] === keyWord){
+                        weui.toast('采购单位重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
                 }
                 if(buyerArr[i] === buyer){
                     buyerArr[i] = keyWord;

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -331,13 +331,15 @@ $(function(){
             return
         }else{
             for(var i in keyWordArr){
-                if(keyWordArr[i].keyWord === keyWord){
-                    weui.toast('关键词重复了', {
-                        duration: 2000,
-                        className: 'text-overflow100',
-                        callback: function(){}
-                    });
-                    return
+                if(keyWord !== keyWords){
+                    if(keyWordArr[i].keyWord === keyWord){
+                        weui.toast('关键词重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
                 }
                 if(keyWordArr[i].keyWord === keyWords){
                     keyWordArr[i].keyWord = keyWord;

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -385,13 +385,15 @@
                     return
                 }else{
                     for(var i in appendedArr){
-                        if(appendedArr[i] === appended){
-                            weui.toast('附加词重复了', {
-                                duration: 2000,
-                                className: 'text-overflow100',
-                                callback: function(){}
-                            });
-                            return
+                        if(appended !== appendeds){
+                            if(appendedArr[i] === appended){
+                                weui.toast('附加词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
                         }
                         if(appendedArr[i] === appendeds){
                             appendedArr[i] = appended;

src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -394,13 +394,15 @@
                     return
                 }else{
                     for(var i in excludeArr){
-                        if(excludeArr[i] === exclude){
-                            weui.toast('排除词重复了', {
-                                duration: 2000,
-                                className: 'text-overflow100',
-                                callback: function(){}
-                            });
-                            return
+                        if(exclude !== excludes){
+                            if(excludeArr[i] === exclude){
+                                weui.toast('排除词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
                         }
                         if(excludeArr[i] === excludes){
                             excludeArr[i] = exclude;

src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -265,13 +265,15 @@
 					return
 				}else{
 					for(var i in winnerArr){
-						if(winnerArr[i] === keyWord){
-							weui.toast('中标单位重复了', {
-								duration: 2000,
-								className: 'text-overflow100',
-								callback: function(){}
-							});
-							return
+						if(keyWord !== winner){
+							if(winnerArr[i] === keyWord){
+								weui.toast('中标单位重复了', {
+									duration: 2000,
+									className: 'text-overflow100',
+									callback: function(){}
+								});
+								return
+							}
 						}
 						if(winnerArr[i] === winner){
 							winnerArr[i] = keyWord;

src/web/staticres/wx_dataExport/js/additionWord.js

@@ -147,13 +147,15 @@ $(function(){
             return
         }else{
             for(var i in buyerArr){
-                if(buyerArr[i] === keyWord){
-                    weui.toast('采购单位重复了', {
-                        duration: 2000,
-                        className: 'text-overflow100',
-                        callback: function(){}
-                    });
-                    return
+                if(keyWord !== buyer){
+                    if(buyerArr[i] === keyWord){
+                        weui.toast('采购单位重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
                 }
                 if(buyerArr[i] === buyer){
                     buyerArr[i] = keyWord;

src/web/staticres/wx_dataExport/js/keyWord.js

@@ -332,13 +332,15 @@ $(function(){
             return
         }else{
             for(var i in keyWordArr){
-                if(keyWordArr[i].keyWord === keyWord){
-                    weui.toast('关键词重复了', {
-                        duration: 2000,
-                        className: 'text-overflow100',
-                        callback: function(){}
-                    });
-                    return
+                if(keyWord !== keyWords){
+                    if(keyWordArr[i].keyWord === keyWord){
+                        weui.toast('关键词重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
                 }
                 if(keyWordArr[i].keyWord === keyWords){
                     keyWordArr[i].keyWord = keyWord;

src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -366,18 +366,21 @@
                     return
                 }else{
                     for(var i in appendedArr){
-                        if(appendedArr[i] === appended){
-                            weui.toast('附加词重复了', {
-                                duration: 2000,
-                                className: 'text-overflow100',
-                                callback: function(){}
-                            });
-                            return
+                        if(appended !== appendeds){
+                            if(appendedArr[i] === appended){
+                                weui.toast('附加词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
                         }
                         if(appendedArr[i] === appendeds){
                             appendedArr[i] = appended;
                         }
                     }
+                    console.log("111")
                     if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
                         for(var i in keyWordsArr){
                             if(keyWordsArr[i].keyWord === tokens){

src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -366,13 +366,15 @@
                     return
                 }else{
                     for(var i in excludeArr){
-                        if(excludeArr[i] === exclude){
-                            weui.toast('排除词重复了', {
-                                duration: 2000,
-                                className: 'text-overflow100',
-                                callback: function(){}
-                            });
-                            return
+                        if(exclude !== excludes){
+                            if(excludeArr[i] === exclude){
+                                weui.toast('排除词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
                         }
                         if(excludeArr[i] === excludes){
                             excludeArr[i] = exclude;

src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -110,7 +110,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}64"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}65"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         $(window).bind("pageshow", function(event){

src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -237,13 +237,15 @@
 					return
 				}else{
 					for(var i in winnerArr){
-						if(winnerArr[i] === keyWord){
-							weui.toast('中标单位重复了', {
-								duration: 2000,
-								className: 'text-overflow100',
-								callback: function(){}
-							});
-							return
+						if(winner !== keyWord){
+							if(winnerArr[i] === keyWord){
+								weui.toast('中标单位重复了', {
+									duration: 2000,
+									className: 'text-overflow100',
+									callback: function(){}
+								});
+								return
+							}
 						}
 						if(winnerArr[i] === winner){
 							winnerArr[i] = keyWord;