1

app/admin/controller/TalentTypeChange.php

@@ -269,8 +269,8 @@ class TalentTypeChange extends AdminController {
         return $response;
     }
 
-    public function submitCheck(TalentTypeChange ti) {
-        Company company = (Company) this.getSession().getAttribute("company");
+    public function submitCheck() {
+        /*Company company = (Company) this.getSession().getAttribute("company");
         EntityWrapper<TalentChecklog> logWrapper = new EntityWrapper<>();
         if (ti.getProcess() == 2) {
             logWrapper.eq("companyId", ti.getCompanyId());
@@ -435,7 +435,7 @@ class TalentTypeChange extends AdminController {
             case 4:
                 break;
         }
-        return new ResponseObj(ResponseObj.SUCCESS, "提交审核成功");
+        return new ResponseObj(ResponseObj.SUCCESS, "提交审核成功");*/
     }
 
     private function setTalentTypeChange(&$where, $data) {

app/admin/view/talent/filesShow.html

@@ -38,16 +38,17 @@
     </thead>
 </table>
 <script>
-    function getFile(project, type, id) {
+    function getFile(project, type, id, source, talent_condition, checkState) {
         var queryData = {};
         queryData['project'] = project;
         queryData['type'] = type;
+        if (type == 1) {
+            queryData['source'] = source;
+            queryData['talent_condition'] = talent_condition;
+            queryData['checkState'] = checkState;
+        }
         var listUrl = "/common/api/listTalentFile";
         var field = "fileTypeId";
-        if (project == CONFIG.project_levelchange) {
-            listUrl = "/common/api/listTalentCommonFile";
-            field = "typeId";
-        }
         $("#fileTable2").bootstrapTable({
             url: Feng.ctxPath + "/common/api/findCommonFileType",
             method: 'POST',

app/admin/view/talent_type_change/to_common_check.html

@@ -74,7 +74,9 @@
                                                 <input type="hidden" id="checkState" name="checkState" value="{$info.checkState}"/>
                                                 <input type="hidden" id="talentId" name="talentId" value="{$info.talentId}"/>
                                                 <input type="hidden" id="enterpriseId" name="enterpriseId" value="{$info.enterpriseId}"/>
-                                                <input type="hidden" id="companyId" value="{$companyId}" value="{$companyId}"/>
+                                                <input type="hidden" id="companyId" name="companyId" value="{$companyId}"/>
+                                                <input type="hidden" id="newSource" name="newSource" value="{$info.newSource}"/>
+                                                <input type="hidden" id="newIdentifyCondition" name="newIdentifyCondition" value="{$info.newIdentifyCondition}"/>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-2 control-label spacing">变更对象</label>
                                                     <div class="col-sm-4 spacing">

public/static/js/common/Feng.js

@@ -601,7 +601,7 @@ var Feng = {
             }
         })
     },
-    showMiniFileModal:function (project,type,id) {
+    showMiniFileModal:function (project,type,id,source,talent_condition,checkState) {
         layer.open({
             type: 2,
             title: "附件",
@@ -619,7 +619,7 @@ var Feng = {
                 layer.setTop(layero);
                 //按钮【按钮一】的回调
                 var iframeWin = window[layero.find('iframe')[0]['name']];
-                iframeWin.getFile(project,type,id);
+                iframeWin.getFile(project,type,id,source,talent_condition,checkState);
             }
         });
     },

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

@@ -354,6 +354,10 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
     var queryData = {};
     queryData['type'] = $("#type").val();
     queryData['project'] = CONFIG.project_levelchange;
+    queryData["source"] = $("#newSource").val();
+    queryData["talent_condition"] = $("#newIdentifyCondition option:selected").val();
+    queryData['checkState'] = $("#checkState").val();
+    queryData['isMix'] = 1;
     $("#fileTable").bootstrapTable({
         url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
@@ -388,7 +392,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
                 if (data == null || data.length == 0) {
                     return;
                 }

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

@@ -16,10 +16,14 @@ TalentTypeChangeInfoDlg.close = function () {
 
 //初始化附件类别表单
 TalentTypeChangeInfoDlg.initFileTable = function () {
-    Feng.showMiniFileModal(CONFIG.project_levelchange, $("#type").val(), $("#id").val());
+    Feng.showMiniFileModal(CONFIG.project_levelchange, $("#type").val(), $("#id").val(), $("#newSource").val(), $("#newIdentifyCondition").val(), $("#checkState").val());
     var queryData = {};
     queryData['type'] = $("#type").val();
     queryData['project'] = CONFIG.project_levelchange;
+    queryData["source"] = $("#newSource").val();
+    queryData["talent_condition"] = $("#newIdentifyCondition").val();
+    queryData['checkState'] = $("#checkState").val();
+    queryData['isMix'] = 1;
     $("#fileTable").bootstrapTable({
         url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
@@ -54,7 +58,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentCommonFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
                 if (data == null || data.length == 0) {
                     return;
                 }
@@ -86,7 +90,7 @@ TalentTypeChangeInfoDlg.initFileTable = function () {
             });
             var queryData = {};
             queryData["mainId"] = $("#id").val();
-            queryData["typeId"] = row.id;
+            queryData["fileTypeId"] = row.id;
             ajax.set(queryData);
             ajax.start();
         }