生活补贴审核++

app/admin/controller/LivingAllowance.php

@@ -65,7 +65,7 @@ class LivingAllowance extends AdminController {
             $obj["industryFieldName"] = DictApi::findByParentCodeAndCode($industry_field_type, $obj["industryField"])["name"];
         }
         if ($obj["address"]) {
-            $obj["streetName"] = DictApi::findByParentCodeAndCode("address", $obj["address"])["name"];
+            $obj["streetName"] = DictApi::findByParentCodeAndCode("street", $obj["address"])["name"];
         }
         if ($obj["nationality"]) {
             $obj["nationalityName"] = DictApi::findByParentCodeAndCode("nationality", $obj["nationality"])["name"];
@@ -237,7 +237,7 @@ class LivingAllowance extends AdminController {
         }
         $where = [];
         $where[] = ["id", "in", $ids];
-        $list = LaModel::where($where)->select($where)->toArray();
+        $list = LaModel::where($where)->select()->toArray();
         $updates = [];
         $newLogs = [];
         $sb = [];

app/admin/controller/Talent.php

@@ -179,6 +179,16 @@ class Talent extends AdminController {
         }
     }
 
+    public function getTalentInfoByIdCard() {
+        $card_number = $this->request->param("idCard");
+        $card_type = $this->request->param("cardType");
+        $where = [];
+        $where[] = ["card_type", "=", $card_type];
+        $where[] = ["card_number", "=", $card_number];
+        $list = Db::table("new_talent_info")->where($where)->select()->toArray();
+        return json($list);
+    }
+
     public function cancel_verify() {
         $params = $this->request->param();
         $ids = $params["ids"];

public/static/modular/master/livingAllowanceInfo/livingAllowanceInfo_info.js

@@ -234,7 +234,7 @@ $(function () {
         sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
         queryParams: function (params) {
-            return {"idCard": $("#idCard").val()};
+            return {"idCard": $("#idCard").val(), "cardType": $("#cardType").val()};
         },
         rowStyle: function (row, index) {
             return {css: {"word-break": "break-word", "white-space": "inherit"}}
@@ -321,7 +321,7 @@ $(function () {
         sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
         showColumns: false,
         queryParams: function (params) {
-            return {"idCard": $("#idCard").val()};
+            return {"idCard": $("#idCard").val(), "cardType": $("#cardType").val()};
         },
         rowStyle: function (row, index) {
             return {css: {"word-break": "break-word", "white-space": "inherit"}}