三库修改

src/config.json

@@ -8,11 +8,11 @@
     "elasticsearch_index": "winner_enterprise",
     "elasticsearch_type": "winnerent",
     "elasticsearch_db": "winner_enterprise",
-    "elasticsearch_buyer_index": "localhost_buyer",
-    "elasticsearch_buyer_type": "mytestbuyer",
+    "elasticsearch_buyer_index": "buyer_enterprise",
+    "elasticsearch_buyer_type": "buyerent",
     "elasticsearch_buyer_db": "buyer_enterprise",
-    "elasticsearch_agency_index": "localhost_agency",
-    "elasticsearch_agency_type": "mytestagency",
+    "elasticsearch_agency_index": "agency_enterprise",
+    "elasticsearch_agency_type": "agencyent",
     "elasticsearch_agency_db": "agency_enterprise",
     "redis_qyk": "qyk_redis",
     "redis_winner_db": "1",

src/web/templates/admin/agencyinfo.html

@@ -162,11 +162,11 @@
     function AddAgencyHTML() {
         $("#infos").html("");
         $("#info_title").html("新增代理机构信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">代理机构名称：</label>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">机构名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_agency_name\" must=\"true\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\"></div></div>" +
@@ -178,9 +178,9 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">代理机构地址地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">机构地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\"></div></div>" +
@@ -292,11 +292,11 @@
     function editdata(_obj) {
         $("#infos").html("");
         $("#info_title").html("编辑采购单位信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">采购单位名称：</label>" +
-            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_agency_name\" must=\"true\" value='" + _obj.agency_name + "'></div></div>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">机构名称：</label>" +
+            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_agency_name\" must=\"true\" readonly=\"true\" value='" + _obj.agency_name + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" value='" + _obj.history_name + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\"  value='" + _obj.area_code + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\" value='" + _obj.type + "'></div></div>" +
@@ -308,9 +308,9 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\" value='" + _obj.city + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\" value='" + _obj.district + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">代理机构地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">机构地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\" value='" + _obj.address + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\" value='"+_obj.wechat_accounts.join(";")+"'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\" value='" + _obj.website + "'></div></div>" +
@@ -378,6 +378,7 @@
             "address": address,
             "wechat_accounts": wechat_accounts,
             "website": website,
+            "contact":contact,
 
         }, function (data) {
             if (data && data.rep) {

src/web/templates/admin/buyerinfo.html

@@ -162,11 +162,11 @@
     function AddBuyerHTML() {
         $("#infos").html("");
         $("#info_title").html("新增采购单位信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">采购单位名称：</label>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">单位名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyer_name\" must=\"true\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\"></div></div>" +
@@ -178,11 +178,11 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位类型：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyerclass\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\"></div></div>" +
@@ -296,11 +296,11 @@
     function editdata(_obj) {
         $("#infos").html("");
         $("#info_title").html("编辑采购单位信息");
-        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">采购单位名称：</label>" +
-            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyer_name\" must=\"true\" value='" + _obj.buyer_name + "'></div></div>" +
+        com ="<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\" style=\"color: red;\">单位名称：</label>" +
+            "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyer_name\" must=\"true\" readonly=\"true\" value='" + _obj.buyer_name + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" value='" + _obj.history_name + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\"  value='" + _obj.area_code + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_type\" value='" + _obj.type + "'></div></div>" +
@@ -312,11 +312,11 @@
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_city\" value='" + _obj.city + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">区县：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_district\" value='" + _obj.district + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位类型：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位类型：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_buyerclass\" value='" + _obj.buyerclass + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">采购单位地址：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">单位地址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_address\" value='" + _obj.address + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">公众号：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\" value='"+_obj.wechat_accounts.join(";")+"'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-2 control-label\">网址：</label>" +
             "<div class=\"col-sm-10\"><input type=\"text\" class=\"form-control\" id=\"s_website\" value='" + _obj.website + "'></div></div>" +
@@ -350,7 +350,7 @@
         var address = $("#s_address").val();                    //采购单位地址
         var wechat_accounts = $("#s_wechat_accounts").val();    //微信公众号
         var website = $("#s_website").val();                    //网址
-        var contact = editor_update.getText();//联系人
+        var contact = editor_update.getText();                  //联系人
         if (typeof contact == 'string') {
             try {
                 var obj=JSON.parse(contact);
@@ -385,6 +385,7 @@
             "address": address,
             "wechat_accounts": wechat_accounts,
             "website": website,
+            "contact":contact,
 
         }, function (data) {
             if (data && data.rep) {

src/web/templates/admin/qiyekuinfo.html

@@ -254,7 +254,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_alias\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\" ></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">省份：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_province\"></div></div>" +
@@ -268,7 +268,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_company_address\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">经营范围：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_business_scope\"></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">公众号：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\"></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">网址：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_website\"></div></div>" +
@@ -545,12 +545,12 @@
         $("#infos").html("");
         $("#info_title").html("编辑企业库信息");
         com = "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\" style=\"color: red;\">企业名称：</label>" +
-            "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_company_name\"  readonly=\"true\" must=\"true\" value='" + _obj.company_name + "'></div></div>" +
+            "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_company_name\"  readonly=\"true\" must=\"true\" readonly=\"true\" value='" + _obj.company_name + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">别名：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_alias\" value='" + _obj.alias + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">历史名称：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_history_name\" placeholder=\"多个;隔开\" value='" + _obj.history_name + "'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划代码：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">行政区划：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_area_code\" value='"+_obj.area_code+"' ></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">省份：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_province\" value='" + _obj.province + "'></div></div>" +
@@ -564,7 +564,7 @@
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_company_address\" value='" + _obj.company_address + "'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">经营范围：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_business_scope\" value='"+_obj.business_scope+"'></div></div>" +
-            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">微信公众号：</label>" +
+            "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">公众号：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_wechat_accounts\" placeholder=\"多个;隔开\" value='"+_obj.wechat_accounts.join(";")+"'></div></div>" +
             "<div class=\"row form-group\"><label for=\"lastname\" class=\"col-sm-3 control-label\">网址：</label>" +
             "<div class=\"col-sm-9\"><input type=\"text\" class=\"form-control\" id=\"s_website\" value='"+_obj.website+"'></div></div>" +