按要求修改

app/admin/controller/Enterprise.php

@@ -371,6 +371,26 @@ class Enterprise extends AdminController {
         }
     }
 
+    public function delEnterprise() {
+        if (!$id = trim($this->request['id'])) {
+            return json(["msg" => 'ID不能为空!', "code" => 500]);
+        }
+        $ep = EnterpriseApi::getOne($id);
+        if (!$ep || $ep->delete == 1)
+            return json(["msg" => '要删除的数据不存在!', "code" => 500]);
+
+        $ep->delete = 1;
+        $ep->deleteUser = session('user')['uid'] . "";
+        $ep->deleteTime = date('Y-m-d H:i:s');
+
+        try {
+            $ep->save();
+            return json(["msg" => '操作成功!', "code" => 200]);
+        } catch (\Exception $e) {
+            return json(["msg" => $e->getMessage()]);
+        }
+    }
+
     public function GotoActivePage() {
         $id = trim($this->request['id']);
         $ep = EnterpriseApi::getOne($id);

app/admin/view/enterprise/goto_enterprise_page.html

@@ -223,6 +223,11 @@
                         <i class="fa fa-download"></i>&nbsp;导出Excel
                     </button>
                     {/if}
+                    {if condition="chkCommission('/admin/enterprise/delEnterprise','/enterprise/delEnterprise')"}
+                    <button type="button" class="btn btn-sm btn-primary " onclick="Enterprise.delEnterprise()">
+                        <i class="fa fa-remove"></i>&nbsp;删除
+                    </button>
+                    {/if}
                 </div>
                 <table id="table" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;"
                        data-mobile-responsive="true" data-click-to-select="true">

app/admin/view/talent/talentInfo_common_check.html

@@ -1,6 +1,8 @@
 {extend name="layout/content"}
 {block name="content"}
 <style type="text/css">
+    td{white-space: normal;word-break: normal;}
+    .form-control{height:auto;}
     .panel-heading{
         color:#333;
         background-color:#f5f5f5;
@@ -46,6 +48,11 @@
         word-wrap:break-word;
         word-break:break-all;
     }
+    .word-wrap-no-width{
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
     .control-symbol{
         display: inline-block;
         position:absolute;
@@ -59,7 +66,6 @@
         text-align:center;
         border-left:1px solid #ddd;
     }
-    #annual_salary{padding-right:32px;}
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -279,6 +285,26 @@
                                                 </div>
                                             </td>
                                         </tr>
+                                        {/if}                                        
+                                        {if condition="in_array($info['talent_type'],[2])"}
+                                        <tr class="talentType2">                                                
+                                            <td>
+                                                <div class="rowGroup word-wrap">
+                                                    <label class=" control-label spacing td-label">流出晋江满3年后又返回晋江的</label>
+                                                    <select class="form-control" readonly disabled id="return" data-value="{$info.return}">
+                                                        <option value="">
+                                                            {switch name="info.return"}
+                                                            {case value="1"}是{/case}
+                                                            {case value="2"}否{/case}
+                                                            {default/}未选择
+                                                            {/switch}
+                                                        </option>
+                                                    </select>
+                                                </div>
+                                            </td>
+                                            <td>
+                                            </td>
+                                        </tr>
                                         {/if}
                                     </table>
                                 </div>
@@ -394,7 +420,7 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                    <input type="text" class="form-control" id="position" name="position" value="{$info.position}"/>
+                                                    <div class="form-control" style="border: none;background:#eee;">{$info.position}</div>
                                                 </div>
                                             </td>
                                             <td rowspan="3" style="width: 300%">
@@ -407,7 +433,7 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing">职称技术资格</label>
-                                                    <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$info.pro_qua}"/>
+                                                    <div class="form-control" style="border: none;background:#eee;">{$info.pro_qua}</div>
                                                 </div>
                                             </td>
                                             <td rowspan="3" style="width: 100%">
@@ -420,7 +446,7 @@
                                             <td>
                                                 <div class="rowGroup">
                                                     <label class="control-label spacing">专业技术职称</label>
-                                                    <input type="text" class="form-control" id="professional" name="professional" value="{$info.professional}"/>
+                                                    <div class="form-control" style="border: none;background:#eee;">{$info.professional}</div>
                                                 </div>
                                             </td>
                                             <td rowspan="3" style="width: 100%">
@@ -429,7 +455,7 @@
                                         </tr>
                                     </table>
                                     {if condition="$info['fjImport'] == 1 or $info['qzImport'] == 1"}
-                                    <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;" class="table table-bordered">
+                                    <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;color:red;font-weight:bold;" class="table table-bordered">
                                         {if condition="$info['fjImport'] == 1"}
                                         <tr>
                                             <td align="center" class="word-wrap">
@@ -468,27 +494,22 @@
                                         <tr>
                                             <td colspan="4">
                                                 {if condition="$info['isImport']"}
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>是否符合直认条件</label>                                                        
+                                                <div style="color:red;font-size:12px;word-wrap: normal;white-space: normal;">*请根据上方导入来源人才数据，按入选条款进行选择是否符合人才直认条件，如果符合人才直认条件，请在下方认定条件中选择跟导入数据“入选条款”同样的人才认定条件</div>
+                                                <div class="rowGroup col-sm-3 zhiren word-wrap-no-width" style="font-weight:bold;">
+                                                    <label class="control-label spacing td-label" style="border-bottom:2px solid red;"><span style="color: red">*</span>是否符合<span style="font-size:16px;color:red;">人才直认</span>条件</label>                                                        
                                                     <input type="radio" name="isMatchZhiren" value="1" {eq name="info.isMatchZhiren" value="1"}checked{/eq}/>是&nbsp;&nbsp;
                                                     <input type="radio" name="isMatchZhiren" value="0" {if condition="!$info['isMatchZhiren']"}checked{/if}/>否
                                                 </div>
                                                 <div class="rowGroup col-sm-6">
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                        <select class="form-control" id="source">
-                                                            <option value="{$info.source}">{$info.sourceName}</option>
-                                                        </select>
-                                                        </select>
+                                                        <div class="form-control" style="border: none;background:#eee;">{$info.sourceName}</div>
                                                     </div>
                                                 </div>
                                                 {else/}
                                                 <div class="rowGroup col-sm-9">
                                                     <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                    <select class="form-control" id="source">
-                                                        <option value="{$info.source}">{$info.sourceName}</option>
-                                                    </select>
-                                                    </select>
+                                                    <div class="form-control" style="border: none;background:#eee;">{$info.sourceName}</div>
                                                 </div>
                                                 {/if}
                                                 {if condition="$info['source_city'] || $info['source_county']"}
@@ -554,9 +575,7 @@
                                                 </div>
                                                 <div class="rowGroup col-sm-6">
                                                     <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
-                                                    <select class="form-control" id="talent_arrange_category" name="talent_arrange_category">
-                                                        <option value="">{$info.talentArrangeCatName}</option>
-                                                    </select>
+                                                    <div class="form-control" style="border: none;background:#eee;">{$info.talentArrangeCatName}</div>
                                                 </div>
                                             </td>
                                         </tr>
@@ -564,9 +583,7 @@
                                             <td colspan="3" style="overflow: inherit">
                                                 <div class="rowGroup col-sm-9">
                                                     <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                    <select class="form-control" id="talent_condition">
-                                                        <option value="{$info.talent_condition}">{$info.talentConditionName}</option>
-                                                    </select>
+                                                    <div class="form-control" style="border: none;background:#eee;">{$info.talentConditionName}</div>
                                                 </div>
                                             </td>
                                             <td {if condition='!$info["annual_salary"]'}style="display:none;"{/if}>
@@ -574,7 +591,6 @@
                                                     <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪（元）</label>
                                                     <div style="position:relative;">
                                                         <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$info.annual_salary}"/>
