提交一些页面修改

app/admin/controller/Enterprise.php

@@ -71,6 +71,27 @@ class Enterprise extends AdminController {
                 $ep['industryFieldNewName'] = $industryFieldNew['name'];
             }
 		}
+        //---------设置行业领域 --------------------------------------------------
+        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){
+                $ep['enterpriseTagName'] = $enterpriseTag['name'];
+            }
+        }
+        //---------设置单位类型 --------------------------------------------------
+        if(\StrUtil::isNotEmpAndNull($ep['enterpriseType'])){
+            $enterpriseType = DictApi::findByParentCodeAndCode("enterprise_type",$ep['enterpriseType']);
+            if($enterpriseType != null){
+                $ep['enterpriseTypeName'] = $enterpriseType['name'];
+            }
+        }
 
 
         return view("", ['ep' => $ep]);
@@ -291,7 +312,7 @@ class Enterprise extends AdminController {
 
         $sheet->getstyle('A1:O1')->getFill()->setFillType(\PHPExcel_style_Fill::FILL_SOLID)->getStartColor()->setRGB("87CEEB");
 
-        $header = ["单位名称", " 社会信用代码","产业领域" ,"单位标签"," 所属街道", "单位地址", " 法人代表", " 单位电话", "人才联络员", "人才联络员电话", "人才联络员邮箱", "审核状态", "账号状态", "注册时间","备注"];
+        $header = ["单位名称", " 统一社会信用代码","产业领域" ,"单位标签"," 所属街道", "单位地址", " 法人代表", " 单位电话", "人才联络员", "人才联络员电话", "人才联络员邮箱", "审核状态", "账号状态", "注册时间","备注"];
 
         foreach ($header as $key => $value) {
             $sheet->setCellValueByColumnAndRow($key+1, 1, $value);

app/admin/view/batch/add.html

@@ -13,7 +13,7 @@
                             <div class="col-sm-9">
                                 <select class="form-control" id="type" name="type" data-bv-field="type">
                                     <option value="">---请选择---</option>
-                                    <option value="1">晋江市优秀人才</option>
+                                    <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">晋江市集成电路优秀人才</option>
                                 </select>
                                 <i style="display: none;" class="form-control-feedback" data-bv-icon-for="type"></i>
@@ -68,7 +68,7 @@
                             <div class="col-sm-9">
                                 <select class="form-control" selectval="1" disabled="disabled" id="source" name="source" data-bv-field="source">
                                     <option value="">请选择</option>
-                                    <option value="1">晋江市优秀人才</option>
+                                    <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">晋江市集成电路优秀人才</option>
 
                                 </select><i style="display: none;" class="form-control-feedback" data-bv-icon-for="source"></i>

app/admin/view/batch/edit.html

@@ -64,7 +64,7 @@
                             <div class="col-sm-9">
                                 <select class="form-control" selectval="1" disabled="disabled" selectVal="{$batch.source}" id="source" name="source" data-bv-field="source">
                                     <option value="">请选择</option>
-                                    <option value="1">晋江市优秀人才</option>
+                                    <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">晋江市集成电路优秀人才</option>
 
                                 </select><i style="display: none;" class="form-control-feedback" data-bv-icon-for="source"></i>

app/admin/view/company/add.html

@@ -15,10 +15,10 @@
                             </div>
                         </div>
                         <div class="form-group has-feedback">
-                            <label class="col-sm-3 control-label">社会信用代码</label>
+                            <label class="col-sm-3 control-label">统一社会信用代码</label>
                             <div class="col-sm-9">
                                 <input class="form-control" id="code" name="code" type="text" data-bv-field="code"><i style="display: none;" class="form-control-feedback" data-bv-icon-for="code"></i>
-                                <small style="display: none;" class="help-block" data-bv-validator="notEmpty" data-bv-for="code" data-bv-result="NOT_VALIDATED">社会信用代码不能为空</small>
+                                <small style="display: none;" class="help-block" data-bv-validator="notEmpty" data-bv-for="code" data-bv-result="NOT_VALIDATED">统一社会信用代码不能为空</small>
                             </div>
                         </div>
                         <div class="form-group">

app/admin/view/company/edit.html

@@ -15,10 +15,10 @@
                             </div>
                         </div>
                         <div class="form-group has-feedback">
-                            <label class="col-sm-3 control-label">社会信用代码</label>
+                            <label class="col-sm-3 control-label">统一社会信用代码</label>
                             <div class="col-sm-9">
                                 <input class="form-control" id="code" name="code" value="{$info.code}" type="text" data-bv-field="code"><i style="display: none;" class="form-control-feedback" data-bv-icon-for="code"></i>
-                                <small style="display: none;" class="help-block" data-bv-validator="notEmpty" data-bv-for="code" data-bv-result="NOT_VALIDATED">社会信用代码不能为空</small>
+                                <small style="display: none;" class="help-block" data-bv-validator="notEmpty" data-bv-for="code" data-bv-result="NOT_VALIDATED">统一社会信用代码不能为空</small>
                             </div>
                         </div>
                         <div class="form-group">

app/admin/view/company/index.html

@@ -21,7 +21,7 @@
                             <div class="col-sm-4">
                                 <div class="input-group input-group-sm">
                                     <div class="input-group-btn">
-                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">社会信用代码</button>
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">统一社会信用代码</button>
                                     </div>
                                     <input type="text" class="form-control" id="code" placeholder="">
                                 </div>

app/admin/view/company/view.html

@@ -15,10 +15,10 @@
                             </div>
                         </div>
                         <div class="form-group has-feedback">
-                            <label class="col-sm-3 control-label">社会信用代码</label>
+                            <label class="col-sm-3 control-label">统一社会信用代码</label>
                             <div class="col-sm-9">
                                 <input class="form-control" id="code" name="code" value="{$info.code}" type="text" data-bv-field="code"><i style="display: none;" class="form-control-feedback" data-bv-icon-for="code"></i>
-                                <small style="display: none;" class="help-block" data-bv-validator="notEmpty" data-bv-for="code" data-bv-result="NOT_VALIDATED">社会信用代码不能为空</small></div>
+                                <small style="display: none;" class="help-block" data-bv-validator="notEmpty" data-bv-for="code" data-bv-result="NOT_VALIDATED">统一社会信用代码不能为空</small></div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">备注</label>

app/admin/view/enterprise/goto_active_page.html

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

app/admin/view/enterprise/goto_enterprise_detail_page.html

@@ -5,7 +5,12 @@
         margin-bottom: 10px;
         padding-right: 4px;
         padding-left: 4px;
+        height: 30px;
     }
+    table td{
+        text-align: center;
+    }
+
 </style>
 <script type="text/javascript">
     $(function () {
@@ -40,194 +45,218 @@
 </script>
 <div class="ibox float-e-margins">
     <div class="ibox-content" style="height: 700px;">
-        <form id="enter_form" class="form-horizontal">
-            <input type="text" class="form-control" id="id" name="id" value="{$ep.id}" style="display: none;"/>
-            <div class="col-sm-12 form-group-sm">
-                <div class="row">
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">单位名称</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="name" name="name"
-                                   value="{$ep.name}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">社会信用代码</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard"
-                                   value="{$ep.idCard}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="display: none">
-                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>产业领域</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="industryFieldNewName"
-                                   name="industryFieldNewName" value="{$ep.industryFieldNewName}">
-                        </div>
-                    </div>
-                    <div class="rowGroup">
-                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>申报类型</label>
-                        <div class="col-sm-4 spacing">
-                            <select class="form-control" id="type" disabled="disabled" name="type" value="{$ep.type}">
-                                <option value="">请选择</option>
-                                <option value="1">晋江市优秀人才</option>
-                                <option value="2">集成电路优秀人才</option>
-                                <option value="3">海峡计划团队</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="display: none">
-                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>单位标签</label>
-                        <div class="col-sm-4 spacing">
-                            <select class="form-control" disabled="disabled" id="enterpriseTag" name="enterpriseTag"
-                                    value="{$ep.enterpriseTag}">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">所属街道</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="street" name="street"
-                                   value="{$ep.streetName}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">单位地址</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="address" name="address"
-                                   value="{$ep.address}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">法人代表</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="legal" name="legal"
-                                   value="{$ep.legal}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">单位电话</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="ephone" name="ephone"
-                                   value="{$ep.ephone}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">人才联络员</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="agentName" name="agentName"
-                                   value="{$ep.agentName}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">人才联络员电话</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="agentPhone"
-                                   name="agentPhone" value="{$ep.agentPhone}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">人才联络员邮箱</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="agentEmail"
-                                   name="agentEmail" value="{$ep.agentEmail}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">企业银行账号</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="bankCard" name="bankCard"
-                                   value="{$ep.bankCard}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">企业开户银行网点</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="bankNetwork"
-                                   name="bankNetwork" value="{$ep.bankNetwork}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">企业开户银行</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="bank" name="bank"
-                                   value="{$ep.bank}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">审核状态</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="checkState"
-                                   name="checkState" value="{$ep.checkStateName}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">审核意见</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="checkMsg" name="checkMsg"
-                                   value="{$ep.checkMsg}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">审核人</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="checkUser" name="checkUser"
-                                   value="{$ep.checkUser}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">账号状态</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="active" name="active"
-                                   value="{$ep.activeName}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">拉黑/冻结原因</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="activeMsg" name="activeMsg"
-                                   value="{$ep.activeMsg}"/>
-                        </div>
-                    </div>
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing">备注</label>
-                        <div class="col-sm-4 spacing">
-                            <input type="text" class="form-control" readonly="readonly" id="description"
-                                   name="description" value="{$ep.description}"/>
-                        </div>
-                    </div>
+        <input type="text" class="form-control" id="id" name="id" value="{$ep.id}" style="display: none;"/>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading">单位信息</div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td>
+                                单位名称
+                            </td>
+                            <td>
+                                {$ep.name}
+                            </td>
+                            <td>
+                                统一社会信用代码
+                            </td>
+                            <td>
+                                {$ep.idCard}
+                            </td>
+                            <td>
+                                营业执照
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                法人代表
+                            </td>
+                            <td>
+                                {$ep.legal}
+                            </td>
+                            <td>
+                                单位地址
+                            </td>
+                            <td>
+                                {$ep.address}
+                            </td>
+                            <td rowspan="2">
+                                <img onclick="Feng.showImg(this)" id="yyzz" alt="营业执照" src="{$ep.imgurl|getStoragePath}"
+                                     style="max-width: 100px;">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                所属街道
+                            </td>
+                            <td>
+                                {$ep.streetName}
+                            </td>
+                            <td>
+                                单位电话
+                            </td>
+                            <td>
+                                {$ep.ephone}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                企业银行账号
+                            </td>
+                            <td>
+                                {$ep.bankCard}
+                            </td>
+                            <td>
+                                企业开户银行
+                            </td>
+                            <td>
+                                {$ep.bank}
+                            </td>
+                            <td>
+                                开户许可证
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                企业开户银行网点
+                            </td>
+                            <td colspan="3">
+                                {$ep.bankNetwork}
+                            </td>
+                            <td>
+                                <img onclick="Feng.showImg(this)" id="bankImg" alt="开启许可证"
+                                     src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
+                            </td>
+                        </tr>
+
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading">申报信息</div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td colspan="5">
+                                申报类型：晋江市现代产业体系人才
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                产业领域
+                            </td>
+                            <td>
+                                {$ep.industryFieldNewName}
+                            </td>
+                            <td>
+                                行业领域
+                            </td>
+                            <td>
+                                {$ep.industryFieldOldName}
+                            </td>
+                            <td>
+                                行业领域佐证材料
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                单位标签
+                            </td>
+                            <td>
+                                {$ep.enterpriseTagName}
+                            </td>
+                            <td>
+                                单位类型
+                            </td>
+                            <td>
+                                {$ep.enterpriseTypeName}
+                            </td>
+                            <td>
+                                <img onclick="Feng.showImg(this)" id="domainImg" alt="开启许可证"
+                                     src="{$ep.domainImg|getStoragePath}" style="max-width: 100px;">
+                            </td>
+                        </tr>
+                    </table>
                 </div>
-                <div class="row">
-                    {if condition="$ep.imgurl neq ''"}
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-1 control-label spacing">营业执照</label>
-                        <div class="col-sm-3 spacing">
-                            <img onclick="Feng.showImg(this)" id="yyzz" alt="营业执照" src="{$ep.imgurl|getStoragePath}"
-                                 style="max-width: 100px;">
-                        </div>
-                    </div>
-                    {/if}
-                    {if condition="$ep.bankImg neq ''"}
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                        <label class="col-sm-1 control-label spacing">开启许可证</label>
-                        <div class="col-sm-3 spacing">
-                            <img onclick="Feng.showImg(this)" id="bankImg" alt="开启许可证"
-                                 src="{$ep.bankImg|getStoragePath}" style="max-width: 100px;">
-                        </div>
-                    </div>
-                    {/if}
-                    {if condition="$ep.domainImg neq ''"}
-                    <div class="rowGroup" style="margin-bottom: 0px;">
-                      <label class="col-sm-1 control-label spacing">行业领域佐证材料</label>
-                      <div class="col-sm-3 spacing">
-                        <img onclick="Feng.showImg(this)" id="domainImg" alt="开启许可证"
-                             src="{$ep.domainImg|getStoragePath}" style="max-width: 100px;">
-                      </div>
-                    </div>
-                    {/if}
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading">人才联络员信息</div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td>
+                                姓名
+                            </td>
+                            <td>
+                                {$ep.agentName}
+                            </td>
+                            <td>
+                                人才联络员电话
+                            </td>
+                            <td>
+                                {$ep.agentPhone}
+                            </td>
+                            <td>
+                                人才联络员邮箱
+                            </td>
+                            <td>
+                                {$ep.agentEmail}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="panel-body">
+            <div class="panel panel-default">
+                <div class="panel-heading">账号信息</div>
+                <div class="panel-body">
+                    <table style="width:100%" class="table table-bordered">
+                        <tr>
+                            <td>
+                                审核状态
+                            </td>
+                            <td>
+                                {$ep.checkStateName}
+                            </td>
+                            <td>
+                                审核意见
+                            </td>
+                            <td>
+                                {$ep.checkMsg}
+                            </td>
+                            <td>
+                                审核人
+                            </td>
+                            <td>
+                                {$ep.checkUser}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                拉黑/冻结原因
+                            </td>
+                            <td>
+                                {$ep.activeMsg}
+                            </td>
+                            <td>
+                                备注
+                            </td>
+                            <td colspan="2">
+                                {$ep.description}
+                            </td>
+                        </tr>
+                    </table>
                 </div>
             </div>
-        </form>
+        </div>
+
+
     </div>
 </div>
 <div style="display: none" id="canvas">

app/admin/view/enterprise/goto_enterprise_page.html

@@ -23,7 +23,7 @@
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
-                                        type="button">社会信用代码
+                                        type="button">统一社会信用代码
                                 </button>
                             </div>
                             <input type="text" class="form-control" id="idCard" placeholder=""/>

app/admin/view/enterprise/goto_examine_page.html

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

app/admin/view/enterprise_change_record/goto_enterprise_change_detail_page.html

@@ -63,7 +63,7 @@
                                                 </div>
                                                 <div class="rowGroup" style="margin-bottom: 0px;">
                                                     <label class="col-sm-2 control-label spacing"><span
-                                                            class="text-danger">*</span>社会信用代码</label>
+                                                            class="text-danger">*</span>统一社会信用代码</label>
                                                     <div class="col-sm-4 spacing">
                                                         <input type="text" class="form-control" id="oldIdCard"
                                                                name="oldIdCard" value="{$ecr.oldIdCard}" readonly
@@ -208,7 +208,7 @@
                                                 </div>
                                                 <div class="rowGroup" style="margin-bottom: 0px;">
                                                     <label class="col-sm-2 control-label spacing"><span
-                                                            class="text-danger">*</span>社会信用代码</label>
+                                                            class="text-danger">*</span>统一社会信用代码</label>
                                                     <div class="col-sm-4 spacing">
                                                         <input type="text" class="form-control" id="newIdCard"
                                                                name="newIdCard" value="{$ecr.newIdCard}" readonly

app/admin/view/enterprise_change_record/goto_enterprise_change_record_page.html

@@ -23,7 +23,7 @@
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
-                                        type="button">原社会信用代码
+                                        type="button">原统一社会信用代码
                                 </button>
                             </div>
                             <input type="text" class="form-control" id="oldIdCard" placeholder=""/>
@@ -98,7 +98,7 @@
                         <div class="input-group input-group-sm">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
-                                        type="button">新社会信用代码
+                                        type="button">新统一社会信用代码
                                 </button>
                             </div>
                             <input type="text" class="form-control" id="newIdCard" placeholder=""/>

app/admin/view/filetype/add.html → app/admin/view/file_type/add.html

@@ -15,7 +15,7 @@
                             </div>
                             <select class="form-control" id="type" name="type" selectVal="{$info.type}">
                                 <option value="">---请选择---</option>
-                                <option value="1">晋江市优秀人才</option>
+                                <option value="1">晋江市现代产业体系人才</option>
                                 <option value="2">集成电路优秀人才</option>
                             </select>
                         </div>

app/admin/view/filetype/edit.html → app/admin/view/file_type/edit.html

@@ -15,7 +15,7 @@
                             </div>
                             <select class="form-control" id="type" name="type" selectVal="{$info.type}">
                                 <option value="">---请选择---</option>
-                                <option value="1">晋江市优秀人才</option>
+                                <option value="1">晋江市现代产业体系人才</option>
                                 <option value="2">集成电路优秀人才</option>
                             </select>
                         </div>

app/admin/view/filetype/index.html → app/admin/view/file_type/index.html

@@ -19,7 +19,7 @@
                                     </div>
                                     <select class="form-control" id="type">
                                         <option value="">---请选择---</option>
-                                        <option value="1">晋江市优秀人才</option>
+                                        <option value="1">晋江市现代产业体系人才</option>
                                         <option value="2">集成电路优秀人才</option>
                                     </select>
                                 </div>
@@ -77,7 +77,7 @@
                             </div>
                         </div>
                         <div class="hidden-xs" id="UnCommonFiletypeTableToolbar" role="group">                            
-                            <if condition="chkCommission('/admin/filetype/add','/unCommonFiletype/add')">                                
+                            <if condition="chkCommission('/admin/file_type/add','/unCommonFiletype/add')">
                                 <button type="button" class="btn btn-sm btn-primary " onclick="UnCommonFiletype.openAddUnCommonFiletype()">
                                     <i class="fa fa-plus"></i>添加
                                 </button>

app/admin/view/talent/base_verify_new.html

@@ -0,0 +1,277 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .layui-layer-btn .layui-layer-btn1 {
+        border-color: #009688;
+        background-color: #009688;
+        color: #fff;
+    }
+    ul li{
+        list-style: none;
+        display:inline-block;
+        margin-bottom: 5px;
+    }
+    #field ul li input{
+        vertical-align:middle;
+        margin-top:1px;
+    }
+</style>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>人才认定申报 - 基础信息审核</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row row-lg">
+                    <div class="col-sm-12">
+                        <div class="row">
+                            <input type="hidden" id="type" value="${user.type}">
+                            <input type="hidden" id="process" value="1">
+                            <input type="hidden" id="title" value="基本条件判定">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="name" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+                                                type="button">证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            性别
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="sex">
+                                        <option value=""></option>
+                                        <option value="1">男</option>
+                                        <option value="2">女</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            民族
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nation">
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row highSearch" style="display: none">
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            国籍/地区
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="nationality">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            籍贯省
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="provinceCode">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            政治面貌
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="politics">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位名称
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterpriseId">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            产业领域
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="industryField">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            申报来源
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="source">
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">申报年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="year" placeholder="">
+                                </div>                            </div>
+                            <div class="col-sm-3" style="display: none">
+                                <div class="input-group ">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">公布入选月份
+                                        </button>
+                                    </div>
+                                    <input type="text"  class="form-control time" id="identifyMonth" name="identifyMonth"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-sm-12" style="text-align: center">
+                                <button type="button" style="cursor:pointer;" id="openSearch" onclick="$('.highSearch,#closeSearch').show();
+                                        $(this).hide();" class="btn btn-sm btn-primary glyphicon glyphicon-eye-open" id="open-but">打开高级搜索</button>
+                                <button type="button" style="cursor:pointer;display: none;" id="closeSearch" onclick="$('#openSearch').show();
+                                        $('.highSearch').hide();
+                                        $(this).hide();"  class="btn btn-sm btn-danger glyphicon glyphicon-eye-close" id="close-but">关闭高级搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentInfo.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentInfo.reset()">重置</button>
+                            </div>
+                        </div>
+                        <div class="hidden-xs" id="TalentInfoTableToolbar" role="group">
+                            <if condition="chkCommission('/admin/talent/base_verify','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.openCheckTalentInfo()" id="">
+                                    <i class="fa fa-check"></i>&nbsp;审核
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_export','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.showExportModal(1)" id="">
+                                    <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/base_download','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.download()" id="">
+                                    <i class="fa fa-download"></i>&nbsp;下载
+                                </button>
+                            </if>
+                            <!--<if condition="chkCommission('/admin/talent/modify_reject_fields','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.updateFieldsAndFiles()" id="">
+                                    <i class="fa fa-edit"></i>&nbsp;修改驳回字段
+                                </button>
+                            </if>-->
+                            <if condition="chkCommission('/admin/talent/setNotPass','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.setNotPass()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;审核不通过
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getPhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getPhones()" id="">
+                                    <i class="fa fa-mobile"></i>&nbsp;获取人才手机号
+                                </button>
+                            </if>
+                            <if condition="chkCommission('/admin/talent/getEnterprisePhones','')">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfo.getEnterprisePhones()" id="">
+                                    <i class="fa fa-phone"></i>&nbsp;获取人才联络员手机号
+                                </button>
+                            </if>
+                        </div>
+                        <table id="TalentInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                            <thead>
+                                <tr>
+                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--导出模态框-->
+<div class="modal fade " id="commonExportModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-lg" role="document" style="min-width: 1000px">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="firstModalLabel">导出</h4>
+            </div>
+            <div class="modal-body">
+                <form id="exportForm" action="/admin/talent/publicExport" target="hiddenIframe" class="form-horizontal">
+                    <div class="form-group" id="field">
+                        <div id="field_info">
+                            <ul>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="name"><span>姓名</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="card_type"><span>证件类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="card_number"><span>证件号码</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="sex"><span>性别</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="birthday"><span>出生日期</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="nation"><span>民族</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="politics"><span>政治面貌</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="nationality"><span>国籍/地区</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="province"><span>籍贯省</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="city"><span>籍贯市</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="county"><span>籍贯县</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="enterpriseTag"><span>单位标签</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="enterpriseName"><span>单位名称</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="street"><span>所属镇街</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="industryFieldNew"><span>产业领域</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="talent_type"><span>人才类型</span></li>
+                                <li style="width:24%"><input type="checkbox" name="export[]" value="checkState"><span>审核状态</span></li>
+                            </ul>
+                        </div>
+                        <div class="form-group" style="text-align: center">
+                            <button type="button" class="btn btn-primary" onclick="TalentInfo.checkAll()">全选</button>
+                            <button type="button" class="btn btn-success" onclick="TalentInfo.unCheckAll()">反选</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="TalentInfo.export(1)">导出</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_first.js"></script>-->
+<!--<script src="${ctxPath}/static/modular/talentIdentify/talentInfo/talentInfo_common.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_base.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/talent/dept_fst_verify.html

@@ -82,7 +82,7 @@
                                     <option value=""></option>
                                     <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
                                     <option value="2">从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才</option>
-                                    <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                    <option value="3">依据《晋江市现代产业体系人才补充认定标准》申报认定</option>
                                 </#SelectCon>
                             </div>
                             <div class="col-sm-3"

app/admin/view/talent/talentInfo_base_check.html

@@ -84,7 +84,7 @@
                                                             <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
                                                             <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
@@ -113,7 +113,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                    附件：                                      
+                                                    附件：
                                                     <table class="fileTable"></table>
                                                 </div>
                                             </div>
@@ -151,7 +151,7 @@
                                                     <div class="rowGroup col-sm-9" id="tipsBlock">
                                                         <label class=" control-label spacing">说明</label>
                                                         {switch name="info.talent_type"}
-                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。"/>{/case}
+                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
                                                         {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
                                                         {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
                                                         {/switch}
@@ -170,11 +170,11 @@
                                                 </div>
                                             </div>
                                             <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                附件：                                      
+                                                附件：
                                                 <table class="fileTable"></table>
                                             </div>
                                         </div>
-                                    </div> 
+                                    </div>
                                 </div>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>

app/admin/view/talent/talentInfo_common_check.html

@@ -32,6 +32,12 @@
         width:100%;
         padding:5px 0;
     }
+    .table .td-label{
+        display: block;
+        text-align: left;
+        border-bottom: 1px solid #ccc;
+        margin-bottom: 10px;
+    }
     .imgs li>div{float:left;}
     .info td{background:#f5f5f5 !important;}
 </style>
@@ -60,120 +66,134 @@
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">个人信息</div>
                                     <div class="panel-body">
-                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="{$info.id}">
-                                                <input type="hidden" name="type" id="type" value="1">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
-                                                <div class="row">
-                                                    <div class="col-sm-10">
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                            <input type="text" class="form-control" id="name" name="name" value="{$info.name}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="card_type" name="card_type" value="{$info.card_type}">
-                                                                {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
-                                                                {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
-                                                                {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
-                                                            </select>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
-                                                            <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
-                                                            <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                            <input type="text" class="form-control" id="birthday" name="birthday" value="{$info.birthday}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                            <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                            <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                            <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
-                                                        </div>
-                                                        <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
-                                                            <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-sm-2">
-                                                        <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                    </div>
-                                                </div>
-                                                <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                    附件：                                      
+                                        <input type="hidden" name="id" id="id" value="{$info.id}">
+                                        <input type="hidden" name="type" id="type" value="1">
+                                        <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <label class="control-label spacing td-label">姓名</label>
+                                                    <input type="text" class="form-control" id="name" name="name" value="{$info.name}" />
+                                                </td>
+                                                <td>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                    <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
+                                                </td>
+                                                <td rowspan="5" style="width: 200%">
+                                                    <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <hr />
+                                                    附件：
                                                     <table class="fileTable"></table>
-                                                </div>
-                                            </div>
-                                        </form>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
+                                                    <select class="form-control" id="card_type" name="card_type" value="{$info.card_type}">
+                                                        {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
+                                                        {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
+                                                        {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
+                                                    </select>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
+                                                    <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
+                                                    <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
+                                                    <input type="text" class="form-control" id="birthday" name="birthday" value="{$info.birthday}"/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
+                                                    <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
+                                                    <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
+                                                </td>
+
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>籍贯</label>
+                                                    <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
+                                                </td>
+                                            </tr>
+
+                                        </table>
                                     </div>
                                 </div>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
-                                        <div class="col-sm-12 form-group-sm">
-                                            <div class="row">
-                                                <div class="col-sm-10">
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位标签</label>
-                                                        <input type="text" class="form-control" id="enterprise_tag" name="enterprise_tag" value="{$info.enterpriseTagName}" />
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
-                                                        <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>所属街道</label>
-                                                        <input type="text" class="form-control" id="street" name="street" value="{$info.streetName}" />
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>产业领域</label>
-                                                        <input type="text" class="form-control" id="industry_field" name="industry_field" value="{$info.industryFieldName}">
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
-                                                        <select class="form-control" id="talent_type" name="talent_type" >
-                                                            <option value="" selected="true">{$info.talentTypeName}</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-9" id="tipsBlock">
-                                                        <label class=" control-label spacing">说明</label>
-                                                        {switch name="info.talent_type"}
-                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。"/>{/case}
-                                                        {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
-                                                        {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
-                                                        {/switch}
-                                                    </div>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
+                                                    <input type="text" class="form-control" id="enterprise_tag" name="enterprise_tag" value="{$info.enterpriseTagName}" />
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
+                                                    <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
+                                                </td>
+                                                <td rowspan="4" style="width: 200%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                    <input type="text" class="form-control" id="street" name="street" value="{$info.streetName}" />
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
+                                                    <input type="text" class="form-control" id="industry_field" name="industry_field" value="{$info.industryFieldName}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
+                                                    <select class="form-control" id="talent_type" name="talent_type" >
+                                                        <option value="" selected="true">{$info.talentTypeName}</option>
+                                                    </select>
+                                                </td>
+                                                <td>
                                                     {if condition="in_array($info['talent_type'],[1,2])"}
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
                                                         <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
                                                     </div>
                                                     {else/}
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
                                                         <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
                                                     </div>
                                                     {/if}
-                                                </div>
-                                            </div>
-                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                                附件：                                      
-                                                <table class="fileTable"></table>
-                                            </div>
-                                        </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <div style="width:100%;white-space:normal;word-wrap:break-word;word-break:break-all; ">
+                                                        {switch name="info.talent_type"}
+                                                        {case value="1"}含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
+                                                        {case value="2"}含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。{/case}
+                                                        {case value="3"}含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。{/case}
+                                                        {/switch}
+                                                    </div>
+
+                                                </td>
+                                            </tr>
+
+                                        </table>
                                     </div> 
                                 </div>
                                 <div class="panel panel-default">

app/admin/view/talent/talentInfo_common_check_new.html

@@ -0,0 +1,396 @@
+{extend name="layout/content"}
+{block name="content"}
+<style type="text/css">
+    .panel-heading{
+        color:#333;
+        background-color:#f5f5f5;
+        border-color:#ddd
+    }
+    .spacing {
+        margin-bottom: 10px;
+        padding-right:4px;
+        padding-left: 4px;
+    }
+    #talentInfoForm label {
+        font-size: xx-small;
+    }
+    .has-feedback .form-control {
+        padding-right: 5px;
+    }
+    .control-label{
+        color: #337ab7;
+    }
+    .rowGroup{
+        padding-bottom: 5px;
+    }
+    .imgs>li{
+        list-style: none;
+        float: left;
+        border: 1px solid #d8d1d1;
+        text-align: center;
+        height: 35px;
+        width:100%;
+        padding:5px 0;
+    }
+    .imgs li>div{float:left;}
+    .info td{background:#f5f5f5 !important;}
+</style>
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div class="form-horizontal">
+            <div class="row">
+                <div class="col-sm-12" >
+                    <div class="tabs-container" >
+                        <ul class="nav nav-tabs">
+                            <li  class="" style="float: right;margin-left: 10px;">
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentInfoInfoDlg.download()" >
+                                    <i class="fa fa-download"></i>&nbsp;打包下载
+                                </button>
+                            </li>
+                            <li  class="" style="float: right;">
+                                <button type="button" class="btn btn-sm btn-info " onclick="$('#fileTable').bootstrapTable('expandAllRows');" >
+                                    <i class="fa fa-caret-square-o-down"></i>&nbsp;显示附件
+                                </button>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div id="tab-1" class="tab-pane active">
+                            <div class="panel-body" >
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人信息</div>
+                                    <div class="panel-body">
+                                        <form id="talentInfoForm" class="form-horizontal" action="/api/talentInfo/upsert" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                            <div class="col-sm-12 form-group-sm">
+                                                <input type="hidden" name="id" id="id" value="{$info.id}">
+                                                <input type="hidden" name="type" id="type" value="1">
+                                                <input type="hidden" name="checkState" id="checkState" value="{$info.checkState}">
+                                                <div class="row">
+                                                    <div class="col-sm-10">
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
+                                                            <input type="text" class="form-control" id="name" name="name" value="{$info.name}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
+                                                            <select class="form-control" id="card_type" name="card_type" value="{$info.card_type}">
+                                                                {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
+                                                                {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
+                                                                {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
+                                                            </select>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
+                                                            <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            
+                                                            <input type="text" class="form-control" id="sex" name="sex" value="{eq name='info.sex' value='1'}男{else/}女{/eq}" />
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
+                                                            <input type="text" class="form-control" id="birthday" name="birthday" value="{$info.birthday}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class="control-label spacing"><span style="color: red">*</span>民族</label>
+                                                            <input class="form-control" id="nation" name="nation" value="{$info.nationName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
+                                                            <input class="form-control" id="politics" name="politics" value="{$info.politicsName}"/>
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
+                                                            <input class="form-control" id="nationality" name="nationality" value="{$info.nationalityName}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
+                                                            <input class="form-control" id="province" name="province" value="{$info.provinceName}{$info.cityName}{$info.countyName}"/>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-sm-2">
+                                                        <img id="photoImg" src="{$info.headimgurl}"  style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    </div>
+                                                </div>
+                                                <div class="row" style="margin-top:20px;padding:10px 25px;">
+                                                    附件：                                      
+                                                    <table class="fileTable"></table>
+                                                </div>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
+                                    <div class="panel-body">
+                                        <div class="col-sm-12 form-group-sm">
+                                            <div class="row">
+                                                <div class="col-sm-10">
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                                        <input type="text" class="form-control" id="enterprise_tag" name="enterprise_tag" value="{$info.enterpriseTagName}" />
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
+                                                        <input type="text" class="form-control" id="enterprise_name" name="enterprise_name" value="{$info.enterpriseName}" />
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>所属街道</label>
+                                                        <input type="text" class="form-control" id="street" name="street" value="{$info.streetName}" />
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>产业领域</label>
+                                                        <input type="text" class="form-control" id="industry_field" name="industry_field" value="{$info.industryFieldName}">
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>人才类型</label>
+                                                        <select class="form-control" id="talent_type" name="talent_type" >
+                                                            <option value="" selected="true">{$info.talentTypeName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-9" id="tipsBlock">
+                                                        <label class=" control-label spacing">说明</label>
+                                                        {switch name="info.talent_type"}
+                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
+                                                        {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
+                                                        {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
+                                                        {/switch}
+                                                    </div>
+                                                    {if condition="in_array($info['talent_type'],[1,2])"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                        <input type="text" class="form-control" id="tax_insurance_month" name="tax_insurance_month" value="{$info.tax_insurance_month}" />
+                                                    </div>
+                                                    {else/}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                        <input type="text" class="form-control" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$info.labor_contract_rangetime}" />
+                                                    </div>
+                                                    {/if}
+                                                </div>
+                                            </div>
+                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
+                                                附件：                                      
+                                                <table class="fileTable"></table>
+                                            </div>
+                                        </div>
+                                    </div> 
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
+                                    <div class="panel-body">
+                                        <div class="col-sm-12 form-group-sm">
+                                            <div class="row">
+                                                <div class="col-sm-10">                          
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>申报年度</label>
+                                                        <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$info.apply_year}" readonly disabled>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
+                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$info.fst_work_time}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>手机号码</label>
+                                                        <input type="text" class="form-control" id="phone" value="{$info.phone}" maxlength="11"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>电子邮箱</label>
+                                                        <input type="text" class="form-control" id="email" value="{$info.email}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>最高学历</label>
+                                                        <select class="form-control" id="highest_degree">
+                                                            <option value="">{$info.highestDegreeName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                        <input type="text" class="form-control" id="graduate_school" value="{$info.graduate_school}">
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                        <input type="text" class="form-control" id="major" value="{$info.major}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing">是否有留学经历</label>
+                                                        <select class="form-control" id="study_abroad" >
+                                                            <option value="">{eq name="study_abroad" value="2"}否{else/}是{/eq}</option>
+                                                        </select>
+                                                    </div>                                                
+                                                    {if condition="$info['abroad_school']"}   
+                                                    <div class="rowGroup col-sm-3 abroad_need_this">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>毕业院校</label>
+                                                        <input type="text" class="form-control" id="abroad_school" value="{$info.abroad_school}" maxlength="11"/>
+                                                    </div>
+                                                    {/if}                                                
+                                                    {if condition="$info['abroad_major']"}   
+                                                    <div class="rowGroup col-sm-3 abroad_need_this">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>专业</label>
+                                                        <input type="text" class="form-control" id="abroad_major" value="{$info.abroad_major}" maxlength="11"/>
+                                                    </div>
+                                                    {/if}
+                                                </div>
+                                            </div>                     
+                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
+                                                上传附件：                                      
+                                                <table class="fileTable"></table>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-sm-10">                                                    
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
+                                                        <input type="text" class="form-control date" id="cur_entry_time" value="{$info.cur_entry_time}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>本单位现任职务</label>
+                                                        <input type="text" class="form-control" id="position" value="{$info.position}"/>
+                                                    </div>
+                                                    {if condition="$info['professional']"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing">专业技术职称</label>
+                                                        <input type="text" class="form-control" id="professional" value="{$info.professional}"/>
+                                                    </div>{/if}
+                                                </div>
+                                            </div>               
+                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
+                                                上传附件：                                      
+                                                <table class="fileTable"></table>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-sm-10">
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing"><span style="color: red">*</span>引进方式</label>
+                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
+                                                            <option value="">{$info.importWayName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>申报来源</label>
+                                                        <select class="form-control" id="source" >
+                                                            <option value="">{$info.sourceName}</option>
+                                                        </select>
+                                                    </div>
+                                                    {if condition="$info['source_city']"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                        <select class="form-control" id="source_city" name="source_city">
+                                                            <option value="">{$info.sourceCityName}</option>
+                                                        </select>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['source_county']"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                        <select class="form-control" id="source_county" name="source_county">
+                                                            <option value="">{$info.sourceCountyName}</option>
+                                                        </select>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['source_batch']"}                                                
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单批次</label>
+                                                        <input type="text" class="form-control" id="source_batch" value="{$info.source_batch}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['fujian_highcert_pubtime']"}                                                
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
+                                                        <input type="text" class="form-control date" id="fujian_highcert_pubtime" value="{$info.fujian_highcert_pubtime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['fujian_highcert_exptime']"}                                                
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
+                                                        <input type="text" class="form-control date" id="fujian_highcert_exptime" value="{$info.fujian_highcert_exptime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['quanzhou_highcert_pubtime']"}    
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
+                                                        <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" value="{$info.quanzhou_highcert_pubtime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    {if condition="$info['quanzhou_highcert_exptime']"}    
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
+                                                        <input type="text" class="form-control date" id="quanzhou_highcert_exptime" value="{$info.quanzhou_highcert_exptime}"/>
+                                                    </div>
+                                                    {/if}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
+                                                        <select class="form-control" id="talent_arrange" name="talent_arrange">
+                                                            <option value="">{$info.talentArrangeName}</option>
+                                                        </select>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <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>
+                                                </div>
+                                            </div>                    
+                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
+                                                上传附件：                                      
+                                                <table class="fileTable"></table>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-sm-10">
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
+                                                        <input type="text" class="form-control" onchange="" id="bank" value="{$info.bank}" placeholder="XX银行"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
+                                                        <input type="text" class="form-control" id="bank_number" value="{$info.bank_number}"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
+                                                        <input type="text" class="form-control" id="bank_branch_name" value="{$info.bank_branch_name}" placeholder="XX银行XX省XX市XX支行/分行/分理处"/>
+                                                    </div>
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class="control-label spacing"><span style="color: red">*</span>银行账号</label>
+                                                        <input type="text" class="form-control" id="bank_account" value="{$info.bank_account}" />
+                                                    </div>
+                                                </div>
+                                            </div>                    
+                                            <div class="row" style="margin-top:20px;padding:10px 25px;">
+                                                上传附件：                                      
+                                                <table class="fileTable"></table>
+                                            </div>
+                                        </div>
+                                    </div> 
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">附件</div>
+                                    <div class="panel-body">
+                                        <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                            <thead>
+                                                <tr>
+                                                    <th data-field="selectItem" data-checkbox="true"></th>
+                                                </tr>
+                                            </thead>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                    <table id="logTable">
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tab-2" class="tab-pane ">
+                            <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    document.write('<script src="/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/talent/talentInfo_library.html

@@ -84,7 +84,7 @@
                                         <option value=""></option>
                                         <option value="1">经我市申报并已经成功入选的泉州高层次人才</option>
                                         <option value="2">从我市以外的其他县（市、区）变动到我市工作的泉州市高层次人才</option>
-                                        <option value="3">依据《晋江市优秀人才补充认定标准》申报认定</option>
+                                        <option value="3">依据《晋江市现代产业体系人才补充认定标准》申报认定</option>
                                     </#SelectCon>
                                 </div>
                                 <div class="col-sm-3"

app/admin/view/talent_condition/add.html

@@ -20,7 +20,7 @@
                             <div class="col-sm-4 spacing">
                                 <select class="form-control" id="type" name="type" onchange="IdentifyConditionInfoDlg.onTypeChange();">
                                     <option value="">请选择</option>
-                                    <option value="1">晋江市优秀人才</option>
+                                    <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">集成电路优秀人才</option>
                                 </select>
                             </div>

app/admin/view/talent_condition/edit.html

@@ -19,7 +19,7 @@
                             <div class="col-sm-4 spacing">
                                 <select class="form-control" id="type" name="type" selectVal="{$info.type}" onchange="IdentifyConditionInfoDlg.onTypeChange();">
                                     <option value="">请选择</option>
-                                    <option value="1">晋江市优秀人才</option>
+                                    <option value="1">晋江市现代产业体系人才</option>
                                     <option value="2">集成电路优秀人才</option>
                                 </select>
                             </div>

app/admin/view/talent_condition/index.html

@@ -29,7 +29,7 @@
                                     </div>
                                     <select class="form-control" id="type">
                                         <option value=""></option>
-                                        <option value="1">晋江市优秀人才</option>
+                                        <option value="1">晋江市现代产业体系人才</option>
                                         <option value="2">集成电路优秀人才</option>
 
                                     </select>

app/common/validate/Enterprise.php

@@ -43,9 +43,9 @@ class Enterprise extends Validate{
         'name.max'     => '单位名称最多100个字符!',
         'name.unique' => '该单位名称已存在',
         'name.regex' => '单位名称只能是中文',
-        'idCard.require'   => '请填写社会信用代码!',
-        'idCard.regex'  => '社会信用代码不正确！',
-        'idCard.unique' => '该社会信用代码已存在',
+        'idCard.require'   => '请填写统一社会信用代码!',
+        'idCard.regex'  => '统一社会信用代码不正确！',
+        'idCard.unique' => '该统一社会信用代码已存在',
         'type.require' => '申报类型必须选择',
         'industryFieldNew.require' => '产业领域必须选择',
         'enterpriseTag.require' => '单位标签必须选择',

app/common/view/auth/register.html

@@ -60,7 +60,7 @@
                                                             </div>
                                                         </div>
                                                         <div class="rowGroup"  >
-                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                                                            <label class="col-sm-1 control-label spacing"><span class="text-danger">*</span>统一社会信用代码</label>
                                                             <div class="col-sm-3 spacing">
                                                                 <input autocomplete="off" type="text" class="form-control" id="idCard" name="idCard" />
                                                             </div>

app/enterprise/controller/Api.php

@@ -91,7 +91,7 @@ class Api extends EnterpriseController {
         $data = [
             'id' => \StrUtil::getRequestDecodeParam($this->request,'enterprise_id'),
             'name' => \StrUtil::getRequestDecodeParam($this->request,'newName'),//单位名称
-            'idCard' => \StrUtil::getRequestDecodeParam($this->request,'newIdCard'),//社会信用代码
+            'idCard' => \StrUtil::getRequestDecodeParam($this->request,'newIdCard'),//统一社会信用代码
             'agentName' => \StrUtil::getRequestDecodeParam($this->request,'newAgentName'),//人才联络员
             'agentPhone' => \StrUtil::getRequestDecodeParam($this->request,'newAgentPhone'),//人才联络员电话
             'legal' => \StrUtil::getRequestDecodeParam($this->request,'newLegal'),//法人

app/enterprise/controller/Index.php

@@ -32,7 +32,7 @@ class Index extends EnterpriseController {
         $ep['streetName'] = DictApi::findDictByCode($ep['street'])->name ?? '';
         switch ($ep['type']){
             case 1:
-                $ep['typeName'] = '晋江市优秀人才';
+                $ep['typeName'] = '晋江市现代产业体系人才';
                 break;
             case 2:
                 $ep['typeName'] = '集成电路优秀人才';

app/enterprise/view/api/to_add.html

@@ -54,7 +54,7 @@
                         </div>
                       </div>
                       <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>统一社会信用代码</label>
                         <div class="col-sm-4 spacing">
                           <input type="text" class="form-control" id="newIdCard" name="newIdCard" value="{$ecr.newIdCard}"/>
                         </div>

app/enterprise/view/api/to_detail.html

@@ -57,7 +57,7 @@
                             </div>
                           </div>
                           <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>统一社会信用代码</label>
                             <div class="col-sm-4 spacing">
                               <input type="text" class="form-control" id="oldIdCard" name="oldIdCard" value="{$ecr.oldIdCard}" readonly disabled/>
                             </div>
@@ -146,7 +146,7 @@
                             </div>
                           </div>
                           <div class="rowGroup"  style="margin-bottom: 0px;">
-                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                            <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>统一社会信用代码</label>
                             <div class="col-sm-4 spacing">
                               <input type="text" class="form-control" id="newIdCard" name="newIdCard" value="{$ecr.newIdCard}" readonly disabled/>
                             </div>

app/enterprise/view/api/to_update.html

@@ -55,7 +55,7 @@
                         </div>
                       </div>
                       <div class="rowGroup"  style="margin-bottom: 0px;">
-                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>社会信用代码</label>
+                        <label class="col-sm-2 control-label spacing"><span class="text-danger">*</span>统一社会信用代码</label>
                         <div class="col-sm-4 spacing">
                           <input type="text" class="form-control" id="newIdCard" name="newIdCard" value="{$ecr.newIdCard}"/>
                         </div>

app/enterprise/view/base/first.html

@@ -32,8 +32,20 @@
         width:100%;
         padding:5px 0;
     }
+    .table .td-label{
+        display: block;
+        text-align: left;
+        border-bottom: 1px solid #ccc;
+        margin-bottom: 10px;
+    }
     .imgs li>div{float:left;}
     .info td{background:#f5f5f5 !important;}
+    .word-wrap{
+        width:100%;
+        white-space:normal;
+        word-wrap:break-word;
+        word-break:break-all;
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -43,169 +55,168 @@
                     <div class="tab-content">
                         <div id="tab-1" class="tab-pane active">
                             <form id="talentInfoForm" action="/enterprise/base/add" method="post" enctype="multipart/form-data" target="hiddenIframe">
+                                <input type="hidden" name="id" id="id" value="{$row.id}">
+                                <input type="hidden" name="year" id="year" value="{$year}">
+                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
+                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
+                                <input type="file" name="photo" id="photo" style="display: none">
+                                <input type="hidden" name="province_name" id="province_name" value="">
+                                <input type="hidden" name="city_name" id="city_name" value="">
+                                <input type="hidden" name="county_name" id="county_name" value="">
+                                <input type="hidden" name="source_city_name" id="source_city_name" value="">
+                                <input type="hidden" name="source_county_name" id="source_county_name" value="">
+                                <input type="hidden" name="checkState" id="checkState" value="{$checkState}">
+                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
+                                <input type="hidden" name="step" id="step" value="1">
+                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
+                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">个人信息</div>
                                     <div class="panel-body">
-                                        <div class="row">
-                                            <div class="col-sm-12 form-group-sm">
-                                                <input type="hidden" name="id" id="id" value="{$row.id}">
-                                                <input type="hidden" name="year" id="year" value="{$year}">
-                                                <input type="hidden" name="enterprise_id" id="enterpriseId" value="{$row.enterprise.id}">
-                                                <input type="hidden" name="enterprise_type" id="type" value="{$row.enterprise.type}">
-                                                <input type="file" name="photo" id="photo" style="display: none">
-                                                <input type="hidden" name="province_name" id="province_name" value="">
-                                                <input type="hidden" name="city_name" id="city_name" value="">
-                                                <input type="hidden" name="county_name" id="county_name" value="">
-                                                <input type="hidden" name="source_city_name" id="source_city_name" value="">
-                                                <input type="hidden" name="source_county_name" id="source_county_name" value="">
-                                                <input type="hidden" name="checkState" id="checkState" value="{$checkState}">
-                                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}">
-                                                <input type="hidden" name="step" id="step" value="1">                                                
-                                                <input type="hidden" name="files" id="files" value="{$row.modify_files}">
-                                                <input type="hidden" name="fields" id="fields" value="{$row.modify_fields}">
-                                                <div class="col-sm-10">
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>姓名</label>
-                                                        <input type="text" class="form-control" id="name" name="name"  value='{$row.name}'/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                        <select class="form-control" id="card_type" name="card_type" value='{$row.card_type}'>
-                                                            <option value="">请选择</option>
-                                                            <option value="1">身份证</option>
-                                                            <option value="2">通行证</option>
-                                                            <option value="3">护照</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>证件号码</label>
-                                                        <input class="form-control" id="card_number" name="card_number" value='{$row.card_number}'>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>性别</label>
-                                                        <select class="form-control" id="sex" name="sex" value='{$row.sex}'>
-                                                            <option value="">请选择</option>
-                                                            <option value="1">男</option>
-                                                            <option value="2">女</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>出生日期</label>
-                                                        <input type="text" class="form-control date" id="birthday" name="birthday" value='{$row.birthday}'/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>民族</label>
-                                                        <select class="form-control" id="nation" name="nation" value='{$row.nation}'>
-                                                        </select>
-                                                    </div> 
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>政治面貌</label>
-                                                        <select class="form-control" id="politics" name="politics" value='{$row.politics}'>
-                                                        </select>
-                                                    </div>   
-                                                    <div class="rowGroup col-sm-3">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>国籍/地区</label>
-                                                        <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
-                                                        </select>
-                                                    </div>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>姓名</label>
+                                                    <input type="text" class="form-control" id="name" name="name" value="{$row.name}" />
+                                                </td>
+                                                <td>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
+                                                    <select class="form-control" id="nation" name="nation" value='{$row.nation}'>
+                                                    </select>
+                                                </td>
+                                                <td rowspan="5" style="width: 200%">
+                                                    <img id="photoImg" {if condition="$row['headimgurl']"} src="/storage/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
+                                                    <hr />
+                                                    附件：
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
+                                                    <select class="form-control" id="card_type" name="card_type" value='{$row.card_type}'>
+                                                        <option value="">请选择</option>
+                                                        <option value="1">身份证</option>
+                                                        <option value="2">通行证</option>
+                                                        <option value="3">护照</option>
+                                                    </select>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*证件号码</span></label>
+                                                    <input class="form-control" id="card_number" name="card_number" value='{$row.card_number}'>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
+                                                    <select class="form-control" id="sex" name="sex" value='{$row.sex}'>
+                                                        <option value="">请选择</option>
+                                                        <option value="1">男</option>
+                                                        <option value="2">女</option>
+                                                    </select>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
+                                                    <input type="text" class="form-control date" id="birthday" name="birthday" value='{$row.birthday}'/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
+                                                    <select class="form-control" id="politics" name="politics" value='{$row.politics}'>
+                                                    </select>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
+                                                    <select class="form-control" id="nationality" name="nationality" value="{$row.nationality}">
+                                                    </select>
+                                                </td>
+
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯省</label>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯省</label>
                                                         <select class="form-control " onchange="TalentInfoInfoDlg.afterSelectProvince()" id="province" name="province" value='{$row.province}'>
                                                         </select>
                                                     </div>
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯市</label>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯市</label>
                                                         <select class="form-control" onchange="TalentInfoInfoDlg.afterSelectCity()" id="city" name="city" value='{$row.city}'></select>
                                                     </div>
                                                     <div class="rowGroup col-sm-3">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>籍贯县</label>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>籍贯县</label>
                                                         <select class="form-control" id="county" name="county" value='{$row.county}'></select>
                                                     </div>
-                                                </div>
-                                                <div class="col-sm-2">
-                                                    <img id="photoImg" {if condition="$row['headimgurl']"} src="/storage/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                            上传附件：                                      
-                                            <table class="fileTable"></table>
-                                        </div>
+                                                </td>
+                                            </tr>
+
+                                        </table>
+
                                     </div>
                                 </div>
                                 <div class="panel panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
-                                        <div class="row">
-                                            <div class="col-sm-10 form-group-sm">
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class="control-label spacing"><span style="color: red">*</span>单位标签</label>
+                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            <tr>
+                                                <td>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
                                                     <select class="form-control" id="enterprise_tag"  value="{$row.enterprise.enterpriseTag}" disabled="disabled">
                                                     </select>
-                                                </div>
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>单位名称</label>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
                                                     <input type="text" class="form-control" id="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$row.enterprise.name}" />
-                                                </div>
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>所属镇街</label>
+                                                </td>
+                                                <td rowspan="4" style="width: 200%">
+                                                    <table class="fileTable"></table>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
                                                     <select class="form-control" id="address" name="address" value="{$row.enterprise.street}" disabled="disabled"></select>
-                                                </div>
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>产业领域</label>
+                                                </td>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
                                                     <select type="text" class="form-control" id="industry_field" value="{$row.enterprise.industryFieldNew}" name="industry_field" disabled="disabled">
                                                     </select>
-                                                </div> 
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class="control-label spacing"><span style="color: red">*</span>人才类型</label>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
                                                     <select class="form-control" id="talent_type" name="talent_type" value="{$row.talent_type}" onchange="TalentInfoInfoDlg.talentTypeChange()">
-                                                        <option value="">请选择</option>  
+                                                        <option value="">请选择</option>
                                                         {volist name="row.talent_type_list" id="item"}
-                                                        <option value="{$item.code}">{$item.name}</option>        
+                                                        <option value="{$item.code}">{$item.name}</option>
                                                         {/volist}
                                                     </select>
-                                                </div>
-                                                <div class="rowGroup col-sm-9" id="tipsBlock" style="display: none">
-                                                    <label class=" control-label spacing">说明</label>
-                                                    <input type="text" class="form-control" id="typeTips" disabled readonly value=""/>
-
-                                                </div>
-                                                {if condition="in_array($row['talent_type'],[1,2])"}                                                        
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
-                                                    <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
-                                                </div>
-                                                {else/}
-                                                <div class="rowGroup col-sm-3" style="display:none;">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
-                                                    <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value=""/>
-                                                </div>
-                                                {/if}                                                        
-                                                {if condition="$row['talent_type'] eq 3"}  
-                                                <div class="rowGroup col-sm-3">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
+                                                </td>
+                                                <td>
+                                                    {if condition="in_array($info['talent_type'],[1,2])"}
+                                                    <div class="rowGroup col-sm-3">
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
+                                                        <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
+                                                    </div>
+                                                    {else/}
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
                                                     <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />
-                                                </div> 
-                                                {else/}
-                                                <div class="rowGroup col-sm-3" style="display:none;">
-                                                    <label class=" control-label spacing"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                    <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="" />
-                                                </div> 
-                                                {/if}  
-                                            </div>
-                                        </div>
-                                        <div class="row" style="margin-top:20px;padding:10px 25px;">
-                                            上传附件：
-                                            <table class="fileTable"></table>
-                                            <!--<ul class="list-unstyled">
-                                                <li style="margin:10px 0;overflow:hidden;">
-                                                    <div style="float:left;margin-left:25px;" id="material_name">社保或所得税缴费记录</div>
-                                                    <button type='button' onclick="TalentInfoInfoDlg.checkFile(this)" style='margin-right: 10px;float:right;' class="btn btn-xs btn-info">
-                                                        <i class="fa fa-upload"></i>上传
-                                                    </button>
-                                                </li>
-                                            </ul>-->
-                                        </div>
+                                                    {/if}
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2">
+                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <div class="word-wrap" id="typeTips">
+
+                                                    </div>
+
+                                                </td>
+                                            </tr>
+
+                                        </table>
                                     </div>
                                 </div>
                             </form> 

app/enterprise/view/base/view.html

@@ -139,7 +139,7 @@
                                                     <div class="rowGroup col-sm-9" id="tipsBlock">
                                                         <label class=" control-label spacing">说明</label>
                                                         {switch name="row.talent_type"}
-                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。"/>{/case}
+                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
                                                         {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
                                                         {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
                                                         {/switch}

app/enterprise/view/index/center_page.html

@@ -49,7 +49,7 @@
                                                 </div>
                                             </div>
                                             <div class="rowGroup">
-                                                <label class="col-sm-2 control-label spacing">社会信用代码</label>
+                                                <label class="col-sm-2 control-label spacing">统一社会信用代码</label>
                                                 <div class="col-sm-4 spacing">
                                                     <input type="text" class="form-control" readonly="readonly"
                                                            name="idCard" value="{$ep.idCard}"/>

app/enterprise/view/talent/second.html

@@ -141,7 +141,7 @@
                                         <div class="rowGroup col-sm-9" id="tipsBlock">
                                             <label class=" control-label spacing">说明</label>
                                             {switch name="row.talent_type"}
-                                            {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。"/>{/case}
+                                            {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
                                             {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
                                             {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
                                             {/switch}

app/enterprise/view/talent/view.html

@@ -140,7 +140,7 @@
                                                     <div class="rowGroup col-sm-9" id="tipsBlock">
                                                         <label class=" control-label spacing">说明</label>
                                                         {switch name="row.talent_type"}
-                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。"/>{/case}
+                                                        {case value="1"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。"/>{/case}
                                                         {case value="2"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。"/>{/case}
                                                         {case value="3"}<input type="text" class="form-control" id="typeTips" disabled readonly value="含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。"/>{/case}
                                                         {/switch}

app/index/view/auth/policy.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>晋江市优秀人才政策导入</title>
+    <title>晋江市现代产业体系人才政策导入</title>
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 </head>

public/static/js/register.js

@@ -3,7 +3,7 @@ var Register = {
     validateFields: {
         username: {validators: {notEmpty: {message: '登录账号不能为空'}}},
         name: {validators: {notEmpty: {message: '单位名称不能为空'},regexp:{regexp:/^[\u4e00-\u9fa5]{1,100}$/,message:"单位名称只允许中文"}}},
-        idCard: {validators: {notEmpty: {message: '社会信用代码不能为空'}}},
+        idCard: {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}},
         agentName: {validators: {notEmpty: {message: '人才联络员不能为空'}}},
         agentPhone: {
             validators: {
@@ -140,7 +140,7 @@ Register.enterpriseUserRegister = function() {
         return;
     }
     if (idCard==null || idCard=='') {
-        Feng.info("请填写社会信用代码!");
+        Feng.info("请填写统一社会信用代码!");
         return;
     }
     if (type==null || type=='') {
@@ -148,7 +148,7 @@ Register.enterpriseUserRegister = function() {
         return;
     }
     if (idCard.length > 40) {
-        Feng.info("社会信用代码最多40个字符!");
+        Feng.info("统一社会信用代码最多40个字符!");
         return;
     }
     if (agentName==null || agentName=='') {

public/static/modular/enterprise/enterprise_list.js

@@ -16,12 +16,12 @@ Enterprise.initColumn = function(){
         {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
         {title: '账号', field: 'username',visible: true, align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '机构名称', field: 'name',visible: true, align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '社会信用代码', field: 'idCard',visible: true, align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '统一社会信用代码', field: 'idCard',visible: true, align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '产业领域', field: 'industryFieldNewName',visible: isShow, align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '机构类型', field: 'type', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip',
             formatter : function(value,row,index){
                 if(value==1){
-                    return "晋江市优秀人才";
+                    return "晋江市现代产业体系人才";
                 }
                 if(value==2){
                     return "集成电路优秀人才";

public/static/modular/enterprise/enterprisechangeRecord/ep_change_record_list.js

@@ -17,14 +17,14 @@ EpChange.initColumn = function(){
         {title: '<span style="color: red">原单位名称</span>', field: 'oldName', align: 'center', width:200, valign: 'middle', 'class': 'uitd_showTip',
 
         },
-        // {title: '原社会信用代码', field: 'oldIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
+        // {title: '原统一社会信用代码', field: 'oldIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '原法人代表', field: 'oldLegal', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '原所属街道', field: 'oldStreetName', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '原单位标签', field: 'oldEnterpriseTagName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '原产业领域', field: 'oldIndustryFieldNewName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '原单位地址', field: 'oldAddress', align: 'center', width:200, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '<span style="color: red">新单位名称</span>', field: 'newName', align: 'center', width:200, valign: 'middle', 'class': 'uitd_showTip'},
-        // {title: '新社会信用代码', field: 'newIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
+        // {title: '新统一社会信用代码', field: 'newIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
         // {title: '新法人代表', field: 'newLegal', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '新所属街道', field: 'newStreetName', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '新单位标签', field: 'newEnterpriseTagName',visible: isShow, align: 'center', width:170, valign: 'middle', 'class': 'uitd_showTip'},

public/static/modular/filetype/unCommonFiletype/unCommonFiletype.js

@@ -19,7 +19,7 @@ UnCommonFiletype.initColumn = function () {
                 if (value == null || value == '') {
                     return "";
                 } else if (value == 1) {
-                    return "晋江市优秀人才";
+                    return "晋江市现代产业体系人才";
                 } else if (value == 2) {
                     return "集成电路优秀人才";
                 } else {
@@ -102,7 +102,7 @@ UnCommonFiletype.openAddUnCommonFiletype = function () {
         area: ['1200px', '500px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: '/admin/filetype/add'
+        content: '/admin/file_type/add'
     });
     UnCommonFiletype.layerIndex = index;
 };
@@ -118,7 +118,7 @@ UnCommonFiletype.openUnCommonFiletypeDetail = function () {
             area: ['1200px', '500px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: '/admin/filetype/edit/id/' + UnCommonFiletype.seItem.id
+            content: '/admin/file_type/edit/id/' + UnCommonFiletype.seItem.id
         });
         this.layerIndex = index;
     }
@@ -130,7 +130,7 @@ UnCommonFiletype.openUnCommonFiletypeDetail = function () {
 UnCommonFiletype.delete = function () {
     if (this.check()) {
         var operation = function () {
-            var ajax = new $ax("/admin/filetype/delete", function (data) {
+            var ajax = new $ax("/admin/file_type/delete", function (data) {
                 if (data.code == 200) {
                     Feng.success(data.msg);
                     UnCommonFiletype.table.refresh();
@@ -169,7 +169,7 @@ UnCommonFiletype.reset = function () {
 
 $(function () {
     var defaultColunms = UnCommonFiletype.initColumn();
-    var table = new BSTable(UnCommonFiletype.id, "/admin/filetype/list", defaultColunms);
+    var table = new BSTable(UnCommonFiletype.id, "/admin/file_type/list", defaultColunms);
     table.setPaginationType("server");
     table.setOnLoadSuccess(function () {
         $(".imgUrl").viewer({

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

@@ -46,7 +46,7 @@ EnterpriseCenter.initColumn = function(){
 		{field: 'selectItem', radio: true},
         {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
         {title: '更新单位名称', field: 'newName', align: 'left', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '更新社会信用代码', field: 'newIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '更新统一社会信用代码', field: 'newIdCard', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
 		{title: '更新产业领域', field: 'newIndustryFieldNewName', align: 'center', width:160, valign: 'middle', 'class': 'uitd_showTip'},
 		{title: '更新单位标签', field: 'newEnterpriseType', align: 'left', width:120, valign: 'middle', 'class': 'uitd_showTip'},
         {title: '更新法人代表', field: 'newLegal', align: 'left', width:100, valign: 'middle', 'class': 'uitd_showTip'},

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

@@ -3,7 +3,7 @@ var EpChangeEdit = {
 	epChangeEditData : {},
 	validateFields: {
 		newName: {validators: {notEmpty: {message: '单位名称不能为空' },regexp:{regexp:/^[\u4e00-\u9fa5]{1,100}$/,message:"单位名称只允许中文"}}},
-		newIdCard : {validators: {notEmpty: {message: '社会信用代码不能为空' }}},
+		newIdCard : {validators: {notEmpty: {message: '统一社会信用代码不能为空' }}},
 		newEnterpriseTag : {validators: {notEmpty: {message: '单位标签不能为空' }}},
 		newEnterpriseType: {validators: {notEmpty: {message: '单位类型不能为空' }}},
 		newLegal: {validators: {notEmpty: {message: '法人代表不能为空'},regexp:{regexp:/^[\u4e00-\u9fa5]{1,50}$/,message:"法人代表只允许中文"}}},

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

@@ -37,7 +37,7 @@ Register.enterpriseUserRegister = function() {
         return;
     }
     if (idCard==null || idCard=='') {
-        Feng.info("请填写社会信用代码!");
+        Feng.info("请填写统一社会信用代码!");
         return;
     }
     if (type==null || type=='') {
@@ -45,7 +45,7 @@ Register.enterpriseUserRegister = function() {
         return;
     }
     if (idCard.length > 40) {
-        Feng.info("社会信用代码最多40个字符!");
+        Feng.info("统一社会信用代码最多40个字符!");
         return;
     }
     if (agentName==null || agentName=='') {

public/static/modular/gate/house/housepurchase_info.js

@@ -529,7 +529,7 @@ HousepurchaseInfoDlg.declareObjChange = function(){
     switch (declareObj) {
         case "":
             break;
-        case "1":                     //新政策中公布入选为晋江市优秀人才后再购房对象
+        case "1":                     //新政策中公布入选为晋江市现代产业体系人才后再购房对象
             break;
         case "2":                     //旧政策中取得购房补贴指标后完成购房，且符合新政策认定标准对象(在库)
             Feng.info("此种对象请通过线下申报，线上不支持旧政策的申报流程！");

public/static/modular/gate/house/housepurchase_select.js

@@ -164,7 +164,7 @@ HousepurchaseInfoDlg.declareObjChange = function(){
     switch (declareObj) {
         case "":
             break;
-        case "1":                     //新政策中公布入选为晋江市优秀人才后再购房对象
+        case "1":                     //新政策中公布入选为晋江市现代产业体系人才后再购房对象
             break;
         case "2":                     //旧政策中取得购房补贴指标后完成购房，且符合新政策认定标准对象(在库)
             Feng.info("此种对象请通过线下申报，线上不支持旧政策的申报流程！");

public/static/modular/gate/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -23,7 +23,7 @@ LivingAllowanceInfo.initColumn = function () {
         },
         // {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:"100px",
         //     formatter : function (value,row,index){
-        //         return value == 1?"晋江市优秀人才":"集成电路优秀人才";
+        //         return value == 1?"晋江市现代产业体系人才":"集成电路优秀人才";
         //     }
         // },
         {

public/static/modular/gate/register.js

@@ -3,7 +3,7 @@ var Register = {
 	validateFields: {
 		username: {validators: {notEmpty: {message: '登录账号不能为空'}}},
 		name: {validators: {notEmpty: {message: '单位名称不能为空'}}},
-		idCard: {validators: {notEmpty: {message: '社会信用代码不能为空'}}},
+		idCard: {validators: {notEmpty: {message: '统一社会信用代码不能为空'}}},
 		agentName: {validators: {notEmpty: {message: '人才联络员不能为空'}}},
 		agentPhone: {
 			validators: {
@@ -129,7 +129,7 @@ Register.enterpriseUserRegister = function() {
 		return;
 	}
 	if (idCard==null || idCard=='') {
-		Feng.info("请填写社会信用代码!");
+		Feng.info("请填写统一社会信用代码!");
 		return;
 	}
 	if (type==null || type=='') {
@@ -137,7 +137,7 @@ Register.enterpriseUserRegister = function() {
 		return;
 	}
 	if (idCard.length > 40) {
-		Feng.info("社会信用代码最多40个字符!");
+		Feng.info("统一社会信用代码最多40个字符!");
 		return;
 	}
 	if (agentName==null || agentName=='') {

public/static/modular/gate/talentBase/talentBase.js

@@ -21,7 +21,7 @@ TalentInfo.initColumn = function () {
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return '晋江市优秀人才';
+                    return '晋江市现代产业体系人才';
                 }
                 if (value == 2) {
                     return '集成电路优秀人才';

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -375,7 +375,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
     switch (talent_type) {
         case "1":
             $("#tipsBlock").css('display', 'block');
-            $("#typeTips").val("含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市优秀人才的人才。");
+            $("#typeTips").html("含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。");
             $("#material_name").html("社保或个税的缴交记录");
             $("#tax_insurance_month").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
@@ -386,7 +386,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             break;
         case "2":
             $("#tipsBlock").css('display', 'block');
-            $("#typeTips").val("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
+            $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
             $("#material_name").html("社保或个税的缴交记录");
             $("#tax_insurance_month").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
@@ -397,7 +397,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             break;
         case "3":
             $("#tipsBlock").css('display', 'block');
-            $("#typeTips").val("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。")
+            $("#typeTips").html("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。")
             $("#material_name").html("社保或个税的缴交记录");
             $("#labor_contract_rangetime").removeAttr("disabled").parent().css("display", "block");
             $('#talentInfoForm').bootstrapValidator('addField', "labor_contract_rangetime", {validators: {notEmpty: {message: '劳动合同起止时间'}}});
@@ -476,14 +476,17 @@ TalentInfoInfoDlg.sourceChange = function () {
 TalentInfoInfoDlg._initFileTypeColumn = function () {
     return [
         {field: 'selectItem', checkbox: false, visible: false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+        {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">';
                 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;
+                    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) {
-                    return '<i class="fa fa-paste"></i>' + value;
+                    str = str + '<i class="fa fa-paste"></i>' + value;
                 }
+                str = str + '<br />' + row.description + '</div>'
+                return str;
             }
         },
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
@@ -496,7 +499,6 @@ TalentInfoInfoDlg._initFileTypeColumn = function () {
                         "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
                 return TalentInfoInfoDlg.validUploadButton(1, value, '', row.tableIndex, row.trIndex);
@@ -517,7 +519,7 @@ TalentInfoInfoDlg.initFile = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
                 data["rows"][k].tableIndex = tableIndex;
                 data["rows"][k].trIndex = datas[tableIndex].length;
                 datas[tableIndex].push(data["rows"][k]);

public/static/modular/gate/talentBase/talentInfo_library.js

@@ -41,7 +41,7 @@ TalentInfo.initColumn = function () {
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:"100px",
             formatter : function (value,row,index){
                 if(value==1){
-                    return '晋江市优秀人才';
+                    return '晋江市现代产业体系人才';
                 }if(value==2){
                     return '集成电路优秀人才';
                 }

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

@@ -32,7 +32,7 @@ TalentInfo.initColumn = function () {
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return '晋江市优秀人才';
+                    return '晋江市现代产业体系人才';
                 }
                 if (value == 2) {
                     return '集成电路优秀人才';

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

@@ -276,7 +276,12 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                if(rel == 'card_number' || rel == 'name'){
+                    var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
+                }else{
+                    var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                }
+
                 data["rows"][k].tableIndex = tableIndex;
                 data["rows"][k].trIndex = datas[tableIndex].length;
                 datas[tableIndex].push(data["rows"][k]);

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

@@ -41,7 +41,7 @@ TalentInfo.initColumn = function () {
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:"100px",
             formatter : function (value,row,index){
                 if(value==1){
-                    return '晋江市优秀人才';
+                    return '晋江市现代产业体系人才';
                 }if(value==2){
                     return '集成电路优秀人才';
                 }

public/static/modular/gate/talentLibrary/talentTypeChange/talentTypeChange_info.js

@@ -206,7 +206,7 @@ TalentTypeChangeInfoDlg.talentInfoDetail = function (){
         $("#oldIntroductionMode").val(data.introductionMode);
         $("#oldYear").val(data.year);
         if(data.type == 1){
-            toastr.success("符合晋江市优秀人才补充认定标准的无需填写‘新泉州高层次人才证书发证日期’及‘新泉州高层次人才证书的有效期’。");
+            toastr.success("符合晋江市现代产业体系人才补充认定标准的无需填写‘新泉州高层次人才证书发证日期’及‘新泉州高层次人才证书的有效期’。");
         }
         if(data.source==1){
             $("#oldCertificateStartTime").parent().parent().attr("style","display:block");

public/static/modular/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -23,7 +23,7 @@ LivingAllowanceInfo.initColumn = function () {
         },
         // {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:"100px",
         //     formatter : function (value,row,index){
-        //         return value == 1?"晋江市优秀人才":"集成电路优秀人才";
+        //         return value == 1?"晋江市现代产业体系人才":"集成电路优秀人才";
         //     }
         // },
         {

public/static/modular/system/amountStandard/amountStandard.js

@@ -17,7 +17,7 @@ AmountStandard.initColumn = function () {
             {title: '人才类型', field: 'type', visible: true, align: 'center', valign: 'middle',
                 formatter:function (value,row,index) {
                     if(value==1){
-                        return "晋江市优秀人才";
+                        return "晋江市现代产业体系人才";
                     }
                     if(value==2){
                         return "集成电路优秀人才";

public/static/modular/system/batch/batch.js

@@ -18,7 +18,7 @@ Batch.initColumn = function () {
         {title: '人才类型', field: 'source', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return "晋江市优秀人才";
+                    return "晋江市现代产业体系人才";
                 }
                 if (value == 2) {
                     return "晋江市集成电路优秀人才";

public/static/modular/system/company/company.js

@@ -17,7 +17,7 @@ Company.initColumn = function () {
         {title: 'id', field: 'id', align: 'center', valign: 'middle', visible: false},
         {title: '单位简称', field: 'shortName', align: 'center', valign: 'middle', sortable: false},
         {title: '单位全称', field: 'name', align: 'center', valign: 'middle', sortable: false},
-        {title: '社会信用代码(不可修改)', field: 'code', align: 'center', valign: 'middle', sortable: false},
+        {title: '统一社会信用代码(不可修改)', field: 'code', align: 'center', valign: 'middle', sortable: false},
         {title: '排序', field: 'sn', align: 'center', valign: 'middle', sortable: true},
         {title: '备注', field: 'description', align: 'center', valign: 'middle', sortable: false}
     ]

public/static/modular/system/company/company_info.js

@@ -22,7 +22,7 @@ var CompanyInfoDlg = {
         code: {
             validators: {
                 notEmpty: {
-                    message: '社会信用代码不能为空'
+                    message: '统一社会信用代码不能为空'
                 }
             }
         },

public/static/modular/system/user/user.js

@@ -22,7 +22,7 @@ MgrUser.initColumn = function () {
         {title: '账号类型', field: 'type', align: 'center', valign: 'middle','class': 'uitd_showTip',
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return "晋江市优秀人才";
+                    return "晋江市现代产业体系人才";
                 }else if (value == 2) {
                     return "集成电路优秀人才";
                 }else if (value == 3) {

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -344,7 +344,7 @@ TalentAllowanceInfoDlg.editProject = function(){
 }
 
 /**
- * 提交晋江市优秀人才的考勤
+ * 提交晋江市现代产业体系人才的考勤
  */
 TalentAllowanceInfoDlg.editJJAttendance = function(){
     var id = $("#jjAttendanceId").val();

public/static/modular/talentAllowance/talentAllowanceInfo_public_check.js

@@ -320,7 +320,7 @@ TalentAllowanceInfoDlg.editProject = function(){
 }
 
 /**
- * 提交晋江市优秀人才的考勤
+ * 提交晋江市现代产业体系人才的考勤
  */
 TalentAllowanceInfoDlg.editJJAttendance = function(){
     var id = $("#jjAttendanceId").val();

public/static/modular/talentIdentify/identifyCondition/identifyCondition.js

@@ -19,7 +19,7 @@ IdentifyCondition.initColumn = function () {
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row, index) {
                 if (value == 1) {
-                    return "晋江市优秀人才";
+                    return "晋江市现代产业体系人才";
                 }
                 if (value == 2) {
                     return "集成电路优秀人才";

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

@@ -34,7 +34,7 @@ TalentInfo.initColumn = function () {
         {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle','class': 'uitd_showTip',width:"140px",
             formatter : function (value,row,index){
                 if(value==1){
-                    return '<span style="color:#6495ED">晋江市优秀人才</span>';
+                    return '<span style="color:#6495ED">晋江市现代产业体系人才</span>';
                 }if(value==2){
                     return '<span style="color:#FF82AB">集成电路优秀人才</span>';
                 }

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

@@ -13,7 +13,7 @@ var TalentInfoInfoDlg = {
 TalentInfoInfoDlg.initFileTypeColumn = function () {
     return [
         {field: 'selectItem', checkbox: false, visible: false},
-        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "30%", 'class': 'uitd_showTip',
+        {title: '名称', field: 'name', visible: true, align: 'center', valign: 'middle', width: "50%", 'class': 'uitd_showTip',
             formatter: function (value, row, index) {
                 if (row.must == 1) {
                     return '<i class="fa fa-paste"></i><span style="font-weight:bold;color:red;font-size:14px;font-family:宋体"> * </span> ' + value;
@@ -33,7 +33,7 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                         "</button>";
             }
         },
-        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "52%", 'class': 'uitd_showTip'},
+        {title: '备注', field: 'description', visible: true, align: 'center', valign: 'middle', width: "32%", 'class': 'uitd_showTip'},
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
                 return "";
@@ -51,10 +51,19 @@ TalentInfoInfoDlg.initFileTable = function () {
         for (var i = 0; i < $(".fileTable").length; i++) {
             datas.push([]);//创建空的多维数组，等下用来存每个附件表的各自的列
         }
+        console.log(data)
         for (var k in data["rows"]) {
             var rel = data["rows"][k].rel;
             if ($("#" + rel).length > 0) {
-                var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                if(rel == 'card_number' || rel == 'name' || rel == 'talent_type'){
+                    var tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
+                }else{
+                    var tableIndex = $("#" + rel).parents(".row").next(".row").find("table.fileTable").index(".fileTable");
+                }
+
+                console.log($("#" + rel).parents(".table").find("table.fileTable"),rel,tableIndex)
+
+
                 data["rows"][k].tableIndex = tableIndex;
                 data["rows"][k].trIndex = datas[tableIndex].length;
                 datas[tableIndex].push(data["rows"][k]);
@@ -84,7 +93,7 @@ TalentInfoInfoDlg.initFileTable = function () {
                 onPostBody: function (data) {
                     for (var k in data) {
                         var files = data[k].files;
-                        var html = '<ul class="imgs"><li style="width: 80%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">操作</li>';
+                        var html = '<ul class="imgs"><li style="width: 60%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 15%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 25%;font-weight: bold;padding-top: 5px;">操作</li>';
                         for (var key in files) {
                             var sn = files[key].url.lastIndexOf(".");
                             var suffix = files[key].url.substring(sn + 1, files[key].url.length);
@@ -99,9 +108,9 @@ TalentInfoInfoDlg.initFileTable = function () {
 
                             html += '<li data-id="' + files[key].id + '">\n\
                                     <div><input type="hidden" name="uploadFiles[]" value="' + files[key].id + '"></div>\n' +
-                                    '<div style="width: 80%;">' + files[key].orignName + '</div>\n' +
-                                    '<div style="width: 10%;">' + imgStr + '</div>\n' +
-                                    '<div style="width: 10%;"></div>\n\
+                                    '<div style="width: 60%;">' + files[key].orignName + '</div>\n' +
+                                    '<div style="width: 15%;">' + imgStr + '</div>\n' +
+                                    '<div style="width: 25%;"></div>\n\
                                     </li>';
                         }
                         html = html + '</ul>';

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

@@ -46,7 +46,7 @@ TalentInfo.initColumn = function () {
         // {title: '人才类别', field: 'type', visible: true, align: 'center', valign: 'middle',width:'120px',
         //     formatter : function (value,row,index){
         //         if(value==1){
-        //             return '晋江市优秀人才';
+        //             return '晋江市现代产业体系人才';
         //         }if(value==2){
         //             return '集成电路优秀人才';
         //         }