修改一些显示界面

app/enterprise/controller/Base.php

@@ -2,6 +2,8 @@
 
 namespace app\enterprise\controller;
 
+use app\common\api\DictApi;
+use app\common\api\EnterpriseApi;
 use app\enterprise\common\EnterpriseController;
 use app\enterprise\api\TalentApi;
 use app\enterprise\model\Talent as TalentModel;
@@ -248,8 +250,14 @@ class Base extends EnterpriseController {
             exit();
         }
         $checkState = $info["checkState"] ?: 0;
-        $enterprise_info = \app\common\model\Enterprise::find($this->user["uid"]);
-        $info["enterprise"] = $enterprise_info;
+        $ep = EnterpriseApi::getOne($this->user["uid"]);
+        $tagList = DictApi::selectByParentCode('enterprise_tag');
+        $streetList = DictApi::selectByParentCode('street');
+        $industryFieldNew = DictApi::selectByParentCode('industry_field');
+        $ep->enterpristTagName = $tagList[$ep->enterpriseTag];
+        $ep->streetName = $streetList[$ep->street];
+        $ep->industryFieldNewName = $industryFieldNew[$ep->industryFieldNew];
+        $info["enterprise"] = $ep;
         $info["talent_type_list"] = \app\common\api\DictApi::findChildDictByCode("talent_type");
         return view("first", ["year" => date("Y"), "checkState" => $checkState, "row" => $info]);
     }

app/enterprise/view/base/first.html

@@ -95,6 +95,9 @@
                                                     </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
+                                                    <p style="text-align: center;color: red">
+                                                        请上传近期免冠半身彩照（两寸）
+                                                    </p>
                                                     <img id="photoImg" {if condition="$row['headimgurl']"} src="/storage/{$row.headimgurl}" {else/} src="/static/img/photo.png" {/if} onclick="$('#photo').click();" style="height:147px;width:105px;margin:0 auto;display:block;">
                                                     <hr />
                                                     附件：
@@ -184,14 +187,13 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class="control-label spacing td-label"><span style="color: red">*</span>单位标签</label>
-                                                        <select class="form-control" id="enterprise_tag"  value="{$row.enterprise.enterpriseTag}" disabled="disabled">
-                                                        </select>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.enterpristTagName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>单位名称</label>
-                                                        <input type="text" class="form-control" id="enterprise_name"  name="enterprise_name" readonly="readonly" value="{$row.enterprise.name}" />
+                                                        <div class="form-control" style="border: none">{$row.enterprise.name}</div>
                                                     </div>
                                                 </td>
                                                 <td rowspan="5" style="width: 200%">
@@ -202,14 +204,13 @@
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>所属街道</label>
-                                                        <select class="form-control" id="address" name="address" value="{$row.enterprise.street}" disabled="disabled"></select>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.streetName}</div>
                                                     </div>
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
                                                         <label class=" control-label spacing td-label"><span style="color: red">*</span>产业领域</label>
-                                                        <select type="text" class="form-control" id="industry_field" value="{$row.enterprise.industryFieldNew}" name="industry_field" disabled="disabled">
-                                                        </select>
+                                                        <div class="form-control" style="border: none">{$row.enterprise.industryFieldNewName}</div>
                                                     </div>
                                                 </td>
                                             </tr>
@@ -226,24 +227,18 @@
                                                     </div>
                                                 </td>
                                                 <td>
+                                                    <label class=" control-label spacing td-label">说明</label>
+                                                    <div class="word-wrap" id="typeTips">
 
-<!--                                                    <div class="rowGroup " style="display: none">-->
-<!--                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>-->
-<!--                                                        <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>-->
-<!--                                                    </div>-->
-
-<!--                                                    <div class="rowGroup" style="display: none">-->
-<!--                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>劳动合同起止时间</label>-->
-<!--                                                        <input type="text" class="form-control rangedate" id="labor_contract_rangetime" name="labor_contract_rangetime" value="{$row.labor_contract_rangetime}" />-->
-<!--                                                    </div>-->
+                                                    </div>
 
                                                 </td>
                                             </tr>
                                             <tr class="talentType1-2" style="display: none">
                                                 <td >
                                                     <div class="rowGroup">
-                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span>在我市缴交社会保险或个人所得税月份</label>
-                                                        <input type="text" class="form-control rangedate" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
+                                                        <label class=" control-label spacing td-label"><span style="color: red">*</span><span id="talentType_first" style="display: none">首次在我市</span>在我市缴交社会保险或个人所得税月份</label>
+                                                        <input type="text" class="form-control rangemonth" id="tax_insurance_month" name="tax_insurance_month" value="{$row.tax_insurance_month}"/>
                                                     </div>
                                                 </td>
                                                 <td>
@@ -268,13 +263,7 @@
                                             </tr>
 
                                             <tr>