-                                                        <i class="control-symbol">元</i>
                                                     </div>
                                                 </div>
                                             </td>

app/common/api/DictApi.php

@@ -156,6 +156,7 @@ class DictApi {
             "salary_pay_way" => "工资发放渠道",
             "salary_pay_month" => "工资发放月份",
             "pre_import_type" => "预引进类型",
+            "return" => "流出晋江满3年后又返回晋江的",
             "name" => "姓名",
             "card_type" => "证件类型",
             "card_number" => "证件号码",

app/common/api/EnterpriseApi.php

@@ -11,11 +11,16 @@ use app\admin\model\Enterprise;
 class EnterpriseApi {
 
     public static function getOne($id) {
-        return Enterprise::findOrEmpty($id);
+        $ep = Enterprise::findOrEmpty($id);
+        if ($ep->delete == 1) {
+            return null;
+        }
+        return $ep;
     }
 
     public static function getSimpleList() {
         $where[] = ["active", "=", 1];
+        $where[] = ["delete", "=", 0];
         return $list = Enterprise::where($where)->order("name", 'asc')->field("name,id")->select()->toArray();
     }
 
@@ -101,6 +106,7 @@ class EnterpriseApi {
         $enterpriseTag = urldecode(trim($request->param("enterpriseTag")));
         $enterpriseType = urldecode(trim($request->param("enterpriseType")));
 
+        $where[] = ["delete", "=", 0];
         if ($name) {
             $where[] = ["name", "like", "%{$name}%"];
         }
@@ -198,7 +204,7 @@ class EnterpriseApi {
         $company_info = CompanyApi::getOne($companyId);
         $where = [];
         $whereRaw = "";
-        $where[] = ['type', '=', session('user')['type']];
+        $where[] = ['r.type', '=', session('user')['type']];
         if ($company_info['code'] != 'super' && !self::chkUserInSuperusers()) {
             if (session('user')['type'] == 1) {
                 $whr[] = ["companyId", "=", $companyId];
@@ -270,59 +276,60 @@ class EnterpriseApi {
         $checkState = trim($request->param("checkState"));
 
         if ($oldName) {
-            $where[] = ["oldName", "like", "%{$oldName}%"];
+            $where[] = ["r.oldName", "like", "%{$oldName}%"];
         }
         if ($oldIdCard) {
-            $where[] = ["oldIdCard", "like", "%{$oldIdCard}%"];
+            $where[] = ["r.oldIdCard", "like", "%{$oldIdCard}%"];
         }
         if ($oldLegal) {
-            $where[] = ["oldLegal", "like", "%{$oldLegal}%"];
+            $where[] = ["r.oldLegal", "like", "%{$oldLegal}%"];
         }
         if ($oldStreet) {
-            $where[] = ["oldStreet", "=", "{$oldStreet}"];
+            $where[] = ["r.oldStreet", "=", "{$oldStreet}"];
         }
         if ($oldEnterpriseTag) {
-            $where[] = ["oldEnterpriseTag", "=", "{$oldEnterpriseTag}"];
+            $where[] = ["r.oldEnterpriseTag", "=", "{$oldEnterpriseTag}"];
         }
         if ($oldIndustryFieldNew) {
-            $where[] = ["oldIndustryFieldNew", "=", "{$oldIndustryFieldNew}"];
+            $where[] = ["r.oldIndustryFieldNew", "=", "{$oldIndustryFieldNew}"];
         }
         if ($newName) {
-            $where[] = ["newName", "like", "%{$newName}%"];
+            $where[] = ["r.newName", "like", "%{$newName}%"];
         }
         if ($newIdCard) {
-            $where[] = ["newIdCard", "like", "%{$newIdCard}%"];
+            $where[] = ["r.newIdCard", "like", "%{$newIdCard}%"];
         }
         if ($newAgentName) {
-            $where[] = ["newAgentName", "like", "%{$newAgentName}%"];
+            $where[] = ["r.newAgentName", "like", "%{$newAgentName}%"];
         }
         if ($checkState) {
-            $where[] = ["checkState", "=", "{$checkState}"];
+            $where[] = ["r.checkState", "=", "{$checkState}"];
         } else {
-            $where[] = ['checkState', '>', 1];
+            $where[] = ['r.checkState', '>', 1];
         }
         if ($newStreet) {
-            $where[] = ["newStreet", "=", "{$newStreet}"];
+            $where[] = ["r.newStreet", "=", "{$newStreet}"];
         }
         if ($newEnterpriseTag) {
-            $where[] = ["newEnterpriseTag", "=", "{$newEnterpriseTag}"];
+            $where[] = ["r.newEnterpriseTag", "=", "{$newEnterpriseTag}"];
         }
         if ($newIndustryFieldNew) {
-            $where[] = ["newIndustryFieldNew", "=", "{$newIndustryFieldNew}"];
+            $where[] = ["r.newIndustryFieldNew", "=", "{$newIndustryFieldNew}"];
         }
+        $where[] = ["e.delete", "=", 0];
         if ($whereRaw) {
-            $count = EnterpriseRecord::where($where)->whereRaw($whereRaw)->count();
+            $count = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->where($where)->whereRaw($whereRaw)->count();
         } else {
-            $count = EnterpriseRecord::where($where)->count();
+            $count = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->where($where)->count();
         }
         if ($count > 0) {
             $talentTypeList = DictApi::selectByParentCode("enterprise_tag");
             $industryFieldNewList = DictApi::selectByParentCode("industry_field");
             $streetList = DictApi::selectByParentCode("street");
             if ($whereRaw) {
-                $list = EnterpriseRecord::where($where)->whereRaw($whereRaw)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+                $list = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->field("r.*")->where($where)->whereRaw($whereRaw)->limit($offset, $limit)->order("r.createTime", 'desc')->select()->toArray();
             } else {
-                $list = EnterpriseRecord::where($where)->limit($offset, $limit)->order("createTime", 'desc')->select()->toArray();
+                $list = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->field("r.*")->where($where)->limit($offset, $limit)->order("r.createTime", 'desc')->select()->toArray();
             }
             foreach ($list as $k => &$v) {
                 $v['oldStreetName'] = $streetList[$v['oldStreet']];
@@ -343,7 +350,7 @@ class EnterpriseApi {
         $company_info = CompanyApi::getOne($companyId);
         $where = [];
         $whereRaw = "";
-        $where[] = ['type', '=', session('user')['type']];
+        $where[] = ['r.type', '=', session('user')['type']];
         if ($company_info['code'] != 'super' && !self::chkUserInSuperusers()) {
             if (session('user')['type'] == 1) {
                 $whr[] = ["companyId", "=", $companyId];
@@ -442,9 +449,9 @@ class EnterpriseApi {
             $where[] = ["newAgentName", "like", "%{$newAgentName}%"];
         }
         if ($checkState) {
-            $where[] = ["checkState", "=", "{$checkState}"];
+            $where[] = ["r.checkState", "=", "{$checkState}"];
         } else {
-            $where[] = ['checkState', '>', 1];
+            $where[] = ['r.checkState', '>', 1];
         }
         if ($newStreet) {
             $where[] = ["newStreet", "=", "{$newStreet}"];
@@ -455,10 +462,11 @@ class EnterpriseApi {
         if ($newIndustryFieldNew) {
             $where[] = ["newIndustryFieldNew", "=", "{$newIndustryFieldNew}"];
         }
+        $where[] = ["e.delete", "=", 0];
         if ($whereRaw) {
-            $count = EnterpriseRecord::where($where)->whereRaw($whereRaw)->count();
+            $count = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->where($where)->whereRaw($whereRaw)->count();
         } else {
-            $count = EnterpriseRecord::where($where)->count();
+            $count = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->where($where)->count();
         }
         if ($count > 0) {
             $organizationTagList = DictApi::selectByParentCode("organization_tag");
@@ -469,9 +477,9 @@ class EnterpriseApi {
             $streetList = DictApi::selectByParentCode("street");
             $agencyTypeList = DictApi::selectByParentCode("agency_type");
             if ($whereRaw) {
-                $list = EnterpriseRecord::where($where)->whereRaw($whereRaw)->order("createTime", 'desc')->select()->toArray();
+                $list = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->field("r.*")->where($where)->whereRaw($whereRaw)->order("createTime", 'desc')->select()->toArray();
             } else {
-                $list = EnterpriseRecord::where($where)->order("createTime", 'desc')->select()->toArray();
+                $list = EnterpriseRecord::alias("r")->leftJoin("un_enterprise e", "e.id=r.mainId")->field("r.*")->where($where)->order("createTime", 'desc')->select()->toArray();
             }
             foreach ($list as $k => &$v) {
                 if ($v["special"] == 1) {

app/enterprise/controller/Talent.php

@@ -697,6 +697,7 @@ class Talent extends EnterpriseController {
             foreach ($all_valid_keys as $key) {
                 $data[$key] = trim($param[$key]);
             }
+            $data["return"] = 0; //流出晋江满3年后又返回晋江的，只有talent_type=2时可以填写且非必填
             if (in_array($data["talent_type"], [1, 2])) {
                 $data["tax_insurance_month"] = $param["tax_insurance_month"];
                 $data["labor_contract_rangetime"] = $param["labor_contract_rangetime"];
@@ -704,6 +705,9 @@ class Talent extends EnterpriseController {
                 $data["salary_pay_month"] = $param["salary_pay_month"];
                 $data["fst_work_time"] = $param["fst_work_time"];
                 $data['pre_import_type'] = null;
+                if ($data["talent_type"] == 2) {
+                    $data["return"] = $param["return"];
+                }
             } else {
                 $data["tax_insurance_month"] = null;
                 $data["labor_contract_rangetime"] = null;

app/enterprise/validate/TalentInfo.php

@@ -26,6 +26,7 @@ class TalentInfo extends Validate {
         "labor_contract_rangetime" => "checkRangeDate:labor_contract_rangetime",
         "fst_work_time" => "dateFormat:Y-m-d",
         "pre_import_type" => "between:1,2",
+        "return" => "between:0,2",
         "salary_pay_way" => "between:1,2",
         "salary_pay_month" => "checkRangeDate:salary_pay_month",
         "experience" => "max:1000",
@@ -59,6 +60,7 @@ class TalentInfo extends Validate {
         "talent_type.between" => "不存在的人才类型，请在列表中选择",
         "fst_work_time.dateFormat" => "来晋工作时间必需是有效的日期格式[yyyy-MM-dd]",
         "pre_import_type.between" => "预引进类型只能在预设列表中选择",
+        "return.between" => "是否流出晋江满3年后又返回晋江的选项只能在预设列表中选择",
         "salary_pay_way.between" => "工资发放渠道只能在预设列表中选择",
         "experience.max" => "工作经历不能超过200个字符，请简明扼要的描述您的工作经历",
         "education.max" => "教育背景不能超过200个字符，请简明扼要的描述您的教育背景",

app/enterprise/view/talent/apply.html

@@ -93,7 +93,7 @@
                                 <input type="hidden" name="import" id="import" value="{$row.isImport}"/>
                                 <input type="hidden" name="isSalary" id="isSalary" value="{$row.isSalary}"/>
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
@@ -192,6 +192,13 @@
                                                     </div>
                                                 </td>
                                             </tr>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
+                                    <div class="panel-body">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup word-wrap">
@@ -299,7 +306,21 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                            {/if}
+                                            {/if}                                    
+                                            <tr class="talentType2" style="display: none">
+                                                <td >
+                                                    <div class="rowGroup word-wrap">
+                                                        <label class=" control-label spacing td-label">流出晋江满3年后又返回晋江的</label>
+                                                        <select class="form-control" id="return" name="return" value="{$row.return}" data-value="{$row.return}">
+                                                            <option value="">请选择</option>
+                                                            <option value="2">否</option>
+                                                            <option value="1">是</option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                </td>
+                                            </tr>
                                         </table>
                                     </div>                            
                                     <div class="panel-body">
@@ -456,7 +477,7 @@
                                             </tr>
                                         </table>
                                         {if condition="$row['fjImport'] == 1 or $row['qzImport'] == 1"}
-                                        <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;" class="table table-bordered">
+                                        <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;color:red;font-weight:bold;" class="table table-bordered">
                                             {if condition="$row['fjImport'] == 1"}
                                             <tr>
                                                 <td align="center" class="word-wrap">
@@ -495,13 +516,11 @@
                                             <tr>
                                                 <td colspan="4">
                                                     {if condition="$row['isImport']"}
-                                                    <div class="rowGroup col-sm-3 zhiren word-wrap-no-width">
-                                                        <div class="zhiren-left">人才直认</div>
-                                                        <div class="zhiren-right">
-                                                            <label class="control-label spacing td-label"><span style="color: red">*</span>是否符合直认条件</label>
-                                                            <input type="radio" name="isMatchZhiren" value="1" {eq name="row.isMatchZhiren" value="1"}checked{/eq} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>是&nbsp;&nbsp;
-                                                            <input type="radio" name="isMatchZhiren" value="0" {if condition="!$row['isMatchZhiren']"}checked{/if} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>否
-                                                        </div>
+                                                    <div style="color:red;font-size:12px;word-wrap: normal;white-space: normal;">*请根据上方导入来源人才数据，按入选条款进行选择是否符合人才直认条件，如果符合人才直认条件，请在下方认定条件中选择跟导入数据“入选条款”同样的人才认定条件</div>
+                                                    <div class="rowGroup col-sm-3 zhiren word-wrap-no-width" style="font-weight:bold;">
+                                                        <label class="control-label spacing td-label" style="border-bottom:2px solid red;"><span style="color: red">*</span>是否符合<span style="font-size:16px;color:red;">人才直认</span>条件</label>
+                                                        <input type="radio" name="isMatchZhiren" value="1" {eq name="row.isMatchZhiren" value="1"}checked{/eq} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>是&nbsp;&nbsp;
+                                                        <input type="radio" name="isMatchZhiren" value="0" {if condition="!$row['isMatchZhiren']"}checked{/if} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>否
                                                     </div>
                                                     <div class="rowGroup col-sm-6">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>

app/enterprise/view/talent/view.html

@@ -1,6 +1,8 @@
 {extend name="layout/content"}
 {block name="content"}
 <style type="text/css">
+    td{white-space: normal;word-break: normal;}
+    .form-control{height:auto;}
     .panel-heading{
         color:#333;
         background-color:#f5f5f5;
@@ -46,6 +48,11 @@
         word-wrap:break-word;
         word-break:break-all;
     }
+    .word-wrap-no-width{
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
     ul{
         padding: 0;
     }
@@ -62,7 +69,7 @@
         text-align:center;
         border-left:1px solid #ddd;
     }
-    #annual_salary{padding-right:32px;}
+    #annual_salary{padding-right:32px;}    
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -277,6 +284,26 @@
                                                 </td>
                                             </tr>
                                             {/if}
+                                            {if condition="in_array($row['talent_type'],[2])"}
+                                            <tr class="talentType2">                                                
+                                                <td >
+                                                    <div class="rowGroup word-wrap">
+                                                        <label class=" control-label spacing td-label">流出晋江满3年后又返回晋江的</label>
+                                                        <select class="form-control" readonly disabled id="return" data-value="{$row.return}">
+                                                            <option value="">
+                                                                {switch name="row.return"}
+                                                                {case value="1"}是{/case}
+                                                                {case value="2"}否{/case}
+                                                                {default/}未选择
+                                                                {/switch}
+                                                            </option>
+                                                        </select>
+                                                    </div>
+                                                </td>
+                                                <td>
+                                                </td>
+                                            </tr>
+                                            {/if}
                                         </table>
                                     </div>
                                     <div class="panel-body">
@@ -394,7 +421,7 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                        <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;">{$row.position}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="3" style="width: 300%">
@@ -406,8 +433,8 @@
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing">职称技术资格</label>
-                                                        <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
+                                                        <label class="control-label spacing">职称技术资格</label>                        
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;">{$row.pro_qua}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="3" style="width: 100%">
@@ -419,8 +446,8 @@
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing">专业技术职称</label>
-                                                        <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
+                                                        <label class="control-label spacing">专业技术职称</label>                                                        
+                                                        <div class="form-control" style="border: none;height:auto;background:#eee;">{$row.professional}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="3" style="width: 100%">
@@ -429,7 +456,7 @@
                                             </tr>
                                         </table>
                                         {if condition="$row['fjImport'] == 1 or $row['qzImport'] == 1"}
-                                        <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;" class="table table-bordered">
+                                        <table style="width: 100%;border-collapse: collapse;background:#f7f7f7;color:red;font-weight:bold;" class="table table-bordered">
                                             {if condition="$row['fjImport'] == 1"}
                                             <tr>
                                                 <td align="center" class="word-wrap">
@@ -468,10 +495,11 @@
                                             <tr>
                                                 <td colspan="4">
                                                     {if condition="$row['isImport']"}
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>是否符合直认条件</label>                                                        
-                                                        <input type="radio" name="isMatchZhiren" value="1" {eq name="row.isMatchZhiren" value="1"}checked{/eq} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>是&nbsp;&nbsp;
-                                                        <input type="radio" name="isMatchZhiren" value="0" {if condition="!$row['isMatchZhiren']"}checked{/if} onchange="TalentInfoInfoDlg.isMatchZhirenChange();"/>否
+                                                    <div style="color:red;font-size:12px;word-wrap: normal;white-space: normal;">*请根据上方导入来源人才数据，按入选条款进行选择是否符合人才直认条件，如果符合人才直认条件，请在下方认定条件中选择跟导入数据“入选条款”同样的人才认定条件</div>
+                                                    <div class="rowGroup col-sm-3 zhiren word-wrap-no-width" style="font-weight:bold;">
+                                                        <label class="control-label spacing td-label" style="border-bottom:2px solid red;"><span style="color: red">*</span>是否符合<span style="font-size:16px;color:red;">人才直认</span>条件</label>
+                                                        <input type="radio" name="isMatchZhiren" value="1" {eq name="row.isMatchZhiren" value="1"}checked{/eq}/>是&nbsp;&nbsp;
+                                                        <input type="radio" name="isMatchZhiren" value="0" {if condition="!$row['isMatchZhiren']"}checked{/if}/>否     
                                                     </div>
                                                     <div class="rowGroup col-sm-6">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>

public/static/modular/enterprise/enterprise_list.js

@@ -168,6 +168,27 @@ Enterprise.gotoEnterpriseDetailPage = function () {
     Enterprise.layerIndex = index;
 };
 
+Enterprise.delEnterprise = function () {
+    if (!Enterprise.check()) {
+        return;
+    }
+    Feng.confirm(
+            "确定删除吗？",
+            function () {
+                var ajax = new $ax(Feng.ctxPath + "/admin/enterprise/delEnterprise?id=" + Enterprise.seItem.id, function (data) {
+                    Feng.info(data.msg);
+                    if (data.code == 200) {
+                        Enterprise.table.refresh();
+                    }
+                }, function (data) {
+                    Feng.error("操作失败!");
+                });
+                ajax.set(null);
+                ajax.start();
+            }
+    );
+};
+
 Enterprise.setActive = function () {
     if (!Enterprise.check()) {
         return;
@@ -335,30 +356,6 @@ Enterprise.unCheckAll = function () {
     $("#fieldCheckModalForm input[type=checkbox]").removeAttr("checked");
 };
 
-Enterprise.delEnterprise = function () {
-    if (!Enterprise.check()) {
-        return;
-    }
-    if (!Enterprise.check()) {
-        return;
-    }
-    Feng.confirm(
-            "确定删除吗？",
-            function () {
-                var ajax = new $ax(Feng.ctxPath + "/enterprise/delEnterprise?id=" + Enterprise.seItem.id, function (data) {
-                    Feng.info(data.msg);
-                    if (data.code == 200) {
-                        Enterprise.table.refresh();
-                    }
-                }, function (data) {
-                    Feng.error("操作失败!");
-                });
-                ajax.set(null);
-                ajax.start();
-            }
-    );
-};
-
 Enterprise.resetPassword = function () {
     if (!Enterprise.check()) {
         return;

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

@@ -247,13 +247,19 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
         {title: '名称', field: 'name', visible: true, align: 'left', valign: 'middle', width: "82%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
                 let str = '<div class="word-wrap">';
+                let highlights_by_api = ["crz"];
+                let description = row.description;
+                if (highlights_by_api.indexOf(row.api) > -1) {
+                    value = '<span style="font-weight:bold;color:red;">' + value + '</span>';
+                    description = '<span style="font-weight:bold;color:red;">' + description + '</span>';
+                }
                 if (row.must == 1) {
                     str = str + '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
                 }
                 if (row.must == 2) {
                     str = str + '<i class="fa fa-paste"></i>' + value;
                 }
-                str = str + '<br /><span id="desc_' + row.rel + '">' + row.description + '</span></div>'
+                str = str + '<br /><span id="desc_' + row.rel + '">' + description + '</span></div>'
                 return str;
             }
         },
@@ -705,6 +711,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
     //$("#tax_insurance_month").val("").parent().css("display", "none");
     //$("#labor_contract_rangetime").val("").parent().css("display", "none");
     $(".talentType1-2").css("display", "none");
+    $(".talentType2").css("display", "none");
     $(".talentType3").css("display", "none");
     var text = "";
     switch (talent_type) {
@@ -738,6 +745,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
             //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料与来我市前工作情况证明，例如原工作单位出具的工作证明、离职证明或原创（领）办企业的营业执照复印件、经市场监管部门备案的公司章程复印件等证明材料");
             $(".talentType1-2").css("display", "table-row");
+            $(".talentType2").css("display", "table-row");
             $("#talentType_first").css('display', "inline");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
@@ -861,7 +869,7 @@ TalentInfoInfoDlg.isMatchZhirenChange = function () {
     if (TalentInfoInfoDlg.isImport() && TalentInfoInfoDlg.isZhiRen()) {
         $("#talent_condition").parents(".table").find(".fileTable").find("tbody").html("");
     } else {
-        show = [3, 4, 5];
+        show = [1, 2, 3, 4, 5];
         var source = $("#source").val();
         TalentInfoInfoDlg.ajaxGetConditionFile(source);
     }

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

@@ -13,6 +13,10 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
         {field: 'selectItem', checkbox: false, visible: false},
         {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
+                let highlights_by_api = ["crz"];
+                if (highlights_by_api.indexOf(row.api) > -1) {
+                    value = '<span style="font-weight:bold;color:red;">' + value + '</span>';
+                }
                 if (row.must == 1) {
                     return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
                 }

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

@@ -16,13 +16,19 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
         {title: '名称', field: 'name', visible: true, align: 'left', valign: 'middle', width: "82%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
                 let str = '<div class="word-wrap">';
+                let highlights_by_api = ["crz"];
+                let description = row.description;
+                if (highlights_by_api.indexOf(row.api) > -1) {
+                    value = '<span style="font-weight:bold;color:red;">' + value + '</span>';
+                    description = '<span style="font-weight:bold;color:red;">' + description + '</span>';
+                }
                 if (row.must == 1) {
                     str = str + '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
                 }
                 if (row.must == 2) {
                     str = str + '<i class="fa fa-paste"></i>' + value;
                 }
-                str = str + '<br /><span id="desc_' + row.rel + '">' + row.description + '</span></div>'
+                str = str + '<br /><span id="desc_' + row.rel + '">' + description + '</span></div>'
                 return str;
             }
         },