xiugai

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

@@ -103,7 +103,7 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let oSpan = $(this).parent().siblings().children('textarea');
         let val = $(oSpan).val();
         $(this).parent().hide();
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -147,6 +147,14 @@ $(function(){
             return
         }else{
             for(var i in buyerArr){
+                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

@@ -239,7 +239,7 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let oSpan = $(this).parent().siblings().children('textarea');
         let val = $(oSpan).val();
         // alert(oSpan.documentElement.scrollTop)
         var keyWord = $(this).prev().children().find(".key").text();
@@ -331,6 +331,14 @@ $(function(){
             return
         }else{
             for(var i in keyWordArr){
+                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

@@ -327,7 +327,7 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let oSpan = $(this).parent().siblings().children('textarea');
                 let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -385,6 +385,14 @@
                     return
                 }else{
                     for(var i in appendedArr){
+                        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_area.html

@@ -663,11 +663,14 @@
 							 "transform":"rotate(-180deg)"
 						 })
 					 }
-					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500);
 					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
 
 				 })
+
+				 // if("")
+
 				 $('.province .checkbox:not(.other)').on('change',function(){
 					var isCheckded = $(this).is(':checked');
 					// console.log(isCheckded);

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

@@ -336,7 +336,7 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let oSpan = $(this).parent().siblings().children('textarea');
                 let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -394,6 +394,14 @@
                     return
                 }else{
                     for(var i in excludeArr){
+                        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_keyWord.html

@@ -137,7 +137,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}45"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}47"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){

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

@@ -221,7 +221,7 @@
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
-				let oSpan = e.target.parentNode.nextElementSibling.children[0];
+				let oSpan = $(this).parent().siblings().children('textarea');
 				let val = $(oSpan).val();
 				$(this).parent().hide();
 				$(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -265,6 +265,14 @@
 					return
 				}else{
 					for(var i in winnerArr){
+						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

@@ -103,7 +103,7 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let oSpan = $(this).parent().siblings().children('textarea');
         let val = $(oSpan).val();
         $(this).parent().hide();
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -147,6 +147,14 @@ $(function(){
             return
         }else{
             for(var i in buyerArr){
+                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

@@ -231,7 +231,7 @@ $(function(){
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
-        let oSpan = e.target.parentNode.nextElementSibling.children[0];
+        let oSpan = $(this).parent().siblings().children('textarea');
         let val = $(oSpan).val();
 
         var keyWord = $(this).prev().children().find(".key").text();
@@ -332,6 +332,14 @@ $(function(){
             return
         }else{
             for(var i in keyWordArr){
+                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

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -308,7 +308,7 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let oSpan = $(this).parent().siblings().children('textarea');
                 let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -366,6 +366,14 @@
                     return
                 }else{
                     for(var i in appendedArr){
+                        if(appendedArr[i] === appended){
+                            weui.toast('附加词重复了', {
+                                duration: 2000,
+                                className: 'text-overflow100',
+                                callback: function(){}
+                            });
+                            return
+                        }
                         if(appendedArr[i] === appendeds){
                             appendedArr[i] = appended;
                         }

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

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"3>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style>

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

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -308,7 +308,7 @@
 
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
-                let oSpan = e.target.parentNode.nextElementSibling.children[0];
+                let oSpan = $(this).parent().siblings().children('textarea');
                 let val = $(oSpan).val();
                 $(this).parent().hide();
                 $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -366,6 +366,14 @@
                     return
                 }else{
                     for(var i in excludeArr){
+                        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_excludeInput.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"4>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>

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"}}63"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}64"></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

@@ -193,7 +193,7 @@
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
-				let oSpan = e.target.parentNode.nextElementSibling.children[0];
+				let oSpan = $(this).parent().siblings().children('textarea');
 				let val = $(oSpan).val();
 				$(this).parent().hide();
 				$(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
@@ -237,6 +237,14 @@
 					return
 				}else{
 					for(var i in winnerArr){
+						if(winnerArr[i] === keyWord){
+							weui.toast('中标单位重复了', {
+								duration: 2000,
+								className: 'text-overflow100',
+								callback: function(){}
+							});
+							return
+						}
 						if(winnerArr[i] === winner){
 							winnerArr[i] = keyWord;
 						}