filetype中rel字段编辑

app/admin/view/filetype/add.html

@@ -111,6 +111,12 @@
                                 <input class="form-control" id="templateUrl" name="templateUrl" type="text" value="{$info.templateUrl}" onclick="$('#templateFile').click();">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">页面定位</label>
+                            <div class="col-sm-8">
+                                <input class="form-control" id="templateUrl" name="rel" type="text" value="{$info.rel}">
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="row btn-group-m-t">

app/admin/view/filetype/edit.html

@@ -117,6 +117,12 @@
                                 <input class="form-control" id="templateUrl" name="templateUrl" type="text" value="{$info.templateUrl}" onclick="$('#templateFile').click();">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">页面定位</label>
+                            <div class="col-sm-8">
+                                <input class="form-control" id="templateUrl" name="rel" type="text" value="{$info.rel}">
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="row btn-group-m-t">

app/common/api/FileTypeApi.php

@@ -57,6 +57,7 @@ class FileTypeApi {
         $data["templateUrl"] = $params["templateUrl"];
         $data["sn"] = $params["sn"];
         $data["api"] = $params["api"];
+        $data["rel"] = $params["rel"];
         if ($request->file()) {
             $uploader = new UploadApi();
             $res = $uploader->uploadOne($request->file("templateFile"), "file", "talent/filetype/template");

app/common/api/VerifyApi.php

@@ -6,6 +6,7 @@ use app\enterprise\model\Talent;
 use app\common\api\DictApi;
 use app\admin\model\Enterprise;
 use think\facade\Db;
+use app\common\model\TalentCondition;
 
 /**
  * Description of VerifyApi
@@ -127,33 +128,33 @@ class VerifyApi {
         }unset($item);
         return ["total" => $count, "rows" => $list];
     }
-    
-    public static function getPublicList($params){
+
+    public static function getPublicList($params) {
         $type = $params["type"];
         $where = [];
         switch ($type) {
             case 1:
             case 2:
-                $where[] = ["isPublic",1];
-                $where[] = ["checkState",11];
+                $where[] = ["isPublic", 1];
+                $where[] = ["checkState", 11];
                 break;
             case 3:             //公示
             case 7:             //公示预览
-                $where[] = ["isPublic",2];
-                $where[] = ["checkState",11];
+                $where[] = ["isPublic", 2];
+                $where[] = ["checkState", 11];
                 break;
             case 4:
-                $where[] = ["isPublic",3];
-                $where[] = ["checkState",11];
+                $where[] = ["isPublic", 3];
+                $where[] = ["checkState", 11];
                 break;
             case 5:
             case 8:             //公布预览
-                $where[] = ["isPublic",4];
-                $where[] = ["checkState",11];
+                $where[] = ["isPublic", 4];
+                $where[] = ["checkState", 11];
                 break;
             case 6:
-                $where[] = ["isPublic",5];
-                $where[] = ["checkState",11];
+                $where[] = ["isPublic", 5];
+                $where[] = ["checkState", 11];
                 break;
         }
         $enterprise_tag_kvs = DictApi::selectByParentCode("enterprise_tag");
@@ -195,6 +196,7 @@ class VerifyApi {
                 $where[] = ["ti.checkState", "=", 11];
                 break;
         }
+        $talent_arrange_kvs = DictApi::selectByParentCode("talent_arrange");
         $enterprise_tag_kvs = DictApi::selectByParentCode("enterprise_tag");
         $count = Talent::alias("ti")->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")->where($where)->count();
         $list = Talent::alias("ti")->leftJoin("new_enterprise e", "e.id=ti.enterprise_id")
@@ -203,6 +205,8 @@ class VerifyApi {
             $item["enterprise_name"] = $item["agentName"];
             $item["talent_type"] = $item["enterprise_type"] == 1 ? "晋江优秀人才" : "集成电路优秀人才";
             $item["enterprise_tag"] = $enterprise_tag_kvs[$item["enterpriseTag"]];
+            $item["talentArrangeName"] = $talent_arrange_kvs[$item["talent_arrange"]];
+            $item["talentConditionName"] = TalentCondition::findOrEmpty($item["talent_condition"])["name"];
         }unset($item);
         return ["total" => $count, "rows" => $list];
     }

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

@@ -53,24 +53,22 @@ TalentInfo.initColumn = function () {
         //     }
         // },
         {title: '人才层次', field: 'talentArrangeName', visible: true, align: 'center', valign: 'middle', width: '100px'},
-        {title: '人才标签', field: 'talentTypeName', visible: isShow, align: 'center', valign: 'middle', width: '100px'},
-        {title: '证件号码', field: 'idCard', visible: true, align: 'center', valign: 'middle', width: '150px', 'class': 'uitd_showTip'},
-        {title: '认定条件', field: 'identifyConditionText', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px'},
-        {title: '认定条件名称', field: 'identifyConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '100px'},
-        {title: '获得时间', field: 'identifyGetTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '100px'},
+        {title: '单位标签', field: 'enterprise_tag', visible: isShow, align: 'center', valign: 'middle', width: '100px'},
+        {title: '证件号码', field: 'card_number', visible: true, align: 'center', valign: 'middle', width: '150px', 'class': 'uitd_showTip'},
+        {title: '认定条件', field: 'talentConditionName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px'},
         {title: '人才证书有效期', field: 'certificateStartTime', visible: isShow, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '150px',
             formatter: function (value, row, index) {
                 return Feng.isNotEmptyStr(row.certificateStartTime) && Feng.isNotEmptyStr(row.qzgccrcActiveTime) ? row.certificateStartTime + "至" + row.qzgccrcActiveTime : "";
             }
         },
-        {title: '首次提交时间', field: 'firstSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
-        {title: '最新提交时间', field: 'newSubmitTime', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '首次提交时间', field: 'first_submit_time', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
+        {title: '最新提交时间', field: 'new_submit_time', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: "100px"},
         {title: '审核状态', field: 'checkState', visible: true, align: 'center', valign: 'middle', width: "100px",
             formatter: function (value, row, index) {
-                if (value == -1) {
+                if (value == 13) {
                     return "<span class='label label-danger'>审核不通过</span>"
                 }
-                if (value == 35) {
+                if (value == 11) {
                     return "<span class='label label-primary'>已通过</span>"
                 }
             }
@@ -90,7 +88,7 @@ TalentInfo.initColumn = function () {
                     return "<span class='label label-warning'>待公布</span>"
                 }
                 if (value == 5) {
-                    if (row.checkState == -1) {
+                    if (row.checkState == 13) {
                         return "<span class='label label-danger'>审核不通过</span>"
                     }
                     return "<span class='label label-primary'>待发证</span>"