wangchuanjin před 3 roky
rodič
revize
07b54c942a

+ 3 - 1
src/web/staticres/frontRouter/pc/my_data_packet/js/index-pc.js

@@ -36,7 +36,9 @@ var vm = new Vue({
     },
     methods: {
       onClickRow (row, c, event) {
-        console.log(row, c, event)
+    	if(event.target.className!="dian-ji"&&row.search!=null&&(row.search.comeinfrom=="supersearchPage"||row.search.comeinfrom=="exportPage")){
+			window.location.href = "/front/dataExport/toSieve?id="+row.search.id;
+		}
       },
       goBuyPage () {
         location.href = '/front/dataPack/createOrder'

+ 249 - 183
src/web/templates/pc/dataExport_sieve.html

@@ -967,194 +967,74 @@
 
         $(".public-nav").css("background-color", "#fff");
         $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-
-        if (localStorage && localStorage.length > 0) {
-            getLocalStorage();
-            if (paramObj) {
-                //筛选日期
-                if (selectDateBtnIndex != -1) {
-                    $("#sieveDate .u-select").removeClass("select");
-                    selectDateDisSelect();
-                    $("#sieveDate .u-select").eq(selectDateBtnIndex).addClass("select");
-                } else {
-                    $("#sieveDate .u-select").removeClass("select");
-                    var publishTime = paramObj["publishtime"];
-                    if (publishTime && publishTime.split("_").length == 2) {
-                        var dates = publishTime.split("_");
-                        var startTime = dates[0];
-                        var endTime = dates[1];
-                        var startTimeVal = "";
-                        var endTimeVal = "";
-                        if (startTime) {
-                            startTimeVal = new Date(new Number(startTime + "000")).Format("yyyy年MM月dd日");
-                        }
-                        if (endTime) {
-                            endTimeVal = new Date(new Number(endTime + "000")).Format("yyyy年MM月dd日");
-                        }
-                        $("#starttime").attr("data-value", startTime);
-                        $("#endtime").attr("data-value", endTime);
-                        $("#starttime").val(startTimeVal);
-                        $("#endtime").val(endTimeVal);
-                    }
-                    selectDateSelect();
-                }
-                //区域
-                var region = paramObj["region"];
-                if (region) {
-                    var regionHtml = "";
-                    $.each(region.split(","), function (i, v) {
-                        regionHtml += "<div data-arr=\"selectArea\" class=\"delete-close\">" + v + "<i class=\"iconfont icon-guanbi\"></i></div>";
-                    });
-                    $("#area-del").html(regionHtml);
-                }
-                //行业
-                var classArr_arr = ClassArr.arr;
-                ClassArr.arr = [];
-                $.each(classArr_arr, function (i, v) {
-                    if (v && v.split("_").length > 0) {
-                        var sel = "";
-                        var dataValue = v;
-                        if (v.split("_").length == 2) {
-                            sel = v.split("_")[1];
-                        } else if (v.split("_").length == 1) {
-                            sel = v;
-                        }
-                        ClassArr.add(sel, dataValue);
-                    }
-                });
-                // 采购单位类型
-                var buyClassing = buyClassArr.arr;
-                buyClassArr.arr = []
-                $.each(buyClassing, function (i, v) {
-                    if (v) {
-                        var sel = "";
-                        var dataValue = v;
-                        sel = v;
-                        buyClassArr.add(v, dataValue);
-                    }
-                });
-                //关键词
-                $("#keyInput").val("");
-                var keyWordP = paramObj["keyword"];
-                if (keyWordP && JSON.parse(keyWordP) && JSON.parse(keyWordP).length > 0) {
-                    var keyWords = JSON.parse(keyWordP);
-                    $("#keyInput").hide();
-                    $.each(keyWords, function (i, val) {
-                        if (val) {
-                            var keyword = val["keyword"];
-                            var appendedArr = val["appended"];
-                            var excludedArr = val["exclude"];
-                            if (keyword) {
-                                var box = "inputDel_0";
-                                var arr = box;
-                                appendArr = appendedArr;
-                                excludeArr = excludedArr;
-                                var template = createKeyBox(keyword);
-                                var LArr = [$("#inputDel_0 .column:eq(0)>div").length, $("#inputDel_0 .column:eq(1)>div").length, $("#inputDel_0 .column:eq(2)>div").length];
-                                var tempI = LArr.indexOf(Math.min(LArr[0], LArr[1], LArr[2]));
-                                box += ' .column:eq(' + (tempI) + ')';
-                                var tempArr = keyAllArr.map(function (v) {
-                                    return v.name
-                                });
-                                if (tempArr.indexOf(keyword) === -1) {
-                                    keyAllArr.push({
-                                        name: keyword,
-                                        append: appendArr,
-                                        exclude: excludeArr
-                                    })
-                                }
-                                appendArr = [];
-                                excludeArr = [];
-                                $(".add-input-w input.sm").remove();
-                                $(".add-input-w").css("display", "none");
-                                $("#addKeyword").css("display", "block");
-                                addDelBox(keyword, '#' + box, arr, template);
-                            }
-                        }
-
-                    });
-                }
-                //金额
-                priceDisSel();
-                priceConfirmHide();
-                if (priceAllBtnSel == "1") {
-                    $("#priceAll").addClass("select");
-                    priceDisSelected();
-                    $("#minprice").val("");
-                    $("#maxprice").val("");
-                } else {
-                    $("#priceAll").removeClass("select");
-                    var minPrice = paramObj["minprice"];
-                    var maxPrice = paramObj["maxprice"];
-                    if (minPrice) {
-                        $("#minprice").val(minPrice);
+        if(getParam("id")!=null){
+          $.ajax({
+            type: 'post',
+            url: '/jypay/dataExport/historyById',
+            data: {
+                id: getParam("id")
+            },
+            async: false,
+            dataType: 'json',
+            success: function (r) {
+              r.area = arrToString(r.area);
+              r.city = arrToString(r.city);
+              r.region = arrToString(r.region);
+              r.winner = arrToString(r.winner);
+              r.buyer = arrToString(r.buyer);
+              if(r.keywords!=null){
+                for(var i=0;i<r.keywords.length;i++){
+                  if(r.keywords[i]!=null){
+                    if(r.keywords[i].keyword==null){
+                      r.keywords[i].keyword = "";
                     }
-                    if (maxPrice) {
-                        $("#maxprice").val(maxPrice);
+                    if(r.keywords[i].appended==null){
+                      r.keywords[i].appended = [];
                     }
-                    priceSelected();
-                }
-                //信息类型
-                var infoArr_arr = InfoArr.arr;
-                InfoArr.arr = [];
-                $.each(infoArr_arr, function (i, v) {
-                    if (v && v.split("_").length > 0) {
-                        var sel = "";
-                        var dataValue = v;
-                        if (v.split("_").length == 2) {
-                            sel = v.split("_")[1];
-                        } else if (v.split("_").length == 1) {
-                            sel = v;
-                        }
-                        InfoArr.add(sel, dataValue);
+                    if(r.keywords[i].exclude==null){
+                      r.keywords[i].exclude = [];
                     }
-                });
-                //采购单位
-                $("#buyerInput").val("");
-                if (paramObj["buyer"] && paramObj["buyer"].split(",").length > 0) {
-                    var buyers = paramObj["buyer"].split(",");
-                    $("#buyerInput").hide();
-                    $.each(buyers, function (i, v) {
-                        if (v) {
-                            addDelBox(v, '#' + "inputDel_1", "inputDel_1", null);
-                        }
-                    });
-                    $("#addBuyer").show();
+                  }
                 }
-                //中标单位
-                $("#winnerInput").val("");
-                if (paramObj["winner"] && paramObj["winner"].split(",").length > 0) {
-                    var winners = paramObj["winner"].split(",");
-                    $("#winnerInput").hide();
-                    $.each(winners, function (i, v) {
-                        if (v) {
-                            addDelBox(v, '#' + "inputDel_2", "inputDel_2", null);
-                        }
-                    });
-                    $("#addWinner").show();
-                }
-            }
-        } else {
-            $("#starttime").val("");
-            $("#endtime").val("");
-            $("#minprice").val("");
-            $("#maxprice").val("");
-        }
-        //
-        if (localStorage.selectType !== "" && localStorage.selectType !== undefined) {
-            var selectType = localStorage.selectType;
-            var select = '';
-            if (selectType === "title") {
-                select = "按标题匹配";
-            } else if (selectType === "all") {
-                select = "按全文匹配";
+                r.keyword = JSON.stringify(r.keywords);
+              }else{
+                r.keyword = "";
+              }
+              if(r.minprice!=""||r.maxprice!=""){
+                priceAllBtnSel = "0";
+              }
+              if(r.industry==null){
+                ClassArr.arr = [];
+              }else{
+                ClassArr.arr = r.industry;
+              }
+              if(r.buyerclass==null){
+                buyClassArr.arr = [];  
+              }else{
+                buyClassArr.arr = r.buyerclass;
+              }
+              InfoArr.arr = r.subtype.split(",");
+              selectDateBtnIndex = -1;
+              paramObj = r;
+              console.info(r)
+              echo(paramObj);
+              echo_selectType(paramObj.selectType);
             }
-            $(".selectType button").each(function () {
-                if ($(this).text() === select) {
-                    $(".selectType button").removeClass("select");
-                    $(this).addClass("select");
-                }
-            });
+          });
+        }else{
+          if (localStorage && localStorage.length > 0) {
+              getLocalStorage();
+              echo(paramObj);
+          } else {
+              $("#starttime").val("");
+              $("#endtime").val("");
+              $("#minprice").val("");
+              $("#maxprice").val("");
+          }
+          //
+          if (localStorage.selectType !== "" && localStorage.selectType !== undefined) {
+            echo_selectType(localStorage.selectType);
+          }
         }
 
         //行业
@@ -2030,6 +1910,192 @@
         $(".selectType button").removeClass("select")
         $(this).addClass("select")
     });
+    function echo(paramObj){
+      if (paramObj) {
+        //筛选日期
+        if (selectDateBtnIndex != -1) {
+            $("#sieveDate .u-select").removeClass("select");
+            selectDateDisSelect();
+            $("#sieveDate .u-select").eq(selectDateBtnIndex).addClass("select");
+        } else {
+            $("#sieveDate .u-select").removeClass("select");
+            var publishTime = paramObj["publishtime"];
+            if (publishTime && publishTime.split("_").length == 2) {
+                var dates = publishTime.split("_");
+                var startTime = dates[0];
+                var endTime = dates[1];
+                var startTimeVal = "";
+                var endTimeVal = "";
+                if (startTime) {
+                    startTimeVal = new Date(new Number(startTime + "000")).Format("yyyy年MM月dd日");
+                }
+                if (endTime) {
+                    endTimeVal = new Date(new Number(endTime + "000")).Format("yyyy年MM月dd日");
+                }
+                $("#starttime").attr("data-value", startTime);
+                $("#endtime").attr("data-value", endTime);
+                $("#starttime").val(startTimeVal);
+                $("#endtime").val(endTimeVal);
+            }
+            selectDateSelect();
+        }
+        //区域
+        var region = paramObj["region"];
+        if (region) {
+            var regionHtml = "";
+            $.each(region.split(","), function (i, v) {
+                regionHtml += "<div data-arr=\"selectArea\" class=\"delete-close\">" + v + "<i class=\"iconfont icon-guanbi\"></i></div>";
+            });
+            $("#area-del").html(regionHtml);
+        }
+        //行业
+        var classArr_arr = ClassArr.arr;
+        ClassArr.arr = [];
+        $.each(classArr_arr, function (i, v) {
+            if (v && v.split("_").length > 0) {
+                var sel = "";
+                var dataValue = v;
+                if (v.split("_").length == 2) {
+                    sel = v.split("_")[1];
+                } else if (v.split("_").length == 1) {
+                    sel = v;
+                }
+                ClassArr.add(sel, dataValue);
+            }
+        });
+        // 采购单位类型
+        var buyClassing = buyClassArr.arr;
+        buyClassArr.arr = []
+        $.each(buyClassing, function (i, v) {
+            if (v) {
+                var sel = "";
+                var dataValue = v;
+                sel = v;
+                buyClassArr.add(v, dataValue);
+            }
+        });
+        //关键词
+        $("#keyInput").val("");
+        var keyWordP = paramObj["keyword"];
+        if (keyWordP && JSON.parse(keyWordP) && JSON.parse(keyWordP).length > 0) {
+            var keyWords = JSON.parse(keyWordP);
+            $("#keyInput").hide();
+            $.each(keyWords, function (i, val) {
+                if (val) {
+                    var keyword = val["keyword"];
+                    var appendedArr = val["appended"];
+                    var excludedArr = val["exclude"];
+                    if (keyword) {
+                        var box = "inputDel_0";
+                        var arr = box;
+                        appendArr = appendedArr;
+                        excludeArr = excludedArr;
+                        var template = createKeyBox(keyword);
+                        var LArr = [$("#inputDel_0 .column:eq(0)>div").length, $("#inputDel_0 .column:eq(1)>div").length, $("#inputDel_0 .column:eq(2)>div").length];
+                        var tempI = LArr.indexOf(Math.min(LArr[0], LArr[1], LArr[2]));
+                        box += ' .column:eq(' + (tempI) + ')';
+                        var tempArr = keyAllArr.map(function (v) {
+                            return v.name
+                        });
+                        if (tempArr.indexOf(keyword) === -1) {
+                            keyAllArr.push({
+                                name: keyword,
+                                append: appendArr,
+                                exclude: excludeArr
+                            })
+                        }
+                        appendArr = [];
+                        excludeArr = [];
+                        $(".add-input-w input.sm").remove();
+                        $(".add-input-w").css("display", "none");
+                        $("#addKeyword").css("display", "block");
+                        addDelBox(keyword, '#' + box, arr, template);
+                    }
+                }
 
+            });
+        }
+        //金额
+        priceDisSel();
+        priceConfirmHide();
+        if (priceAllBtnSel == "1") {
+            $("#priceAll").addClass("select");
+            priceDisSelected();
+            $("#minprice").val("");
+            $("#maxprice").val("");
+        } else {
+            $("#priceAll").removeClass("select");
+            var minPrice = paramObj["minprice"];
+            var maxPrice = paramObj["maxprice"];
+            if (minPrice) {
+                $("#minprice").val(minPrice);
+            }
+            if (maxPrice) {
+                $("#maxprice").val(maxPrice);
+            }
+            priceSelected();
+        }
+        //信息类型
+        var infoArr_arr = InfoArr.arr;
+        InfoArr.arr = [];
+        $.each(infoArr_arr, function (i, v) {
+            if (v && v.split("_").length > 0) {
+                var sel = "";
+                var dataValue = v;
+                if (v.split("_").length == 2) {
+                    sel = v.split("_")[1];
+                } else if (v.split("_").length == 1) {
+                    sel = v;
+                }
+                InfoArr.add(sel, dataValue);
+            }
+        });
+        //采购单位
+        $("#buyerInput").val("");
+        if (paramObj["buyer"] && paramObj["buyer"].split(",").length > 0) {
+            var buyers = paramObj["buyer"].split(",");
+            $("#buyerInput").hide();
+            $.each(buyers, function (i, v) {
+                if (v) {
+                    addDelBox(v, '#' + "inputDel_1", "inputDel_1", null);
+                }
+            });
+            $("#addBuyer").show();
+        }
+        //中标单位
+        $("#winnerInput").val("");
+        if (paramObj["winner"] && paramObj["winner"].split(",").length > 0) {
+            var winners = paramObj["winner"].split(",");
+            $("#winnerInput").hide();
+            $.each(winners, function (i, v) {
+                if (v) {
+                    addDelBox(v, '#' + "inputDel_2", "inputDel_2", null);
+                }
+            });
+            $("#addWinner").show();
+        }
+    }
+  }
+  function echo_selectType(selectType){
+    var select = '';
+    if (selectType === "title") {
+        select = "按标题匹配";
+    } else if (selectType === "all") {
+        select = "按全文匹配";
+    }
+    $(".selectType button").each(function () {
+        if ($(this).text() === select) {
+            $(".selectType button").removeClass("select");
+            $(this).addClass("select");
+        }
+    });
+  }
+  function arrToString(v){
+    if(v==null){
+      return ""
+    }else{
+      return v.join(",");
+    }
+  }
 </script>
 </html>