sandm 2 жил өмнө
parent
commit
4211da9588

+ 7 - 4
app/admin/controller/DirectlyIdentify.php

@@ -36,10 +36,13 @@ class DirectlyIdentify extends AdminController{
 
         $id = Db::table("new_talent_zhiren")->insertGetId($zhiren_data);
 
-        queue("app\job\Import", ["id" => $id,"type" => 1]);
+        //queue("app\job\Import", ["id" => $id,"type" => 1]);
 
-        $data = ["code" => 200, "msg" => "导入成功"];
-        echo sprintf('<script>parent.DirectlyIdentify.callBack(%s);</script>', json_encode($data));
+        $response_obj = new \StdClass();
+        $response_obj->code = 200;
+        $response_obj->msg = '导入成功';
+        return \StrUtil::back($response_obj, "DirectlyIdentify.callBack");
+        //echo sprintf('<script>console.log(DirectlyIdentify);DirectlyIdentify.callBack(%s);</script>', json_encode($data));
     }
 
     public function talent_import(){
@@ -62,7 +65,7 @@ class DirectlyIdentify extends AdminController{
 
         $id = Db::table("new_talent_zhiren")->insertGetId($zhiren_data);
 
-        queue("app\job\Import", ["id" => $id,"type" => 2]);
+        //queue("app\job\Import", ["id" => $id,"type" => 2]);
 
         $data = ["code" => 200, "msg" => "导入成功"];
         echo sprintf('<script>parent.DirectlyIdentify.callBack(%s);</script>', json_encode($data));

+ 2 - 2
app/admin/controller/Enterprise.php

@@ -202,10 +202,10 @@ class Enterprise extends AdminController {
             ];
 
             if($checkState == 2){
-                $record_data['templateCode'] = "【晋江市人才服务平台】您好!您提交申请的优秀人才机构注册信息因信息填写错误或上传不完整已被退回,请及时登录申报系统查看审核意见并重新提交。";
+                $record_data['templateCode'] = "【晋江市人才服务平台】您好!您提交的晋江市现代产业体系人才机构注册信息因信息填写错误或上传不完整已被退回,请及时登录“晋江市人才综合服务申报平台”根据审核意见修改并重新提交。退订回复TD。";
             }
             if($checkState == 3){
-                $record_data['templateCode'] = "【晋江市人才服务平台】您好!您提交申请的优秀人才机构注册信息已审核通过,可登录申报系统做相关事宜申报。";
+                $record_data['templateCode'] = "【晋江市人才服务平台】您好!您提交的晋江市现代产业体系人才机构注册信息已审核通过,可登录“晋江市人才综合服务申报平台”做相关事宜申报。退订回复TD。";
             }
 
             $smsapi = new ChuanglanSmsApi();

+ 3 - 0
app/admin/view/directly_identify/index.html

@@ -109,4 +109,7 @@
     </div>
 </div>
 <script src="/static/modular/directlyIdentify/index.js"></script>
+<script>
+    console.log(DirectlyIdentify)
+</script>
 {/block}

+ 10 - 0
public/static/modular/directlyIdentify/index.js

@@ -68,6 +68,16 @@ DirectlyIdentify.talentImportSubmit = function () {
     $("#talent-import-form")[0].submit();
 }
 
+//回调
+DirectlyIdentify.callBack = function (data) {
+    Feng.info(data.msg);
+    if (data.code == 200) {
+        $("#enterpriseImportModal").modal("hide");
+        $("#talentImportModal").modal("hide");
+        DirectlyIdentify.table.refresh();
+    }
+}
+
 $(function () {
 
     var defaultColunms = DirectlyIdentify.initColumn();