Ver código fonte

卫健高教++

sugangqiang 1 ano atrás
pai
commit
f125c6c58a
29 arquivos alterados com 3056 adições e 154 exclusões
  1. 96 81
      app/admin/controller/Enterprise.php
  2. 26 9
      app/admin/controller/EnterpriseChangeRecord.php
  3. 2 2
      app/admin/view/enterprise/hospital/goto_active_page.html
  4. 2 15
      app/admin/view/enterprise/hospital/goto_enterprise_detail_page.html
  5. 3 2
      app/admin/view/enterprise/hospital/goto_examine_page.html
  6. 1 12
      app/admin/view/enterprise/school/goto_active_page.html
  7. 3 16
      app/admin/view/enterprise/school/goto_enterprise_detail_page.html
  8. 2 12
      app/admin/view/enterprise/school/goto_examine_page.html
  9. 1 1
      app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html
  10. 224 0
      app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_detail_page.html
  11. 300 0
      app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_detail_page1.html
  12. 63 0
      app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_examine_page.html
  13. 196 0
      app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_record_page.html
  14. 214 0
      app/admin/view/enterprise_change_record/school/goto_enterprise_change_detail_page.html
  15. 300 0
      app/admin/view/enterprise_change_record/school/goto_enterprise_change_detail_page1.html
  16. 63 0
      app/admin/view/enterprise_change_record/school/goto_enterprise_change_examine_page.html
  17. 118 0
      app/admin/view/enterprise_change_record/school/goto_enterprise_change_record_page.html
  18. 4 3
      app/common/api/EnterpriseApi.php
  19. 13 0
      app/common/api/LocationApi.php
  20. 34 0
      app/common/api/Nhc.php
  21. 10 1
      public/static/modular/enterprise/enterprise_examine.js
  22. 182 0
      public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_detail.js
  23. 146 0
      public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_detail1.js
  24. 79 0
      public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_examine.js
  25. 301 0
      public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_list.js
  26. 182 0
      public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_detail.js
  27. 146 0
      public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_detail1.js
  28. 79 0
      public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_examine.js
  29. 266 0
      public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_list.js

+ 96 - 81
app/admin/controller/Enterprise.php

