更新一些修改

app/common/view/auth/register.html

@@ -118,7 +118,7 @@
                                                                     <td>
                                                                         <div class="rowGroup">
                                                                             <label class=" control-label spacing td-label"><span style="color: red">*</span>企业电话</label>
-                                                                            <input autocomplete="off" type="text" class="form-control" id="ephone" name="ephone" placeholder="固话格式0595xxxx" />
+                                                                            <input autocomplete="off" type="text" class="form-control" id="ephone" name="ephone" placeholder="固话格式0595-xxxx" />
                                                                         </div>
                                                                     </td>
                                                                 </tr>
@@ -173,6 +173,11 @@
                                                             </div>
                                                             <div class="row" id="typeGroup" style="display: none">
                                                                 <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                                                    <tr class="agencyType1">
+                                                                        <td colspan="3">
+                                                                            <p style="color: #333;width:100%;white-space:normal;word-wrap:break-word;word-break:break-all;">备注：现代产业体系主要包括“4341”现代产业体系，“4”即鞋服、纺织、建材、食品4大传统优势产业，“3”即信息技术、智能装备、医疗健康3大新兴产业，“4”即商贸物流、文体旅游、研发创意、金融服务4大现代服务业，“1”即探索布局未来产业（数字经济等）</p>
+                                                                        </td>
+                                                                    </tr>
                                                                     <tr class="agencyType1">
                                                                         <td>
                                                                             <div class="rowGroup">

app/enterprise/view/api/to_add.html

@@ -89,7 +89,7 @@
                                 <td>
                                     <div class="rowGroup">
                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>{eq name="ecr.special" value="0"}企业{else/}单位{/eq}电话</label>
-                                        <input autocomplete="off" type="text" class="form-control" id="newEphone" name="newEphone" placeholder="固话格式0595xxxx" value="{$ecr.newEphone}"/>
+                                        <input autocomplete="off" type="text" class="form-control" id="newEphone" name="newEphone" placeholder="固话格式0595-xxxx" value="{$ecr.newEphone}"/>
                                     </div>
                                 </td>
                             </tr>
@@ -177,6 +177,11 @@
                         {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 colspan="3">
+                                        <p style="color: #333;width:100%;white-space:normal;word-wrap:break-word;word-break:break-all;">备注：现代产业体系主要包括“4341”现代产业体系，“4”即鞋服、纺织、建材、食品4大传统优势产业，“3”即信息技术、智能装备、医疗健康3大新兴产业，“4”即商贸物流、文体旅游、研发创意、金融服务4大现代服务业，“1”即探索布局未来产业（数字经济等）</p>
+                                    </td>
+                                </tr>
                                 <tr class="agencyType1">
                                     <td>
                                         <div class="rowGroup">

app/index/controller/Auth.php

@@ -224,7 +224,10 @@ class Auth extends BaseController {
     }
 
     public function test() {
-        queue("app\job\Import", ["type" => 1, "info" => '11111']);
+        $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load("/www/wwwroot/report/public/storage/uploadexcel/20221212/acaab37ab8b05d029436929d6ccae434.xlsx");
+        $sheet = $spreadsheet->getSheet(0);
+        $datas = $sheet->toArray();
+        dd($datas);
     }
 
 }

app/job/Import.php

@@ -33,6 +33,7 @@ class Import {
      * @return bool
      */
     public function deal($data): bool {
+
         if ($data['type'] == 1) {//企业导入
             $id = $data['id'];
             $res = Db::table("new_talent_zhiren")->where('id', $id)->findOrEmpty();
@@ -155,7 +156,8 @@ class Import {
             } else {
                 return false;
             }
-        } elseif ($data['type'] == 2) {//省级人才导入
+        }
+        elseif ($data['type'] == 2) {//省级人才导入
             $id = $data['id'];
             $res = Db::table("new_talent_zhiren")->where('id', $id)->findOrEmpty();
             if ($res) {
@@ -265,7 +267,9 @@ class Import {
             } else {
                 return false;
             }
-        } elseif ($data['type'] == 3){//泉州人才导入
+        }
+        elseif ($data['type'] == 3){//泉州人才导入
+
             $id = $data['id'];
             $res = Db::table("new_talent_zhiren")->where('id', $id)->findOrEmpty();
             if ($res) {
@@ -273,10 +277,12 @@ class Import {
                     return false;
                 }
                 try {
+
                     $path = dirname(dirname(dirname(__FILE__)));
                     $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($path ."/public/storage/" . $res['task_file']);
                     $sheet = $spreadsheet->getSheet(0);
                     $datas = $sheet->toArray();
+
                     $datas = array_slice($datas, 1); //去标题
                     $country = Db::table("sys_dict")->where("pid", 35)->column("code", "name");
 
@@ -392,6 +398,7 @@ class Import {
                     Db::table("new_talent_zhiren")->where('id', $id)->update(['task_result' => $res['task_file'], 'task_status' => 1, 'updateTime' => date("Y-m-d H:i:s", time())]);
                     return true;
                 } catch (\Exception $e) {
+
                     Db::table("new_talent_zhiren")->where('id', $id)->update(['task_result' => $e->getMessage(), 'task_status' => 0, 'updateTime' => date("Y-m-d H:i:s", time())]);
                     return false;
                 }

public/static/js/register.js

@@ -2,7 +2,7 @@ var Register = {
     registData: {},
     validateFields: {
         username: {validators: {notEmpty: {message: '登录账号不能为空'}}},
-        name: {validators: {notEmpty: {message: '单位/企业名称不能为空'}, regexp: {regexp: /^([\u4E00-\u9FA5]|\(|\)|\（|\）){1,100}$/, message: "单位/企业名称只允许中文"}}},
+        name: {validators: {notEmpty: {message: '单位/企业名称不能为空'}, regexp: {regexp: /^([\u4E00-\u9FA5]|\（|\）){1,100}$/, message: "单位/企业名称只允许中文"}}},
         //idCard: {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}},
         agentName: {validators: {notEmpty: {message: '人才联络员不能为空'}}},
         agentPhone: {

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

@@ -2,7 +2,7 @@ var locked = false;
 var EpChangeEdit = {
     epChangeEditData: {},
     validateFields1: {
-        newName: {validators: {notEmpty: {message: '企业名称不能为空'}, regexp: {regexp: /^([\u4E00-\u9FA5]|\(|\)|\（|\）){1,100}$/, message: "单位名称只允许中文"}}},
+        newName: {validators: {notEmpty: {message: '企业名称不能为空'}, regexp: {regexp: /^([\u4E00-\u9FA5]|\（|\）){1,100}$/, message: "单位名称只允许中文"}}},
         newIdCard: {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}},
         newEnterpriseTag: {validators: {notEmpty: {message: '企业标签不能为空'}}},
         newEnterpriseType: {validators: {notEmpty: {message: '企业类型不能为空'}}},

public/static/modular/gate/register.js

@@ -385,6 +385,7 @@ Register.typeChange = function(){
 	}else{
 		$("#enterpriseTag,#industryField").val("");
 		$("#enterpriseTag,#industryField").parent().parent().attr("style","display:none");
+
 	}
 }