企业端电路申报第一版

app/common/api/VerifyApi.php

@@ -43,6 +43,8 @@ class VerifyApi {
             }
             $enterprise = Enterprise::findOrEmpty($info["enterprise_id"])->toArray();
             $info["enterpriseName"] = $enterprise["name"];
+            $info["enterpriseId"] = $enterprise["id"];
+            $info["enterpriseType"] = $enterprise["type"];
             $info["enterpriseTag"] = $enterprise["enterpriseTag"];
             if ($enterprise["street"]) {
                 $info["street"] = $enterprise["street"];

public/static/modular/gate/talentInfo/new_talentInfo.js

@@ -344,7 +344,7 @@ TalentInfo.delete = function () {
 TalentInfo.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
-    queryData['card_number'] = $("#idCard").val();
+    queryData['card_number'] = $("#card_number").val();
     queryData['sex'] = $("#sex").val();
     queryData['nation'] = $("#nation").val();
     queryData['nationality'] = $("#nationality").val();
@@ -365,12 +365,12 @@ TalentInfo.search = function () {
  */
 TalentInfo.reset = function () {
     $("#name").val("");
-    $("#idCard").val("");
+    $("#card_number").val("");
     $("#sex").val("");
     $("#nation").val("");
     $("#nationality").val("");
-    $("#talentType").val("");
-    $("#talentArrange").val("");
+    $("#talent_type").val("");
+    $("#talent_arrange").val("");
     $("#checkState").val("");
 }
 

public/static/modular/gate/talentInfo/talentInfo.js

@@ -345,7 +345,7 @@ TalentInfo.delete = function () {
 TalentInfo.formParams = function () {
     var queryData = {};
     queryData['name'] = $("#name").val();
-    queryData['card_number'] = $("#idCard").val();
+    queryData['card_number'] = $("#card_number").val();
     queryData['sex'] = $("#sex").val();
     queryData['nation'] = $("#nation").val();
     queryData['nationality'] = $("#nationality").val();
@@ -366,12 +366,12 @@ TalentInfo.search = function () {
  */
 TalentInfo.reset = function () {
     $("#name").val("");
-    $("#idCard").val("");
+    $("#card_number").val("");
     $("#sex").val("");
     $("#nation").val("");
     $("#nationality").val("");
-    $("#talentType").val("");
-    $("#talentArrange").val("");
+    $("#talent_type").val("");
+    $("#talent_arrange").val("");
     $("#checkState").val("");
 }
 

public/static/modular/gate/talentInfo/talentInfo_ic_select.js

@@ -13,33 +13,29 @@ var TalentInfoInfoDlg = {
  * 获取人才认定
  */
 TalentInfoInfoDlg.getIdentifyCondition = function() {
-    var level = $("#talentArrange").val();
+    var level = $("#talent_arrange").val();
     var type = $("#type").val();
     if(level==null||level==''){
-        $("#identifyCondition").empty();
-        $("#identifyCondition").trigger('chosen:updated');
+        $("#talent_condition").empty();
+        $("#talent_condition").trigger('chosen:updated');
         return;
     }
-    if(type==null||type==''){
-        Feng.info("请先选择人才类别");
-        return ;
-    }
     Feng.addAjaxSelect({
-        "id": "identifyCondition",
+        "id": "talent_condition",
         "displayCode": "id",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/common/findIdentifyConditionByLevel?talentLevel="+level+"&type="+type
+        "url": Feng.ctxPath + "/common/api/findIdentifyConditionByLevel?level=" + level + "&type=" + type
     });
-    $("#identifyCondition").trigger('chosen:updated');
+    $("#talent_condition").trigger('chosen:updated');
 }
 
 TalentInfoInfoDlg.bankChange = function () {
     var bank = $("#bank").val();
     if($.trim(bank)=='中国工商银行'){
-        $("#bankNumber").val('102391050013');
+        $("#bank_number").val('102391050013');
     }else {
-        $("#bankNumber").val('');
+        $("#bank_number").val('');
     }
 }
 
@@ -48,35 +44,35 @@ TalentInfoInfoDlg.bankChange = function () {
  * 加载市
  */
 TalentInfoInfoDlg.afterSelectProvince = function () {
-    var province = $("#provinceCode").val();
-    $("#cityCode").empty();
-    $("#countyCode").empty();
+    var province = $("#province").val();
+    $("#city").empty();
+    $("#county").empty();
     if(province==null||province==''){
         return;
     }
     Feng.addAjaxSelect({
-        "id": "cityCode",
+        "id": "city",
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCityByProvinceSelect/"+province
+        "url": Feng.ctxPath + "/common/tool/findCityByProvinceSelect/code/" + province
     });
 }
 /**
  * 加载县
  */
 TalentInfoInfoDlg.afterSelectCity = function (){
-    var city = $("#cityCode").val();
-    $("#countyCode").empty();
+    var city = $("#city").val();
+    $("#county").empty();
     if(city==null||city==''){
         return;
     }
     Feng.addAjaxSelect({
-        "id": "countyCode",
+        "id": "county",
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/findCountyByCitySelect/"+city
+        "url": Feng.ctxPath + "/common/tool/findCountyByCitySelect/code/" + city
     });
 }
 //初始化附件类别表单
@@ -84,8 +80,10 @@ TalentInfoInfoDlg.initFileTable = function (){
     var queryData = {};
     queryData['project'] = CONFIG.project_rcrd;
     queryData['type'] = $("#type").val();
+    queryData['checkState'] = $("#checkState").val();
+    queryData['isMix'] = 1;
     $("#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,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -118,7 +116,7 @@ TalentInfoInfoDlg.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/listTalentFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }
@@ -193,23 +191,19 @@ TalentInfoInfoDlg.downloadFile = function (id,type){
 $(function() {
     //批量加载字典表数据
     var arr = [
-        {"name":"nation","code":"un_nation"},
-        {"name":"talentArrange","code":"un_talentLevel"},
-        {"name":"nationality","code":"un_nationality"},
-        {"name":"talentType","code":"un_jbt_talentType"},
-        {"name":"politics","code":"un_political"},
-        {"name":"highEducation","code":"un_education"},
-        {"name":"introductionMode","code":"un_introduction_mode"},
-        {"name":"industryField","code":"un_industryField"},
-        {"name":"address","code":"un_street"}];
+        {"name": "nation", "code": "nation"},
+        {"name": "talent_arrange", "code": "talent_arrange"},
+        {"name": "nationality", "code": "nationality"},
+        {"name": "politics", "code": "politics"},
+        {"name": "highest_degree", "code": "highest_degree"}];
     Feng.findChildDictBatch(JSON.stringify(arr));
     //加载省份
     Feng.addAjaxSelect({
-        "id": "provinceCode",
+        "id": "province",
         "displayCode": "code",
         "displayName": "name",
         "type": "GET",
-        "url": Feng.ctxPath + "/api/commonLocation/getProvinceSelect"
+        "url": "/common/tool/getProvinceSelect"
     });
     var id = $("#id").val();
     if(id!=null && id!=''){
@@ -219,28 +213,15 @@ $(function() {
         Feng.getCheckLog("logTable",{"type":CONFIG.project_rcrd,"mainId":id,"typeFileId":"","active":1})
     }
     $("#address").val($("#address").attr("value"));
-    $("#provinceCode").val($("#provinceCode").attr("value"));
+    $("#province").val($("#province").attr("value"));
     TalentInfoInfoDlg.afterSelectProvince();
-    $("#cityCode").val($("#cityCode").attr("value"));
+    $("#city").val($("#city").attr("value"));
     TalentInfoInfoDlg.afterSelectCity();
-    $("#countyCode").val($("#countyCode").attr("value"));
-    $("#talentArrange").val($("#talentArrange").attr("value"));
+    $("#county").val($("#county").attr("value"));
+    $("#talent_arrange").val($("#talent_arrange").attr("value"));
     TalentInfoInfoDlg.getIdentifyCondition();
-    $("#talentArrange").val($("#talentArrange").attr("value"));
-    $("#identifyCondition").val($("#identifyCondition").attr("value"));
-    TalentInfoInfoDlg.validId();
-    $("#photo").change(function (e) {
-        var tag = e.target;
-        var file = tag.files[0];
-        var imgSrc;
-        var reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = function() {
-            imgSrc = this.result;
-            $("#photoImg").attr("src", imgSrc);
-        };
-    });
-    TalentInfoInfoDlg.setNoChangeField();
+    $("#talent_arrange").val($("#talent_arrange").attr("value"));
+    $("#talent_condition").val($("#talent_condition").attr("value"));
     $("input,select,textarea").not("input[type='hidden']").not("input[type='file']").attr("style","pointer-events: none;background-color: #eee;");
 });