@@ -22,9 +22,8 @@ use app\common\state\CommonConst;
 class Enterprise extends AdminController {
 
     public function gotoEnterprisePage() {
-        $type = $this->user["type"];
         $template = "";
-        switch ($type) {
+        switch ($this->user["type"]) {
             case CommonConst::ENTERPRISE_WJ:
                 $template = "/enterprise/hospital/goto_enterprise_page";
                 break;
@@ -44,33 +43,35 @@ class Enterprise extends AdminController {
     public function gotoEnterpriseDetailPage() {
         $id = trim($this->request['id']);
         $ep = EnterpriseApi::getOne($id);
-        $check_info = ApiData::where('action', '=', 'register_check')->where('uid', '=', $ep['idCard'])->where('status', '=', 1)->find();
-        $force = intval($this->request['force'], 0);
-        if ($force || !$check_info || !$check_info['status']) {
-            $rsapi = new RsApi();
-            switch ($ep['special']) {
-                case 0:
-                    $ep['rs'] = $rsapi->I040102($ep['idCard']);
-                    break;
-                case 1:
-                    $ep['rs'] = $rsapi->I080101($ep['idCard']);
-                    break;
-                case 3:
-                    $ep['rs'] = $rsapi->I030501($ep['name'], $ep['idCard']);
-                    break;
-            }
+        if (!in_array($ep["type"], [CommonConst::ENTERPRISE_WJ, CommonConst::ENTERPRISE_GJ])) {
+            $check_info = ApiData::where('action', '=', 'register_check')->where('uid', '=', $ep['idCard'])->where('status', '=', 1)->find();
+            $force = intval($this->request['force'], 0);
+            if ($force || !$check_info || !$check_info['status']) {
+                $rsapi = new RsApi();
+                switch ($ep['special']) {
+                    case 0:
+                        $ep['rs'] = $rsapi->I040102($ep['idCard']);
+                        break;
+                    case 1:
+                        $ep['rs'] = $rsapi->I080101($ep['idCard']);
+                        break;
+                    case 3:
+                        $ep['rs'] = $rsapi->I030501($ep['name'], $ep['idCard']);
+                        break;
+                }
 
-            ApiData::where('action', '=', 'register_check')->where('uid', '=', $ep['idCard'])->where('status', '=', 1)->update(['status' => 0, 'updateTime' => time()]);
-            $api_model_data = [
-                'uid' => $ep['idCard'],
-                'action' => 'register_check',
-                'content' => serialize($ep['rs']),
-                'createTime' => time()
-            ];
+                ApiData::where('action', '=', 'register_check')->where('uid', '=', $ep['idCard'])->where('status', '=', 1)->update(['status' => 0, 'updateTime' => time()]);
+                $api_model_data = [
+                    'uid' => $ep['idCard'],
+                    'action' => 'register_check',
+                    'content' => serialize($ep['rs']),
+                    'createTime' => time()
+                ];
 
-            ApiData::create($api_model_data);
-        } else {
-            $ep['rs'] = unserialize($check_info['content']);
+                ApiData::create($api_model_data);
+            } else {
+                $ep['rs'] = unserialize($check_info['content']);
+            }
         }
 
         if (!$ep) {
@@ -201,13 +202,16 @@ class Enterprise extends AdminController {
         switch ($this->user["type"]) {
             case CommonConst::ENTERPRISE_WJ:
                 $template = "/enterprise/hospital/goto_enterprise_detail_page";
+                $ep["medicalCommunityName"] = \app\common\api\Nhc::getMedicalCommunityMap()[$ep["medicalCommunityId"]];
+                $ep["fullLocationName"] = $ep["county"] ? \app\common\api\LocationApi::getNameByCode($ep["county"], true) : \app\common\api\LocationApi::getNameByCode($ep["city"], true);
                 break;
             case CommonConst::ENTERPRISE_GJ:
                 $template = "/enterprise/school/goto_enterprise_detail_page";
                 break;
         }
+        $assign['ep'] = $ep;
 
-        return view($template, ['ep' => $ep]);
+        return view($template, $assign);
     }
 
     public function gotoExaminePage() {
@@ -228,24 +232,9 @@ class Enterprise extends AdminController {
                 $ep['industryFieldNewName'] = $industryFieldNew['name'];
             }
         }
-
-
-        if ($ep->special == 0) {
-            $fields = ["name" => "企业名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "企业地址", "street" => "所属街道", "ephone" => "企业电话", "bankCard" => "企业银行账号", "bank" => "企业开户银行", "bankNetwork" => "企业开户银行网点",
-                "agencyType" => "机构类型", "industryFieldNew" => "产业领域", "industryFieldOld" => "行业领域", "enterpriseTag" => "企业标签", "enterpriseType" => "企业类型",
-                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
-            $files = ["imgurl" => "企业营业执照", "bankImg" => "开户许可证/基本存款账户信息", "domainImg" => "行业领域佐证材料", "beian" => "人才联络员信息备案表", "typeImg" => "规上、高新技术、专精特新企业上传材料"];
-        } else {
-            $fields = ["name" => "单位名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "单位地址", "street" => "所属街道", "ephone" => "单位电话", "bankCard" => "单位银行账号", "bank" => "单位开户银行", "bankNetwork" => "单位开户银行网点",
-                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
-            if ($ep->special == 1) {
-                $fields["institutionTag"] = "单位标签";
-            }
-            if ($ep->special == 3) {
-                $fields["organizationTag"] = "机构标签";
-            }
-            $files = ["imgurl" => "法人证或批文", "bankImg" => "开户许可证/基本存款账户信息", "beian" => "人才联络员备案表"];
-        }
+        $fieldsAndFiles = $this->getFieldAndFilesBySpecialAndType($ep->special, $ep->type);
+        $fields = $fieldsAndFiles["fields"];
+        $files = $fieldsAndFiles["files"];
 
         $modify_fields = [];
         $modify_files = [];
@@ -259,8 +248,17 @@ class Enterprise extends AdminController {
             $checked = in_array($key, $_modify_files);
             $modify_files[$key] = ["field" => $key, "name" => $value, "checked" => $checked];
         }
+        $template = "";
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_WJ:
+                $template = "/enterprise/hospital/goto_examine_page";
+                break;
+            case CommonConst::ENTERPRISE_GJ:
+                $template = "/enterprise/school/goto_examine_page";
+                break;
+        }
 
-        return view("", ['ep' => $ep, 'checkUser' => session('user')['name'], 'fields' => $modify_fields, "files" => $modify_files]);
+        return view($template, ['ep' => $ep, 'checkUser' => session('user')['name'], 'fields' => $modify_fields, "files" => $modify_files]);
     }
 
     public function doExamine() {
@@ -447,23 +445,9 @@ class Enterprise extends AdminController {
             }
         }
 
-
-        if ($ep->special == 0) {
-            $fields = ["name" => "企业名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "企业地址", "street" => "所属街道", "ephone" => "企业电话", "bankCard" => "企业银行账号", "bank" => "企业开户银行", "bankNetwork" => "企业开户银行网点",
-                "agencyType" => "机构类型", "industryFieldNew" => "产业领域", "industryFieldOld" => "行业领域", "enterpriseTag" => "企业标签", "enterpriseType" => "企业类型",
-                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
-            $files = ["imgurl" => "企业营业执照", "bankImg" => "开户许可证/基本存款账户信息", "domainImg" => "行业领域佐证材料", "beian" => "人才联络员信息备案表", "typeImg" => "规上、高新技术、专精特新企业上传材料"];
-        } else {
-            $fields = ["name" => "单位名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "单位地址", "street" => "所属街道", "ephone" => "单位电话", "bankCard" => "单位银行账号", "bank" => "单位开户银行", "bankNetwork" => "单位开户银行网点",
-                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
-            if ($ep->special == 1) {
-                $fields["institutionTag"] = "单位标签";
-            }
-            if ($ep->special == 3) {
-                $fields["organizationTag"] = "机构标签";
-            }
-            $files = ["imgurl" => "法人证或批文", "bankImg" => "开户许可证/基本存款账户信息", "beian" => "人才联络员备案表"];
-        }
+        $fieldsAndFiles = $this->getFieldAndFilesBySpecialAndType($ep->special, $ep->type);
+        $fields = $fieldsAndFiles["fields"];
+        $files = $fieldsAndFiles["files"];
 
         $modify_fields = [];
         $modify_files = [];
@@ -587,7 +571,17 @@ class Enterprise extends AdminController {
         $id = trim($this->request['id']);
         $ep = EnterpriseApi::getOne($id);
 
-        return view("", ['ep' => $ep]);
+        $template = "";
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_WJ:
+                $template = "/enterprise/hospital/goto_active_page";
+                break;
+            case CommonConst::ENTERPRISE_GJ:
+                $template = "/enterprise/school/goto_active_page";
+                break;
+        }
+
+        return view($template, ['ep' => $ep]);
     }
 
     public function setActive() {
@@ -706,22 +700,9 @@ class Enterprise extends AdminController {
         $id = $this->request->param("id");
         $ep = EnterpriseApi::getOne($id);
 
-        if ($ep->special == 0) {
-            $fields = ["name" => "企业名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "企业地址", "street" => "所属街道", "ephone" => "企业电话", "bankCard" => "企业银行账号", "bank" => "企业开户银行", "bankNetwork" => "企业开户银行网点",
-                "agencyType" => "机构类型", "industryFieldNew" => "产业领域", "industryFieldOld" => "行业领域", "enterpriseTag" => "企业标签", "enterpriseType" => "企业类型",
-                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
-            $files = ["imgurl" => "企业营业执照", "bankImg" => "开户许可证/基本存款账户信息", "domainImg" => "行业领域佐证材料", "beian" => "人才联络员信息备案表", "typeImg" => "规上、高新技术、专精特新企业上传材料"];
-        } else {
-            $fields = ["name" => "单位名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "单位地址", "street" => "所属街道", "ephone" => "单位电话", "bankCard" => "单位银行账号", "bank" => "单位开户银行", "bankNetwork" => "单位开户银行网点",
-                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
-            if ($ep->special == 1) {
-                $fields["institutionTag"] = "单位标签";
-            }
-            if ($ep->special == 3) {
-                $fields["organizationTag"] = "机构标签";
-            }
-            $files = ["imgurl" => "法人证或批文", "bankImg" => "开户许可证/基本存款账户信息", "beian" => "人才联络员备案表"];
-        }
+        $fieldsAndFiles = $this->getFieldAndFilesBySpecialAndType($ep->special, $ep->type);
+        $fields = $fieldsAndFiles["fields"];
+        $files = $fieldsAndFiles["files"];
 
         $modify_fields = [];
         $modify_files = [];
@@ -769,4 +750,38 @@ class Enterprise extends AdminController {
         }
     }
 
+    private function getFieldAndFilesBySpecialAndType($special, $type) {
+        if ($special == 0) {
+            if ($type == CommonConst::ENTERPRISE_JC) {
+                $fields = ["name" => "企业名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "企业地址", "street" => "所属街道", "ephone" => "企业电话", "bankCard" => "企业银行账号", "bank" => "企业开户银行", "bankNetwork" => "企业开户银行网点",
+                    "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+                $files = ["imgurl" => "企业营业执照", "bankImg" => "开户许可证/基本存款账户信息", "beian" => "人才联络员信息备案表"];
+            } else if ($type == CommonConst::ENTERPRISE_WJ) {
+                $fields = ["name" => "医院名称", "idCard" => "登记号", "legal" => "法人代表", "medicalCommunityId" => "医共体", "isGeneral" => "是否总院", "ephone" => "医院电话", "province" => "地址省", "city" => "地址市", "county" => "地址县\区", "address" => "企业地址",
+                    "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+                $files = ["imgurl" => "医疗机构执业许可证", "beian" => "人才联络员信息备案表"];
+            } else if ($type == CommonConst::ENTERPRISE_GJ) {
+                $fields = ["name" => "学校名称", "legal" => "法人代表", "ephone" => "学校电话", "province" => "地址省", "city" => "地址市", "county" => "地址县\区", "address" => "学校地址",
+                    "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+                $files = ["imgurl" => "办学许可证、法人证书或登记证书", "beian" => "人才联络员信息备案表"];
+            } else {
+                $fields = ["name" => "企业名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "企业地址", "street" => "所属街道", "ephone" => "企业电话", "bankCard" => "企业银行账号", "bank" => "企业开户银行", "bankNetwork" => "企业开户银行网点",
+                    "agencyType" => "机构类型", "industryFieldNew" => "产业领域", "industryFieldOld" => "行业领域", "enterpriseTag" => "企业标签", "enterpriseType" => "企业类型",
+                    "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+                $files = ["imgurl" => "企业营业执照", "bankImg" => "开户许可证/基本存款账户信息", "domainImg" => "行业领域佐证材料", "beian" => "人才联络员信息备案表", "typeImg" => "规上、高新技术、专精特新企业上传材料"];
+            }
+        } else {
+            $fields = ["name" => "单位名称", "idCard" => "统一社会信用代码", "legal" => "法人代表", "address" => "单位地址", "street" => "所属街道", "ephone" => "单位电话", "bankCard" => "单位银行账号", "bank" => "单位开户银行", "bankNetwork" => "单位开户银行网点",
+                "agentName" => "人才联络员姓名", "agentPhone" => "人才联络员电话", "agentEmail" => "人才联络员邮箱"];
+            if ($special == 1) {
+                $fields["institutionTag"] = "单位标签";
+            }
+            if ($special == 3) {
+                $fields["organizationTag"] = "机构标签";
+            }
+            $files = ["imgurl" => "法人证或批文", "bankImg" => "开户许可证/基本存款账户信息", "beian" => "人才联络员备案表"];
+        }
+        return ["fields" => $fields, "files" => $files];
+    }
+
 }

+ 26 - 9
app/admin/controller/EnterpriseChangeRecord.php

@@ -14,6 +14,7 @@ use app\common\model\CurrentcyFileType;
 use app\common\model\MessageRecord;
 use app\common\model\TalentChecklog;
 use app\common\model\TalentCommonFile;
+use app\common\state\CommonConst;
 
 /**
  * 企业变更审核
@@ -24,11 +25,27 @@ class EnterpriseChangeRecord extends AdminController {
     private $compatible_time = "2022-10-15 23:59:59";
 
     public function gotoEnterpriseChangeRecordPage() {
-        $talentTypeList = DictApi::findChildDictByCode("enterprise_tag");
-        $industryFieldNewList = DictApi::findChildDictByCode("industry_field");
-        $streetList = DictApi::findChildDictByCode("street");
 
-        return view("", ['enterprise_tag' => $talentTypeList, 'industryFieldNew' => $industryFieldNewList, 'street' => $streetList]);
+        $template = "";
+        $assigns = [];
+        switch ($this->user["type"]) {
+            case CommonConst::ENTERPRISE_WJ:
+                $template = "/enterprise_change_record/hospital/goto_enterprise_change_record_page";
+                $where[] = ["status", "<>", 3];
+                $assigns["medicalCommunities"] = \app\common\api\Nhc::getMedicalCommunityList();
+                break;
+            case CommonConst::ENTERPRISE_GJ:
+                $template = "/enterprise_change_record/school/goto_enterprise_change_record_page";
+                break;
+            default:
+                $talentTypeList = DictApi::findChildDictByCode("enterprise_tag");
+                $industryFieldNewList = DictApi::findChildDictByCode("industry_field");
+                $streetList = DictApi::findChildDictByCode("street");
+                $assigns = ['enterprise_tag' => $talentTypeList, 'industryFieldNew' => $industryFieldNewList, 'street' => $streetList];
+                break;
+        }
+
+        return view($template, $assigns);
     }
 
     public function findEnterpriseChangeRecordByPage() {
@@ -53,12 +70,12 @@ class EnterpriseChangeRecord extends AdminController {
                 $ecr['newStreetName'] = $streetList[$ecr['newStreet']];
             }
         }
-        $check_info = ApiData::where('action','=','register_check')->where('uid','=',$ep['idCard'])->where('status','=',1)->find();
-        $force = intval($this->request['force'],0);
+        $check_info = ApiData::where('action', '=', 'register_check')->where('uid', '=', $ep['idCard'])->where('status', '=', 1)->find();
+        $force = intval($this->request['force'], 0);
 
-        if($force || !$check_info || !$check_info['status']){
+        if ($force || !$check_info || !$check_info['status']) {
             $rsapi = new RsApi();
-            switch ($ep['special']){
+            switch ($ep['special']) {
                 case 0:
                     $ecr['rs'] = $rsapi->I040102($ecr['newIdCard']);
                     break;
@@ -76,7 +93,7 @@ class EnterpriseChangeRecord extends AdminController {
                 'createTime' => time()
             ];
             ApiData::create($api_model_data);
-        }else{
+        } else {
             $ecr['rs'] = unserialize($check_info['content']);
         }
 

+ 2 - 2
app/admin/view/enterprise/hospital/goto_active_page.html

@@ -7,7 +7,7 @@
       <div class="row">
         <div class="col-sm-12">
           <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label">单位名称</label>
+            <label class="col-sm-2 control-label">医院名称</label>
             <div class="col-sm-10">
               <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$ep.name}"  />
             </div>
@@ -18,7 +18,7 @@
       <div class="row">
         <div class="col-sm-12">
           <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label">统一社会信用代码</label>
+            <label class="col-sm-2 control-label">登记号</label>
             <div class="col-sm-10">
               <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$ep.idCard}"  />
             </div>

+ 2 - 15
app/admin/view/enterprise/hospital/goto_enterprise_detail_page.html

@@ -28,22 +28,9 @@
 </style>
 <script type="text/javascript">
     $(function () {
-        Feng.addAjaxSelect({
-            "id": "enterpriseTag",
-            "displayCode": "code",
-            "displayName": "name",
-            "type": "GET",
-            "url": Feng.ctxPath + "/admin/dict/findChildDictByCode?code=enterprise_tag"
-        });
         $("select").each(function () {
             $(this).val($(this).attr("value"));
         });
-        var type = $("#type").val();
-        if (type == 1) {
-        $(".type1").attr("style", "display:table-row");
-        } else {
-        $(".type1").attr("style", "display:none");
-        }
         {if condition = "!$ep['imgurl_is_img']"}
         $("#yyzz").attr("src", Feng.ctxPath + "/static/img/Pdf.png");
         // $("#yyzz").attr("onclick", Feng.showPdf(photoImg,"pdf","预览"));
@@ -57,7 +44,7 @@
             $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
         });
         $("#force_refresh").on('click', function () {
-            window.location.href = "/admin/enterprise/gotoEnterpriseDetailPage?force=1&id={$ep.id}";
+            window.location.href = "/admin/enterprise/gotoEnterpriseDetailPage?id={$ep.id}";
         });
     });
 
@@ -133,7 +120,7 @@
                                 医院地址
                             </td>
                             <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
-                                {$ep.address}
+                                {$ep.fullLocationName} {$ep.address}
                             </td>
                         </tr>
                     </table>

+ 3 - 2
app/admin/view/enterprise/hospital/goto_examine_page.html

@@ -4,10 +4,11 @@
     <div class="ibox-content">
         <form id="ep_active" class="form-horizontal">
             <input type="text" id="id" value="{$ep.id}" style="display: none;" />
+            <input type="text" id="type" value="{$ep.type}" style="display: none;" />
             <div class="row">
                 <div class="col-sm-12">
                     <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">单位名称</label>
+                        <label class="col-sm-2 control-label">医院名称</label>
                         <div class="col-sm-10">
                             <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$ep.name}"  />
                         </div>
@@ -18,7 +19,7 @@
             <div class="row">
                 <div class="col-sm-12">
                     <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">统一社会信用代码</label>
+                        <label class="col-sm-2 control-label">登记号</label>
                         <div class="col-sm-10">
                             <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$ep.idCard}"  />
                         </div>

+ 1 - 12
app/admin/view/enterprise/school/goto_active_page.html

@@ -7,7 +7,7 @@
       <div class="row">
         <div class="col-sm-12">
           <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label">单位名称</label>
+            <label class="col-sm-2 control-label">学校名称</label>
             <div class="col-sm-10">
               <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$ep.name}"  />
             </div>
@@ -15,17 +15,6 @@
         </div>
       </div>
       <div class="hr-line-dashed"></div>
-      <div class="row">
-        <div class="col-sm-12">
-          <div class="rowGroup"  style="margin-bottom: 0px;">
-            <label class="col-sm-2 control-label">统一社会信用代码</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$ep.idCard}"  />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="hr-line-dashed"></div>
       <div class="row">
         <div class="col-sm-12">
           <div class="rowGroup"  style="margin-bottom: 0px;">

+ 3 - 16
app/admin/view/enterprise/school/goto_enterprise_detail_page.html

@@ -28,22 +28,9 @@
 </style>
 <script type="text/javascript">
     $(function () {
-        Feng.addAjaxSelect({
-            "id": "enterpriseTag",
-            "displayCode": "code",
-            "displayName": "name",
-            "type": "GET",
-            "url": Feng.ctxPath + "/admin/dict/findChildDictByCode?code=enterprise_tag"
-        });
         $("select").each(function () {
             $(this).val($(this).attr("value"));
         });
-        var type = $("#type").val();
-        if (type == 1) {
-        $(".type1").attr("style", "display:table-row");
-        } else {
-        $(".type1").attr("style", "display:none");
-        }
         {if condition = "!$ep['imgurl_is_img']"}
         $("#yyzz").attr("src", Feng.ctxPath + "/static/img/Pdf.png");
         // $("#yyzz").attr("onclick", Feng.showPdf(photoImg,"pdf","预览"));
@@ -57,7 +44,7 @@
             $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
         });
         $("#force_refresh").on('click', function () {
-            window.location.href = "/admin/enterprise/gotoEnterpriseDetailPage?force=1&id={$ep.id}";
+            window.location.href = "/admin/enterprise/gotoEnterpriseDetailPage?id={$ep.id}";
         });
     });
 
@@ -118,8 +105,8 @@
                             <td class="key">
                                 学校地址
                             </td>
-                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">
-                                {$ep.address}
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b">                                
+                                {$ep.fullLocationName} {$ep.address}
                             </td>
                         </tr>
                     </table>

+ 2 - 12
app/admin/view/enterprise/school/goto_examine_page.html

@@ -4,10 +4,11 @@
     <div class="ibox-content">
         <form id="ep_active" class="form-horizontal">
             <input type="text" id="id" value="{$ep.id}" style="display: none;" />
+            <input type="text" id="type" value="{$ep.type}" style="display: none;" />
             <div class="row">
                 <div class="col-sm-12">
                     <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">单位名称</label>
+                        <label class="col-sm-2 control-label">学校名称</label>
                         <div class="col-sm-10">
                             <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$ep.name}"  />
                         </div>
@@ -15,17 +16,6 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="row">
-                <div class="col-sm-12">
-                    <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label">统一社会信用代码</label>
-                        <div class="col-sm-10">
-                            <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$ep.idCard}"  />
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="hr-line-dashed"></div>
             <div class="row">
                 <div class="col-sm-12">
                     <div class="rowGroup"  style="margin-bottom: 0px;">

+ 1 - 1
app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html

@@ -115,7 +115,7 @@
                                         type="button">新法人代表
                                 </button>
                             </div>
-                            <input type="text" class="form-control" id="newAgentName" placeholder=""/>
+                            <input type="text" class="form-control" id="newLegal" placeholder=""/>
                         </div>
                     </div>
                     <div class="col-sm-4">

+ 224 - 0
app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_detail_page.html

@@ -0,0 +1,224 @@
+{extend name="layout/content"}
+{block name="content"}
+<style>
+    .float-e-margins .btn{margin-bottom:0 !important;}
+    .upload-btn {
+        position: relative;
+        display: inline-block;
+        cursor: pointer;
+        background: #1ab394;
+        padding: 6px 12px;
+        color: #fff;
+        text-align: center;
+        border-radius: 3px;
+        overflow: hidden;
+        font-size: 14px;
+        font-weight: 400;
+    }
+
+    .imgs li {
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+
+
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+        height: 30px;
+    }
+    table td{
+        text-align: center;
+    }
+    .key{
+        width: 150px;
+        text-align: right;
+        background-color: #f0f9eb;
+    }
+    .value1{
+        width: 240px;
+        text-align: left;
+    }
+    .word-wrap{
+        width:100%;
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
+    span.new{font-weight:bold;color:#333;}
+    span.old{text-decoration:line-through;}
+    ul.files{list-style:none;display:flex;justify-content:center;padding:0;align-items:flex-start;}
+    ul.files li{overflow:hidden;position:relative;margin-right:10px;float:left;}
+    ul.files i.old{text-align:center;height:0;width:0;line-height:15px;color:#fff;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #000;border-bottom:15px solid #000;border-left:15px solid transparent;display:block;}
+    ul.files i.new{text-align:center;height:0;width:0;line-height:15px;color:#000;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #0bfd1a;border-bottom:15px solid #0bfd1a;border-left:15px solid transparent;display:block;}
+</style>
+<script>
+    $(function () {
+        $("#force_refresh").on('click', function () {
+            window.location.href = "/admin/enterpriseChangeRecord/gotoEnterpriseChangeDetailPage?id={$ecr.id}";
+        });
+    })
+</script>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <input type="hidden" id="id" name="id" value="{$ecr.id}"/>
+                <input type="hidden" id="type" name="type" value="{$ecr.type}"/>
+                <input type="hidden" id="checkState" name="checkState" value="{$ecr.checkState}"/>
+                <div class="panel-heading">医院信息<button id="force_refresh">刷新</button></div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td class="key">
+                                医院名称
+                            </td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldName}{eq name="ecr.oldIsGeneral" value="1"}(总院){/eq}' data-new='{$ecr.newName}{eq name="ecr.newIsGeneral" value="1"}(总院){/eq}'></td>
+                            <td class="key">
+                                登记证
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b" data-old='{$ecr.oldIdCard}' data-new='{$ecr.newIdCard}'></td>
+                            <td rowspan="3" style="border: 1px solid #c0a16b;width: 300px">
+                                <label>
+                                    医疗机构执业许可证
+                                </label>
+                                <ul class="files yyzz">
+                                    {if condition="$ecr['oldImgurl'] eq $ecr['newImgurl']"}
+                                    {if condition="$ecr['oldImgurl']"}
+                                    <li>
+                                        {if condition="$ecr['oldImgurl_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px">
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px">
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {else/}
+                                    {if condition="$ecr['oldImgurl']"}
+                                    <li>
+                                        {if condition="$ecr['oldImgurl_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px"><i class="old">旧</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {if condition="$ecr['newImgurl']"}
+                                    <li>
+                                        {if condition="$ecr['newImgurl_is_img'] eq 1"}
+                                        <img src="{$ecr.newImgurl|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newImgurl|getStoragePath}', 'imgurl')" style="max-height:60px"><i class="new">新</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {/if}
+                                </ul>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="key">
+                                所属医共体
+                            </td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldMedicalCommunityName}' data-new='{$ecr.newMedicalCommunityName}'></td>
+                            <td class="key" style="border-right: 1px solid #c0a16b">
+                                法人代表
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b" data-old='{$ecr.oldLegal}' data-new='{$ecr.newLegal}'>
+                                {$ep.legal}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="key">
+                                医院电话
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b" data-old='{$ecr.oldEphone}' data-new='{$ecr.newEphone}'></td>
+                            <td class="key">
+                                医院地址
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b" data-old='{$ecr.oldFullLocationName} {$ecr.oldAddress}' data-new='{$ecr.newFullLocationName} {$ecr.newAddress}'></td>
+                        </tr>
+                    </table>                    
+                </div>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading">人才联络员信息</div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td class="key">
+                                姓名
+                            </td>
+                            <td class="value1 word-wrap" data-old="{$ecr.oldAgentName}" data-new="{$ecr.newAgentName}"></td>
+                            <td class="key">
+                                人才联络员电话
+                            </td>
+                            <td class="value1 word-wrap" data-old="{$ecr.oldAgentPhone}" data-new="{$ecr.newAgentPhone}"></td>
+                        </tr>
+                        <tr>
+                            <td class="key">
+                                人才联络员邮箱
+                            </td>
+                            <td class="value1 word-wrap" data-old="{$ecr.oldAgentEmail}" data-new="{$ecr.newAgentEmail}"></td>
+                            <td class="key">
+                                人才联络员信息备案表
+                            </td>
+                            <td style="text-align: left">
+                                <ul class="files beian">
+                                    {if condition="$ecr['oldBeian'] eq $ecr['newBeian']"}
+                                    {if condition="$ecr['oldBeian']"}
+                                    <li>
+                                        {if condition="$ecr['oldBeian_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px">
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px">
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {else/}
+                                    {if condition="$ecr['oldBeian']"}
+                                    <li>
+                                        {if condition="$ecr['oldBeian_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px"><i class="old">旧</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {if condition="$ecr['newBeian']"}
+                                    <li>
+                                        {if condition="$ecr['newBeian_is_img'] eq 1"}
+                                        <img src="{$ecr.newBeian|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBeian|getStoragePath}', 'beian')" style="max-height:60px"><i class="new">新</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {/if}
+                                </ul>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                <table id="logTable">
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe style="display: none;" id="hiddenIframe" name="hiddenIframe"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_detail.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 300 - 0
app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_detail_page1.html

@@ -0,0 +1,300 @@
+{extend name="layout/content"}
+{block name="content"}
+<style>
+    .upload-btn {
+        position: relative;
+        display: inline-block;
+        cursor: pointer;
+        background: #1ab394;
+        padding: 6px 12px;
+        color: #fff;
+        text-align: center;
+        border-radius: 3px;
+        overflow: hidden;
+        font-size: 14px;
+        font-weight: 400;
+    }
+
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+    }
+
+    .imgs li {
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="tabs-container">
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a>
+                            </li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="ecre.initFileTable()"
+                                                        aria-expanded="false">2.附件上传</a></li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <input type="text" class="form-control" id="id" name="id" value="{$ecr.id}"
+                                   style="display: none;"/>
+                            <input type="text" class="form-control" id="type" name="type" value="{$ecr.type}"
+                                   style="display: none;"/>
+                            <input style="display: none;" type="text" class="form-control" id="checkState"
+                                   name="checkState" value="{$ecr.checkState}"/>
+                            <div class="panel-body">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">变更前机构信息</div>
+                                    <div class="panel-body">
+                                        <div class="col-sm-12 ">
+                                            <div class="row">
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位名称</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldName"
+                                                               name="oldName" value="{$ecr.oldName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">统一社会信用代码</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldIdCard"
+                                                               name="oldIdCard" value="{$ecr.oldIdCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">法人代表</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldLegal"
+                                                               name="oldLegal" value="{$ecr.oldLegal}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>所属街道</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldStreet"
+                                                               name="oldStreet" value="{$ecr.oldStreetName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位地址</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAddress"
+                                                               name="oldAddress" value="{$ecr.oldAddress}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldEphone"
+                                                               name="oldEphone" value="{$ecr.oldEphone}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentName"
+                                                               name="oldAgentName" value="{$ecr.oldAgentName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentPhone"
+                                                               name="oldAgentPhone" value="{$ecr.oldAgentPhone}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>电子邮箱</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentEmail"
+                                                               name="oldAgentEmail" value="{$ecr.oldAgentEmail}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业银行账号</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBankCard"
+                                                               name="oldBankCard" value="{$ecr.oldBankCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBankNetwork"
+                                                               name="oldBankNetwork" value="{$ecr.oldBankNetwork}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBank"
+                                                               name="oldBank" value="{$ecr.oldBank}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">变更后机构信息</div>
+                                    <div class="panel-body">
+
+                                        <div class="col-sm-12 ">
+                                            <div class="row">
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位名称</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newName"
+                                                               name="newName" value="{$ecr.newName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">统一社会信用代码</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newIdCard"
+                                                               name="newIdCard" value="{$ecr.newIdCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">法人代表</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newLegal"
+                                                               name="newLegal" value="{$ecr.newLegal}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>所属街道</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newStreet"
+                                                               name="newStreet" value="{$ecr.newStreetName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位地址</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAddress"
+                                                               name="newAddress" value="{$ecr.newAddress}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newEphone"
+                                                               name="newEphone" value="{$ecr.newEphone}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentName"
+                                                               name="newAgentName" value="{$ecr.newAgentName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentPhone"
+                                                               name="newAgentPhone" value="{$ecr.newAgentPhone}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>电子邮箱</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentEmail"
+                                                               name="newAgentEmail" value="{$ecr.newAgentEmail}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业银行账号</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBankCard"
+                                                               name="newBankCard" value="{$ecr.newBankCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBankNetwork"
+                                                               name="newBankNetwork" value="{$ecr.newBankNetwork}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBank"
+                                                               name="newBank" value="{$ecr.newBank}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <table id="fileTable" class="table-condensed"
+                                   style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true"
+                                   data-click-to-select="true">
+                                <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                                </thead>
+                            </table>
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe style="display: none;" id="hiddenIframe" name="hiddenIframe"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_detail1.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+{/block}

+ 63 - 0
app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_examine_page.html

@@ -0,0 +1,63 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <form id="erc_examine" class="form-horizontal">
+            <input type="text" id="id" value="{$ecr.id}" style="display: none;" />
+            <div class="row">
+                <div class="row">
+                    <div class="col-sm-12">
+                        <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label"><span class="text-danger">*</span>审核状态</label>
+                            <div class="col-sm-10">
+                                <select class="form-control" id="checkState" name="checkState" onchange="examine.toggleField()">
+                                    <option value="">--- 请选择 ---</option>
+                                    <option value="3" {in name="ecr.checkState" value="3,6"}selected{/in}>审核驳回</option>
+                                    <option value="4" {in name="ecr.checkState" value="4,7"}selected{/in}>审核通过</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="hr-line-dashed"></div>
+                <div class="row">
+                    <div class="col-sm-12">
+                        <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label">审核意见</label>
+                            <div class="col-sm-10">
+                                <textarea class="form-control" rows="6" id="checkMsg" name="checkMsg">{$ecr.checkMsg}</textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="field" {if condition="!in_array($ecr['checkState'],[3,6])"}style="padding-top:5px;display:none"{/if}>
+                    <label for="checkMsg" class="control-label">可修改字段</label>
+                    <div id="field_info">
+                        <ul style="overflow:hidden;list-style:none;">
+                            {volist name="fields" id="field"}
+                            <li style="float:left;margin-right:10px;"><input type="checkbox" value="{$field.field}" {if condition="$field['checked']"}checked="true"{/if}><span>{$field.name}</span></li>
+                            {/volist}
+                        </ul>
+                    </div>
+                    <label for="checkMsg" class="control-label">可修改附件</label>
+                    <div id="field_file">
+                        <ul style="overflow:hidden;list-style:none;">
+                            {volist name="files" id="file"}
+                            <li style="float:left;margin-right:10px;"><input type="checkbox" value="{$file.field}" {if condition="$file['checked']"}checked="true"{/if}><span>{$file.name}</span></li>
+                            {/volist}
+                        </ul>
+                    </div>
+                    <div class="form-group" style="text-align: center">
+                        <button type="button" class="btn btn-primary" onclick="examine.checkAll()">全选</button>
+                        <button type="button" class="btn btn-success" onclick="examine.unCheckAll()">反选</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+<input type="text" id="checkStateTemp" value="{$ecr.checkState}" style="display: none;" />
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_examine.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 196 - 0
app/admin/view/enterprise_change_record/hospital/goto_enterprise_change_record_page.html

@@ -0,0 +1,196 @@
+{extend name="layout/content"}
+{block name="content"}
+<style>
+    #field_info{overflow:hidden;}
+    #field_info li{list-style:none;float:left;margin:2px 5px;}
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>医院信息变更</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <input type="hidden" id="type" value="${type}">
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原医院名称
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原登记号
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldIdCard" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原法人代表
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldLegal" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原医共体
+                                </button>
+                            </div>
+                            <select class="form-control" id="oldMedicalCommunityId">
+                                <option value="">请选择</option>
+                                {volist name="medicalCommunities" id="mc"}
+                                <option value="{$mc.id}">{$mc.name}</option>
+                                {/volist}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原是否总院
+                                </button>
+                            </div>
+                            <select class="form-control" id="oldIsGeneral">
+                                <option value="">请选择</option>
+                                <option value="1">是</option>
+                                <option value="2">否</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新医院名称
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新登记号
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newIdCard" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                        type="button">新法人代表
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newLegal" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新医共体
+                                </button>
+                            </div>
+                            <select class="form-control" id="newMedicalCommunityId">
+                                <option value="">请选择</option>
+                                {volist name="medicalCommunities" id="mc"}
+                                <option value="{$mc.id}">{$mc.name}</option>
+                                {/volist}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新是否总院
+                                </button>
+                            </div>
+                            <select class="form-control" id="newIsGeneral">
+                                <option value="">请选择</option>
+                                <option value="1">是</option>
+                                <option value="2">否</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    审核状态
+                                </button>
+                            </div>
+                            <select class="form-control" id="checkState">
+                                <option value=""></option>
+                                <option value="2">待审核</option>
+                                <option value="6">初审驳回</option>
+                                <option value="7">初审通过</option>
+                                <option value="3">审核驳回</option>
+                                <option value="4">审核通过</option>
+                                <option value="5">重新提交</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.search()">
+                            <i class="fa fa-search"></i>&nbsp;搜索
+                        </button>
+                        <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.reset()">
+                            <i class="fa fa-trash"></i>&nbsp;重置
+                        </button>
+                    </div>
+                </div>
+                <div class="hidden-xs" id="tableToolbar" role="group">
+                    {if
+                    condition="chkCommission('/admin/enterpriseChangeRecord/doExamine','/enterprisechangeRecord/doExamine')"}
+                    <button type="button" class="btn btn-sm btn-primary "
+                            onclick="EpChange.gotoEnterpriseChangeDetailPage()">
+                        <i class="fa fa-edit"></i>&nbsp;审核
+                    </button>
+                    {/if}
+                    {if condition="chkCommission('/admin/enterpriseChangeRecord/updateFieldsAndFiles','')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.updateFieldsAndFiles()" id="">
+                        <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                    </button>
+                    {/if}
+                    {if
+                    condition="chkCommission('/admin/enterpriseChangeRecord/export','/enterprisechangeRecord/excelExport')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.export()">
+                        <i class="fa fa-download"></i>&nbsp;导出
+                    </button>
+                    {/if}
+                </div>
+                <table id="table" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;"
+                       data-mobile-responsive="true" data-click-to-select="true">
+                    <thead>
+                        <tr>
+                            <th data-field="selectItem" data-checkbox="true"></th>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_list.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 214 - 0
app/admin/view/enterprise_change_record/school/goto_enterprise_change_detail_page.html

@@ -0,0 +1,214 @@
+{extend name="layout/content"}
+{block name="content"}
+<style>
+    .float-e-margins .btn{margin-bottom:0 !important;}
+    .upload-btn {
+        position: relative;
+        display: inline-block;
+        cursor: pointer;
+        background: #1ab394;
+        padding: 6px 12px;
+        color: #fff;
+        text-align: center;
+        border-radius: 3px;
+        overflow: hidden;
+        font-size: 14px;
+        font-weight: 400;
+    }
+
+    .imgs li {
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+
+
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+        height: 30px;
+    }
+    table td{
+        text-align: center;
+    }
+    .key{
+        width: 150px;
+        text-align: right;
+        background-color: #f0f9eb;
+    }
+    .value1{
+        width: 240px;
+        text-align: left;
+    }
+    .word-wrap{
+        width:100%;
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
+    span.new{font-weight:bold;color:#333;}
+    span.old{text-decoration:line-through;}
+    ul.files{list-style:none;display:flex;justify-content:center;padding:0;align-items:flex-start;}
+    ul.files li{overflow:hidden;position:relative;margin-right:10px;float:left;}
+    ul.files i.old{text-align:center;height:0;width:0;line-height:15px;color:#fff;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #000;border-bottom:15px solid #000;border-left:15px solid transparent;display:block;}
+    ul.files i.new{text-align:center;height:0;width:0;line-height:15px;color:#000;position:absolute;right:0;bottom:0;border-top:15px solid transparent;border-right:15px solid #0bfd1a;border-bottom:15px solid #0bfd1a;border-left:15px solid transparent;display:block;}
+</style>
+<script>
+    $(function () {
+        $("#force_refresh").on('click', function () {
+            window.location.href = "/admin/enterpriseChangeRecord/gotoEnterpriseChangeDetailPage?id={$ecr.id}";
+        });
+    })
+</script>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <input type="hidden" id="id" name="id" value="{$ecr.id}"/>
+                <input type="hidden" id="type" name="type" value="{$ecr.type}"/>
+                <input type="hidden" id="checkState" name="checkState" value="{$ecr.checkState}"/>
+                <div class="panel-heading">学校信息<button id="force_refresh">刷新</button></div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td class="key">
+                                学校名称
+                            </td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldName}' data-new='{$ecr.newName}'></td>
+                            <td class="key" style="border-right: 1px solid #c0a16b">
+                                法人代表
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b" data-old='{$ecr.oldLegal}' data-new='{$ecr.newLegal}'>
+                                {$ep.legal}
+                            </td>
+                            <td rowspan="2" style="border: 1px solid #c0a16b;width: 300px">
+                                <label>
+                                    办学许可证、法人证书或登记证书
+                                </label>
+                                <ul class="files yyzz">
+                                    {if condition="$ecr['oldImgurl'] eq $ecr['newImgurl']"}
+                                    {if condition="$ecr['oldImgurl']"}
+                                    <li>
+                                        {if condition="$ecr['oldImgurl_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px">
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px">
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {else/}
+                                    {if condition="$ecr['oldImgurl']"}
+                                    <li>
+                                        {if condition="$ecr['oldImgurl_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldImgurl|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldImgurl|getStoragePath}', 'imgurl')" style="max-height:60px"><i class="old">旧</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {if condition="$ecr['newImgurl']"}
+                                    <li>
+                                        {if condition="$ecr['newImgurl_is_img'] eq 1"}
+                                        <img src="{$ecr.newImgurl|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newImgurl|getStoragePath}', 'imgurl')" style="max-height:60px"><i class="new">新</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {/if}
+                                </ul>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="key">
+                                学校电话
+                            </td>
+                            <td class="value1 word-wrap" data-old='{$ecr.oldEphone}' data-new='{$ecr.newEphone}'></td>
+                            <td class="key" style="border-right: 1px solid #c0a16b">
+                                学校地址
+                            </td>
+                            <td class="value1 word-wrap" style="border-right: 1px solid #c0a16b" data-old='{$ecr.oldFullLocationName} {$ecr.oldAddress}' data-new='{$ecr.newFullLocationName} {$ecr.newAddress}'></td>
+                        </tr>
+                    </table>                    
+                </div>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading">人才联络员信息</div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td class="key">
+                                姓名
+                            </td>
+                            <td class="value1 word-wrap" data-old="{$ecr.oldAgentName}" data-new="{$ecr.newAgentName}"></td>
+                            <td class="key">
+                                人才联络员电话
+                            </td>
+                            <td class="value1 word-wrap" data-old="{$ecr.oldAgentPhone}" data-new="{$ecr.newAgentPhone}"></td>
+                        </tr>
+                        <tr>
+                            <td class="key">
+                                人才联络员邮箱
+                            </td>
+                            <td class="value1 word-wrap" data-old="{$ecr.oldAgentEmail}" data-new="{$ecr.newAgentEmail}"></td>
+                            <td class="key">
+                                人才联络员信息备案表
+                            </td>
+                            <td style="text-align: left">
+                                <ul class="files beian">
+                                    {if condition="$ecr['oldBeian'] eq $ecr['newBeian']"}
+                                    {if condition="$ecr['oldBeian']"}
+                                    <li>
+                                        {if condition="$ecr['oldBeian_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px">
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px">
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {else/}
+                                    {if condition="$ecr['oldBeian']"}
+                                    <li>
+                                        {if condition="$ecr['oldBeian_is_img'] eq 1"}
+                                        <img onclick="Feng.showImg(this)" src="{$ecr.oldBeian|getStoragePath}" style="max-height:60px"><i class="old">旧</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.oldBeian|getStoragePath}', 'beian')" style="max-height:60px"><i class="old">旧</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {if condition="$ecr['newBeian']"}
+                                    <li>
+                                        {if condition="$ecr['newBeian_is_img'] eq 1"}
+                                        <img src="{$ecr.newBeian|getStoragePath}" onclick="Feng.showImg(this)" style="max-height:60px"/><i class="new">新</i>
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" onclick="Feng.showPdf('{$ecr.newBeian|getStoragePath}', 'beian')" style="max-height:60px"><i class="new">新</i>
+                                        {/if}
+                                    </li>
+                                    {/if}
+                                    {/if}
+                                </ul>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                <table id="logTable">
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe style="display: none;" id="hiddenIframe" name="hiddenIframe"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_detail.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 300 - 0
app/admin/view/enterprise_change_record/school/goto_enterprise_change_detail_page1.html

@@ -0,0 +1,300 @@
+{extend name="layout/content"}
+{block name="content"}
+<style>
+    .upload-btn {
+        position: relative;
+        display: inline-block;
+        cursor: pointer;
+        background: #1ab394;
+        padding: 6px 12px;
+        color: #fff;
+        text-align: center;
+        border-radius: 3px;
+        overflow: hidden;
+        font-size: 14px;
+        font-weight: 400;
+    }
+
+    .spacing {
+        margin-bottom: 10px;
+        padding-right: 4px;
+        padding-left: 4px;
+    }
+
+    .imgs li {
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 30px;
+    }
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="tabs-container">
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a>
+                            </li>
+                            <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="ecre.initFileTable()"
+                                                        aria-expanded="false">2.附件上传</a></li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <input type="text" class="form-control" id="id" name="id" value="{$ecr.id}"
+                                   style="display: none;"/>
+                            <input type="text" class="form-control" id="type" name="type" value="{$ecr.type}"
+                                   style="display: none;"/>
+                            <input style="display: none;" type="text" class="form-control" id="checkState"
+                                   name="checkState" value="{$ecr.checkState}"/>
+                            <div class="panel-body">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">变更前机构信息</div>
+                                    <div class="panel-body">
+                                        <div class="col-sm-12 ">
+                                            <div class="row">
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位名称</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldName"
+                                                               name="oldName" value="{$ecr.oldName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">统一社会信用代码</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldIdCard"
+                                                               name="oldIdCard" value="{$ecr.oldIdCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">法人代表</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldLegal"
+                                                               name="oldLegal" value="{$ecr.oldLegal}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>所属街道</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldStreet"
+                                                               name="oldStreet" value="{$ecr.oldStreetName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位地址</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAddress"
+                                                               name="oldAddress" value="{$ecr.oldAddress}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldEphone"
+                                                               name="oldEphone" value="{$ecr.oldEphone}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentName"
+                                                               name="oldAgentName" value="{$ecr.oldAgentName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentPhone"
+                                                               name="oldAgentPhone" value="{$ecr.oldAgentPhone}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>电子邮箱</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldAgentEmail"
+                                                               name="oldAgentEmail" value="{$ecr.oldAgentEmail}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业银行账号</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBankCard"
+                                                               name="oldBankCard" value="{$ecr.oldBankCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBankNetwork"
+                                                               name="oldBankNetwork" value="{$ecr.oldBankNetwork}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="oldBank"
+                                                               name="oldBank" value="{$ecr.oldBank}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">变更后机构信息</div>
+                                    <div class="panel-body">
+
+                                        <div class="col-sm-12 ">
+                                            <div class="row">
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位名称</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newName"
+                                                               name="newName" value="{$ecr.newName}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">统一社会信用代码</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newIdCard"
+                                                               name="newIdCard" value="{$ecr.newIdCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">法人代表</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newLegal"
+                                                               name="newLegal" value="{$ecr.newLegal}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>所属街道</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newStreet"
+                                                               name="newStreet" value="{$ecr.newStreetName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位地址</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAddress"
+                                                               name="newAddress" value="{$ecr.newAddress}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>单位电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newEphone"
+                                                               name="newEphone" value="{$ecr.newEphone}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentName"
+                                                               name="newAgentName" value="{$ecr.newAgentName}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>人才联络员电话</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentPhone"
+                                                               name="newAgentPhone" value="{$ecr.newAgentPhone}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing"><span
+                                                            class="text-danger">*</span>电子邮箱</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newAgentEmail"
+                                                               name="newAgentEmail" value="{$ecr.newAgentEmail}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业银行账号</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBankCard"
+                                                               name="newBankCard" value="{$ecr.newBankCard}" readonly
+                                                               disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBankNetwork"
+                                                               name="newBankNetwork" value="{$ecr.newBankNetwork}"
+                                                               readonly disabled/>
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup" style="margin-bottom: 0px;">
+                                                    <label class="col-sm-2 control-label spacing">企业开户银行</label>
+                                                    <div class="col-sm-4 spacing">
+                                                        <input type="text" class="form-control" id="newBank"
+                                                               name="newBank" value="{$ecr.newBank}" readonly disabled/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <table id="fileTable" class="table-condensed"
+                                   style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true"
+                                   data-click-to-select="true">
+                                <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                                </thead>
+                            </table>
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料,编辑好相应的文件夹名称</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe style="display: none;" id="hiddenIframe" name="hiddenIframe"></iframe>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_detail1.js?v='+(new Date()).getTime()+'"><\/script>');
+</script>
+{/block}

+ 63 - 0
app/admin/view/enterprise_change_record/school/goto_enterprise_change_examine_page.html

@@ -0,0 +1,63 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <form id="erc_examine" class="form-horizontal">
+            <input type="text" id="id" value="{$ecr.id}" style="display: none;" />
+            <div class="row">
+                <div class="row">
+                    <div class="col-sm-12">
+                        <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label"><span class="text-danger">*</span>审核状态</label>
+                            <div class="col-sm-10">
+                                <select class="form-control" id="checkState" name="checkState" onchange="examine.toggleField()">
+                                    <option value="">--- 请选择 ---</option>
+                                    <option value="3" {in name="ecr.checkState" value="3,6"}selected{/in}>审核驳回</option>
+                                    <option value="4" {in name="ecr.checkState" value="4,7"}selected{/in}>审核通过</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="hr-line-dashed"></div>
+                <div class="row">
+                    <div class="col-sm-12">
+                        <div class="rowGroup"  style="margin-bottom: 0px;">
+                            <label class="col-sm-2 control-label">审核意见</label>
+                            <div class="col-sm-10">
+                                <textarea class="form-control" rows="6" id="checkMsg" name="checkMsg">{$ecr.checkMsg}</textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="field" {if condition="!in_array($ecr['checkState'],[3,6])"}style="padding-top:5px;display:none"{/if}>
+                    <label for="checkMsg" class="control-label">可修改字段</label>
+                    <div id="field_info">
+                        <ul style="overflow:hidden;list-style:none;">
+                            {volist name="fields" id="field"}
+                            <li style="float:left;margin-right:10px;"><input type="checkbox" value="{$field.field}" {if condition="$field['checked']"}checked="true"{/if}><span>{$field.name}</span></li>
+                            {/volist}
+                        </ul>
+                    </div>
+                    <label for="checkMsg" class="control-label">可修改附件</label>
+                    <div id="field_file">
+                        <ul style="overflow:hidden;list-style:none;">
+                            {volist name="files" id="file"}
+                            <li style="float:left;margin-right:10px;"><input type="checkbox" value="{$file.field}" {if condition="$file['checked']"}checked="true"{/if}><span>{$file.name}</span></li>
+                            {/volist}
+                        </ul>
+                    </div>
+                    <div class="form-group" style="text-align: center">
+                        <button type="button" class="btn btn-primary" onclick="examine.checkAll()">全选</button>
+                        <button type="button" class="btn btn-success" onclick="examine.unCheckAll()">反选</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+<input type="text" id="checkStateTemp" value="{$ecr.checkState}" style="display: none;" />
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/enterprisechangeRecord/ep_change_record_examine.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 118 - 0
app/admin/view/enterprise_change_record/school/goto_enterprise_change_record_page.html

@@ -0,0 +1,118 @@
+{extend name="layout/content"}
+{block name="content"}
+<style>
+    #field_info{overflow:hidden;}
+    #field_info li{list-style:none;float:left;margin:2px 5px;}
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>学校信息变更</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <input type="hidden" id="type" value="${type}">
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原学校名称
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    原法人代表
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="oldLegal" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新学校名称
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newName" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    新法人代表
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="newLegal" placeholder=""/>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    审核状态
+                                </button>
+                            </div>
+                            <select class="form-control" id="checkState">
+                                <option value=""></option>
+                                <option value="2">待审核</option>
+                                <option value="6">初审驳回</option>
+                                <option value="7">初审通过</option>
+                                <option value="3">审核驳回</option>
+                                <option value="4">审核通过</option>
+                                <option value="5">重新提交</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.search()">
+                            <i class="fa fa-search"></i>&nbsp;搜索
+                        </button>
+                        <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.reset()">
+                            <i class="fa fa-trash"></i>&nbsp;重置
+                        </button>
+                    </div>
+                </div>
+                <div class="hidden-xs" id="tableToolbar" role="group">
+                    {if
+                    condition="chkCommission('/admin/enterpriseChangeRecord/doExamine','/enterprisechangeRecord/doExamine')"}
+                    <button type="button" class="btn btn-sm btn-primary "
+                            onclick="EpChange.gotoEnterpriseChangeDetailPage()">
+                        <i class="fa fa-edit"></i>&nbsp;审核
+                    </button>
+                    {/if}
+                    {if condition="chkCommission('/admin/enterpriseChangeRecord/updateFieldsAndFiles','')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.updateFieldsAndFiles()" id="">
+                        <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                    </button>
+                    {/if}
+                    {if
+                    condition="chkCommission('/admin/enterpriseChangeRecord/export','/enterprisechangeRecord/excelExport')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="EpChange.export()">
+                        <i class="fa fa-download"></i>&nbsp;导出
+                    </button>
+                    {/if}
+                </div>
+                <table id="table" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;"
+                       data-mobile-responsive="true" data-click-to-select="true">
+                    <thead>
+                        <tr>
+                            <th data-field="selectItem" data-checkbox="true"></th>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_list.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

+ 4 - 3
app/common/api/EnterpriseApi.php

@@ -8,6 +8,7 @@ use app\enterprise\model\EnterpriseRecord;
 use think\facade\Db;
 use app\admin\model\Enterprise;
 use app\common\state\CommonConst;
+use app\common\api\Nhc;
 
 class EnterpriseApi {
 
@@ -184,7 +185,7 @@ class EnterpriseApi {
             $insList = DictApi::selectByParentCode("institution_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
-            $medicalCommunityList = Db::table("nhc_medical_community")->column("name", "id");
+            $medicalCommunityList = Nhc::getMedicalCommunityMap();
             //dd($talentTypeList);
             if ($whereRaw) {
                 if ($isExport) {
@@ -357,7 +358,7 @@ class EnterpriseApi {
             $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
-            $medicalCommunityList = Db::table("nhc_medical_community")->column("name", "id");
+            $medicalCommunityList = Nhc::getMedicalCommunityMap();
             if ($whereRaw) {
                 $list = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->field("r.*")->where($where)->whereRaw($whereRaw)->limit($offset, $limit)->order("r.createTime", 'desc')->select()->toArray();
             } else {
@@ -526,7 +527,7 @@ class EnterpriseApi {
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
             $agencyTypeList = DictApi::selectByParentCode("agency_type");
-            $medicalCommunityList = Db::table("nhc_medical_community")->column("name", "id");
+            $medicalCommunityList = Nhc::getMedicalCommunityMap();
             if ($whereRaw) {
                 $list = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->field("r.*")->where($where)->whereRaw($whereRaw)->order("createTime", 'desc')->select()->toArray();
             } else {

+ 13 - 0
app/common/api/LocationApi.php

@@ -17,4 +17,17 @@ class LocationApi {
         return Db::table("un_common_location")->where($where)->select()->toArray();
     }
 
+    /**
+     * 
+     * @param type $code
+     * @param type $isfull
+     * @return type
+     */
+    public static function getNameByCode($code, $isfull = false) {
+        $where = [];
+        $where[] = ["code", "=", $code];
+        $field = $isfull ? "fullName" : "name";
+        return Db::table("un_common_location")->where($where)->find()[$field];
+    }
+
 }

+ 34 - 0
app/common/api/Nhc.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\common\api;
+
+use think\facade\Db;
+
+/**
+ * Description of Nhc
+ * 卫健相关数据接口
+ * @author sgq
+ */
+class Nhc {
+
+    /**
+     * 获取医共体列表,按正序排
+     * @return type
+     */
+    public static function getMedicalCommunityList() {
+        $where = [];
+        $where[] = ["status", "<>", 3];
+        $list = Db::table("nhc_medical_community")->where($where)->order("num asc,createTime asc")->select()->toArray();
+        return $list;
+    }
+
+    /**
+     * 获取医共体键值对id,name
+     * @return type
+     */
+    public static function getMedicalCommunityMap() {
+        $list = Db::table("nhc_medical_community")->column("name", "id");
+        return $list;
+    }
+
+}

+ 10 - 1
public/static/modular/enterprise/enterprise_examine.js

@@ -92,12 +92,21 @@ EpExam.unCheckAll = function () {
 }
 
 EpExam.toggleField = function () {
+    var type = $("#type").val();
     var checkState = $("#checkState").val();
     var checkMsg = $("#checkMsg").val();
+    var typeName = "";
+    if (type == 5) {
+        typeName = "医院";
+    } else if (type == 6) {
+        typeName = "学校";
+    } else {
+        typeName = "机构账号";
+    }
     if (checkState == 3) {
         $("#field").css("display", "none");
         if (checkMsg == null || checkMsg == '') {
-            $("#checkMsg").val("机构账号注册审核通过。");
+            $("#checkMsg").val(typeName + "注册审核通过。");
         }
     } else if (checkState == 2) {
         $("#checkMsg").val("");

+ 182 - 0
public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_detail.js

@@ -0,0 +1,182 @@
+var ecre = {};
+
+ecre.doExamine = function () {
+    var checkState = $("#checkState").val();
+    if (checkState == null || (checkState != 2 && checkState != 5 && checkState != 7)) {
+        Feng.info("不在审核范围内!");
+        return;
+    }
+    var index = layer.open({
+        type: 2,
+        title: '审核',
+        area: ['830px', '450px'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        shade: 0,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeExaminePage?id=' + $("#id").val(),
+        btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;提交', '<i class="fa fa-save"></i>&nbsp;&nbsp;保存', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+        btnAlign: 'c',
+        yes: function (index, layero) {
+            //按钮【按钮一】的回调
+            layer.confirm("确认提交审核结果?", function () {
+                var iframeWin = window[layero.find('iframe')[0]['name']];
+                iframeWin.examine.submitToCheck();
+            })
+        },
+        btn2: function (index, layero) {
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            iframeWin.examine.addSubmit();
+            return false;
+        }
+    });
+//    layer.full(index);
+    ecre.layerIndex = index;
+};
+
+ecre.initFileTable = function () {
+    $("#fileTable").bootstrapTable({
+        url: Feng.ctxPath + "/common/api/listCurrencyFileType",
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
+        escape: true,
+        pagination: false, // 设置为 true 会在表格底部显示分页条
+        paginationHAlign: "left",
+        paginationDetailHAlign: "right",
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        showColumns: false,
+        detailView: true, //是否显示父子表
+        pageList: [10, 30, 50],
+        queryParams: function (params) {
+            return $.extend({"type": "enterpriseChange"}, params)
+        },
+        rowStyle: function (row, index) {
+            return {classes: "info"};
+        },
+        columns: ecre.initFileTypeColumn(),
+        onPostBody: function () {
+            $("td.uitd_showTip").bind("mouseover", function () {
+                var htm = $(this).html();
+                $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+            });
+        },
+        onLoadSuccess: function (data) {
+            $("#fileTable").bootstrapTable('expandAllRows');
+        },
+        onExpandRow: function (index, row, $detail) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
+                if (data == null || data.length == 0) {
+                    return;
+                }
+                var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                for (var key in data) {
+                    var sn = data[key].url.lastIndexOf(".");
+                    var suffix = data[key].ext;//data[key].url.substring(sn+1,data[key].url.length);
+                    var imgStr = "";
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS' || suffix == "DOCX" || suffix == "docx" || suffix == 'DOC' || suffix == 'doc') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
+                    }
+                    var btn = "<button type=\'button\' onclick=\"ecre.downloadFile('" + data[key].id + "',2)\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\"><i class=\"fa fa-download\"></i>下载</button>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            '<li style="width: 10%;padding-top: 2px;">' + btn + '</li>';
+                }
+                html = html + '</ul>';
+                $detail.html(html);
+                $(".imgs").viewer({
+                    // toolbar:false,
+                    fullscreen: false
+                });
+            }, function (data) {
+                Feng.error("查询失败!" + data.responseJSON.message + "!");
+            });
+            var queryData = {};
+            queryData["mainId"] = $("#id").val();
+            queryData["typeId"] = row.id;
+            ajax.set(queryData);
+            ajax.start();
+        }
+    });
+}
+
+
+ecre.initFileTypeColumn = function () {
+    return [
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
+                }
+            }
+        },
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
+    ]
+}
+
+ecre.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + '/common/api/downloadFile?id=' + id + "&type=" + type;
+};
+
+
+
+$(function () {
+    // var arr = [
+    // 	{"name":"newStreet","code":"street"},
+    // 	{"name":"oldStreet","code":"street"},
+    // 	{"name":"newTalentType","code":"enterprise_type"},
+    // 	{"name":"oldTalentType","code":"enterprise_type"},
+    // 	{"name":"oldIndustryFieldNew","code":"industry_field"},
+    // 	{"name":"newIndustryFieldNew","code":"industry_field"}];
+    // Feng.findChildDictBatch(JSON.stringify(arr))
+    $("td.value1").each(function () {
+        var oldVal = $(this).data("old");
+        var newVal = $(this).data("new");
+        var style = 0;
+        var html = "";
+        var oldValStr = oldVal == "" ? '"未填写"' : oldVal;
+        if (oldVal != newVal) {
+            switch (style) {
+                case 1:
+                    html = '<span class="new"><i class="fa fa-dot-circle-o" aria-hidden="true"></i>' + newVal + '</span><br/><span class="old"><i class="fa fa-circle-o" aria-hidden="true"></i>' + oldValStr + '</span>';
+                    break;
+                default:
+                    html = '<span class="old">' + oldValStr + '</span> -> <span class="new">' + newVal + '</span>';
+                    break;
+            }
+        } else {
+            html = oldValStr;
+        }
+        $(this).html(html);
+        if (oldVal == "" && $(this).find("span.old").length == 1) {
+            $(this).find("span.old").css("text-decoration", "none");
+        }
+    });
+    $("select").each(function () {
+        $(this).val($(this).attr("value"));
+    })
+    /*if ($("#type").val() == 1) {
+     $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:block");
+     } else {
+     $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:none");
+     }*/
+    var id = $("#id").val();
+    Feng.getCheckLog("logTable", {"type": 10, "mainId": id, "typeFileId": "", "active": 1})
+    $(".fa").bind("mouseover", function () {
+        var htm = $(this).data('msg');
+        $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+    });
+
+});

+ 146 - 0
public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_detail1.js

@@ -0,0 +1,146 @@
+var ecre = {};
+
+ecre.doExamine = function () {
+    var checkState = $("#checkState").val();
+    if (checkState == null || (checkState != 2 && checkState != 5)) {
+        Feng.info("不在审核范围内!");
+        return;
+    }
+    var index = layer.open({
+        type: 2,
+        title: '审核',
+        area: ['830px', '450px'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeExaminePage?id=' + $("#id").val(),
+        btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;确定', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+        yes: function (index, layero) {
+            //按钮【按钮一】的回调
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            iframeWin.examine.addSubmit();
+        }
+    });
+//    layer.full(index);
+    ecre.layerIndex = index;
+};
+
+
+
+ecre.initFileTable = function () {
+    $("#fileTable").bootstrapTable({
+        url: Feng.ctxPath + "/common/api/listCurrencyFileType",
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
+        escape: true,
+        pagination: false, // 设置为 true 会在表格底部显示分页条
+        paginationHAlign: "left",
+        paginationDetailHAlign: "right",
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        showColumns: false,
+        detailView: true, //是否显示父子表
+        pageList: [10, 30, 50],
+        queryParams: function (params) {
+            return $.extend({"type": "governmentChange"}, params)
+        },
+        rowStyle: function (row, index) {
+            return {classes: "info"};
+        },
+        columns: ecre.initFileTypeColumn(),
+        onPostBody: function () {
+            $("td.uitd_showTip").bind("mouseover", function () {
+                var htm = $(this).html();
+                $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+            });
+        },
+        onLoadSuccess: function (data) {
+            $("#fileTable").bootstrapTable('expandAllRows');
+        },
+        onExpandRow: function (index, row, $detail) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
+                if (data == null || data.length == 0) {
+                    return;
+                }
+                var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                for (var key in data) {
+                    var sn = data[key].url.lastIndexOf(".");
+                    var suffix = data[key].ext;//data[key].url.substring(sn+1,data[key].url.length);
+                    var imgStr = "";
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
+                    }
+                    var btn = "<button type=\'button\' onclick=\"ecre.downloadFile('" + data[key].id + "',2)\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\"><i class=\"fa fa-download\"></i>下载</button>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            '<li style="width: 10%;padding-top: 2px;">' + btn + '</li>';
+                }
+                html = html + '</ul>';
+                $detail.html(html);
+                $(".imgs").viewer({
+                    // toolbar:false,
+                    fullscreen: false
+                });
+            }, function (data) {
+                Feng.error("查询失败!" + data.responseJSON.message + "!");
+            });
+            var queryData = {};
+            queryData["mainId"] = $("#id").val();
+            queryData["typeId"] = row.id;
+            ajax.set(queryData);
+            ajax.start();
+        }
+    });
+}
+
+
+ecre.initFileTypeColumn = function () {
+    return [
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
+                }
+            }
+        },
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
+    ]
+}
+
+ecre.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + '/api/common/downloadFile?id=' + id + "&type=" + type;
+};
+
+
+
+$(function () {
+    // var arr = [
+    // 	{"name":"newStreet","code":"street"},
+    // 	{"name":"oldStreet","code":"street"},
+    // 	{"name":"newTalentType","code":"enterprise_type"},
+    // 	{"name":"oldTalentType","code":"enterprise_type"},
+    // 	{"name":"oldIndustryFieldNew","code":"industry_field"},
+    // 	{"name":"newIndustryFieldNew","code":"industry_field"}];
+    // Feng.findChildDictBatch(JSON.stringify(arr))
+
+    $("select").each(function () {
+        $(this).val($(this).attr("value"));
+    })
+    if ($("#type").val() == 1) {
+        $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:block");
+    } else {
+        $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:none");
+    }
+});

+ 79 - 0
public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_examine.js

@@ -0,0 +1,79 @@
+var examine = {};
+var locked = false;
+
+examine.save = function (submit) {
+    var id = $("#id").val();
+    var checkState = $("#checkState").val();
+    var checkMsg = $("#checkMsg").val();
+    if (checkState == null || checkState == '') {
+        Feng.info("请选择审核状态!");
+        return;
+    }
+    if (checkMsg == null || checkMsg == '') {
+        Feng.info("请填写审核意见!");
+        return;
+    }
+    if (checkState == 3 && $("#field input[type=checkbox]:checked").length == 0) {
+        Feng.info("请选择驳回修改的字段或者附件");
+        return;
+    }
+    var fieldCount = $("#field_info input[type=checkbox]:checked").length;
+    var fields = new Array();
+    for (var i = 0; i < fieldCount; i++) {
+        fields.push($("#field_info input[type=checkbox]:checked").eq(i).val());
+    }
+    var fileCount = $("#field_file input[type=checkbox]:checked").length;
+    var files = new Array();
+    for (var i = 0; i < fileCount; i++) {
+        files.push($("#field_file input[type=checkbox]:checked").eq(i).val());
+    }
+    var da = {"id": id, "checkState": checkState, "checkMsg": checkMsg, fields: fields, files: files, submit: submit};
+    if (locked)
+        return;
+    locked = true;
+    var ajax = new $ax(Feng.ctxPath + "/admin/enterpriseChangeRecord/doExamine", function (data) {
+        if (data.code == 200) {
+            if (submit) {
+                window.parent.parent.EpChange.table.refresh();
+                parent.layer.closeAll();
+            }
+        }
+        Feng.info(data.msg);
+        locked = false;
+    }, function (data) {
+        Feng.error("操作失败!" + data.responseJSON.message + "!");
+        locked = false;
+    });
+    ajax.set(da);
+    ajax.start();
+}
+examine.addSubmit = function () {
+    examine.save(0);
+};
+
+examine.submitToCheck = function () {
+    examine.save(1);
+};
+
+examine.checkAll = function () {
+    $("#field input[type=checkbox]").prop("checked", true);
+}
+examine.unCheckAll = function () {
+    $("#field input[type=checkbox]").removeAttr("checked");
+}
+
+examine.toggleField = function () {
+    var checkState = $("#checkState").val();
+    var checkMsg = $("#checkMsg").val();
+    if (checkState == 4) {
+        $("#field").css("display", "none");
+        if (checkMsg == null || checkMsg == '') {
+            $("#checkMsg").val("机构信息变更审核通过。");
+        }
+    } else if (checkState == 3) {
+        $("#checkMsg").val("");
+        $("#field").css("display", "block");
+    } else {
+        $("#field").css("display", "none");
+    }
+}

+ 301 - 0
public/static/modular/enterprise/hospital/enterprisechangeRecord/ep_change_record_list.js

@@ -0,0 +1,301 @@
+var EpChange = {
+    id: "table", //表格id
+    seItem: null, //选中的条目
+    table: null,
+    layerIndex: -1
+};
+
+EpChange.initColumn = function () {
+    var type = $("#type").val();
+    return [
+        {field: 'selectItem', radio: true},
+        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+        {title: '<span style="color: red">原医院名称</span>', field: 'oldName', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.oldIsGeneral == 1) {
+                    return value + "(总院)";
+                }
+                return value;
+            }
+        },
+        {title: '原法人代表', field: 'oldLegal', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '原医共体', field: 'oldMedicalCommunityName', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '原医院地址', field: 'oldFullAddress', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '<span style="color: red">新医院名称</span>', field: 'newName', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.newIsGeneral == 1) {
+                    return value + "(总院)";
+                }
+                return value;
+            }
+        },
+        {title: '新法人代表', field: 'newLegal', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '新医共体', field: 'newMedicalCommunityName', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '新医院地址', field: 'newFullAddress', align: 'center', width: 170, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '申请时间', field: 'createTime', align: 'center', width: 150, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: 100,
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"EpChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
+            }
+        },
+        {title: '审核状态', field: 'checkState', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (value == null || value == '') {
+                    return "";
+                } else if (value == 1) {
+                    return "保存未提交";
+                } else if (value == 2) {
+                    return "待审核";
+                } else if (value == 3) {
+                    return "审核驳回";
+                } else if (value == 4) {
+                    return "审核通过";
+                } else if (value == 5) {
+                    return "重新提交";
+                } else if (value == 6) {
+                    return "初审驳回";
+                } else if (value == 7) {
+                    return "初审通过";
+                } else {
+                    return "";
+                }
+            },
+            cellStyle: function (value, row, index) {
+                if (value == null || value == '') {
+                    return {css: {}};
+                } else if (value == 1) {
+                    return {css: {}};
+                } else if (value == 2) {
+                    return {css: {"background-color": "LightGrey"}};
+                } else if (value == 3) {
+                    return {css: {"background-color": "Orange"}};
+                } else if (value == 4) {
+                    return {css: {'background-color': 'LightGreen'}};
+                } else if (value == 5) {
+                    return {css: {'background-color': 'LightGrey'}};
+                } else if (value == 6) {
+                    return {css: {'background-color': 'Orange'}};
+                } else if (value == 7) {
+                    return {css: {'background-color': 'LightBlue'}};
+                } else {
+                    return {css: {}};
+                }
+            }
+        },
+    ];
+};
+
+EpChange.search = function () {
+    var queryData = {};
+    queryData['oldName'] = $("#oldName").val();
+    queryData['oldIdCard'] = $("#oldIdCard").val();
+    queryData['oldLegal'] = $("#oldLegal").val();
+    queryData['oldMedicalCommunityId'] = $("#oldMedicalCommunityId").val();
+    queryData['oldIsGeneral'] = $("#oldIsGeneral").val();
+    queryData['newName'] = $("#newName").val();
+    queryData['newIdCard'] = $("#newIdCard").val();
+    queryData['newLegal'] = $("#newLegal").val();
+    queryData['newMedicalCommunityId'] = $("#newMedicalCommunityId").val();
+    queryData['newIsGeneral'] = $("#newIsGeneral").val();
+    queryData['checkState'] = $("#checkState").val();
+
+    EpChange.table.refresh({"query": queryData});
+};
+
+EpChange.reset = function () {
+    $("#oldName").val("");
+    $("#oldIdCard").val("");
+    $("#oldLegal").val("");
+    $("#oldMedicalCommunityId").val("");
+    $("#oldIsGeneral").val("");
+    $("#newName").val("");
+    $("#newIdCard").val("");
+    $("#newLegal").val("");
+    $("#newMedicalCommunityId").val("");
+    $("#newIsGeneral").val("");
+    $("#checkState").val("");
+};
+
+EpChange.check = function () {
+    var selected = $('#' + EpChange.id).bootstrapTable('getSelections');
+    if (selected.length == 0) {
+        Feng.info("请先选中表格中的某一记录!");
+        return false;
+    } else {
+        EpChange.seItem = selected[0];
+        return true;
+    }
+};
+
+EpChange.gotoEnterpriseChangeDetailPage = function () {
+    if (!EpChange.check()) {
+        return;
+    }
+    var index = layer.open({
+        type: 2,
+        title: '查看详情',
+        area: ['830px', '450px'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeDetailPage?id=' + EpChange.seItem.id,
+        btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+        btnAlign: 'c',
+        yes: function (index, layero) {
+            var obj = layero.find("iframe")[0].contentWindow;
+            obj.ecre.doExamine();
+        }
+    });
+    layer.full(index);
+    EpChange.layerIndex = index;
+};
+
+
+/**
+ * 修改驳回的字段及附件
+ */
+EpChange.updateFieldsAndFiles = function () {
+    if (this.check()) {
+        var id = EpChange.seItem.id;
+        var ajax = new $ax("/admin/enterpriseChangeRecord/findFieldsAndFiles?id=" + id, function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "fieldCheckModalForm",
+                    title: '修改',
+                    area: ['800px', '450px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: EpChange.creatFieldCheckModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        var fileList = data.files;
+                        var fieldList = data.fields;
+                        var html_field = '';
+                        var html_file = '';
+                        for (var key in fieldList) {
+                            html_field = html_field + '<li><input type="checkbox" ' + (fieldList[key].checked ? "checked" : "") + ' value="' + fieldList[key].field + '"><span>' + fieldList[key].name + '</span></li>';
+                        }
+                        for (var key in fileList) {
+                            html_file = html_file + '<li style="width: 100%"><input type="checkbox" ' + (fileList[key].checked ? "checked" : "") + ' value="' + fileList[key].field + '"><span>' + fileList[key].name + '</span></li>';
+                        }
+                        $("#field_info").empty().append("<ul>" + html_field + "</ul>");
+                        $("#field_file").empty().append("<ul>" + html_file + "</ul>");
+                    },
+                    yes: function (index, layero) {
+                        EpChange.submitFieldsAndFiles(index, id);
+                    }
+                });
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.start();
+    }
+};
+
+/**
+ * 修改提交
+ * @param index
+ * @param id
+ */
+EpChange.submitFieldsAndFiles = function (index, id) {
+    var fields = '';
+    var files = '';
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            fields = fields + $(this).val() + ",";
+        }
+    });
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            files = files + $(this).val() + ",";
+        }
+    });
+    if (fields == '' && files == '') {
+        Feng.info("请选择可修改的字段或附件!");
+        return;
+    }
+    var ajax = new $ax("/admin/enterpriseChangeRecord/updateFieldsAndFiles", function (data) {
+        if (data.code == 200) {
+            layer.close(index);
+            Feng.success(data.msg);
+        } else {
+            Feng.error(data.msg);
+        }
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.setData({"id": id, "fields": fields, "files": files})
+    ajax.start();
+};
+EpChange.creatFieldCheckModal = function () {
+    return '<form id="fieldCheckModalForm">\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div >\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="EpChange.checkAll()">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="EpChange.unCheckAll()">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
+};
+EpChange.checkAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").prop("checked", true);
+};
+EpChange.unCheckAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").removeAttr("checked");
+};
+
+EpChange.export = function () {
+    var queryData = {};
+    queryData['oldName'] = $("#oldName").val();
+    queryData['oldIdCard'] = $("#oldIdCard").val();
+    queryData['oldLegal'] = $("#oldLegal").val();
+    queryData['oldMedicalCommunityId'] = $("#oldMedicalCommunityId").val();
+    queryData['oldIsGeneral'] = $("#oldIsGeneral").val();
+    queryData['oldIndustryField'] = $("#oldIndustryField").val();
+    queryData['newName'] = $("#newName").val();
+    queryData['newIdCard'] = $("#newIdCard").val();
+    queryData['newLegal'] = $("#newLegal").val();
+    queryData['newMedicalCommunityId'] = $("#newMedicalCommunityId").val();
+    queryData['newIsGeneral'] = $("#newIsGeneral").val();
+    queryData['checkState'] = $("#checkState").val();
+    window.location.href = Feng.setUrlParam(Feng.ctxPath + "/admin/enterpriseChangeRecord/export", queryData);
+}
+
+EpChange.showLog = function (id) {
+    layer.open({
+        type: 1,
+        title: "日志",
+        fixed: false,
+        content: '<table id="' + id + '"></table>',
+        area: ['80%', '80%'],
+        maxmin: true,
+        success: function (layero, index) {
+            Feng.getCheckLog(id, {"type": 10, "mainId": id, "typeFileId": "", "active": 1})
+        }
+    });
+}
+
+
+
+$(function () {
+    var defaultColunms = EpChange.initColumn();
+    var table = new BSTable(EpChange.id, "/admin/enterpriseChangeRecord/findEnterpriseChangeRecordByPage", defaultColunms);
+    table.setPaginationType("server");
+    EpChange.table = table.init();
+});

