取消驳回注释

app/common.php

@@ -208,7 +208,7 @@ function export($columns, $rows, $filename = "jjrcw", $settings = [], $sheetname
     }
 
     header('Content-Type: application/vnd.ms-excel');
-    header('Content-Disposition: attachment;filename="' . $filename . '"');
+    header('Content-Disposition: attachment;filename="' . $filename . '.xls"');
     $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xls($spreadsheet);
     $writer->save($saveurl);
     //删除临时的sheet

app/common/controller/Auth.php

@@ -317,36 +317,36 @@ class Auth extends BaseController {
         $ep = EnterpriseApi::getOne(session('temp')['uid']);
         if ($this->request->isPost()) {
             $response_object = new \StdClass();
-            //注释注册驳回$data = $ep->toArray();
-            $data = [
-                'name' => \StrUtil::getRequestDecodeParam($this->request, 'name'), //单位名称
-                'idCard' => \StrUtil::getRequestDecodeParam($this->request, 'idCard'), //统一社会信用代码
-                'agentName' => \StrUtil::getRequestDecodeParam($this->request, 'agentName'), //人才联络员
-                'legal' => \StrUtil::getRequestDecodeParam($this->request, 'legal'), //法人
-                'street' => \StrUtil::getRequestDecodeParam($this->request, 'street'), //镇街
-                'address' => \StrUtil::getRequestDecodeParam($this->request, 'address'), //地址
-                'type' => intval($this->request['type']),
-                'agencyType' => intval($this->request['agencyType']),
-                'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseTag'), //单位标签
-                'organizationTag' => \StrUtil::getRequestDecodeParam($this->request, 'organizationTag'), //机构标签
-                'institutionTag' => \StrUtil::getRequestDecodeParam($this->request, 'institutionTag'), //事业单位标签
-                'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'), //单位类型
-                'agentPhone' => \StrUtil::getRequestDecodeParam($this->request, 'agentPhone'), //手机
-                'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'agentEmail'), //邮箱
-                'ephone' => \StrUtil::getRequestDecodeParam($this->request, 'ephone'), //单位电话
-                'industryFieldNew' => \StrUtil::getRequestDecodeParam($this->request, 'industryFieldNew'), //产业领域
-                'industryFieldOld' => \StrUtil::getRequestDecodeParam($this->request, 'industryFieldOld'), //行业领域
-                'bankCard' => \StrUtil::getRequestDecodeParam($this->request, 'bankCard'), //银行
-                'bank' => \StrUtil::getRequestDecodeParam($this->request, 'bank'), //开户行
-                'bankNetwork' => \StrUtil::getRequestDecodeParam($this->request, 'bankNetwork')//网点
-            ];
-            /* 注释注册驳回字段if ($ep->modify_fields) {
-              $modify_fields = explode(",", $ep->modify_fields);
-              foreach ($modify_fields as $field) {
-              $data[$field] = \StrUtil::getRequestDecodeParam($this->request, $field);
-              }
-              } */
-            $modify_files = ["imgurl", "bankImg", "domainImg", "typeImg", "beian"]; //注释注册驳回附件explode(",", $ep->modify_files);
+            $data = $ep->toArray();
+            /* $data = [
+              'name' => \StrUtil::getRequestDecodeParam($this->request, 'name'), //单位名称
+              'idCard' => \StrUtil::getRequestDecodeParam($this->request, 'idCard'), //统一社会信用代码
+              'agentName' => \StrUtil::getRequestDecodeParam($this->request, 'agentName'), //人才联络员
+              'legal' => \StrUtil::getRequestDecodeParam($this->request, 'legal'), //法人
+              'street' => \StrUtil::getRequestDecodeParam($this->request, 'street'), //镇街
+              'address' => \StrUtil::getRequestDecodeParam($this->request, 'address'), //地址
+              'type' => intval($this->request['type']),
+              'agencyType' => intval($this->request['agencyType']),
+              'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseTag'), //单位标签
+              'organizationTag' => \StrUtil::getRequestDecodeParam($this->request, 'organizationTag'), //机构标签
+              'institutionTag' => \StrUtil::getRequestDecodeParam($this->request, 'institutionTag'), //事业单位标签
+              'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'), //单位类型
+              'agentPhone' => \StrUtil::getRequestDecodeParam($this->request, 'agentPhone'), //手机
+              'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'agentEmail'), //邮箱
+              'ephone' => \StrUtil::getRequestDecodeParam($this->request, 'ephone'), //单位电话
+              'industryFieldNew' => \StrUtil::getRequestDecodeParam($this->request, 'industryFieldNew'), //产业领域
+              'industryFieldOld' => \StrUtil::getRequestDecodeParam($this->request, 'industryFieldOld'), //行业领域
+              'bankCard' => \StrUtil::getRequestDecodeParam($this->request, 'bankCard'), //银行
+              'bank' => \StrUtil::getRequestDecodeParam($this->request, 'bank'), //开户行
+              'bankNetwork' => \StrUtil::getRequestDecodeParam($this->request, 'bankNetwork')//网点
+              ]; */
+            if ($ep->modify_fields) {
+                $modify_fields = explode(",", $ep->modify_fields);
+                foreach ($modify_fields as $field) {
+                    $data[$field] = \StrUtil::getRequestDecodeParam($this->request, $field);
+                }
+            }
+            $modify_files = explode(",", $ep->modify_files); //["imgurl", "bankImg", "domainImg", "typeImg", "beian"];
             $files = $this->request->file();
             if ($files) {
                 $uploadapi = new UploadApi();

app/enterprise/controller/Api.php

@@ -391,38 +391,11 @@ class Api extends EnterpriseController {
                     $record->newBank = $data['bank'];
                     $record->newBankNetwork = $data['bankNetwork'];
                 } else {
-                    /* 注释变更驳回如果恢复，这段要去掉 */
-                    $record->newAgencyType = $data['agencyType'];
-                    $record->newName = htmlspecialchars($data['name']);
-                    $record->newIdCard = htmlspecialchars($data['idCard']);
-                    if ($data["agencyType"] == 1) {
-                        $record->newIndustryFieldNew = $data['industryFieldNew'];
-                        $record->newIndustryFieldOld = $data['industryFieldOld'];
-                    } else {
-                        $record->newIndustryFieldNew = null;
-                        $record->newIndustryFieldOld = null;
+                    $fields = array_filter(explode(",", $record->modify_fields));
+                    for ($i = 0; $i < count($fields); $i++) {
+                        $key = lcfirst(substr($fields[$i], 3));
+                        $record[$fields[$i]] = $data[$key]; //仅可修改选择的字段
                     }
-                    $record->newStreet = $data['street'];
-                    $record->newAddress = $data['address'];
-                    $record->newLegal = $data['legal'];
-                    $record->newEphone = $data['ephone'];
-                    $record->newAgentName = $data['agentName'];
-                    $record->newAgentEmail = $data['agentEmail'];
-                    $record->newAgentPhone = $data['agentPhone'];
-                    $record->newEnterpriseTag = $data['enterpriseTag'];
-                    $record->newOrganizationTag = $data['organizationTag'];
-                    $record->newInstitutionTag = $data['institutionTag'];
-                    $record->newEnterpriseType = $data['enterpriseType'];
-                    $record->newBankCard = $data['bankCard'];
-                    $record->newBank = $data['bank'];
-                    $record->newBankNetwork = $data['bankNetwork'];
-                    /* 注释变更驳回如果恢复，这段要去掉 */
-
-                    /* 注释变更驳回$fields = array_filter(explode(",", $record->modify_fields));
-                      for ($i = 0; $i < count($fields); $i++) {
-                      $key = lcfirst(substr($fields[$i], 3));
-                      $record[$fields[$i]] = $data[$key]; //仅可修改选择的字段
-                      } */
                 }
                 if (!$record["newImgurl"]) {
                     if (strtotime($record["createTime"]) < strtotime($this->compatible_time)) {
@@ -483,8 +456,7 @@ class Api extends EnterpriseController {
                 $files = $this->request->file();
                 if ($files) {
                     $uploadapi = new UploadApi();
-                    //注释变更驳回$modify_files = array_filter(explode(",", $record->modify_files));
-                    $modify_files = ["newImgurl", "newBankImg", "newDomainImg", "newTypeImg", "newBeian"];
+                    $modify_files = array_filter(explode(",", $record->modify_files)); //["newImgurl", "newBankImg", "newDomainImg", "newTypeImg", "newBeian"];
                     if (strtotime($record->createTime) < strtotime($this->compatible_time)) {
                         //旧typeid需要转换成新的禁用文件格式
                         $oldtypes = ["1161965644164075522" => "newImgurl", "1518753449987148467" => "newImgurl", "1518328155588131269" => "newBankImg", "1518926324960220206" => "newBankImg",

public/static/modular/gate/enterprise/enterprise_change_edit.js

@@ -464,8 +464,8 @@ EpChangeEdit.submitToCheck = function () {
 EpChangeEdit.setFieldDisabled = function () {
     var checkState = $("#checkState").length > 0 ? $("#checkState").val() : 1;
     if (checkState != 1) {
-        //注释变更驳回$("#ecr_form :input").prop("disabled", true);
-        //注释变更驳回$("#ecr_form :button").css("display", "none");
+        $("#ecr_form :input").prop("disabled", true);
+        $("#ecr_form :button").css("display", "none");
         var fields = $("#fields").val().split(",");
         for (var i in fields) {
             $("#" + fields[i]).removeAttr("disabled");

public/static/modular/gate/enterprise/enterprise_edit.js

@@ -229,7 +229,7 @@ $("#imgurl,#bankImg,#beian,#domainImg,#typeImg").change(function (e) {
     };
 });
 Register.setFieldDisabled = function () {
-    //注释驳回限制$("#ep_form :input").not("button").prop("disabled", true);
+    $("#ep_form :input").not("button").prop("disabled", true);
     var fields = $("#fields").val().split(",");
     for (var i in fields) {
         $("#" + fields[i]).removeAttr("disabled");