-                                                <td colspan="2">
-                                                    <label class=" control-label spacing td-label">说明</label>
-                                                    <div class="word-wrap" id="typeTips">
 
-                                                    </div>
-
-                                                </td>
                                             </tr>
 
                                         </table>

public/static/modular/gate/talentBase/talentInfo_info.js

@@ -381,6 +381,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含经晋江市认定且还在晋江市就业创业的人才，或在晋江市就业创业但未曾申报过晋江市现代产业体系人才的人才。");
             //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料");
             $(".talentType1-2").css("display", "table-row");
+            $("#talentType_first").css('display',"none");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
                     notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'}
@@ -398,6 +399,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含本办法出台后首次从晋江市以外引进认定的人才，或者流出晋江市满3年后又返回晋江市就业创业(不含企业集团内部人员调动)的人才。")
             //$("#desc_talent_type").html("请上传社会保险或个人所得税缴费佐证材料与来我市前工作情况证明，例如原工作单位出具的工作证明、离职证明或原创（领）办企业的营业执照复印件、经市场监管部门备案的公司章程复印件等证明材料");
             $(".talentType1-2").css("display", "table-row");
+            $("#talentType_first").css('display',"inline");
             $('#talentInfoForm').bootstrapValidator('addField', "tax_insurance_month", {
                 validators: {
                     notEmpty: {message: '在我市缴交社会保险或个人所得税月份不能为空'}
@@ -415,6 +417,7 @@ TalentInfoInfoDlg.talentTypeChange = function () {
             $("#typeTips").html("含已经与晋江市用人单位达成就业意向且签订预引进意向合作协议（合同）的人才，或拟来我市创业且提交企业名称预先核准的人才。")
             //$("#desc_talent_type").html("请先提供意向合作协议（合同）或企业名称预先核准材料，落地我市后再补齐上述材料");
             $(".talentType3").css("display", "table-row");
+            $("#talentType_first").css('display',"none");
             $('#talentInfoForm').bootstrapValidator('addField', "pre_import_type", {validators: {notEmpty: {message: '请选择预引进类型'}}});
             if (TalentInfoInfoDlg.talentTypeOneTwo) {
                 TalentInfoInfoDlg.talentTypeOneTwo = false;
@@ -525,7 +528,7 @@ TalentInfoInfoDlg._initFileTypeColumn = function () {
         {title: '模板', field: 'templateUrl', visible: true, align: 'center', valign: 'middle', width: "8%",
             formatter: function (value, row, index) {
                 if (value == null || value == '' || value == 'null') {
-                    return '无';
+                    return '';
                 }
                 return "<button type='button' onclick=\"TalentInfoInfoDlg.downloadFile('" + row.id + "',3)\" style='margin-right: 10px' class=\"btn btn-xs btn-primary\">" +
                         "<i class=\"fa fa-download\"></i>下载" +
@@ -602,8 +605,9 @@ TalentInfoInfoDlg.initFile = function () {
                             } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
                                 imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + files[key].url + "','" + files[key].id + "','" + files[key].orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
                             } else {
-                                imgStr = '<img class=\"imgUrl\"  src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
+                                imgStr = '<img class=\"imgUrl\" onclick=\"Feng.showImg(this)\"  src=\"' + files[key].url + '\" style=\"width:25px;height:25px;\">';
                             }
+                            console.log(imgStr)
 
                             html += '<li data-id="' + files[key].id + '">\n\
                                     <div><input type="hidden" name="uploadFiles[]" value="' + files[key].id + '"></div>\n' +
@@ -801,7 +805,7 @@ TalentInfoInfoDlg.callBack = function (data) {
         } else if (suffix == "xlsx" || suffix == "XLSX" || suffix == 'xls' || suffix == 'XLS') {
             imgStr = "<button type='button'  onclick=\"Feng.showExcel('" + data.info + "','" + data.id + "','" + data.orignName + "')\" class=\"btn btn-xs btn-danger\"><i class=\"fa fa-file-excel-o\" aria-hidden=\"true\"></i></button>";
         } else {
-            imgStr = '<img class="imgUrl"  src="' + data.info + '" style="width:25px;height:25px;">';
+            imgStr = '<img class="imgUrl" onclick=\"Feng.showImg(this)\" src="' + data.info + '" style="width:25px;height:25px;">';
         }
         var li = $("input[name='uploadFiles[]'][value='" + data.id + "'").parents("li");
         if (li.length > 0) {
@@ -1019,6 +1023,14 @@ $(function () {
             trigger: "click"
         })
     })
+    $(".rangemonth").each(function () {
+        laydate.render({
+            elem: this,
+            type: "month",
+            range: true,
+            trigger: "click"
+        })
+    })
     if (id != null && id != '') {
         //select初始化
         $("select").each(function () {