+ 182 - 0
public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_detail.js

@@ -0,0 +1,182 @@
+var ecre = {};
+
+ecre.doExamine = function () {
+    var checkState = $("#checkState").val();
+    if (checkState == null || (checkState != 2 && checkState != 5 && checkState != 7)) {
+        Feng.info("不在审核范围内!");
+        return;
+    }
+    var index = layer.open({
+        type: 2,
+        title: '审核',
+        area: ['830px', '450px'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        shade: 0,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeExaminePage?id=' + $("#id").val(),
+        btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;提交', '<i class="fa fa-save"></i>&nbsp;&nbsp;保存', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+        btnAlign: 'c',
+        yes: function (index, layero) {
+            //按钮【按钮一】的回调
+            layer.confirm("确认提交审核结果?", function () {
+                var iframeWin = window[layero.find('iframe')[0]['name']];
+                iframeWin.examine.submitToCheck();
+            })
+        },
+        btn2: function (index, layero) {
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            iframeWin.examine.addSubmit();
+            return false;
+        }
+    });
+//    layer.full(index);
+    ecre.layerIndex = index;
+};
+
+ecre.initFileTable = function () {
+    $("#fileTable").bootstrapTable({
+        url: Feng.ctxPath + "/common/api/listCurrencyFileType",
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
+        escape: true,
+        pagination: false, // 设置为 true 会在表格底部显示分页条
+        paginationHAlign: "left",
+        paginationDetailHAlign: "right",
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        showColumns: false,
+        detailView: true, //是否显示父子表
+        pageList: [10, 30, 50],
+        queryParams: function (params) {
+            return $.extend({"type": "enterpriseChange"}, params)
+        },
+        rowStyle: function (row, index) {
+            return {classes: "info"};
+        },
+        columns: ecre.initFileTypeColumn(),
+        onPostBody: function () {
+            $("td.uitd_showTip").bind("mouseover", function () {
+                var htm = $(this).html();
+                $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+            });
+        },
+        onLoadSuccess: function (data) {
+            $("#fileTable").bootstrapTable('expandAllRows');
+        },
+        onExpandRow: function (index, row, $detail) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
+                if (data == null || data.length == 0) {
+                    return;
+                }
+                var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                for (var key in data) {
+                    var sn = data[key].url.lastIndexOf(".");
+                    var suffix = data[key].ext;//data[key].url.substring(sn+1,data[key].url.length);
+                    var imgStr = "";
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS' || suffix == "DOCX" || suffix == "docx" || suffix == 'DOC' || suffix == 'doc') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
+                    }
+                    var btn = "<button type=\'button\' onclick=\"ecre.downloadFile('" + data[key].id + "',2)\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\"><i class=\"fa fa-download\"></i>下载</button>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            '<li style="width: 10%;padding-top: 2px;">' + btn + '</li>';
+                }
+                html = html + '</ul>';
+                $detail.html(html);
+                $(".imgs").viewer({
+                    // toolbar:false,
+                    fullscreen: false
+                });
+            }, function (data) {
+                Feng.error("查询失败!" + data.responseJSON.message + "!");
+            });
+            var queryData = {};
+            queryData["mainId"] = $("#id").val();
+            queryData["typeId"] = row.id;
+            ajax.set(queryData);
+            ajax.start();
+        }
+    });
+}
+
+
+ecre.initFileTypeColumn = function () {
+    return [
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
+                }
+            }
+        },
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
+    ]
+}
+
+ecre.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + '/common/api/downloadFile?id=' + id + "&type=" + type;
+};
+
+
+
+$(function () {
+    // var arr = [
+    // 	{"name":"newStreet","code":"street"},
+    // 	{"name":"oldStreet","code":"street"},
+    // 	{"name":"newTalentType","code":"enterprise_type"},
+    // 	{"name":"oldTalentType","code":"enterprise_type"},
+    // 	{"name":"oldIndustryFieldNew","code":"industry_field"},
+    // 	{"name":"newIndustryFieldNew","code":"industry_field"}];
+    // Feng.findChildDictBatch(JSON.stringify(arr))
+    $("td.value1").each(function () {
+        var oldVal = $(this).data("old");
+        var newVal = $(this).data("new");
+        var style = 0;
+        var html = "";
+        var oldValStr = oldVal == "" ? '"未填写"' : oldVal;
+        if (oldVal != newVal) {
+            switch (style) {
+                case 1:
+                    html = '<span class="new"><i class="fa fa-dot-circle-o" aria-hidden="true"></i>' + newVal + '</span><br/><span class="old"><i class="fa fa-circle-o" aria-hidden="true"></i>' + oldValStr + '</span>';
+                    break;
+                default:
+                    html = '<span class="old">' + oldValStr + '</span> -> <span class="new">' + newVal + '</span>';
+                    break;
+            }
+        } else {
+            html = oldValStr;
+        }
+        $(this).html(html);
+        if (oldVal == "" && $(this).find("span.old").length == 1) {
+            $(this).find("span.old").css("text-decoration", "none");
+        }
+    });
+    $("select").each(function () {
+        $(this).val($(this).attr("value"));
+    })
+    /*if ($("#type").val() == 1) {
+     $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:block");
+     } else {
+     $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:none");
+     }*/
+    var id = $("#id").val();
+    Feng.getCheckLog("logTable", {"type": 10, "mainId": id, "typeFileId": "", "active": 1})
+    $(".fa").bind("mouseover", function () {
+        var htm = $(this).data('msg');
+        $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+    });
+
+});

