1

app/admin/controller/TalentTypeChange.php

@@ -109,6 +109,11 @@ class TalentTypeChange extends AdminController {
         return json(["rows" => $list, "total" => $count]);
     }
 
+    public function toCommonCheck($id) {
+        $info = ttcModel::find($id);
+        return view("", ["info" => $info]);
+    }
+
     private function setTalentTypeChange(&$where, $data) {
         if (\StrUtil::isNotEmpAndNull($data["talentName"])) {
             $where[] = ["talentName", "like", "%{$data["talentName"]}%"];

app/admin/view/talent_type_change/common_check.html → app/admin/view/talent_type_change/to_common_check.html

@@ -53,7 +53,11 @@
                         <ul class="nav nav-tabs">
                             <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">1.基本信息</a></li>
                             <li id="fileLi" class=""><a data-toggle="tab" href="#tab-2" onclick="TalentTypeChangeInfoDlg.initFileTable()"  aria-expanded="false">2.附件上传</a></li>
-                            <li  class="" style="float: right;"><#button name="打包下载" icon="fa-download" clickFun="TalentTypeChangeInfoDlg.download()"/></li>
+                            <li  class="" style="float: right;">                                
+                                <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChangeInfoDlg.download()" >
+                                    <i class="fa fa-download"></i>&nbsp;打包下载
+                                </button>
+                            </li>
                         </ul>
                     </div>
                     <div class="tab-content">

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common_check.js

@@ -21,7 +21,7 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
     queryData['type'] = $("#type").val();
     queryData['project'] = CONFIG.project_levelchange;
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -54,7 +54,7 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }
@@ -86,7 +86,7 @@ TalentTypeChangeInfoDlg.initFileTable = function (){
             });
             var queryData = {};
             queryData["mainId"] = $("#id").val();
-            queryData["fileTypeId"] = row.id;
+            queryData["typeId"] = row.id;
             ajax.set(queryData);
             ajax.start();
         }

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_first.js

@@ -221,7 +221,7 @@ TalentTypeChange.openTalentTypeChangeCheck = function () {
             area: ['800px', '420px'], //宽高
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/' + TalentTypeChange.seItem.id + '/1',
+            content: Feng.ctxPath + '/admin/talentTypeChange/toCommonCheck/id/' + TalentTypeChange.seItem.id + '/1',
             btn: ['<i class="fa fa-eye"></i>&nbsp;&nbsp;保存未提交', '<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             btn1: function (index, layero) {