feat: 信息类型新增二级分类

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/set_infotype.js

@@ -20,9 +20,35 @@ var vNode = {
             },
             {
                 name: '招标预告',
-                value: '预告',
+                value: '',
                 level: 1,
-                children: []
+                children: [
+                    {
+                        name: '预告',
+                        value: '预告',
+                        level: 2,
+                    },
+                    {
+                        name: '预审',
+                        value: '预审',
+                        level: 2,
+                    },
+                    {
+                        name: '预审结果',
+                        value: '预审结果',
+                        level: 2,
+                    },
+                    {
+                        name: '论证意见',
+                        value: '论证意见',
+                        level: 2,
+                    },
+                    {
+                        name: '需求公示',
+                        value: '需求公示',
+                        level: 2,
+                    },
+                ]
             },
             {
                 name: '招标公告',

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

@@ -112,7 +112,12 @@
                     </li>
                     <li>
                     <dl>
-                    <dt class="question" data-value="预告">招标预告</dt>
+                      <dt data-value="预告">招标预告</dt>
+                      <dd>预告</dd>
+                      <dd>预审</dd>
+                      <dd>预审结果</dd>
+                      <dd>论证意见</dd>
+                      <dd>需求公示</dd>
                     </dl>
                     </li>
                     <li>

src/jfw/modules/app/src/web/templates/vipsubscribe/messageType.html

@@ -102,7 +102,12 @@
                 </li>
                 <li>
                     <dl>
-                        <dt dataValue="预告">招标预告</dt>
+                        <dt>招标预告</dt>
+                        <dd>预告</dd>
+                        <dd>预审</dd>
+                        <dd>预审结果</dd>
+                        <dd>论证意见</dd>
+                        <dd>需求公示</dd>
                     </dl>
                 </li>
                 <li>
@@ -155,12 +160,14 @@
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
     <script>
+		var hasZBYG = ''
 		var hasZBGG = ""
 		var hasZBJG = ""
 		var hasZBXYXX = ""
 		var hasStr = ""
         function hasActive(){
             var arr = "";
+			hasZBYG = ''
 			hasZBGG = ""
 			hasZBJG = ""
 			hasZBXYXX = ""
@@ -168,6 +175,12 @@
             $(".list ul li dl dd").each(function(index){
                 if($(this).hasClass('active')){
                     arr = arr + "," + $(this).text()
+					if ($(this).prevAll("dt").text()=="招标预告") {
+						if (hasZBYG) {
+							hasZBYG += '、'
+						}
+						hasZBYG += $(this).text()
+					}
 					if($(this).prevAll("dt").text()=="招标公告"){
 						if(hasZBGG!=""){
 							hasZBGG+="、"
@@ -189,9 +202,9 @@
                 }
             })
             $(".list ul li dl dt").each(function(index){
-                if($(this).hasClass('active')&&($(this).text()=="招标预告"||$(this).text()=="拟建项目")){
+                if($(this).hasClass('active')&&$(this).text()=="拟建项目"){
                     arr = arr + "," + $(this).attr("dataValue")
-					if($(this).text()=="招标预告"||$(this).text()=="拟建项目"){
+					if($(this).text()=="拟建项目"){
 						if (hasStr!=""){
 							hasStr += "、"
 						}
@@ -228,7 +241,13 @@
 		//
 		function getChecked(){
 			hasActive();
-			if (hasZBGG!=""||hasZBJG!=""|hasZBXYXX!=""){
+			if (hasZBYG || hasZBGG!=""||hasZBJG!=""|hasZBXYXX!=""){
+				if(hasZBYG){
+					if(hasStr != ""){
+						hasStr +="、"
+					}
+					hasStr+="招标预告 ("+hasZBYG+")"
+				}
 				if(hasZBGG!=""){
 					if(hasStr != ""){
 						hasStr +="、"

src/web/staticres/common-module/collection/js/notice-mobile.js

@@ -103,7 +103,7 @@ var noticeComponent = {
             "预审",
             "预审结果",
             "论证意见",
-            "需求公示"
+            "需求公示",
           ]
         },
         {
@@ -171,13 +171,6 @@ var noticeComponent = {
                   bool = false
                 })
               }
-            } else if(data == '预告') {
-              if(Object.keys(item)[0] == '招标预告') {
-                item[Object.keys(item)[0]].forEach(function(d) {
-                  d.type = true
-                  bool = false
-                })
-              }
             }
           });
         })
@@ -299,9 +292,6 @@ var noticeComponent = {
             if (data.name === '拟建项目') {
               str = '拟建'
               noticeArr.push(str)
-            } else if(data.name === '招标预告') {
-              str = '预告'
-              noticeArr.push(str)
             } else {
               str = data.name
               noticeArr.push(str)

src/web/templates/pc/dataExport_sieve.html

@@ -830,6 +830,11 @@
                         <span class="info-select-now all">全部</span>
                         <span class="info-select-now split">拟建项目</span>
                         <span class="info-select-now split">招标预告</span>
+                        <span data-value="招标预告_预告">预告</span>
+                        <span data-value="招标预告_预审">预审</span>
+                        <span data-value="招标预告_预审结果">预审结果</span>
+                        <span data-value="招标预告_论证意见">论证意见</span>
+                        <span data-value="招标预告_需求公示">需求公示</span>
                         <span class="info-select-now split">招标公告</span><span data-value="招标公告_招标">招标</span><span
                                 data-value="招标公告_邀标">邀标</span><span data-value="招标公告_询价">询价</span><span
                                 data-value="招标公告_竞谈">竞谈</span><span data-value="招标公告_单一">单一</span><span
@@ -1446,7 +1451,6 @@
     //信息类型
     function getSubType() {
         var njxm = {"拟建项目": "拟建"};
-        var zbyg = {"招标预告": "预告"};
         var subArr = new Array();
         InfoArr.arr.map(function (v) {
             var arr = InfoData[v];
@@ -1455,8 +1459,6 @@
             } else {
                 if (v == Object.keys(njxm)[0]) {
                     v = njxm[v];
-                } else if (v == Object.keys(zbyg)[0]) {
-                    v = zbyg[v];
                 }
                 subArr.push(v.split('_').pop());
             }
@@ -1962,6 +1964,7 @@
 
     /* 信息 */
     var InfoData = {
+        '招标预告': ['预告', '预审', '预审结果', '论证意见', '需求公示', '其他'],
         '招标公告': ['招标', '邀标', '询价', '竞谈', '单一', '竞价', '变更', '其他'],
         '招标结果': ['中标', '成交', '废标', '流标'],
         '招标信用信息': ['合同', '验收', '违规']

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

@@ -110,7 +110,12 @@
                         </li>
                     <li>
                         <dl>
-                            <dt class="question" data-value="预告">招标预告</dt>
+                          <dt data-value="预告">招标预告</dt>
+                          <dd>预告</dd>
+                          <dd>预审</dd>
+                          <dd>预审结果</dd>
+                          <dd>论证意见</dd>
+                          <dd>需求公示</dd>
                         </dl>
                     </li>
                     <li>

src/web/templates/weixin/vipsubscribe/messageType.html

@@ -57,7 +57,12 @@
             </li>
             <li>
                 <dl>
-                    <dt dataValue="预告">招标预告</dt>
+                    <dt>招标预告</dt>
+                    <dd>预告</dd>
+                    <dd>预审</dd>
+                    <dd>预审结果</dd>
+                    <dd>论证意见</dd>
+                    <dd>需求公示</dd>
                 </dl>
             </li>
             <li>
@@ -105,6 +110,7 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
 <script>
     initShare({{.T.signature}},{{.T.openid}}, 2, "jy_extend",{{.T.nickname}},{{.T.avatar}});
+		var hasZBYG = ''
     var hasZBGG = ""
     var hasZBJG = ""
     var hasZBXYXX = ""
@@ -112,6 +118,7 @@
 
     function hasActive() {
         var arr = "";
+        hasZBYG = ''
         hasZBGG = ""
         hasZBJG = ""
         hasZBXYXX = ""
@@ -119,6 +126,12 @@
         $(".list ul li dl dd").each(function (index) {
             if ($(this).hasClass('active')) {
                 arr = arr + "," + $(this).text()
+                if ($(this).prevAll("dt").text()=="招标预告") {
+                  if (hasZBYG) {
+                    hasZBYG += '、'
+                  }
+                  hasZBYG += $(this).text()
+                }
                 if ($(this).prevAll("dt").text() == "招标公告") {
                     if (hasZBGG != "") {
                         hasZBGG += "、"
@@ -140,9 +153,9 @@
             }
         })
         $(".list ul li dl dt").each(function (index) {
-            if ($(this).hasClass('active') && ($(this).text() == "招标预告" || $(this).text() == "拟建项目")) {
+            if ($(this).hasClass('active') && $(this).text() == "拟建项目") {
                 arr = arr + "," + $(this).attr("dataValue")
-                if ($(this).text() == "招标预告" || $(this).text() == "拟建项目") {
+                if ($(this).text() == "拟建项目") {
                     if (hasStr != "") {
                         hasStr += "、"
                     }
@@ -181,7 +194,13 @@
     //
     function getChecked() {
         hasActive();
-        if (hasZBGG != "" || hasZBJG != "" | hasZBXYXX != "") {
+        if (hasZBYG || hasZBGG != "" || hasZBJG != "" | hasZBXYXX != "") {
+            if(hasZBYG){
+              if(hasStr != ""){
+                hasStr +="、"
+              }
+              hasStr+="招标预告 ("+hasZBYG+")"
+            }
             if (hasZBGG != "") {
                 if (hasStr != "") {
                     hasStr += "、"