+ 146 - 0
public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_detail1.js

@@ -0,0 +1,146 @@
+var ecre = {};
+
+ecre.doExamine = function () {
+    var checkState = $("#checkState").val();
+    if (checkState == null || (checkState != 2 && checkState != 5)) {
+        Feng.info("不在审核范围内!");
+        return;
+    }
+    var index = layer.open({
+        type: 2,
+        title: '审核',
+        area: ['830px', '450px'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeExaminePage?id=' + $("#id").val(),
+        btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;确定', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+        yes: function (index, layero) {
+            //按钮【按钮一】的回调
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            iframeWin.examine.addSubmit();
+        }
+    });
+//    layer.full(index);
+    ecre.layerIndex = index;
+};
+
+
+
+ecre.initFileTable = function () {
+    $("#fileTable").bootstrapTable({
+        url: Feng.ctxPath + "/common/api/listCurrencyFileType",
+        method: 'POST',
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        search: false, // 是否显示表格搜索,此搜索是客户端搜索,不会进服务端
+        showRefresh: false, // 是否显示刷新按钮
+        clickToSelect: true, // 是否启用点击选中行
+        singleSelect: true, // 设置True 将禁止多选
+        striped: true, // 是否显示行间隔色
+        escape: true,
+        pagination: false, // 设置为 true 会在表格底部显示分页条
+        paginationHAlign: "left",
+        paginationDetailHAlign: "right",
+        sidePagination: "server", // 设置在哪里进行分页,可选值为 'client' 或者 'server'
+        showColumns: false,
+        detailView: true, //是否显示父子表
+        pageList: [10, 30, 50],
+        queryParams: function (params) {
+            return $.extend({"type": "governmentChange"}, params)
+        },
+        rowStyle: function (row, index) {
+            return {classes: "info"};
+        },
+        columns: ecre.initFileTypeColumn(),
+        onPostBody: function () {
+            $("td.uitd_showTip").bind("mouseover", function () {
+                var htm = $(this).html();
+                $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+            });
+        },
+        onLoadSuccess: function (data) {
+            $("#fileTable").bootstrapTable('expandAllRows');
+        },
+        onExpandRow: function (index, row, $detail) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
+                if (data == null || data.length == 0) {
+                    return;
+                }
+                var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                for (var key in data) {
+                    var sn = data[key].url.lastIndexOf(".");
+                    var suffix = data[key].ext;//data[key].url.substring(sn+1,data[key].url.length);
+                    var imgStr = "";
+                    if (suffix == "pdf" || suffix == "PDF") {
+                        imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                    } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
+                        imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data[key].url + "','" + data[key].id + "','" + data[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                    } else {
+                        imgStr = '<img class=\"imgUrl\"  src=\"' + data[key].url + '\" style=\"width:25px;height:25px;\">';
+                    }
+                    var btn = "<button type=\'button\' onclick=\"ecre.downloadFile('" + data[key].id + "',2)\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\"><i class=\"fa fa-download\"></i>下载</button>";
+                    html = html + '<li style="display: none">' + data[key].id + '</li>\n' +
+                            '<li style="width: 80%;padding-top: 5px;">' + data[key].orignName + '</li>\n' +
+                            '<li style="width: 10%;">' + imgStr + '</li>\n' +
+                            '<li style="width: 10%;padding-top: 2px;">' + btn + '</li>';
+                }
+                html = html + '</ul>';
+                $detail.html(html);
+                $(".imgs").viewer({
+                    // toolbar:false,
+                    fullscreen: false
+                });
+            }, function (data) {
+                Feng.error("查询失败!" + data.responseJSON.message + "!");
+            });
+            var queryData = {};
+            queryData["mainId"] = $("#id").val();
+            queryData["typeId"] = row.id;
+            ajax.set(queryData);
+            ajax.start();
+        }
+    });
+}
+
+
+ecre.initFileTypeColumn = function () {
+    return [
+        {field: 'selectItem', checkbox: false, visible: false},
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (row.must == 1) {
+                    return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
+                }
+                if (row.must == 2) {
+                    return '<i class="fa fa-paste"></i>' + value;
+                }
+            }
+        },
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
+    ]
+}
+
+ecre.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + '/api/common/downloadFile?id=' + id + "&type=" + type;
+};
+
+
+
+$(function () {
+    // var arr = [
+    // 	{"name":"newStreet","code":"street"},
+    // 	{"name":"oldStreet","code":"street"},
+    // 	{"name":"newTalentType","code":"enterprise_type"},
+    // 	{"name":"oldTalentType","code":"enterprise_type"},
+    // 	{"name":"oldIndustryFieldNew","code":"industry_field"},
+    // 	{"name":"newIndustryFieldNew","code":"industry_field"}];
+    // Feng.findChildDictBatch(JSON.stringify(arr))
+
+    $("select").each(function () {
+        $(this).val($(this).attr("value"));
+    })
+    if ($("#type").val() == 1) {
+        $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:block");
+    } else {
+        $("#newEnterpriseType,#oldEnterpriseType,#oldIndustryFieldOld,#oldIndustryFieldNew,#newIndustryFieldNew,#newIndustryFieldOld,#newEnterpriseTag,#oldEnterpriseTag").parent().parent().attr("style", "display:none");
+    }
+});

