123

app/admin/controller/Enterprise.php

@@ -14,27 +14,27 @@ use think\facade\Db;
 
 class Enterprise extends AdminController {
 
-    public function gotoEnterprisePage(){
+    public function gotoEnterprisePage() {
 
 
 
         return view("", []);
     }
 
-    public function findEnterpriseByPage(){
+    public function findEnterpriseByPage() {
         $res = EnterpriseApi::getList($this->request);
 
         return json($res);
     }
 
-    public function gotoEnterpriseDetailPage(){
+    public function gotoEnterpriseDetailPage() {
         $id = trim($this->request['id']);
         $ep = EnterpriseApi::getOne($id);
-        if(!$ep){
+        if (!$ep) {
             return "无此企业";
         }
         //--------设置 审核状态---------------------------------------------------
-        switch ($ep['checkState']){
+        switch ($ep['checkState']) {
             case 1:
                 $ep['checkStateName'] = "待审核";
                 break;
@@ -49,7 +49,7 @@ class Enterprise extends AdminController {
                 break;
         }
         //-------设置账号状态----------------------------------------------------
-        switch ($ep['active']){
+        switch ($ep['active']) {
             case 1:
                 $ep['activeName'] = "账号有效";
                 break;
@@ -59,89 +59,94 @@ class Enterprise extends AdminController {
         }
         //---------设置 街道-----------------------------------------------------
         if (\StrUtil::isNotEmpAndNull($ep['street'])) {
-            $street_info = DictApi::findByParentCodeAndCode('street',$ep['street']);
-    		if ($street_info != null) {
+            $street_info = DictApi::findByParentCodeAndCode('street', $ep['street']);
+            if ($street_info != null) {
                 $ep['streetName'] = $street_info['name'];
             }
-		}
+        }
+        if (\StrUtil::isNotEmpAndNull($ep['agencyType'])) {
+            $agencyType = DictApi::findByParentCodeAndCode('agency_type', $ep['agencyType']);
+            $ep["agencyTypeName"] = $agencyType["name"];
+        }
+
         //---------设置产业领域 --------------------------------------------------
-        if(\StrUtil::isNotEmpAndNull($ep['industryFieldNew'])){
-            $industryFieldNew = DictApi::findByParentCodeAndCode('industry_field',$ep['industryFieldNew']);
-			if($industryFieldNew != null){
+        if (\StrUtil::isNotEmpAndNull($ep['industryFieldNew'])) {
+            $industryFieldNew = DictApi::findByParentCodeAndCode('industry_field', $ep['industryFieldNew']);
+            if ($industryFieldNew != null) {
                 $ep['industryFieldNewName'] = $industryFieldNew['name'];
             }
-		}
+        }
         //---------设置行业领域 --------------------------------------------------
-        if(\StrUtil::isNotEmpAndNull($ep['industryFieldOld'])){
-            $industryFieldOld = DictApi::findByParentCodeAndCode($ep['industryFieldNew'] . "_field",$ep['industryFieldOld']);
-            if($industryFieldOld != null){
+        if (\StrUtil::isNotEmpAndNull($ep['industryFieldOld'])) {
+            $industryFieldOld = DictApi::findByParentCodeAndCode($ep['industryFieldNew'] . "_field", $ep['industryFieldOld']);
+            if ($industryFieldOld != null) {
                 $ep['industryFieldOldName'] = $industryFieldOld['name'];
             }
         }
         //---------设置单位标签 --------------------------------------------------
-        if(\StrUtil::isNotEmpAndNull($ep['enterpriseTag'])){
-            $enterpriseTag = DictApi::findByParentCodeAndCode("enterprise_tag",$ep['enterpriseTag']);
-            if($enterpriseTag != null){
+        if (\StrUtil::isNotEmpAndNull($ep['enterpriseTag'])) {
+            $enterpriseTag = DictApi::findByParentCodeAndCode("enterprise_tag", $ep['enterpriseTag']);
+            if ($enterpriseTag != null) {
                 $ep['enterpriseTagName'] = $enterpriseTag['name'];
             }
         }
         //---------设置单位类型 --------------------------------------------------
-        if(\StrUtil::isNotEmpAndNull($ep['enterpriseType'])){
-            $enterpriseType = DictApi::findByParentCodeAndCode("enterprise_type",$ep['enterpriseType']);
-            if($enterpriseType != null){
+        if (\StrUtil::isNotEmpAndNull($ep['enterpriseType'])) {
+            $enterpriseType = DictApi::findByParentCodeAndCode("enterprise_type", $ep['enterpriseType']);
+            if ($enterpriseType != null) {
                 $ep['enterpriseTypeName'] = $enterpriseType['name'];
             }
         }
 
         $imgurl_info = pathinfo($ep['imgurl']);
-        if(in_array($imgurl_info['extension'],["jpeg","jpg","png","gif"])){
+        if (in_array($imgurl_info['extension'], ["jpeg", "jpg", "png", "gif"])) {
             $ep['imgurl_is_img'] = 1;
-        }else{
+        } else {
             $ep['imgurl_is_img'] = 0;
         }
 
         $bankImg_info = pathinfo($ep['bankImg']);
-        if(in_array($bankImg_info['extension'],["jpeg","jpg","png","gif"])){
+        if (in_array($bankImg_info['extension'], ["jpeg", "jpg", "png", "gif"])) {
             $ep['bankImg_is_img'] = 1;
-        }else{
+        } else {
             $ep['bankImg_is_img'] = 0;
         }
 
         $domainImg_info = pathinfo($ep['domainImg']);
-        if(in_array($domainImg_info['extension'],["jpeg","jpg","png","gif"])){
+        if (in_array($domainImg_info['extension'], ["jpeg", "jpg", "png", "gif"])) {
             $ep['domainImg_is_img'] = 1;
-        }else{
+        } else {
             $ep['domainImg_is_img'] = 0;
         }
 
         $typeImg_info = pathinfo($ep['typeImg']);
-        if(in_array($typeImg_info['extension'],["jpeg","jpg","png","gif"])){
+        if (in_array($typeImg_info['extension'], ["jpeg", "jpg", "png", "gif"])) {
             $ep['typeImg_is_img'] = 1;
-        }else{
+        } else {
             $ep['typeImg_is_img'] = 0;
         }
 
         $beian_info = pathinfo($ep['beian']);
-        if(in_array($beian_info['extension'],["jpeg","jpg","png","gif"])){
+        if (in_array($beian_info['extension'], ["jpeg", "jpg", "png", "gif"])) {
             $ep['beian_is_img'] = 1;
-        }else{
+        } else {
             $ep['beian_is_img'] = 0;
         }
 
         return view("", ['ep' => $ep]);
     }
 
-    public function gotoExaminePage(){
+    public function gotoExaminePage() {
 
         $id = trim($this->request['id']);
         $ep = EnterpriseApi::getOne($id);
-        if(!$ep){
+        if (!$ep) {
             return "无此企业";
         }
         //---------设置产业领域 --------------------------------------------------
-        if(\StrUtil::isNotEmpAndNull($ep['industryFieldNew'])){
-            $industryFieldNew = DictApi::findByParentCodeAndCode('industry_field',$ep['industryFieldNew']);
-            if($industryFieldNew != null){
+        if (\StrUtil::isNotEmpAndNull($ep['industryFieldNew'])) {
+            $industryFieldNew = DictApi::findByParentCodeAndCode('industry_field', $ep['industryFieldNew']);
+            if ($industryFieldNew != null) {
                 $ep['industryFieldNewName'] = $industryFieldNew['name'];
             }
         }
@@ -152,21 +157,21 @@ class Enterprise extends AdminController {
         return view("", ['ep' => $ep, 'checkUser' => session('user')['name']]);
     }
 
-    public function doExamine(){
+    public function doExamine() {
         $id = trim($this->request['id']);
-        if(!$id){
+        if (!$id) {
             return json(["msg" => 'ID不能为空!']);
         }
         $ep = EnterpriseApi::getOne($id);
-        if(!$ep){
+        if (!$ep) {
             return json(["msg" => '无此企业!']);
         }
         $checkState = $this->request['checkState'];
-        if($checkState == null || ($checkState != 2 && $checkState != 3)){
+        if ($checkState == null || ($checkState != 2 && $checkState != 3)) {
             return json(["msg" => '请选择审核状态!']);
         }
         $checkMsg = $this->request['checkMsg'];
-        if($checkState == 2){
+        if ($checkState == 2) {
             if (\StrUtil::isEmpOrNull($checkMsg)) {
                 return json(["msg" => '请填写审核意见!']);
             }
@@ -197,20 +202,20 @@ class Enterprise extends AdminController {
                 'phone' => $ep['agentPhone'],
                 'params' => '机构注册信息',
                 'state' => 1,
-                'sendingDate' => date("Y-m-d H:i:s",time()),
-                'createTime' => date("Y-m-d H:i:s",time())
+                'sendingDate' => date("Y-m-d H:i:s", time()),
+                'createTime' => date("Y-m-d H:i:s", time())
             ];
 
-            if($checkState == 2){
+            if ($checkState == 2) {
                 $record_data['templateCode'] = "【晋江市人才服务平台】您好！您提交的晋江市现代产业体系人才机构注册信息因信息填写错误或上传不完整已被退回，请及时登录“晋江市人才综合服务申报平台”根据审核意见修改并重新提交。退订回复TD。";
             }
-            if($checkState == 3){
+            if ($checkState == 3) {
                 $record_data['templateCode'] = "【晋江市人才服务平台】您好！您提交的晋江市现代产业体系人才机构注册信息已审核通过，可登录“晋江市人才综合服务申报平台”做相关事宜申报。退订回复TD。";
             }
 
             $smsapi = new ChuanglanSmsApi();
 
-            $result = $smsapi->sendSMS($ep['agentPhone'],$record_data['templateCode']);
+            $result = $smsapi->sendSMS($ep['agentPhone'], $record_data['templateCode']);
 
             MessageRecord::create($record_data);
 
@@ -226,40 +231,39 @@ class Enterprise extends AdminController {
                 'step' => 101,
                 'stateChange' => TalentState::stateEnum($checkState),
                 'description' => $checkMsg,
-                'createTime' => date("Y-m-d H:i:s",time()),
-                'createUser' => session('user')['name']."({$company['name']})"
+                'createTime' => date("Y-m-d H:i:s", time()),
+                'createUser' => session('user')['name'] . "({$company['name']})"
             ]);
 
-            return json(["msg" => '操作成功!',"code" => 200]);
-
-        } catch (\Exception $e){
+            return json(["msg" => '操作成功!', "code" => 200]);
+        } catch (\Exception $e) {
             return json(["msg" => $e->getMessage()]);
         }
     }
 
-    public function GotoActivePage(){
+    public function GotoActivePage() {
         $id = trim($this->request['id']);
         $ep = EnterpriseApi::getOne($id);
 
         return view("", ['ep' => $ep]);
     }
 
-    public function setActive(){
-        if(!$id = trim($this->request['id'])){
-            return json(["msg" => 'ID不能为空!',"code" => 500]);
+    public function setActive() {
+        if (!$id = trim($this->request['id'])) {
+            return json(["msg" => 'ID不能为空!', "code" => 500]);
         }
         $ep = EnterpriseApi::getOne($id);
         $active = $this->request['active'];
-        if($ep['active'] == null || ($ep['active'] != 1 && $ep['active'] != 2)){
-            return json(["msg" => '状态有误!',"code" => 500]);
+        if ($ep['active'] == null || ($ep['active'] != 1 && $ep['active'] != 2)) {
+            return json(["msg" => '状态有误!', "code" => 500]);
         }
-        if($ep['active'] == 2){
+        if ($ep['active'] == 2) {
             $msg = trim($this->request['activeMsg']);
-            if(empty($msg)){
-                return json(["msg" => '请填写拉黑/冻结原因!',"code" => 500]);
+            if (empty($msg)) {
+                return json(["msg" => '请填写拉黑/冻结原因!', "code" => 500]);
             }
-            if(strlen($msg) > 100){
-                return json(["msg" => '拉黑/冻结原因 最多100个字符!',"code" => 500]);
+            if (strlen($msg) > 100) {
+                return json(["msg" => '拉黑/冻结原因 最多100个字符!', "code" => 500]);
             }
         }
 
@@ -269,7 +273,7 @@ class Enterprise extends AdminController {
         $ep->updateUser = session('user')['uid'] . "";
         $ep->updateTime = date('y-m-d H:i:s');
 
-    	try {
+        try {
             $ep->save();
             //添加日志
             TalentChecklog::create([
@@ -282,25 +286,25 @@ class Enterprise extends AdminController {
                 'step' => 102,
                 'stateChange' => TalentState::stateEnum(10),
                 'description' => $msg,
-                'createTime' => date("Y-m-d H:i:s",time()),
-                'createUser' => session('user')['name']."({$company['name']})"
+                'createTime' => date("Y-m-d H:i:s", time()),
+                'createUser' => session('user')['name'] . "({$company['name']})"
             ]);
 
-            return json(["msg" => '操作成功!',"code" => 200]);
-		} catch (\Exception $e) {
+            return json(["msg" => '操作成功!', "code" => 200]);
+        } catch (\Exception $e) {
             return json(["msg" => $e->getMessage()]);
         }
     }
 
-    public function resetPassword(){
-        if(!$id = trim($this->request['id'])){
-            return json(["msg" => 'ID不能为空!',"code" => 500]);
+    public function resetPassword() {
+        if (!$id = trim($this->request['id'])) {
+            return json(["msg" => 'ID不能为空!', "code" => 500]);
         }
         $ep = EnterpriseApi::getOne($id);
-        if(!$ep){
-            return json(["msg" => '找不到该用户!',"code" => 500]);
+        if (!$ep) {
+            return json(["msg" => '找不到该用户!', "code" => 500]);
         }
-        $ep->password = hash("md5", 'JJrc@123');//默认密码
+        $ep->password = hash("md5", 'JJrc@123'); //默认密码
         $ep->updateUser = session('user')['uid'] . "";
         $ep->updateTime = date("Y-m-d H:i:s");
         $ep->save();
@@ -316,13 +320,13 @@ class Enterprise extends AdminController {
             'step' => 103,
             'stateChange' => '重置密码',
             'description' => '重置密码',
-            'createTime' => date("Y-m-d H:i:s",time()),
-            'createUser' => session('user')['name']."({$company['name']})"
+            'createTime' => date("Y-m-d H:i:s", time()),
+            'createUser' => session('user')['name'] . "({$company['name']})"
         ]);
-        return json(["msg" => '重置密码成功!',"code" => 200]);
+        return json(["msg" => '重置密码成功!', "code" => 200]);
     }
 
-    public function export(){
+    public function export() {
         $res = EnterpriseApi::getList($this->request);
 
         $objPHPExcel = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
@@ -331,7 +335,7 @@ class Enterprise extends AdminController {
         //最后修改人
         $objPHPExcel->getProperties()->setLastModifiedBy("System");
         //标题
-        $objPHPExcel->getProperties()->settitle("企业用户信息".date("ymdHis"));
+        $objPHPExcel->getProperties()->settitle("企业用户信息" . date("ymdHis"));
 
         $objPHPExcel->getDefaultStyle()->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
         $objPHPExcel->getDefaultStyle()->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
@@ -346,90 +350,89 @@ class Enterprise extends AdminController {
 
         $sheet->getstyle('A1:O1')->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setRGB("87CEEB");
 
-        $header = ["单位名称", " 统一社会信用代码","产业领域" ,"单位标签"," 所属街道", "单位地址", " 法人代表", " 单位电话", "人才联络员", "人才联络员电话", "人才联络员邮箱", "审核状态", "账号状态", "注册时间","备注"];
+        $header = ["单位名称", " 统一社会信用代码", "产业领域", "单位标签", " 所属街道", "单位地址", " 法人代表", " 单位电话", "人才联络员", "人才联络员电话", "人才联络员邮箱", "审核状态", "账号状态", "注册时间", "备注"];
 
         foreach ($header as $key => $value) {
-            $sheet->setCellValueByColumnAndRow($key+1, 1, $value);
+            $sheet->setCellValueByColumnAndRow($key + 1, 1, $value);
         }
 
-        if($res['total'] > 0){
+        if ($res['total'] > 0) {
             $row = 2;
-            foreach ($res['rows'] as $k => $v){
-                for ($i = 0; $i < count($header);$i++){
-                    switch ($i){
+            foreach ($res['rows'] as $k => $v) {
+                for ($i = 0; $i < count($header); $i++) {
+                    switch ($i) {
                         case 0:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['name']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['name']);
                             break;
                         case 1:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['idCard']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['idCard']);
                             break;
                         case 2:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['industryFieldNewName']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['industryFieldNewName']);
                             break;
                         case 3:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['enterpriseTagName']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['enterpriseTagName']);
                             break;
                         case 4:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['streetName']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['streetName']);
                             break;
                         case 5:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['address']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['address']);
                             break;
                         case 6:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['legal']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['legal']);
                             break;
                         case 7:
-                            $sheet->setCellValueExplicitByColumnAndRow($i+1, $row, $v['ephone'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+                            $sheet->setCellValueExplicitByColumnAndRow($i + 1, $row, $v['ephone'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
                             break;
                         case 8:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['agentName']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['agentName']);
                             break;
                         case 9:
-                            $sheet->setCellValueExplicitByColumnAndRow($i+1, $row, $v['agentPhone'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
+                            $sheet->setCellValueExplicitByColumnAndRow($i + 1, $row, $v['agentPhone'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
                             break;
                         case 10:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['agentEmail']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['agentEmail']);
                             break;
                         case 11:
-                            switch ($v['checkState']){
+                            switch ($v['checkState']) {
                                 case 1:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "未审核");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "未审核");
                                     break;
                                 case 2:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "审核驳回");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "审核驳回");
                                     break;
                                 case 3:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "审核通过");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "审核通过");
                                     break;
                                 case 4:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "重新提交");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "重新提交");
                                     break;
                                 default:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "");
                                     break;
                             }
                             break;
                         case 12:
-                            switch ($v['active']){
+                            switch ($v['active']) {
                                 case 1:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "账号有效");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "账号有效");
                                     break;
                                 case 2:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "拉黑/冻结");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "拉黑/冻结");
                                     break;
                                 default:
-                                    $sheet->setCellValueByColumnAndRow($i+1, $row, "");
+                                    $sheet->setCellValueByColumnAndRow($i + 1, $row, "");
                                     break;
                             }
                             break;
                         case 13:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['createTime']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['createTime']);
                             break;
                         case 14:
-                            $sheet->setCellValueByColumnAndRow($i+1, $row, $v['description']);
+                            $sheet->setCellValueByColumnAndRow($i + 1, $row, $v['description']);
                             break;
                     }
-
                 }
                 $row++;
             }
@@ -437,7 +440,7 @@ class Enterprise extends AdminController {
 
 
         header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        header('Content-Disposition: attachment;filename="'."企业用户信息".date("ymdHis").'.xlsx"');
+        header('Content-Disposition: attachment;filename="' . "企业用户信息" . date("ymdHis") . '.xlsx"');
         header('Cache-Control: max-age=0');
         // If you're serving to IE 9, then the following may be needed
         header('Cache-Control: max-age=1');
@@ -448,6 +451,6 @@ class Enterprise extends AdminController {
         header('Pragma: public'); // HTTP/1.0
         $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($objPHPExcel, 'Xlsx');
         $writer->save('php://output');
-
     }
-}
+
+}

app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -162,16 +162,17 @@
                         </tr>
 
                     </table>
-                    {if condition="$ep.special == 0"}
+                    {if condition="$ep['special'] eq 0"}
                         <p>
                             申报类型：
                             {switch name="ep.type"}
-                            {case value="1"}晋江市现代产业体系人才{/case}
+                            {case value="1"}晋江市现代产业体系人才{if condition="$ep['agencyTypeName']"}（{$ep.agencyTypeName}）{/if}{/case}
                             {case value="2"}集成电路优秀人才{/case}
                             {/switch}
                             <input type="hidden" id="type" value="{$ep.type}">
                         </p>
                         <table style="width:100%;table-layout:fixed;" class="table table-bordered">
+                            {if condition="$ep['agencyType'] eq 1"}
                             <tr class="type1">
                                 <td class="key">
                                     产业领域
@@ -201,9 +202,10 @@
                                     </div>
                                 </td>
                             </tr>
+                            {/if}
                             <tr class="type1">
                                 <td class="key">
-                                    单位标签
+                                    企业标签
                                 </td>
                                 <td class="value1 word-wrap">
                                     {$ep.enterpriseTagName}

app/common/api/VerifyApi.php

@@ -302,11 +302,14 @@ class VerifyApi {
                             $where[] = ["tl.state", "=", TalentState::SCND_SUBMIT];
                             break;
                         case 2://驳回
-                            $where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
-                            $where[] = ["tl.state", "in", [TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT]];
+                            //$where[] = ["ti.checkState", "=", TalentState::SCND_SUBMIT];
+                            $where[] = ["tl.new_state", "in", [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT]];
+                            $where[] = ["tl.state", "in", [TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT]];
                             break;
                         default:
-                            $where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];
+                            //$where[] = ["ti.checkState", "in", [TalentState::SCND_SUBMIT, TalentState::FST_VERIFY_FAIL]];
+                            $where[] = ["tl.new_state", "in", [TalentState::SCND_SAVE, TalentState::SCND_SUBMIT]];
+                            $where[] = ["tl.state", "in", [TalentState::SCND_SUBMIT,TalentState::DEPT_VERIFY_REJECT, TalentState::REVERIFY_REJECT, TalentState::FST_VERIFY_REJECT]];
                     }
                     break;
                 case 6:

app/common/controller/Auth.php

@@ -34,6 +34,7 @@ class Auth extends BaseController {
                 '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'),
                 'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'),
                 'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'agentEmail'),
@@ -55,11 +56,15 @@ class Auth extends BaseController {
                 $files = $this->request->file();
                 if ($special == 'qiye') {
                     if ($data['type'] == 1) {
-                        validate(Enterprise::class)->batch(true)->scene('add')->check($data);
-                        if (!array_key_exists('domainImg', $files) || $files['domainImg'] == '') {
-                            $response_object->code = 500;
-                            $response_object->msg = '行业领域佐证材料不能为空';
-                            return \StrUtil::back($response_object, "Register.epCallBack");
+                        if ($data["agencyType"] == 1) {
+                            validate(Enterprise::class)->batch(true)->scene('add')->check($data);
+                            if (!array_key_exists('domainImg', $files) || $files['domainImg'] == '') {
+                                $response_object->code = 500;
+                                $response_object->msg = '行业领域佐证材料不能为空';
+                                return \StrUtil::back($response_object, "Register.epCallBack");
+                            }
+                        } else {
+                            validate(Enterprise::class)->batch(true)->scene('add2')->check($data);
                         }
                         $checkTypes = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
                         if (in_array($data["enterpriseType"], $checkTypes) && (!array_key_exists('typeImg', $files) || $files['typeImg'] == '')) {
@@ -224,6 +229,7 @@ class Auth extends BaseController {
                 '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'), //单位标签
                 'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'enterpriseType'), //单位类型
                 'agentPhone' => \StrUtil::getRequestDecodeParam($this->request, 'agentPhone'), //手机
@@ -292,7 +298,11 @@ class Auth extends BaseController {
                 $data['id'] = $ep->id;
                 if ($ep->special == 0) {
                     if ($ep->type == 1) {
-                        validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change')->check($data);
+                        if ($ep->agencyType == 1) {
+                            validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change')->check($data);
+                        } else {
+                            validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change2')->check($data);
+                        }
                     } else {
                         validate(\app\common\validate\Enterprise::class)->batch(true)->scene('jc_change')->check($data);
                     }

app/common/validate/Enterprise.php

@@ -13,6 +13,7 @@ class Enterprise extends Validate {
         'name' => 'require|max:100|unique:un_enterprise|regex:/^[\x{4e00}-\x{9fa5}\(\)（）\da-zA-Z&]{2,50}$/u',
         'idCard' => ['require', 'unique:un_enterprise', 'regex:/^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/'],
         'type' => 'require',
+        'agencyType' => 'require',
         'industryFieldNew' => 'require',
         'enterpriseTag' => 'require',
         'enterpriseType' => 'require',
@@ -45,6 +46,7 @@ class Enterprise extends Validate {
         'idCard.regex' => '统一社会信用代码不正确！',
         'idCard.unique' => '该统一社会信用代码已存在',
         'type.require' => '申报类型必须选择',
+        'type.require' => '机构类型必须选择',
         'industryFieldNew.require' => '产业领域必须选择',
         'enterpriseTag.require' => '单位标签必须选择',
         'enterpriseType.require' => '单位类型必须选择',
@@ -68,8 +70,10 @@ class Enterprise extends Validate {
         'bankNetwork.regex' => '开户银行网点不正确，请检查'
     ];
     protected $scene = [
-        'add' => ['username', 'password', 're_password', 'name', 'idCard', 'type', 'industryFieldNew', 'enterpriseTag', 'enterpriseType', 'agentName', 'agentPhone', 'verificationCode', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],
+        'add' => ['username', 'password', 're_password', 'name', 'idCard', 'type', 'agencyType', 'industryFieldNew', 'enterpriseTag', 'enterpriseType', 'agentName', 'agentPhone', 'verificationCode', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],
+        'add2' => ['username', 'password', 're_password', 'name', 'idCard', 'type', 'enterpriseTag', 'enterpriseType', 'agentName', 'agentPhone', 'verificationCode', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],
         'change' => ['name', 'idCard', 'industryFieldNew', 'enterpriseTag', 'enterpriseType', 'agentName', 'agentPhone', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],
+        'change2' => ['name', 'idCard', 'enterpriseTag', 'enterpriseType', 'agentName', 'agentPhone', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],
         'changePwd' => ['password'],
         'check_common' => ['name', 'idCard', 'industryFieldNew', 'enterpriseTag', 'enterpriseType', 'agentName', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],
         'jc_add' => ['username', 'password', 're_password', 'name', 'idCard', 'type', 'agentName', 'agentPhone', 'verificationCode', 'legal', 'street', 'address', 'ephone', 'agentEmail', 'bankCard', 'bank', 'bankNetwork'],

app/common/view/auth/register.html

@@ -154,7 +154,7 @@
                                                             <div class="row">
                                                                 <div class="rowGroup" >
                                                                     <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>申报类型</label>
-                                                                    <div class="col-sm-4 spacing">
+                                                                    <div class="col-sm-3 spacing">
                                                                         <select class="form-control" id="type" name="type" onchange="Register.typeChange()">
                                                                             <option value="">请选择</option>
                                                                             <option value="1">晋江市现代产业体系人才</option>
@@ -163,10 +163,17 @@
                                                                         </select>
                                                                     </div>
                                                                 </div>
+                                                                <div class="rowGroup agencyType"  style="display: none">
+                                                                    <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>机构类型</label>
+                                                                    <div class="col-sm-3 spacing">
+                                                                        <select class="form-control" id="agencyType" name="agencyType" onchange="Register.agencyTypeChange()">
+                                                                        </select>
+                                                                    </div>
+                                                                </div>
                                                             </div>
                                                             <div class="row" id="typeGroup" style="display: none">
                                                                 <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                                                    <tr>
+                                                                    <tr class="agencyType1">
                                                                         <td>
                                                                             <div class="rowGroup">
                                                                                 <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
@@ -186,7 +193,7 @@
                                                                             <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
                                                                         </td>
                                                                     </tr>
-                                                                    <tr>
+                                                                    <tr class="agencyType1 agencyType2">
                                                                         <td>
                                                                             <div class="rowGroup">
                                                                                 <label class="control-label spacing td-label"><span style="color: red">*</span>企业标签</label>

app/enterprise/controller/Api.php

@@ -58,6 +58,7 @@ class Api extends EnterpriseController {
             'newAgentEmail' => $ep['agentEmail'],
             'newAgentPhone' => $ep['agentPhone'],
             'type' => $ep['type'],
+            'newAgencyType' => $ep['agencyType'],
             'newEnterpriseTag' => $ep['enterpriseTag'],
             'newEnterpriseType' => $ep['enterpriseType'],
             'newIndustryFieldNew' => $ep['industryFieldNew'],
@@ -146,6 +147,7 @@ class Api extends EnterpriseController {
             'street' => \StrUtil::getRequestDecodeParam($this->request, 'newStreet'), //镇街
             'address' => \StrUtil::getRequestDecodeParam($this->request, 'newAddress'), //地址
             'type' => intval($this->request['type']),
+            'agencyType' => intval($this->request['newAgencyType']),
             'enterpriseTag' => \StrUtil::getRequestDecodeParam($this->request, 'newEnterpriseTag'), //单位标签
             'enterpriseType' => \StrUtil::getRequestDecodeParam($this->request, 'newEnterpriseType'), //单位类型
             'agentEmail' => \StrUtil::getRequestDecodeParam($this->request, 'newAgentEmail'), //邮箱
@@ -171,7 +173,11 @@ class Api extends EnterpriseController {
                     if ($ep->type == 2) {
                         validate(\app\common\validate\Enterprise::class)->batch(true)->scene('jc_change')->check($data);
                     } else {
-                        validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change')->check($data);
+                        if ($data["agencyType"] == 1) {
+                            validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change')->check($data);
+                        } else {
+                            validate(\app\common\validate\Enterprise::class)->batch(true)->scene('change2')->check($data);
+                        }
                     }
                     break;
                 case 1:
@@ -189,6 +195,7 @@ class Api extends EnterpriseController {
                     'id' => $record_id,
                     'mainId' => $data['id'],
                     'type' => $data['type'],
+                    'oldAgencyType' => $ep['agencyType'],
                     'oldName' => $ep['name'],
                     'oldIdCard' => $ep['idCard'],
                     'oldIndustryFieldNew' => $ep['industryFieldNew'],
@@ -210,6 +217,7 @@ class Api extends EnterpriseController {
                     "oldDomainImg" => $ep["domainImg"],
                     "oldTypeImg" => $ep["typeImg"],
                     "oldBeian" => $ep["beian"],
+                    'newAgencyType' => $data['agencyType'],
                     'newName' => htmlspecialchars($data['name']),
                     'newIdCard' => htmlspecialchars($data['idCard']),
                     'newIndustryFieldNew' => $data['industryFieldNew'],
@@ -235,6 +243,11 @@ class Api extends EnterpriseController {
                 $record_data["newDomainImg"] = $ep["domainImg"];
                 $record_data["newTypeImg"] = $ep["typeImg"];
                 $record_data["newBeian"] = $ep["beian"];
+                if ($data["agencyType"] != 1) {
+                    $record_data["newIndustryFieldNew"] = null;
+                    $record_data["newIndustryFieldOld"] = null;
+                    $record_data["newDomainImg"] = null;
+                }
                 $files = $this->request->file();
                 if ($files) {
                     $uploadapi = new UploadApi();
@@ -256,7 +269,7 @@ class Api extends EnterpriseController {
                     }
 
                     //检验附件 行业领域佐证材料
-                    if (array_key_exists('domainImg', $files)) {
+                    if (array_key_exists('domainImg', $files) && $data['agencyType'] == 1) {
                         $upload_result2 = $uploadapi->uploadOne($this->request->file('domainImg'), 'system');
                         if ($upload_result2->code == 500) {
                             return \StrUtil::back($upload_result2, "EpChangeEdit.callBack");
@@ -289,7 +302,7 @@ class Api extends EnterpriseController {
                     if (!$record_data["newBankImg"]) {
                         throw new ValidateException("请上传开户许可证");
                     }
-                    if ($ep->type == 1 && !$record_data["newDomainImg"]) {
+                    if ($ep->type == 1 && $data['agencyType'] == 1 && !$record_data["newDomainImg"]) {
                         throw new ValidateException("请上传行业领域佐证材料");
                     }
                     if (in_array($record_data["newEnterpriseType"], ["guishang", "gaoxinjishu", "zhuanjingtexin"]) && !$record_data["newTypeImg"]) {
@@ -321,6 +334,7 @@ class Api extends EnterpriseController {
             } else {
                 $record = EnterpriseRecord::find($record_id);
                 $ep = Enterprise::where('id', session("user")["uid"])->find();
+                $record->oldAgencyType = $ep['agencyType'];
                 $record->oldName = $ep['name'];
                 $record->oldIdCard = $ep['idCard'];
                 $record->oldIndustryFieldNew = $ep['industryFieldNew'];
@@ -339,10 +353,16 @@ class Api extends EnterpriseController {
                 $record->oldBankNetwork = $ep['bankNetwork'];
 
                 if ($record->checkState == 1) {
+                    $record->newAgencyType = $data['agencyType'];
                     $record->newName = htmlspecialchars($data['name']);
                     $record->newIdCard = htmlspecialchars($data['idCard']);
-                    $record->newIndustryFieldNew = $data['industryFieldNew'];
-                    $record->newIndustryFieldOld = $data['industryFieldOld'];
+                    if ($data["agencyType"] == 1) {
+                        $record->newIndustryFieldNew = $data['industryFieldNew'];
+                        $record->newIndustryFieldOld = $data['industryFieldOld'];
+                    } else {
+                        $record->newIndustryFieldNew = null;
+                        $record->newIndustryFieldOld = null;
+                    }
                     $record->newStreet = $data['street'];
                     $record->newAddress = $data['address'];
                     $record->newLegal = $data['legal'];
@@ -488,9 +508,12 @@ class Api extends EnterpriseController {
                     if (!$record["newBankImg"]) {
                         throw new ValidateException("请上传开户许可证");
                     }
-                    if ($ep->type == 1 && !$record["newDomainImg"]) {
+                    if ($ep->type == 1 && $data["agencyType"] == 1 && !$record["newDomainImg"]) {
                         throw new ValidateException("请上传行业领域佐证材料");
                     }
+                    if ($data["agencyType"] != 1) {
+                        $record["newDomainImg"] = null;
+                    }
                     if (in_array($record->newEnterpriseType, ["guishang", "gaoxinjishu", "zhuanjingtexin"]) && !$record["newTypeImg"]) {
                         throw new ValidateException("规上、高新技术、专精特新企业需要上传佐证材料");
                     }
@@ -906,6 +929,7 @@ class Api extends EnterpriseController {
         }
         switch ($ep->special) {
             case 0:
+                $agencyTypeList = DictApi::selectByParentCode('agency_type');
                 $tagList = DictApi::selectByParentCode('enterprise_tag');
                 $typeList = DictApi::selectByParentCode('enterprise_type');
                 $industryFieldNew = DictApi::selectByParentCode('industry_field');
@@ -919,6 +943,8 @@ class Api extends EnterpriseController {
                 $ecr['newEnterpriseTypeName'] = $typeList[$ecr['newEnterpriseType']];
                 $ecr['oldIndustryFieldNewName'] = $industryFieldNew[$ecr['oldIndustryFieldNew']];
                 $ecr['newIndustryFieldNewName'] = $industryFieldNew[$ecr['newIndustryFieldNew']];
+                $ecr['oldAgencyTypeName'] = $agencyTypeList[$ecr['oldAgencyType']];
+                $ecr['newAgencyTypeName'] = $agencyTypeList[$ecr['newAgencyType']];
                 return view("", ['ecr' => $ecr]);
                 break;
             case 1:

app/enterprise/controller/Index.php

@@ -41,6 +41,7 @@ class Index extends EnterpriseController {
 
     public function centerPage() {
         $ep = Enterprise::where('id', $this->user['uid'])->find();
+        $ep['agencyTypeName'] = DictApi::findByParentCodeAndCode('agency_type', $ep['agencyType'])->name ?? "";
         $ep['industryFieldNewName'] = DictApi::findDictByCode($ep['industryFieldNew'])->name ?? '';
         $ep['industryFieldOldName'] = DictApi::findDictByCode($ep['industryFieldOld'])->name ?? '';
         $ep['enterpriseTagName'] = DictApi::findDictByCode($ep['enterpriseTag'])->name ?? '';

app/enterprise/controller/Talent.php

@@ -36,8 +36,8 @@ class Talent extends EnterpriseController {
         $res = TalentApi::getList($this->request, $step);
         return json($res);
     }
-    
-    public function zrIndex(){
+
+    public function zrIndex() {
         return view();
     }
 
@@ -777,8 +777,12 @@ class Talent extends EnterpriseController {
                     Db::table("new_talent_checklog")->where($whr)->save($upd_checklog);
                 }
             } else if ($checkState == TalentState::SCND_SUBMIT) {
-                if ($data["id"]) {
+                if (!$info["first_submit_time"]) {
+                    $data["first_submit_time"] = date("Y-m-d H:i:s");
+                } else {
                     $data["new_submit_time"] = date("Y-m-d H:i:s");
+                }
+                if ($data["id"]) {
                     TalentModel::update($data);
                 } else {
                     //新增

app/enterprise/view/api/to_add.html

@@ -129,68 +129,77 @@
                             </tr>
                         </table>
                         {if condition="$ecr['special'] eq 0"}
-                            <div class="row">
-                                <div class="rowGroup" >
-                                    <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>申报类型</label>
-                                    <div class="col-sm-4 spacing">
-                                        <div class="form-control" disabled="disabled">
-                                            {switch name="ecr.type"}
-                                            {case value="1"}晋江市现代产业体系人才{/case}
-                                            {case value="2"}集成电路优秀人才{/case}
-                                            {case value="3"}海峡计划团队{/case}
-                                            {/switch}
-                                        </div>
+                        <div class="row">
+                            <div class="rowGroup" >
+                                <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>申报类型</label>
+                                <div class="col-sm-3 spacing">
+                                    <div class="form-control" disabled="disabled">
+                                        {switch name="ecr.type"}
+                                        {case value="1"}晋江市现代产业体系人才{/case}
+                                        {case value="2"}集成电路优秀人才{/case}
+                                        {case value="3"}海峡计划团队{/case}
+                                        {/switch}
+                                    </div>
+                                </div>
+                                {eq name="ecr.type" value="1"}
+                                <div class="rowGroup agencyType">
+                                    <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>机构类型</label>
+                                    <div class="col-sm-3 spacing">
+                                        <select class="form-control" id="newAgencyType" name="newAgencyType" value="{$ecr.newAgencyType}" onchange="EpChangeEdit.agencyTypeChange()">
+                                        </select>
                                     </div>
                                 </div>
+                                {/eq}
                             </div>
-                            {if condition="$ecr['type'] eq 1"}
-                            <div class="row" id="typeGroup">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                <select autocomplete="off" type="text" class="form-control" id="newIndustryFieldNew" name="newIndustryFieldNew" value="{$ecr.newIndustryFieldNew}" onchange="EpChangeEdit.industryChange()"></select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>行业领域</label>
-                                                <select class="form-control" id="newIndustryFieldOld" name="newIndustryFieldOld" value="{$ecr.newIndustryFieldOld}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td style="position:relative;">
-                                            <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#domainImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
-                                            <label class="control-label spacing"><span style="color: red">*</span>行业领域上传材料</label>
-                                            {if condition="$ecr['domainImg']"}
-                                            {eq name="ecr.domainImg_is_img" value="1"}
-                                            <img src="{$ecr.domainImg|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)" >
-                                            {else/}
-                                            <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.domainImg|getStoragePath}', 'domainImg')">
-                                            {/eq}
-                                            {else/}
-                                            <img src="/static/img/yyzz.png" style="height:60px;">
-                                            {/if}
-                                            <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>企业标签</label>
-                                                <select class="form-control" id="newEnterpriseTag" name="newEnterpriseTag" value="{$ecr.newEnterpriseTag}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>企业类型</label>
-                                                <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}" onchange="EpChangeEdit.changeEnterpriseType()">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td class="typeUploader" {if condition="in_array($ecr.newEnterpriseType,['guishang','gaoxinjishu','zhuanjingtexin'])"}style="position:relative;"{else/}style="position:relative;display:none;"{/if}>
+                        </div>
+                        {if condition="$ecr['type'] eq 1"}
+                        <div class="row" id="typeGroup">
+                            <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                <tr class="agencyType1">
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                            <select autocomplete="off" type="text" class="form-control" id="newIndustryFieldNew" name="newIndustryFieldNew" value="{$ecr.newIndustryFieldNew}" onchange="EpChangeEdit.industryChange()"></select>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>行业领域</label>
+                                            <select class="form-control" id="newIndustryFieldOld" name="newIndustryFieldOld" value="{$ecr.newIndustryFieldOld}">
+                                            </select>
+                                        </div>
+                                    </td>
+                                    <td style="position:relative;">
+                                        <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#domainImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
+                                        <label class="control-label spacing"><span style="color: red">*</span>行业领域上传材料</label>
+                                        {if condition="$ecr['domainImg']"}
+                                        {eq name="ecr.domainImg_is_img" value="1"}
+                                        <img src="{$ecr.domainImg|getStoragePath}" style="height:60px;" onclick="Feng.showImg(this)" >
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" style="height:60px;" onclick="Feng.showPdf('{$ecr.domainImg|getStoragePath}', 'domainImg')">
+                                        {/eq}
+                                        {else/}
+                                        <img src="/static/img/yyzz.png" style="height:60px;">
+                                        {/if}
+                                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
+                                    </td>
+                                </tr>
+                                <tr class="agencyType1 agencyType2">
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>企业标签</label>
+                                            <select class="form-control" id="newEnterpriseTag" name="newEnterpriseTag" value="{$ecr.newEnterpriseTag}">
+                                            </select>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>企业类型</label>
+                                            <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}" onchange="EpChangeEdit.changeEnterpriseType()">
+                                            </select>
+                                        </div>
+                                    </td>
+                                    <td class="typeUploader" {if condition="in_array($ecr.newEnterpriseType,['guishang','gaoxinjishu','zhuanjingtexin'])"}style="position:relative;"{else/}style="position:relative;display:none;"{/if}>
                                         <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#typeImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
                                         <label class="control-label spacing"><span style="color: red">*</span>规上、高新技术、专精特新企业上传材料</label>
                                         {if condition="$ecr['typeImg']"}
@@ -203,11 +212,11 @@
                                         <img src="/static/img/yyzz.png" style="height:60px;">
                                         {/if}
                                         <input style="display: none" autocomplete="off" type="file" class="form-control" id="typeImg" name="typeImg" />
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                            {/if}
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        {/if}
                         {/if}
                     </div>
                 </div>

app/enterprise/view/api/to_detail.html

@@ -191,7 +191,7 @@
                             <td colspan="5">
                                 申报类型：
                                 {switch name="ecr.type"}
-                                {case value="1"}晋江市现代产业体系人才{/case}
+                                {case value="1"}晋江市现代产业体系人才{if condition="$ecr['newAgencyType'] neq $ecr['oldAgencyType']"}（<span class='old'>{$ecr.oldAgencyTypeName}</span> -> {$ecr.newAgencyTypeName}）{else/}（{$ecr.newAgencyTypeName}）{/if}{/case}
                                 {case value="2"}集成电路优秀人才{/case}
                                 {/switch}
                             </td>

app/enterprise/view/api/to_update.html

@@ -132,68 +132,77 @@
                             </tr>
                         </table>
                         {if condition="$ecr['special'] eq 0"}
-                            <div class="row">
-                                <div class="rowGroup" >
-                                    <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>申报类型</label>
-                                    <div class="col-sm-4 spacing">
-                                        <div class="form-control" disabled="disabled">
-                                            {switch name="ecr.type"}
-                                            {case value="1"}晋江市现代产业体系人才{/case}
-                                            {case value="2"}集成电路优秀人才{/case}
-                                            {case value="3"}海峡计划团队{/case}
-                                            {/switch}
-                                        </div>
+                        <div class="row">
+                            <div class="rowGroup" >
+                                <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>申报类型</label>
+                                <div class="col-sm-3 spacing">
+                                    <div class="form-control" disabled="disabled">
+                                        {switch name="ecr.type"}
+                                        {case value="1"}晋江市现代产业体系人才{/case}
+                                        {case value="2"}集成电路优秀人才{/case}
+                                        {case value="3"}海峡计划团队{/case}
+                                        {/switch}
                                     </div>
                                 </div>
                             </div>
-                            {if condition="$ecr['type'] eq 1"}
-                            <div class="row" id="typeGroup">
-                                <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                <select autocomplete="off" type="text" class="form-control" id="newIndustryFieldNew" name="newIndustryFieldNew" value="{$ecr.newIndustryFieldNew}" onchange="EpChangeEdit.industryChange()"></select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>行业领域</label>
-                                                <select class="form-control" id="newIndustryFieldOld" name="newIndustryFieldOld" value="{$ecr.newIndustryFieldOld}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td style="position:relative;">
-                                            <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#domainImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
-                                            <label class="control-label spacing"><span style="color: red">*</span>行业领域上传材料</label>
-                                            {if condition="$ecr['newDomainImg']"}
-                                            {eq name="ecr.domainImg_is_img" value="1"}
-                                            <img src="{$ecr.newDomainImg|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)" >
-                                            {else/}
-                                            <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.newDomainImg|getStoragePath}', 'domainImg')">
-                                            {/eq}
-                                            {else/}
-                                            <img src="/static/img/yyzz.png" style="height: 60px;">
-                                            {/if}
-                                            <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>企业标签</label>
-                                                <select class="form-control" id="newEnterpriseTag" name="newEnterpriseTag" value="{$ecr.newEnterpriseTag}">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td>
-                                            <div class="rowGroup">
-                                                <label class="control-label spacing td-label"><span style="color: red">*</span>企业类型</label>
-                                                <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}" onchange="EpChangeEdit.changeEnterpriseType()">
-                                                </select>
-                                            </div>
-                                        </td>
-                                        <td class="typeUploader" {if condition="in_array($ecr.newEnterpriseType,['guishang','gaoxinjishu','zhuanjingtexin'])"}style="position:relative;"{else/}style="position:relative;display:none;"{/if}>
+                            {eq name="ecr.type" value="1"}
+                            <div class="rowGroup agencyType">
+                                <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>机构类型</label>
+                                <div class="col-sm-3 spacing">
+                                    <select class="form-control" id="newAgencyType" name="newAgencyType" value="{$ecr.newAgencyType}" onchange="EpChangeEdit.agencyTypeChange()">
+                                    </select>
+                                </div>
+                            </div>
+                            {/eq}
+                        </div>
+                        {if condition="$ecr['type'] eq 1"}
+                        <div class="row" id="typeGroup">
+                            <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                <tr class='agencyType1' {if condition="$ecr['agencyType'] neq 1"}style="display:none;"{/if}>
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                            <select autocomplete="off" type="text" class="form-control" id="newIndustryFieldNew" name="newIndustryFieldNew" value="{$ecr.newIndustryFieldNew}" onchange="EpChangeEdit.industryChange()"></select>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>行业领域</label>
+                                            <select class="form-control" id="newIndustryFieldOld" name="newIndustryFieldOld" value="{$ecr.newIndustryFieldOld}">
+                                            </select>
+                                        </div>
+                                    </td>
+                                    <td style="position:relative;">
+                                        <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#domainImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
+                                        <label class="control-label spacing"><span style="color: red">*</span>行业领域上传材料</label>
+                                        {if condition="$ecr['newDomainImg']"}
+                                        {eq name="ecr.domainImg_is_img" value="1"}
+                                        <img src="{$ecr.newDomainImg|getStoragePath}" style="height: 60px;" onclick="Feng.showImg(this)" >
+                                        {else/}
+                                        <img src="/static/img/Pdf.png" style="height: 60px;" onclick="Feng.showPdf('{$ecr.newDomainImg|getStoragePath}', 'domainImg')">
+                                        {/eq}
+                                        {else/}
+                                        <img src="/static/img/yyzz.png" style="height: 60px;">
+                                        {/if}
+                                        <input style="display: none" autocomplete="off" type="file" class="form-control" id="domainImg" name="domainImg" />
+                                    </td>
+                                </tr>
+                                <tr class='agencyType1 agencyType2'>
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>企业标签</label>
+                                            <select class="form-control" id="newEnterpriseTag" name="newEnterpriseTag" value="{$ecr.newEnterpriseTag}">
+                                            </select>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="rowGroup">
+                                            <label class="control-label spacing td-label"><span style="color: red">*</span>企业类型</label>
+                                            <select class="form-control" id="newEnterpriseType" name="newEnterpriseType" value="{$ecr.newEnterpriseType}" onchange="EpChangeEdit.changeEnterpriseType()">
+                                            </select>
+                                        </div>
+                                    </td>
+                                    <td class="typeUploader" {if condition="in_array($ecr.newEnterpriseType,['guishang','gaoxinjishu','zhuanjingtexin'])"}style="position:relative;"{else/}style="position:relative;display:none;"{/if}>
                                         <button type="button" class="btn btn-info btn-sm" style="position:absolute;right:5px;top:5px;" onclick="$('#typeImg').click()"><i class="fa fa-upload" aria-hidden="true"></i>上传文件</button>
                                         <label class="control-label spacing"><span style="color: red">*</span>规上、高新技术、专精特新企业上传材料</label>
                                         {if condition="$ecr['newTypeImg']"}
@@ -206,11 +215,11 @@
                                         <img src="/static/img/yyzz.png" style="height: 60px;">
                                         {/if}
                                         <input style="display: none" autocomplete="off" type="file" class="form-control" id="typeImg" name="typeImg" />
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                            {/if}
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        {/if}
                         {/if}
                     </div>
                 </div>

app/enterprise/view/index/center_page.html

@@ -146,13 +146,14 @@
                                             <p>
                                                 申报类型:
                                                 {switch name="ep.type"}
-                                                {case value="1"}晋江市现代产业体系人才{/case}
+                                                {case value="1"}晋江市现代产业体系人才{if condition="$ep['agencyTypeName']"}（{$ep.agencyTypeName}）{/if}{/case}
                                                 {case value="2"}集成电路优秀人才{/case}
                                                 {/switch}
                                                 <input type="hidden" id="type" value="{$ep.type}">
                                             </p>
                                             {if condition="$ep['type'] eq 1"}
                                             <table style="width:100%;table-layout:fixed;" class="table table-bordered">
+                                                {if condition="$ep['agencyType'] eq 1"}
                                                 <tr class="type1">
                                                     <td  class="key">
                                                         产业领域
@@ -177,6 +178,7 @@
                                                         {/if}
                                                     </td>
                                                 </tr>
+                                                {/if}
                                                 <tr class="type1">
                                                     <td  class="key">
                                                         企业标签

public/static/js/register.js

@@ -193,10 +193,12 @@ Register.enterpriseUserRegister = function () {
         $("#type").removeAttr("disabled");
     }
     var type = $("#type").val();
+    var agencyType = $("#agencyType").val();
     var agentEmail = $("#agentEmail").val();
     var enterpriseTag = $("#enterpriseTag").val();
     var enterpriseType = $("#enterpriseType").val();
     var industryFieldNew = $("#industryFieldNew").val();
+    var industryFieldOld = $("#industryFieldOld").val();
     var bankCard = $("#bankCard").val();
     var bank = $("#bank").val();
     var bankNetwork = $("#bankNetwork").val();
@@ -273,16 +275,6 @@ Register.enterpriseUserRegister = function () {
             return;
         }
 
-        if (type == null || type == '') {
-            Feng.info("请选择申报类型!");
-            return;
-        }
-
-        if (type == null || type == '') {
-            Feng.info("请选择企业类别");
-            return;
-        }
-
         if (bankCard == null || bankCard == '') {
             Feng.info("请填写企业银行账号!");
             return;
@@ -314,21 +306,44 @@ Register.enterpriseUserRegister = function () {
             return;
         }
 
+        if (type == null || type == '') {
+            Feng.info("请选择申报类型!");
+            return;
+        }
+
         if (type == 1) {
-            if (enterpriseTag == null || enterpriseTag == '') {
-                Feng.info("请选择单位标签!");
+            if (agencyType == null || agencyType == '') {
+                Feng.info("请选择机构类型");
                 return;
             }
-            if (industryFieldNew == null || industryFieldNew == '') {
-                Feng.info("请选择产业领域");
-                return;
+            switch (agencyType) {
+                case "1":
+                    if (industryFieldNew == null || industryFieldNew == '') {
+                        Feng.info("请选择产业领域");
+                        return;
+                    }
+                    if (industryFieldOld == null || industryFieldOld == '') {
+                        Feng.info("请选择行业领域");
+                        return;
+                    }
+                    var xxx = document.getElementById("domainImg").value;
+                    if (xxx == "") {
+                        Feng.info("请上传行业领域佐证材料!");
+                        return;
+                    }
+                    if (!Feng.chkFileInvalid(document.getElementById("domainImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "行业领域佐证材料只允许上传PDF或图片")) {
+                        return;
+                    }
+                    break;
+                case "2":
+                    break;
             }
-            var xxx = document.getElementById("domainImg").value;
-            if (xxx == "") {
-                Feng.info("请上传行业领域佐证材料!");
+            if (enterpriseTag == null || enterpriseTag == '') {
+                Feng.info("请选择企业标签!");
                 return;
             }
-            if (!Feng.chkFileInvalid(document.getElementById("domainImg").files[0], 5, 10, ["image/jpeg", "image/gif", "image/png", "image/jpg", "application/pdf"], "行业领域佐证材料只允许上传PDF或图片")) {
+            if (enterpriseType == null || enterpriseType == '') {
+                Feng.info("请选择企业类型!");
                 return;
             }
             var checkType = ["guishang", "gaoxinjishu", "zhuanjingtexin"];
@@ -598,11 +613,30 @@ Register.typeChange = function () {
     $("#type").removeAttr("disabled");
     var type = $("#type").val();
     if (type == 1) {
-        $("#typeGroup").attr("style", "display:block");
+        $(".agencyType").attr("style", "display:block");
     } else {
-        $("#typeGroup").attr("style", "display:none");
-        $("#enterpriseTag,#industryFieldNew,#industryFieldOld").val("");
-
+        $(".agencyType").attr("style", "display:none");
+        $("#enterpriseTag,#industryFieldNew,#industryFieldOld,#enterpriseType").val("");
+    }
+}
+Register.agencyTypeChange = function () {
+    var agencyType = $("#agencyType").val();
+    switch (agencyType) {
+        case "1":
+            $("#typeGroup").attr("style", "display:block");
+            $(".agencyType1").attr("style", "");
+            $(".agencyType2").attr("style", "");
+            break;
+        case "2":
+            $("#typeGroup").attr("style", "display:block");
+            $(".agencyType1").attr("style", "display:none");
+            $(".agencyType2").attr("style", "");
+            $("#industryFieldNew").val("");
+            $("#industryFieldOld").val("");
+            break;
+        default:
+            $("#typeGroup").attr("style", "display:none");
+            break;
     }
 }
 Register.industryChange = function () {
@@ -656,7 +690,8 @@ $(function () {
         {"name": "enterpriseTag", "code": "enterprise_tag"},
         {"name": "industryFieldNew", "code": "industry_field"},
         {"name": "enterpriseType", "code": "enterprise_type"},
-        {"name": "sy_street", "code": "street"}];
+        {"name": "sy_street", "code": "street"},
+        {"name": "agencyType", "code": "agency_type"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("#imgurl,#sy_imgurl,#bankImg,#sy_bankImg,#beian,#domainImg,#typeImg").change(function (e) {
         var that = this;

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

@@ -146,6 +146,7 @@ EpChangeEdit.collectData = function () {
     this
             .set('id')
             .set('type')
+            .set('newAgencyType')
             .set('newName')
             .set('newIdCard')
             .set('newEnterpriseTag')
@@ -552,6 +553,26 @@ $("#imgurl,#bankImg,#beian,#domainImg,#typeImg").change(function (e) {
         }
     };
 });
+EpChangeEdit.agencyTypeChange = function () {
+    var agencyType = $("#newAgencyType").val();
+    switch (agencyType) {
+        case "1":
+            $("#typeGroup").attr("style", "display:block");
+            $(".agencyType1").attr("style", "");
+            $(".agencyType2").attr("style", "");
+            break;
+        case "2":
+            $("#typeGroup").attr("style", "display:block");
+            $(".agencyType1").attr("style", "display:none");
+            $(".agencyType2").attr("style", "");
+            $("#newIndustryFieldNew").val("");
+            $("#newIndustryFieldOld").val("");
+            break;
+        default:
+            $("#typeGroup").attr("style", "display:none");
+            break;
+    }
+}
 
 $(function () {
     EpChangeEdit.setFieldDisabled();
@@ -574,7 +595,8 @@ $(function () {
         {"name": "newEnterpriseTag", "code": "enterprise_tag"},
         {"name": "newEnterpriseType", "code": "enterprise_type"},
         {"name": "newIndustryFieldNew", "code": "industry_field"},
-        {"name": "newIndustryFieldOld", "code": industryNew + "_field"}];
+        {"name": "newIndustryFieldOld", "code": industryNew + "_field"},
+        {"name": "newAgencyType", "code": "agency_type"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     $("select").each(function () {
         $(this).val($(this).attr("value"));

public/static/modular/gate/talentInfo/new_talentInfo_info.js

@@ -335,9 +335,7 @@ TalentInfoInfoDlg.initFileTable = function () {
                         var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
                         for (var key in files) {
                             var btn = "";
-                            if (data[k].step != 1) {
-                                btn = TalentInfoInfoDlg.validUploadButton(2, data[k].id, files[key].id, i, k);
-                            }
+                            btn = TalentInfoInfoDlg.validUploadButton(2, data[k].id, files[key].id, i, k);
                             var sn = files[key].url.lastIndexOf(".");
                             var suffix = files[key].ext;//files[key].url.substring(sn + 1, files[key].url.length);
                             var imgStr = "";
@@ -988,7 +986,7 @@ TalentInfoInfoDlg.validUploadButton = function (type, fileTypeId, fileId, tableI
     files = files.split(",");
     var checkState = $("#checkState").val();
     var realState = $("#realState").val();
-    console.log(checkState, realState);
+    //console.log(checkState, realState);
     if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 8 && realState == 8) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
         if (type == 1) {          //上传
             return "<button type='button' onclick=\"TalentInfoInfoDlg.checkFile(this," + fileTypeId + "," + null + "," + tableIndex + "," + trIndex + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +

public/static/modular/talentIdentify/talentInfo/talentInfo_base.js

@@ -69,6 +69,11 @@ TalentInfo.initColumn = function () {
                     if (value == 10) {
                         return "<span class='label label-success'>待审核</span>"
                     }
+                    if (value == 8) {
+                        if (row.realState == 11) {
+                            return "<span class='label label-danger'>初审驳回</span>"
+                        }
+                    }
                     if (value == 9) {
                         if (row.realState == 13) {
                             return "<span class='label label-danger'>部门驳回</span>"