Browse Source

积分审核完善

sugangqiang 2 years ago
parent
commit
dbb7741631

+ 21 - 36
app/admin/controller/IntegralVerify.php

@@ -607,7 +607,7 @@ class IntegralVerify extends AdminController {
     /**
     /**
      * 初审-提交未保存
      * 初审-提交未保存
      * @param \think\Request $request
      * @param \think\Request $request
-     * @param type $talent_info
+     * @param type $record
      * @return type json
      * @return type json
      */
      */
     private function fstCheck(\think\Request $request, $record) {
     private function fstCheck(\think\Request $request, $record) {
@@ -639,7 +639,7 @@ class IntegralVerify extends AdminController {
 
 
     /**
     /**
      * 初审-提交审核
      * 初审-提交审核
-     * @param type $talent_info
+     * @param type $record
      * @return type json
      * @return type json
      */
      */
     private function fstSubmitCheck($record) {
     private function fstSubmitCheck($record) {
@@ -676,7 +676,7 @@ class IntegralVerify extends AdminController {
     /**
     /**
      * 复审-提交未保存
      * 复审-提交未保存
      * @param \think\Request $request
      * @param \think\Request $request
-     * @param type $talent_info
+     * @param type $record
      * @param type json
      * @param type json
      */
      */
     private function reCheck(\think\Request $request, $record) {
     private function reCheck(\think\Request $request, $record) {
@@ -704,13 +704,13 @@ class IntegralVerify extends AdminController {
             TalentLogApi::write(ProjectState::INTEGRAL, $record["id"], [$log_checkState, $checkState], $params["checkMsg"]);
             TalentLogApi::write(ProjectState::INTEGRAL, $record["id"], [$log_checkState, $checkState], $params["checkMsg"]);
         }
         }
         $data["id"] = $record["id"];
         $data["id"] = $record["id"];
-        TalentModel::update($data);
+        IntegralRecord::update($data);
         return json(["code" => 200, "msg" => "保存成功"]);
         return json(["code" => 200, "msg" => "保存成功"]);
     }
     }
 
 
     /**
     /**
      * 复审-提交审核
      * 复审-提交审核
-     * @param type $talent_info
+     * @param type $record
      * @return type json
      * @return type json
      */
      */
     private function reSubmitCheck($record) {
     private function reSubmitCheck($record) {
@@ -744,7 +744,7 @@ class IntegralVerify extends AdminController {
         return json(["code" => 200, "msg" => "审核成功"]);
         return json(["code" => 200, "msg" => "审核成功"]);
     }
     }
 
 
-    private function sendMsgByState($talent_info, $state, $userIds = []) {
+    private function sendMsgByState($record, $state, $userIds = []) {
         $phones = [];
         $phones = [];
         $template = "";
         $template = "";
         $type = 0;
         $type = 0;
@@ -752,50 +752,35 @@ class IntegralVerify extends AdminController {
         $userId = 0;
         $userId = 0;
         $name = null;
         $name = null;
         switch ($state) {
         switch ($state) {
-            case TalentState::BASE_VERIFY_PASS://基础信息审核通过发送短信通知用户
-                $type = 2;
-                $processName = "基础信息审核";
-                $template = "【晋江市人才服务平台】尊敬的用户,您提交的人才基础信息审核通过,请及时登录申报系统并进行人才认定的信息申报填写。";
-                break;
-            case TalentState::BASE_REJECT://基础信息审核驳回发送短信通知用户
-                $type = 2;
-                $processName = "基础信息审核";
-                $template = "【晋江市人才服务平台】尊敬的用户,您提交的人才基础信息审核驳回,原因是:{$log['description']},请及时登录申报系统修改并重新提交。";
-                break;
-            case TalentState::BASE_VERIFY_FAIL://基础信息审核不通过发送短信通知用户
-                $type = 2;
-                $processName = "基础信息审核";
-                $template = "【晋江市人才服务平台】尊敬的用户,您提交的人才基础信息审核不通过,原因是:{$log['description']}。";
-                break;
-            case TalentState::FST_VERIFY_PASS://初审通过发送短信通知并审部门
+            case IntegralState::VERIFY_PASS://初审通过发送短信通知并审部门
                 $type = 1;
                 $type = 1;
                 $processName = "初级审核";
                 $processName = "初级审核";
-                $template = "【晋江市人才服务平台】您的部门有新的人才认定申报需要审批,请及时登录审批系统处理。";
+                $template = "【晋江市人才服务平台】您的部门有新的积分申报需要审批,请及时登录审批系统处理。";
                 break;
                 break;
-            case TalentState::FST_VERIFY_REJECT; //初审驳回发送短信通知用户
+            case IntegralState::VERIFY_REJECT; //初审驳回发送短信通知用户
                 $type = 2;
                 $type = 2;
                 $processName = "初级审核";
                 $processName = "初级审核";
-                $template = "【晋江市人才服务平台】尊敬的用户,您提交的人才认定申报审核驳回,原因是:{$log['description']},请及时登录申报系统修改并重新提交。";
+                $template = "【晋江市人才服务平台】尊敬的用户,您提交的积分申报审核驳回,原因是:{$log['description']},请及时登录申报系统修改并重新提交。";
                 break;
                 break;
-            case TalentState::FST_VERIFY_FAIL://初审不通过发送短信通知用户
+            case IntegralState::VERIFY_FAIL://初审不通过发送短信通知用户
                 $type = 2;
                 $type = 2;
                 $processName = "初级审核";
                 $processName = "初级审核";
-                $template = "【晋江市人才服务平台】尊敬的用户,您提交的人才认定申报审核不通过,原因是:{$log['description']}。";
+                $template = "【晋江市人才服务平台】尊敬的用户,您提交的积分申报审核不通过,原因是:{$log['description']}。";
                 break;
                 break;
-            case TalentState::DEPT_VERIFY_REJECT://并审驳回发送短信通知初审部门
+            case IntegralState::REVERIFY_PASS://复核通过发短信通知征信部门
                 $type = 1;
                 $type = 1;
-                $processName = "部门并审";
-                $template = "【晋江市人才服务平台】有人才认定申报在并审阶段被驳回,原因是:{$log['description']},请及时登录审批系统处理。";
+                $processName = "审";
+                $template = "【晋江市人才服务平台】有新的积分申报通过复审进入征信阶段,请及时登录审批系统处理。";
                 break;
                 break;
-            case TalentState::REVERIFY_PASS://复核通过发短信通知征信部门
+            case IntegralState::REVERIFY_REJECT://复核驳回发短信通知初审部门
                 $type = 1;
                 $type = 1;
                 $processName = "复审";
                 $processName = "复审";
-                $template = "【晋江市人才服务平台】有新的人才认定申报通过复审进入征信阶段,请及时登录审批系统处理。";
+                $template = "【晋江市人才服务平台】有积分申报在复审阶段被驳回,原因是:{$log['description']},请及时登录审批系统处理。";
                 break;
                 break;
-            case TalentState::REVERIFY_REJECT://复核驳回发短信通知初审部门
-                $type = 1;
+            case IntegralState::REVERIFY_FAIL://并审驳回发送短信通知初审部门
+                $type = 2;
                 $processName = "复审";
                 $processName = "复审";
-                $template = "【晋江市人才服务平台】有人才认定申报在复审阶段被驳回,原因是:{$log['description']},请及时登录审批系统处理。";
+                $template = "【晋江市人才服务平台】尊敬的用户,您提交的积分申报审核不通过,原因是:{$log['description']}。";
                 break;
                 break;
         }
         }
         if ($type == 1) {
         if ($type == 1) {
@@ -805,7 +790,7 @@ class IntegralVerify extends AdminController {
             $phones = array_unique(array_filter($phones));
             $phones = array_unique(array_filter($phones));
         }
         }
         if ($type == 2) {
         if ($type == 2) {
-            $ep = EnterpriseApi::getOne($talent_info['enterprise_id']);
+            $ep = EnterpriseApi::getOne($record['enterprise_id']);
             $phones[] = $ep->agentPhone;
             $phones[] = $ep->agentPhone;
             $userId = $ep->id;
             $userId = $ep->id;
             $name = $ep->name;
             $name = $ep->name;

+ 2 - 10
app/enterprise/controller/Integral.php

@@ -64,17 +64,9 @@ class Integral extends EnterpriseController {
     }
     }
 
 
     public function view(\think\Request $request) {
     public function view(\think\Request $request) {
-        switch ($this->user["type"]) {
-            case 1:
-                $tpl = "view"; //晋江人才
-                break;
-            case 2:
-                $tpl = "ic_view"; //集成电路
-                break;
-        }
         $id = $request->param("id");
         $id = $request->param("id");
-        $info = \app\common\api\VerifyApi::getTalentInfoById($id);
-        return view($tpl, ["row" => $info]);
+        $info = IntegralRecordApi::getOne($id);
+        return view("", ["row" => $info]);
     }
     }
 
 
     /**
     /**

+ 69 - 437
app/enterprise/view/integral/view.html

@@ -1,6 +1,6 @@
 {extend name="layout/content"}
 {extend name="layout/content"}
 {block name="content"}
 {block name="content"}
-<style type="text/css">
+<style type="text/css" xmlns="http://www.w3.org/1999/html">
     .panel-heading{
     .panel-heading{
         color:#333;
         color:#333;
         background-color:#f5f5f5;
         background-color:#f5f5f5;
@@ -11,7 +11,7 @@
         padding-right:4px;
         padding-right:4px;
         padding-left: 4px;
         padding-left: 4px;
     }
     }
-    .panel label {
+    #integralInfoForm label {
         font-size: xx-small;
         font-size: xx-small;
     }
     }
     .has-feedback .form-control {
     .has-feedback .form-control {
@@ -62,7 +62,9 @@
         text-align:center;
         text-align:center;
         border-left:1px solid #ddd;
         border-left:1px solid #ddd;
     }
     }
-    #annual_salary{padding-right:32px;}
+    .has-feedback label~.form-control-feedback{
+        top: 31px;
+    }
 </style>
 </style>
 <div class="ibox float-e-margins">
 <div class="ibox float-e-margins">
     <div class="ibox-content">
     <div class="ibox-content">
@@ -70,229 +72,68 @@
             <div class="row">
             <div class="row">
                 <div class="col-sm-12" >
                 <div class="col-sm-12" >
                     <div class="tab-content">
                     <div class="tab-content">
-
                         <div id="tab-1" class="tab-pane active">
                         <div id="tab-1" class="tab-pane active">
-                            <div class="panel-body" >
+                            <form id="integralInfoForm" action="/enterprise/integral/apply" 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="hidden" name="checkState" id="checkState" value="{$row.checkState}"/>
+                                <input type="hidden" name="realState" id="realState" value="{$row.real_state}"/>
+                                <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 panel-default">
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-heading" onclick="$(this).next().toggle()">基础信息</div>
                                     <div class="panel-body">
                                     <div class="panel-body">
-                                        <input type="hidden" name="id" id="id" value="{$row.id}">
-                                        <input type="hidden" name="type" id="type" value="1">
-                                        <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
-                                        <input type="hidden" name="enterprise_tag" id="enterprise_tag" value="{$row.enterpriseTag}">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                             <tr>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><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="name" value="{$row.name}"  readonly disabled/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>民族</label>
-                                                        <input class="form-control" value="{$row.nationName}" readonly disabled id="nation"/>
+                                                        <input type="text" class="form-control" id="name" name="name" value="{$row.name}"/>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
-                                                <td rowspan="5" style="width: 200%">
-                                                    <img id="photoImg" onclick="Feng.showImg(this)" src="{$row.headimgurl|getStoragePath}"  style="height:147px;width:105px;margin:0 auto;display:block;">
-                                                    <hr />
-                                                    附件:
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                            <tr>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>证件类型</label>
-                                                        <select class="form-control" value="{$row.card_type}" readonly disabled  id="card_type">
+                                                        <select class="form-control" id="card_type" name="card_type" value="{$row.card_type}">
                                                             <option value="">请选择</option>
                                                             <option value="">请选择</option>
-                                                            <option value="1" {eq name="row.card_type" value="1"} selected="" {/eq}>身份证</option>
-                                                            <option value="2" {eq name="row.card_type" value="2"} selected="" {/eq}>通行证</option>
-                                                            <option value="3" {eq name="row.card_type" value="3"} selected="" {/eq}>护照</option>
+                                                            <option value="1">身份证</option>
+                                                            <option value="2">通行证</option>
+                                                            <option value="3">护照</option>
                                                         </select>
                                                         </select>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</span></label>
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>证件号码</span></label>
-                                                        <input class="form-control" value="{$row.card_number}" readonly disabled  id="card_number">
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>性别</label>
-                                                        <input type="text" class="form-control" value="{eq name='info.sex' value='1'}男{else/}女{/eq}"  readonly disabled  id="sex"/>
+                                                        <input class="form-control" id="card_number" name="card_number" value="{$row.card_number}">
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>出生日期</label>
-                                                        <input type="text" class="form-control" value="{$row.birthday}" readonly disabled  id="birthday"/>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
+                                                        <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                             </tr>
                                             </tr>
                                             <tr>
                                             <tr>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>政治面貌</label>
-                                                        <input class="form-control" value="{$row.politicsName}" readonly disabled  id="politics"/>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
+                                                        <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>国籍/地区</label>
-                                                        <input class="form-control" value="{$row.nationalityName}" readonly disabled id="nationality">
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2">
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing"><span style="color: red">*</span>籍贯</label>
-                                                        <input class="form-control" value="{$row.provinceName}{$row.cityName}{$row.countyName}" readonly disabled id="province"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </div>
-                                </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才基础信息</div>
-                                    <div class="panel-body">
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup word-wrap">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                        <div class="form-control" style="border: none;height:auto;">{$row.enterpriseTagName}</div>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup word-wrap">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                        <div class="form-control" style="border: none">{$row.enterpriseName}</div>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup word-wrap">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                        <div class="form-control" style="border: none">{$row.streetName}</div>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup word-wrap">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                        <div class="form-control" style="border: none">{$row.industryFieldName}</div>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>人才类型</label>
-                                                        <select class="form-control" readonly disabled id="talent_type" data-value="{$row.talent_type}">
-                                                            <option value="" selected="true">{$row.talentTypeName}</option>
-                                                        </select>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label">人才类型说明</label>
-                                                        <div class="word-wrap" id="typeTips">                                                    
-                                                            {switch name="row.talent_type"}
-                                                            {case value="1"}含经晋江市认定且还在晋江市就业创业的人才,或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。{/case}
-                                                            {case value="2"}含本办法出台后首次从晋江市以外引进认定的人才,或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。{/case}
-                                                            {case value="3"}含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议(合同)的人才,或拟来我市创业且提交企业名称预先核准的人才。{/case}
-                                                            {/switch}
-                                                        </div>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" colspan="2">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                            {if condition="in_array($row['talent_type'],[1,2])"}
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup ">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 2"}首次{/if}在我市缴交社会保险或个人所得税月份</label>
-                                                        <input type="text" class="form-control" value="{$row.tax_insurance_month}"  readonly disabled id="tax_insurance_month"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>
-                                                        <input type="text" class="form-control" value="{$row.labor_contract_rangetime}"  readonly disabled id="labor_contract_rangetime"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup word-wrap">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
-                                                        <input type="radio" name="salary_pay_way" value="1" {eq name="row.salary_pay_way" value="1"}checked{/eq} readonly disabled/>本单位&nbsp;&nbsp;
-                                                               <input type="radio" name="salary_pay_way" value="2" {eq name="row.salary_pay_way" value="2"}checked{/eq} readonly disabled/>本单位所属集团公司及权属公司
+                                                        <div class="form-control" style="border: none">{$row.enterprise.name}</div>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放月份</label>
-                                                        <input type="text" class="form-control" value="{$row.salary_pay_month}"  readonly disabled id="salary_pay_month"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {if condition="in_array($row['enterprise']['enterpriseTag'],['mtdw','gyqyh','mbfqy','jrjg'])"}
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>{if condition="$row['talent_type'] eq 1"}近三年{else/}首次{/if}来晋工作时间</label>
-                                                        <input type="text" class="form-control date" id="fst_work_time" value="{$row.fst_work_time}"  readonly disabled/>
-                                                    </div>
-                                                </td>
-                                                {if condition="$row['talent_type'] eq 1"}
-                                                <td id="come_in_jin_str">
-                                                    <label class=" control-label spacing td-label">近三年来晋工作时间说明</label>
-                                                    <div class="word-wrap">
-                                                        如您为近三年来晋工作的人才,须填写近三年来晋日期,同时上传对应佐证材料,如果来晋时间已超过三年,则此项不必填写。
-                                                    </div>
-                                                </td>
-                                                {/if}
-                                            </tr>
-                                            {/if}
-                                            {/if}
-                                            {if condition="in_array($row['talent_type'],[3])"}
-                                            <tr class="talentType3">
-                                                <td >
-                                                    <div class="rowGroup">
-                                                        预引进类型
-                                                    </div>
-                                                </td>
-                                                <td >
-                                                    <div class="rowGroup">
-                                                        <input type="radio" name="pre_import_type" value="1" {eq name="row.pre_import_type" value="1"}checked{/eq} readonly disabled/><span style="color: red">*</span>意向合同&nbsp;&nbsp;&nbsp;&nbsp;
-                                                        <input type="radio" name="pre_import_type" value="2" {eq name="row.pre_import_type" value="2"}checked{/eq} readonly disabled/><span style="color: red">*</span>创业企业名称预核准
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}
-                                        </table>
-                                    </div>
-                                    <div class="panel-body">
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>工作简历</label>
-                                                        <textarea class="form-control" style="border: none" readonly disabled>{$row.experience}</textarea>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>教育背景</label>
-                                                        <textarea class="form-control" style="border: none" readonly disabled>{$row.education}</textarea>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                             </tr>
                                             </tr>
@@ -300,286 +141,75 @@
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                                 <div class="panel panel-default">
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">人才认定申请</div>
-                                    <div class="panel-body">
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>申报年度</label>
-                                                        <input type="text" class="form-control" name="apply_year" id="apply_year" value="{$row.apply_year}" readonly disabled>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>手机号码</label>
-                                                        <input type="text" class="form-control" id="phone" name="phone" maxlength="11" value="{$row.phone}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>电子邮箱</label>
-                                                        <input type="text" class="form-control" id="email" name="email"  value="{$row.email}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">申报项目</div>
+                                    <div class="panel-body" id="itemList">                                   
+                                        {volist name="row.items" id="item"}                                 
+                                        <table style="width:100%;border-collapse: collapse;" class="table table-bordered">
                                             <tr>
                                             <tr>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>最高学历</label>
-                                                        <select class="form-control" id="highest_degree">
-                                                            <option value="">{$row.highestDegreeName}</option>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>项目类别</label>
+                                                        <select class="form-control" name="projectType[]" value="{$item.item_id|getCacheById='IntegralItem',###,'projectId'|getCacheById='IntegralProject',###,'projectType'}" onchange="IntegralInfoDlg.onProjectTypeChange(this);">
+                                                            <option value="">请选择</option>
+                                                            <option value="1">基础分</option>
+                                                            <option value="2">贡献分</option>
+                                                            <option value="3">资历分</option>
                                                         </select>
                                                         </select>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>毕业院校</label>
-                                                        <input type="text" class="form-control" id="graduate_school" name="graduate_school" value="{$row.graduate_school}">
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>专业</label>
-                                                        <input type="text" class="form-control" id="major" name="major" value="{$row.major}"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <table style="width: 100%;border-collapse: collapse;border:1px solid #ddd;border-left:none;border-right:none;" class="table table-bordered">                                    
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label">是否有留学经历</label>
-                                                        <select class="form-control" id="study_abroad" >
-                                                            <option value="">{eq name="study_abroad" value="2"}否{else/}是{/eq}</option>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>积分项目</label>
+                                                        <select class="form-control" name="projectId[]" value="{$item.item_id|getCacheById='IntegralItem',###,'projectId'}" onchange="IntegralInfoDlg.onProjectChange(this);">
+                                                            <option value="">请选择</option>
                                                         </select>
                                                         </select>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
-                                                <td>
-                                                    <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
-                                                        <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$row.abroad_school}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup abroad_need_this" {if condition='!$row["study_abroad"] or $row["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
-                                                        <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$row.abroad_major}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>引进方式</label>
-                                                        <select class="form-control" id="import_way" name="import_way" data-placeholder="引进方式">
-                                                            <option value="">{$row.importWayName}</option>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>积分标准</label>
+                                                        <select class="form-control" name="item_id[]" value="{$item.item_id}" onchange="IntegralInfoDlg.onItemChange(this);">
+                                                            <option value="">请选择</option>
                                                         </select>
                                                         </select>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
                                                 <td>
                                                 <td>
                                                     <div class="rowGroup">
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位入职时间</label>
-                                                        <input type="text" class="form-control date" id="cur_entry_time" name="cur_entry_time" value="{$row.cur_entry_time}"/>
+                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>数额<span class="unit"></span></label>
+                                                        <input type="text" class="form-control" name="amount[]" value="{$item.amount}"/>
                                                     </div>
                                                     </div>
                                                 </td>
                                                 </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing td-label"><span style="color: red">*</span>本单位现任职务</label>
-                                                        <input type="text" class="form-control" id="position" name="position" value="{$row.position}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 300%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing">职称技术资格</label>
-                                                        <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 100%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing">专业技术职称</label>
-                                                        <input type="text" class="form-control" id="professional" name="professional" value="{$row.professional}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="3" style="width: 100%">
-                                                    <table class="fileTable"></table>
-                                                </td>
                                             </tr>
                                             </tr>
-                                        </table>
-
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>申报来源</label>
-                                                        <div class="form-control" style="border: none;background:#eee;">{$row.sourceName}</div>
-                                                        <input type="hidden" id="source" value="{$row.source}">
-                                                    </div>
-                                                </td>
-                                                <td rowspan="7" style="width: 100%">
+                                            <!--<tr>
+                                                <td colspan="5">
                                                     <table class="fileTable"></table>
                                                     <table class="fileTable"></table>
                                                 </td>
                                                 </td>
-                                            </tr> 
-                                            {if condition="$row['source_batch']"}
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>入选名单的文件号及批次</label>
-                                                        <input type="text" class="form-control" id="source_batch" name="source_batch" value="{$row.source_batch}"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}
-                                            {if condition="$row['source_city'] || $row['source_county']"}
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup col-sm-6" {if condition="!$row['source_city']"}style="display:none;"{/if}>
-                                                         <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
-                                                        <select class="form-control" id="source_city" name="source_city">
-                                                            <option value="">{$row.sourceCityName}</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-6" {if condition="!$row['source_county']"}style="display:none;"{/if}>
-                                                         <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
-                                                        <select class="form-control" id="source_county" name="source_county">
-                                                            <option value="">{$row.sourceCountyName}</option>
-                                                        </select>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}
-                                            {if condition="in_array($row['source'],[1,3])"}
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup col-sm-6 fujian_highcert">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书发证日期</label>
-                                                        <input type="text" class="form-control date" id="fujian_highcert_pubtime" name="fujian_highcert_pubtime" value="{$row.fujian_highcert_pubtime}"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-6 fujian_highcert">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>福建省高层次人才证书有效期</label>
-                                                        <input type="text" class="form-control date" id="fujian_highcert_exptime" name="fujian_highcert_exptime" value="{$row.fujian_highcert_exptime}"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}
-                                            {if condition="in_array($row['source'],[2,4])"}
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup col-sm-6 quanzhou_highcert">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书发证日期</label>
-                                                        <input type="text" class="form-control date" id="quanzhou_highcert_pubtime" name="quanzhou_highcert_pubtime" value="{$row.quanzhou_highcert_pubtime}"/>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-6 quanzhou_highcert">
-                                                        <label class=" control-label spacing" ><span style="color: red">*</span>泉州高层次人才证书有效期</label>
-                                                        <input type="text" class="form-control date" id="quanzhou_highcert_exptime" name="quanzhou_highcert_exptime" value="{$row.quanzhou_highcert_exptime}"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            {/if}
-                                            <tr>
-                                                <td colspan="3">
-                                                    <div class="rowGroup col-sm-6">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>人才层次</label>
-                                                        <select class="form-control" id="talent_arrange" name="talent_arrange">
-                                                            <option value="">{$row.talentArrangeName}</option>
-                                                        </select>
-                                                    </div>
-                                                    <div class="rowGroup col-sm-6">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>人才条款</label>
-                                                        <select class="form-control" id="talent_arrange_category" name="talent_arrange_category">
-                                                            <option value="">{$row.talentArrangeCatName}</option>
-                                                        </select>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2">
-                                                    <div class="rowGroup col-sm-9">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>认定条件</label>
-                                                        <input type='hidden' name='talent_condition' id='talent_condition' value='{$row.talent_condition}'>
-                                                        <div class='form-control' style='border: none;background:#eee;'>{$row.talentConditionName}</div>
-                                                    </div>
-                                                </td>
-                                                <td {if condition='!$row["annual_salary"]'}style="display:none;"{/if}>
-                                                    <div class="rowGroup col-sm-12">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
-                                                        <div style="position:relative;">
-                                                            <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$row.annual_salary}"/>
-                                                            <i class="control-symbol">元</i>
-                                                        </div>
-                                                    </div>
-                                                </td>
-                                            </tr>
+                                            </tr>-->
                                         </table>
                                         </table>
+                                        {/volist}
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                                 <div class="panel panel-default">
                                 <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">个人开户银行信息</div>
-                                    <div class="panel-body">
-                                        <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行</label>
-                                                        <input type="text" class="form-control" onchange="TalentInfoInfoDlg.bankChange()" id="bank" name="bank" placeholder="XX银行" value="{$row.bank}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>银行行号</label>
-                                                        <input type="text" class="form-control" id="bank_number" name="bank_number" value="{$row.bank_number}"/>
-                                                    </div>
-                                                </td>
-                                                <td rowspan="2" style="width: 200%">
-                                                    <table class="fileTable"></table>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>开户银行网点</label>
-                                                        <input type="text" class="form-control" id="bank_branch_name" name="bank_branch_name" placeholder="XX银行XX省XX市XX支行/分行/分理处" value="{$row.bank_branch_name}"/>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <div class="rowGroup">
-                                                        <label class="control-label spacing"><span style="color: red">*</span>个人银行账号</label>
-                                                        <input type="text" class="form-control" id="bank_account" name="bank_account"  value="{$row.bank_account}"/>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        </table>
+                                    <div class="panel-heading" onclick="$(this).next().toggle()">附件</div>
+                                    <div class="panel-body" id="itemList">
+                                        <table class="fileTable"></table>
                                     </div>
                                     </div>
                                 </div>
                                 </div>
-                                <div class="panel panel-default">
-                                    <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
-                                    <table id="logTable">
-                                    </table>
-                                </div>
-                            </div>
+                            </form>
+                            <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                <input type='hidden' id="fileId" name="fileId" />
+                                <input type='file' id="upload_file" name="fileUrl" style='display: none'/>
+                                <input type='hidden' id="mainId" name="mainId" />
+                                <input type='hidden' id="fileTypeId" name="fileTypeId" />
+                                <input type='hidden' id="index" name="index" />
+                                <input type='hidden' id="tableIndex" name="tableIndex" />
+                                <input type='hidden' id="trIndex" name="trIndex" />
+                                <input type="hidden" name="backName" value="IntegralInfoDlg.callBack"/>
+                                <input type="type" name="type" value="20"/>
+                            </form>
+                            <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                            <table id="logTable">
+                            </table>
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
@@ -587,6 +217,8 @@
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+<iframe id="hiddenIframe" name="hiddenIframe" style="display: none;"></iframe>
+<!--<script src="${ctxPath}/static/modular/gate/talentInfo/talentInfo_info.js"></script>-->
 <script type="text/javascript">
 <script type="text/javascript">
     document.write('<script src="/static/modular/gate/integral/integralInfo_select.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/gate/integral/integralInfo_select.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');
     document.write('<script src="/static/modular/common/config.js?v=' + (new Date()).getTime() + '"><\/script>');

+ 12 - 49
public/static/modular/gate/integral/integral.js

@@ -47,72 +47,35 @@ Integral.initColumn = function () {
                 if (row.real_state != row.checkState) {
                 if (row.real_state != row.checkState) {
                     switch (row.real_state) {
                     switch (row.real_state) {
                         case 4:
                         case 4:
-                            return "<span class='label label-danger'>基础信息审核驳回</span>";
-                            break;
-                        case 6:
-                            return "<span class='label label-danger'>基础信息复审驳回</span>";
-                            break;
-                        case 11:
                             return "<span class='label label-danger'>初审驳回</span>";
                             return "<span class='label label-danger'>初审驳回</span>";
                             break;
                             break;
-                        case 13:
-                            return "<span class='label label-danger'>部门驳回</span>";
-                            break;
-                        case 15:
-                            return "<span class='label label-danger'>复审驳回</span>";
+                        case 7:
+                            //复审驳回
+                            return "<span class='label label-success'>待重新初审</span>";
                             break;
                             break;
-
                     }
                     }
                 } else {
                 } else {
                     switch (value) {
                     switch (value) {
-                        case - 2:
-                            return "<span class='label label-danger'>初审失败</span>";
-                            break;
-                        case - 1:
-                            return "<span class='label label-danger'>基础信息审核失败</span>";
-                            break;
-                        case 7:
-                            return "<span class='label label-danger'>基础信息复审失败</span>";
-                            break;
                         case 1:
                         case 1:
                             return "<span class='label'>保存未提交</span>";
                             return "<span class='label'>保存未提交</span>";
                             break;
                             break;
                         case 2:
                         case 2:
                             if (row.last_state == 4) {
                             if (row.last_state == 4) {
-                                return "<span class='label label-success'>待审核(重新提交)</span>";
-                            }
-                            return "<span class='label label-success'>待审核</span>";
-                            break;
-                        case 3:
-                            return "<span class='label label-success'>待基础条件复审</span>";
-                            break;
-                        case 5:
-                            return "<span class='label'>待详细填报</span>";
-                            break;
-                        case 8:
-                            return "<span class='label'>保存未提交</span>";
-                            break;
-                        case 9:
-                            if (row.last_state == 11) {
                                 return "<span class='label label-success'>待初审(重新提交)</span>";
                                 return "<span class='label label-success'>待初审(重新提交)</span>";
                             }
                             }
                             return "<span class='label label-success'>待初审</span>";
                             return "<span class='label label-success'>待初审</span>";
                             break;
                             break;
-                        case 10:
-                            if (row.companyIds) {
-                                return "<span class='label label-success'>待部门审核</span>";
-                            } else {
-                                return "<span class='label label-success'>待复审</span>";
-                            }
-                            break;
-                        case 12:
+                        case 3:
                             return "<span class='label label-success'>待复审</span>";
                             return "<span class='label label-success'>待复审</span>";
                             break;
                             break;
-                        case 14:
-                            return "<span class='label label-primary'>复审通过待核查征信</span>";
+                        case 5:
+                            return "<span class='label label-danger'>初审不通过</span>";
+                            break;
+                        case 6:
+                            return "<span class='label label-success'>复审通过待核查征信</span>";
                             break;
                             break;
-                        case 16:
-                            return "<span class='label label-danger'>复审失败</span>";
+                        case 8:
+                            return "<span class='label label-danger'>复审不通过</span>";
                             break;
                             break;
                         case 21:
                         case 21:
                             return "<span class='label label-success'>征信通过</span>";
                             return "<span class='label label-success'>征信通过</span>";
@@ -299,7 +262,7 @@ Integral.viewInfo = function () {
     if (this.check()) {
     if (this.check()) {
         var index = layer.open({
         var index = layer.open({
             type: 2,
             type: 2,
-            title: '人才认定申报详情',
+            title: '积分申报详情',
             area: ['800px', '420px'], //宽高
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             fix: false, //不固定
             maxmin: true,
             maxmin: true,

+ 9 - 1
public/static/modular/gate/integral/integralInfo.js

@@ -562,6 +562,7 @@ IntegralInfoDlg.downloadFile = function (id, type) {
 IntegralInfoDlg.setNoChangeField = function () {
 IntegralInfoDlg.setNoChangeField = function () {
     var checkState = $("#checkState").val();
     var checkState = $("#checkState").val();
     var fields = $("#fields").val();
     var fields = $("#fields").val();
+    var allowedModifyItem = $("#files").val() == "1" ? true : false;
     var realState = $("#realState").val();
     var realState = $("#realState").val();
     if (realState == 4 || checkState == 2) {
     if (realState == 4 || checkState == 2) {
         $("input,textarea").each(function () {
         $("input,textarea").each(function () {
@@ -587,9 +588,17 @@ IntegralInfoDlg.setNoChangeField = function () {
                 }
                 }
             }
             }
         }
         }
+
+        if (!allowedModifyItem) {
+            $("#toolbar").css("display", "none");
+        } else {
+            $("#itemList :input").removeAttr("readonly");
+            $("#itemList :input").removeAttr("disabled");
+        }
     }
     }
 }
 }
 $(function () {
 $(function () {
+    IntegralInfoDlg.setNoChangeField();
     $('#integralInfoForm').bootstrapValidator({
     $('#integralInfoForm').bootstrapValidator({
         feedbackIcons: {
         feedbackIcons: {
             valid: 'glyphicon glyphicon-ok',
             valid: 'glyphicon glyphicon-ok',
@@ -624,7 +633,6 @@ $(function () {
     }
     }
     $("#card_type").val($("#card_type").attr("value"));
     $("#card_type").val($("#card_type").attr("value"));
     IntegralInfoDlg.validId();
     IntegralInfoDlg.validId();
-    IntegralInfoDlg.setNoChangeField();
     //IntegralInfoDlg.changeAndLoadFile();
     //IntegralInfoDlg.changeAndLoadFile();
 });
 });
 
 

+ 209 - 119
public/static/modular/gate/integral/integralInfo_select.js

@@ -1,24 +1,35 @@
 /**
 /**
  * 初始化人才认定申报详情对话框
  * 初始化人才认定申报详情对话框
  */
  */
-var TalentInfoInfoDlg = {
-    talentInfoInfoData: {},
+var locked = false;
+var IntegralInfoDlg = {
+    integralInfoData: {}
 };
 };
 
 
+/**
+ * 关闭此对话框
+ */
+IntegralInfoDlg.close = function () {
+    parent.layer.close(window.parent.TalentInfo.layerIndex);
+}
+
 /**
 /**
  * 初始化表格的列
  * 初始化表格的列
  */
  */
-TalentInfoInfoDlg.initFileTypeColumn = function () {
+IntegralInfoDlg.initFileTypeColumn = function () {
     return [
     return [
         {field: 'selectItem', checkbox: false, visible: false},
         {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) {
             formatter: function (value, row, index) {
+                let str = '<div class="word-wrap">';
                 if (row.must == 1) {
                 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) {
                 if (row.must == 2) {
-                    return '<i class="fa fa-paste"></i>' + value;
+                    str = str + '<i class="fa fa-paste"></i>' + value;
                 }
                 }
+                str = str + '<br /><span id="desc_' + row.rel + '">' + row.description + '</span></div>'
+                return str;
             }
             }
         },
         },
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
@@ -26,160 +37,239 @@ TalentInfoInfoDlg.initFileTypeColumn = function () {
                 if (value == null || value == '' || value == 'null') {
                 if (value == null || value == '' || value == 'null') {
                     return '无';
                     return '无';
                 }
                 }
-                return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
+                return "<button type='button' onclick=\"IntegralInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
                         "<i class=\"fa fa-download\"></i>下载" +
                         "<i class=\"fa fa-download\"></i>下载" +
                         "</button>";
                         "</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%",
         {title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle', width: "10%",
             formatter: function (value, row, index) {
             formatter: function (value, row, index) {
-                return "";
+                return IntegralInfoDlg.validUploadButton(1, value, '');
             }
             }
         }
         }
     ]
     ]
 };
 };
-
-TalentInfoInfoDlg.initFileTable = function () {
+IntegralInfoDlg.changeAndLoadFile = function () {
+    var table = $(".fileTable");
+    var items = $("select[name='item_id[]']");
+    var item_id = [];
+    for (var i = 0; i < items.length; i++) {
+        let _id = items.eq(i).val();
+        if (_id) {
+            item_id.push(_id);
+        }
+    }
+    if (item_id.length == 0) {
+        table.bootstrapTable("destroy");
+        return;
+    }
     var ajax = new $ax("/common/api/findCommonFileType", function (data) {
     var ajax = new $ax("/common/api/findCommonFileType", function (data) {
         if (data == null || data.length == 0) {
         if (data == null || data.length == 0) {
             return;
             return;
         }
         }
-        var datas = new Array();
-        for (var i = 0; i < $(".fileTable").length; i++) {
-            datas.push([]);//创建空的多维数组,等下用来存每个附件表的各自的列
-        }
-        var enterpriseTag = $("#enterprise_tag").val();
-        for (var k in data["rows"]) {
-            if (data["rows"][k].enterprise_tag != "" && data["rows"][k].enterprise_tag != null && data["rows"][k].enterprise_tag.indexOf(enterpriseTag) == -1) {
-                continue;
-            }
-            var rel = data["rows"][k].rel;
-            if ($("#" + rel).length > 0) {
-                var tableIndex = 0;
-                if ($("#" + rel).parents(".table").length > 0) {
-                    tableIndex = $("#" + rel).parents(".table").find("table.fileTable").index(".fileTable");
-                } else {
-                    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]);
-                if (data["rows"][k].option) {
-                    //指定了选项
-                    if (rel == "birthday") {
-                        let birthday = parseInt($("#" + rel).val().substring(0, 4));
-                        let currentYear = parseInt(new Date().getFullYear());
-                        let age = currentYear - (isNaN(birthday) ? 0 : birthday);
-                        if (isNaN(birthday) || (!isNaN(birthday) && age < data["rows"][k].option))
-                            data["rows"][k].hidden = true;
-                    } else {
-                        let selectVal = $("#" + rel).data("value").toString();
-                        let options = data["rows"][k].option.split(",");
-                        if (options.indexOf(selectVal) == -1) {
-                            data["rows"][k].hidden = true;
+        table.bootstrapTable("destroy");
+        table.bootstrapTable({
+            columns: IntegralInfoDlg.initFileTypeColumn(),
+            data: data.rows,
+            showHeader: true,
+            rowStyle: function (row, index) {
+                return {classes: ""};
+            },
+            onPostBody: function (data) {
+                for (var k in data) {
+                    var files = data[k].files;
+                    var html = '<ul class="imgs"><li style="width: 70%;font-weight: bold;padding-top: 5px;">附件原名</li><li style="width: 10%;font-weight: bold;padding-top: 5px;">预览</li><li style="width: 20%;font-weight: bold;padding-top: 5px;">操作</li>';
+                    for (var key in files) {
+                        var btn = "";
+                        btn = IntegralInfoDlg.validUploadButton(2, data[k].id, files[key].id);
+                        var sn = files[key].url.lastIndexOf(".");
+                        var suffix = files[key].ext; //files[key].url.substring(sn + 1, files[key].url.length);
+                        var imgStr = "";
+                        if (suffix == "pdf" || suffix == "PDF") {
+                            imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
+                        } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS' || suffix == 'docx' || suffix == 'doc' || suffix == 'DOCX' || suffix == 'DOC') {
+                            imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
+                        } else {
+                            imgStr = '<img class=\"imgUrl\" onclick=\"Feng.showImg(this)\" src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
                         }
                         }
-                    }
-                }
-            } else {
-                if (data["rows"][k].isConditionFile) {
-                    var tableIndex = 0;
-                    if ($("#talent_condition").parents(".table").length > 0) {
-                        tableIndex = $("#talent_condition").parents(".table").find("table.fileTable").index(".fileTable");
-                    } else {
-                        tableIndex = $("#talent_condition").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]);//放入人才条件后面的附件表
-                } else {
-                    var tableIndex = $(".fileTable").length - 1;
-                    data["rows"][k].tableIndex = tableIndex;
-                    data["rows"][k].trIndex = datas[tableIndex].length;
-                    datas[$(".fileTable").length - 1].push(data["rows"][k]);//没有归属,放入最后一个附件表
-                }
-            }
-        }
-        for (var i = 0; i < $(".fileTable").length; i++) {
-            var that = $(".fileTable").eq(i);
-            that.bootstrapTable({
-                columns: TalentInfoInfoDlg.initFileTypeColumn(),
-                data: datas[i],
-                showHeader: false,
-                rowStyle: function (row, index) {
-                    return {classes: ""};
-                },
-                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>';
-                        for (var key in files) {
-                            var sn = files[key].url.lastIndexOf(".");
-                            var suffix = files[key].ext;//files[key].url.substring(sn + 1, files[key].url.length);
-                            var imgStr = "";
-                            if (suffix == "pdf" || suffix == "PDF") {
-                                imgStr = "<button type='button'  onclick=\"Feng.showPdf('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-pdf-o\" aria-hidden=\"true\"></i></button>";
-                            } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
-                                imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
-                            } else {
-                                imgStr = '<img class=\"imgUrl\" onclick="Feng.showImg(this)" src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
-                            }
 
 
-                            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\
+                        html += '<li data-id="' + files[key].id + '">\n\
+                                    <div>' + (data[k].step != 1 ? '<input type="hidden" name="uploadFiles[]" value="' + files[key].id + '">' : "") + '</div>\n' +
+                                '<div style="width: 70%;">' + files[key].orignName + '</div>\n' +
+                                '<div style="width: 10%;">' + imgStr + '</div>\n' +
+                                '<div style="width: 20%;">' + btn + '</div>\n\
                                     </li>';
                                     </li>';
-                        }
-                        html = html + '</ul>';
-                        that.find("tr[data-index='" + k + "']").attr("data-rel", data[k]["rel"]);
-                        that.find("tr[data-index='" + k + "']").attr("data-option", data[k]["option"]);
-                        that.find("tr[data-index='" + k + "']").after('<tr class="detail-view"><td colspan="5">' + html + '</td></tr>');
-                        if (typeof data[k].hidden != "undefined") {
-                            that.find("tr[data-index='" + k + "']").css("display", "none");
-                            that.find("tr[data-index='" + k + "']").next("tr.detail-view").css("display", "none");
-                        }
                     }
                     }
-                    $("td.uitd_showTip").bind("mouseover", function () {
-                        var htm = $(this).html();
-                        $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
-                    });
-                },
-            });
-        }
+                    html = html + '</ul>';
+                    table.find("tr[data-index='" + k + "']").after('<tr class="detail-view"><td colspan="5">' + html + '</td></tr>');
+                }
+                $("td.uitd_showTip").bind("mouseover", function () {
+                    var htm = $(this).html();
+                    $(this).webuiPopover({title: '详情', content: htm, trigger: 'hover'}).webuiPopover('show');
+                });
+            },
+        });
     }, function (data) {
     }, function (data) {
         Feng.error("查询失败!" + data.responseJSON.message + "!");
         Feng.error("查询失败!" + data.responseJSON.message + "!");
     });
     });
     var queryData = {};
     var queryData = {};
     queryData["mainId"] = $("#id").val();
     queryData["mainId"] = $("#id").val();
-    queryData['project'] = CONFIG.project_rcrd;
+    queryData['project'] = CONFIG.project_integral_apply;
     queryData['type'] = $("#type").val();
     queryData['type'] = $("#type").val();
-    queryData["source"] = $("#source").val();
-    queryData["talent_condition"] = $("#talent_condition").val();
+    queryData["itemId"] = item_id;
     queryData['checkState'] = $("#checkState").val();
     queryData['checkState'] = $("#checkState").val();
     ajax.set(queryData);
     ajax.set(queryData);
     ajax.start();
     ajax.start();
 }
 }
 
 
-TalentInfoInfoDlg.downloadFile = function (id, type) {
-    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type=" + type;
+IntegralInfoDlg.onProjectTypeChange = function (obj) {
+    var projectType = $(obj).val();
+    var projectObj = $(obj).parents("table").find("select[name='projectId[]']")
+    Feng.addAjaxSelect({
+        "obj": projectObj,
+        "displayCode": "id",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/common/api/getIntegralProjectsByType/projectType/" + projectType
+    });
+}
+IntegralInfoDlg.onProjectChange = function (obj) {
+    var projectId = $(obj).val();
+    var itemObj = $(obj).parents("table").find("select[name='item_id[]']")
+    Feng.addAjaxSelect({
+        "obj": itemObj,
+        "displayCode": "id",
+        "displayName": "name",
+        "bindData": "unit",
+        "type": "GET",
+        "url": "/common/api/getIntegralItemsByProject/projectId/" + projectId
+    });
+}
+IntegralInfoDlg.onItemChange = function (obj) {
+    var unit = $(obj).find("option:selected").data("unit");
+    var parent = $(obj).parents("table");
+    if (typeof unit != "undefined" && unit) {
+        parent.find(".unit").html("(" + unit + ")");
+    } else {
+        parent.find(".unit").html("");
+    }
+    IntegralInfoDlg.changeAndLoadFile();
+}
+
+var currentTable = null;
+var currentTr = null;
+//选择附件并显示附件名
+IntegralInfoDlg.checkFile = function (content, fileTypeId, fileId) {
+    currentTable = $(content).parents(".fileTable");
+    currentTr = $(content).parents("tr").data("index");
+    if (!IntegralInfoDlg.validateIsEdit())
+        return;
+    $("#upload_file").unbind("change");
+    $("#upload_file").change(function () {
+        if (!Feng.chkFileInvalid(this.files[0], 5, 10))
+            return;
+        IntegralInfoDlg.upload(fileTypeId, fileId);
+    });
+    $('#upload_file').val("");
+    $('#upload_file').click();
+}
+//上传附件
+IntegralInfoDlg.upload = function (fileTypeId, fileId) {
+    var id = $("#id").val();
+    if (!IntegralInfoDlg.validateIsEdit())
+        return;
+    if (fileId != null && fileId != 'null') {
+        $("#fileId").val(fileId)
+    } else {
+        $("#fileId").val("");
+    }
+    $("#mainId").val(id);
+    $("#fileTypeId").val(fileTypeId);
+    var index = layer.load(0, {shade: false, time: 0});
+    $("#index").val(index);
+    $("#uploadForm").submit();
+}
+//删除附件
+IntegralInfoDlg.deleteFile = function (id, state) {
+    if (!IntegralInfoDlg.validateIsEdit())
+        return;
+    var operation = function () {
+        var ajax = new $ax(Feng.ctxPath + "/common/api/deleteFile", function (data) {
+            if (data.code = 200) {
+                Feng.success(data.msg);
+                $("input[name='uploadFiles[]'][value='" + id + "']").parents("li").remove();
+                //$("#fileTable").bootstrapTable("refresh", {});
+            } else {
+                Feng.error(data.msg);
+            }
+        }, function (data) {
+            Feng.error("删除失败!" + data.responseJSON.message + "!");
+        });
+        ajax.set("id", id);
+        ajax.set("type", 1);
+        ajax.start();
+    }
+    Feng.confirm("删除后无法恢复,确认删除吗?", operation);
 }
 }
 
 
 
 
+/**
+ * 校验是否显示按钮
+ * @param type      类型  1-上传按钮,2-修改删除按钮
+ * @param row
+ * @returns {string}
+ */
+IntegralInfoDlg.validUploadButton = function (type, fileTypeId, fileId) {
+    var files = $("#files").val();
+    files = files.split(",");
+    var checkState = $("#checkState").val();
+    var realState = $("#realState").val();
+    //console.log(checkState, realState);
+    if (Feng.isEmptyStr(checkState) || checkState == 0 || (checkState == 1 && realState == 1) || (checkState == 11 && realState != 14) || (realState == 11 && files.indexOf(fileTypeId.toString()) != -1)) {
+        if (type == 1) {          //上传
+            return "<button type='button' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + null + ")\" style='margin-right: 10px' class=\"btn btn-xs btn-info\">" +
+                    "<i class=\"fa fa-upload\"></i>上传" +
+                    "</button>";
+        } else {
+            return "<button type=\'button\' onclick=\"IntegralInfoDlg.checkFile(this," + fileTypeId + "," + fileId + ")\" style=\'margin-right: 10px\' class=\"btn btn-xs btn-info\">" +
+                    "<i class=\"fa fa-paste\"></i>修改" +
+                    "</button>" +
+                    "<button type='button' onclick=\"IntegralInfoDlg.deleteFile(" + fileId + ")\" class=\"btn btn-xs btn-danger\">" +
+                    "<i class=\"fa fa-times\"></i>删除" +
+                    "</button>";
+        }
+    } else {
+        return "";
+    }
+}
+
+IntegralInfoDlg.downloadFile = function (id, type) {
+    window.location.href = Feng.ctxPath + "/api/common/downloadFile?id=" + id + "&type=" + type;
+}
+
+//设置不可修改的字段
+IntegralInfoDlg.setNoChangeField = function () {
+    console.log(123)
+    $("input,textarea").each(function () {
+        $(this).attr("readonly", "readonly");
+    });
+    $("select,input[type=radio]").each(function () {
+        $(this).attr("disabled", "disabled");
+    });
+}
 $(function () {
 $(function () {
-    $(":input").prop("disabled", true);
-    $("#talent_type option").eq(0).prop("selected", true);
     var id = $("#id").val();
     var id = $("#id").val();
     var checkState = $("#checkState").val();
     var checkState = $("#checkState").val();
-    TalentInfoInfoDlg.initFileTable();
     if (id != null && id != '') {
     if (id != null && id != '') {
         //select初始化
         //select初始化
         $("select").each(function () {
         $("select").each(function () {
             $(this).val($(this).attr("value")).trigger("change");
             $(this).val($(this).attr("value")).trigger("change");
         });
         });
-        Feng.getCheckLog("logTable", {"type": CONFIG.project_rcrd, "mainId": id, "typeFileId": "", "active": 1})
+        Feng.getCheckLog("logTable", {"type": CONFIG.project_integral_apply, "mainId": id, "typeFileId": "", "active": 1})
     }
     }
+    $("#card_type").val($("#card_type").attr("value"));
+    IntegralInfoDlg.setNoChangeField();
+    //IntegralInfoDlg.changeAndLoadFile();
 });
 });