+ 79 - 0
public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_examine.js

@@ -0,0 +1,79 @@
+var examine = {};
+var locked = false;
+
+examine.save = function (submit) {
+    var id = $("#id").val();
+    var checkState = $("#checkState").val();
+    var checkMsg = $("#checkMsg").val();
+    if (checkState == null || checkState == '') {
+        Feng.info("请选择审核状态!");
+        return;
+    }
+    if (checkMsg == null || checkMsg == '') {
+        Feng.info("请填写审核意见!");
+        return;
+    }
+    if (checkState == 3 && $("#field input[type=checkbox]:checked").length == 0) {
+        Feng.info("请选择驳回修改的字段或者附件");
+        return;
+    }
+    var fieldCount = $("#field_info input[type=checkbox]:checked").length;
+    var fields = new Array();
+    for (var i = 0; i < fieldCount; i++) {
+        fields.push($("#field_info input[type=checkbox]:checked").eq(i).val());
+    }
+    var fileCount = $("#field_file input[type=checkbox]:checked").length;
+    var files = new Array();
+    for (var i = 0; i < fileCount; i++) {
+        files.push($("#field_file input[type=checkbox]:checked").eq(i).val());
+    }
+    var da = {"id": id, "checkState": checkState, "checkMsg": checkMsg, fields: fields, files: files, submit: submit};
+    if (locked)
+        return;
+    locked = true;
+    var ajax = new $ax(Feng.ctxPath + "/admin/enterpriseChangeRecord/doExamine", function (data) {
+        if (data.code == 200) {
+            if (submit) {
+                window.parent.parent.EpChange.table.refresh();
+                parent.layer.closeAll();
+            }
+        }
+        Feng.info(data.msg);
+        locked = false;
+    }, function (data) {
+        Feng.error("操作失败!" + data.responseJSON.message + "!");
+        locked = false;
+    });
+    ajax.set(da);
+    ajax.start();
+}
+examine.addSubmit = function () {
+    examine.save(0);
+};
+
+examine.submitToCheck = function () {
+    examine.save(1);
+};
+
+examine.checkAll = function () {
+    $("#field input[type=checkbox]").prop("checked", true);
+}
+examine.unCheckAll = function () {
+    $("#field input[type=checkbox]").removeAttr("checked");
+}
+
+examine.toggleField = function () {
+    var checkState = $("#checkState").val();
+    var checkMsg = $("#checkMsg").val();
+    if (checkState == 4) {
+        $("#field").css("display", "none");
+        if (checkMsg == null || checkMsg == '') {
+            $("#checkMsg").val("机构信息变更审核通过。");
+        }
+    } else if (checkState == 3) {
+        $("#checkMsg").val("");
+        $("#field").css("display", "block");
+    } else {
+        $("#field").css("display", "none");
+    }
+}

