部门导出增加显示各部门审核意见

和审核列表增加申报年度
增加判断企业需要填写姓名和身份证才能保存申报

app/admin/controller/Talent.php

@@ -1773,6 +1773,7 @@ class Talent extends AdminController {
         $names["checkMsg"] = "审核意见";
         $names["first_dept_check_time"] = "进入并审时间";
         $names["verifyDepts"] = "审核部门";
+        $names["deptDescription"] = "审核部门意见";
         $names["deptPass"] = "部门通过";
         $names["deptReject"] = "部门驳回";
         $names["deptWait"] = "部门待审";
@@ -1780,10 +1781,14 @@ class Talent extends AdminController {
         if ($process == 4 && in_array($company["code"], ["super", "rsj"])) {
             $fields[] = "first_dept_check_time";
             $fields[] = "verifyDepts";
+            $fields[] = "deptDescription";
             $fields[] = "deptPass";
             $fields[] = "deptReject";
             $fields[] = "deptWait";
-            $verifyDeptsColumn = getExcelColumnByIndex(count($fields) - 4);
+            $verifyDescriptionColumn = getExcelColumnByIndex(count($fields) - 4);
+            $setting["font"][] = [sprintf("%s%d:%s%d", $verifyDescriptionColumn, 2, $verifyDescriptionColumn, count($list) + 1), 8, "宋体"];
+            $setting["width"][] = [$verifyDescriptionColumn, 45];
+            $verifyDeptsColumn = getExcelColumnByIndex(count($fields) - 5);
             $setting["font"][] = [sprintf("%s%d:%s%d", $verifyDeptsColumn, 2, $verifyDeptsColumn, count($list) + 1), 8, "宋体"];
             $setting["width"][] = [$verifyDeptsColumn, 30];
         }

app/admin/view/talent/talentInfo_common_check.html

@@ -2,7 +2,8 @@
 {block name="content"}
 <style type="text/css">
     td{white-space: normal;word-break: normal;}
-    .form-control{height:auto;background:#eee;min-height:32px;}
+    .form-control{height:auto;}
+    .ibox-content .form-control{background:#eee;min-height:32px;}
     .panel-heading{
         color:#333;
         background-color:#f5f5f5;

app/common/api/VerifyApi.php

@@ -903,6 +903,7 @@ class VerifyApi {
                 $item["deptReject"] = 0;
                 $item["deptPass"] = 0;
                 $item["deptWait"] = 0;
+                $deptDescriptions = [];
                 foreach ($companys as $k => $companyId) {
                     $company = getCacheById("Company", $companyId);
                     $log = TalentLogApi::getCompanyNewestCheckedLog($item["id"], $companyId);
@@ -917,12 +918,14 @@ class VerifyApi {
                             $verifyDepts[$k] .= "（审核通过）";
                             $item["deptPass"]++;
                         }
+                        $deptDescriptions[] = sprintf("%s：%s", $company["name"], $log["description"]);
                     } else {
                         $verifyDepts[$k] .= "（待审核）";
                         $item["deptWait"]++;
                     }
                 }
                 $item["verifyDepts"] = implode(chr(10), $verifyDepts);
+                $item["deptDescription"] = implode(chr(10), $deptDescriptions);
             }
         }unset($item);
         return $list;

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

@@ -425,6 +425,12 @@ TalentInfoInfoDlg.addSubmit = function () {
      return;
      }*/
     var id = $('#id').val();
+    var name = $("#name").val().trim();
+    var cardNumber = $("#card_number").val().trim();
+    if (name == "" || cardNumber == "") {
+        layer.alert("姓名和身份证不能为空");
+        return;
+    }
     if (id != null && id != '') {
         if (!TalentInfoInfoDlg.validateIsEdit())
             return;

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

@@ -26,6 +26,7 @@ TalentInfo.initColumn = function () {
     }
     return [
         {field: 'selectItem', checkbox: true},
+        {title: '申报年度', field: 'apply_year', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '企业名称', field: 'enterprise_name', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px",
             formatter: function (value, row, index) {
@@ -37,7 +38,6 @@ TalentInfo.initColumn = function () {
                 }
             }
         },
-        // {title: '人才申报类型', field: 'talent_type', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '单位标签', field: 'enterprise_tag', visible: isShow, align: 'center', valign: 'middle', width: "120px", 'class': 'uitd_showTip'},
         {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "120px"},
         {title: '认定层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "80px"},