+ 266 - 0
public/static/modular/enterprise/school/enterprisechangeRecord/ep_change_record_list.js

@@ -0,0 +1,266 @@
+var EpChange = {
+    id: "table", //表格id
+    seItem: null, //选中的条目
+    table: null,
+    layerIndex: -1
+};
+
+EpChange.initColumn = function () {
+    var type = $("#type").val();
+    return [
+        {field: 'selectItem', radio: true},
+        {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+        {title: '<span style="color: red">原学校名称</span>', field: 'oldName', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '原法人代表', field: 'oldLegal', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '原学校地址', field: 'oldFullAddress', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '<span style="color: red">新学校名称</span>', field: 'newName', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '新法人代表', field: 'newLegal', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '新学校地址', field: 'newFullAddress', align: 'center', width: 200, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '申请时间', field: 'createTime', align: 'center', width: 150, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: 100,
+            formatter: function (value, row, index) {
+                return "<span class='label label-success' onclick=\"EpChange.showLog('" + value + "')\" >" +
+                        "<i class=\"fa fa-book\"></i>日志" +
+                        "</span>";
+            }
+        },
+        {title: '审核状态', field: 'checkState', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (value == null || value == '') {
+                    return "";
+                } else if (value == 1) {
+                    return "保存未提交";
+                } else if (value == 2) {
+                    return "待审核";
+                } else if (value == 3) {
+                    return "审核驳回";
+                } else if (value == 4) {
+                    return "审核通过";
+                } else if (value == 5) {
+                    return "重新提交";
+                } else if (value == 6) {
+                    return "初审驳回";
+                } else if (value == 7) {
+                    return "初审通过";
+                } else {
+                    return "";
+                }
+            },
+            cellStyle: function (value, row, index) {
+                if (value == null || value == '') {
+                    return {css: {}};
+                } else if (value == 1) {
+                    return {css: {}};
+                } else if (value == 2) {
+                    return {css: {"background-color": "LightGrey"}};
+                } else if (value == 3) {
+                    return {css: {"background-color": "Orange"}};
+                } else if (value == 4) {
+                    return {css: {'background-color': 'LightGreen'}};
+                } else if (value == 5) {
+                    return {css: {'background-color': 'LightGrey'}};
+                } else if (value == 6) {
+                    return {css: {'background-color': 'Orange'}};
+                } else if (value == 7) {
+                    return {css: {'background-color': 'LightBlue'}};
+                } else {
+                    return {css: {}};
+                }
+            }
+        },
+    ];
+};
+
+EpChange.search = function () {
+    var queryData = {};
+    queryData['oldName'] = $("#oldName").val();
+    queryData['oldLegal'] = $("#oldLegal").val();
+    queryData['newName'] = $("#newName").val();
+    queryData['newLegal'] = $("#newLegal").val();
+    queryData['checkState'] = $("#checkState").val();
+
+    EpChange.table.refresh({"query": queryData});
+};
+
+EpChange.reset = function () {
+    $("#oldName").val("");
+    $("#oldLegal").val("");
+    $("#newName").val("");
+    $("#newLegal").val("");
+    $("#checkState").val("");
+};
+
+EpChange.check = function () {
+    var selected = $('#' + EpChange.id).bootstrapTable('getSelections');
+    if (selected.length == 0) {
+        Feng.info("请先选中表格中的某一记录!");
+        return false;
+    } else {
+        EpChange.seItem = selected[0];
+        return true;
+    }
+};
+
+EpChange.gotoEnterpriseChangeDetailPage = function () {
+    if (!EpChange.check()) {
+        return;
+    }
+    var index = layer.open({
+        type: 2,
+        title: '查看详情',
+        area: ['830px', '450px'], //宽高
+        fix: false, //不固定
+        maxmin: true,
+        content: Feng.ctxPath + '/admin/enterpriseChangeRecord/gotoEnterpriseChangeDetailPage?id=' + EpChange.seItem.id,
+        btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
+        btnAlign: 'c',
+        yes: function (index, layero) {
+            var obj = layero.find("iframe")[0].contentWindow;
+            obj.ecre.doExamine();
+        }
+    });
+    layer.full(index);
+    EpChange.layerIndex = index;
+};
+
+
+/**
+ * 修改驳回的字段及附件
+ */
+EpChange.updateFieldsAndFiles = function () {
+    if (this.check()) {
+        var id = EpChange.seItem.id;
+        var ajax = new $ax("/admin/enterpriseChangeRecord/findFieldsAndFiles?id=" + id, function (data) {
+            if (data.code == 200) {
+                layer.open({
+                    type: 1,
+                    id: "fieldCheckModalForm",
+                    title: '修改',
+                    area: ['800px', '450px'], //宽高
+                    fix: false, //不固定
+                    shade: 0,
+                    maxmin: true,
+                    content: EpChange.creatFieldCheckModal(),
+                    btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
+                    btnAlign: 'c',
+                    zIndex: layer.zIndex,
+                    success: function (layero, index) {
+                        var fileList = data.files;
+                        var fieldList = data.fields;
+                        var html_field = '';
+                        var html_file = '';
+                        for (var key in fieldList) {
+                            html_field = html_field + '<li><input type="checkbox" ' + (fieldList[key].checked ? "checked" : "") + ' value="' + fieldList[key].field + '"><span>' + fieldList[key].name + '</span></li>';
+                        }
+                        for (var key in fileList) {
+                            html_file = html_file + '<li style="width: 100%"><input type="checkbox" ' + (fileList[key].checked ? "checked" : "") + ' value="' + fileList[key].field + '"><span>' + fileList[key].name + '</span></li>';
+                        }
+                        $("#field_info").empty().append("<ul>" + html_field + "</ul>");
+                        $("#field_file").empty().append("<ul>" + html_file + "</ul>");
+                    },
+                    yes: function (index, layero) {
+                        EpChange.submitFieldsAndFiles(index, id);
+                    }
+                });
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("查询失败!" + data.responseJSON.message + "!");
+        });
+        ajax.start();
+    }
+};
+
+/**
+ * 修改提交
+ * @param index
+ * @param id
+ */
+EpChange.submitFieldsAndFiles = function (index, id) {
+    var fields = '';
+    var files = '';
+    $("#field_info li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            fields = fields + $(this).val() + ",";
+        }
+    });
+    $("#field_file li input").each(function (index) {
+        if ($(this).is(":checked")) {
+            files = files + $(this).val() + ",";
+        }
+    });
+    if (fields == '' && files == '') {
+        Feng.info("请选择可修改的字段或附件!");
+        return;
+    }
+    var ajax = new $ax("/admin/enterpriseChangeRecord/updateFieldsAndFiles", function (data) {
+        if (data.code == 200) {
+            layer.close(index);
+            Feng.success(data.msg);
+        } else {
+            Feng.error(data.msg);
+        }
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.setData({"id": id, "fields": fields, "files": files})
+    ajax.start();
+};
+EpChange.creatFieldCheckModal = function () {
+    return '<form id="fieldCheckModalForm">\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <div >\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="EpChange.checkAll()">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="EpChange.unCheckAll()">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
+};
+EpChange.checkAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").prop("checked", true);
+};
+EpChange.unCheckAll = function () {
+    $("#fieldCheckModalForm input[type=checkbox]").removeAttr("checked");
+};
+
+EpChange.export = function () {
+    var queryData = {};
+    queryData['oldName'] = $("#oldName").val();
+    queryData['oldLegal'] = $("#oldLegal").val();
+    queryData['newName'] = $("#newName").val();
+    queryData['newLegal'] = $("#newLegal").val();
+    queryData['checkState'] = $("#checkState").val();
+    window.location.href = Feng.setUrlParam(Feng.ctxPath + "/admin/enterpriseChangeRecord/export", queryData);
+}
+
+EpChange.showLog = function (id) {
+    layer.open({
+        type: 1,
+        title: "日志",
+        fixed: false,
+        content: '<table id="' + id + '"></table>',
+        area: ['80%', '80%'],
+        maxmin: true,
+        success: function (layero, index) {
+            Feng.getCheckLog(id, {"type": 10, "mainId": id, "typeFileId": "", "active": 1})
+        }
+    });
+}
+
+
+
+$(function () {
+    var defaultColunms = EpChange.initColumn();
+    var table = new BSTable(EpChange.id, "/admin/enterpriseChangeRecord/findEnterpriseChangeRecordByPage", defaultColunms);
+    table.setPaginationType("server");
+    EpChange.table = table.init();
+});