一些小问题

app/admin/view/talent/talentInfo_base_check.html

@@ -73,7 +73,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType" value="{$info.card_type}">
+                                                            <select class="form-control" id="card_type" name="cardType" value="{$info.card_type}">
                                                                 {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
                                                                 {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
                                                                 {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
@@ -81,7 +81,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
-                                                            <input class="form-control" id="card_type" name="card_type" value="{$info.card_number}">
+                                                            <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            

app/admin/view/talent/talentInfo_common_check.html

@@ -73,7 +73,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType" value="{$info.card_type}">
+                                                            <select class="form-control" id="card_type" name="card_type" value="{$info.card_type}">
                                                                 {eq name="info.card_type" value="1"}<option value="1">身份证</option>{/eq}
                                                                 {eq name="info.card_type" value="2"}<option value="2">通行证</option>{/eq}
                                                                 {eq name="info.card_type" value="3"}<option value="3">护照</option>{/eq}
@@ -81,7 +81,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
-                                                            <input class="form-control" id="card_type" name="card_type" value="{$info.card_number}">
+                                                            <input class="form-control" id="card_number" name="card_number" value="{$info.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            

app/enterprise/controller/Base.php

@@ -95,7 +95,10 @@ class Base extends EnterpriseController {
                 $start = date_create($date1);
                 $end = date_create($date2);
                 $diff = date_diff($end, $start);
-                if ($diff->m < 6) {
+                $m = $diff->m ?: 0;
+                $y = $diff->y ?: 0;
+                $months = $y * 12 + $m;
+                if ($months < 6) {
                     $res = ["msg" => $filed_dict["tax_insurance_month"] . "应大于或等于6个月"];
                     echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
                     exit;
@@ -112,7 +115,10 @@ class Base extends EnterpriseController {
                 $start = date_create($date1);
                 $end = date_create($date2);
                 $diff = date_diff($end, $start);
-                if ($diff->m < 6) {
+                $m = $diff->m ?: 0;
+                $y = $diff->y ?: 0;
+                $months = $y * 12 + $m;
+                if ($months < 6) {
                     $res = ["msg" => $filed_dict["labor_contract_rangetime"] . "应大于或等于6个月"];
                     echo sprintf("<script>parent.TalentInfoInfoDlg.infoCallback(%s);</script>", json_encode($res));
                     exit;

app/enterprise/view/base/view.html

@@ -60,7 +60,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>证件类型</label>
-                                                            <select class="form-control" id="cardType" name="cardType" value="{$row.card_type}">
+                                                            <select class="form-control" id="card_type" name="card_type" value="{$row.card_type}">
                                                                 <option value="">请选择</option>
                                                                 <option value="1">身份证</option>
                                                                 <option value="2">通行证</option>
@@ -69,7 +69,7 @@
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*证件号码</span></label>
-                                                            <input class="form-control" id="card_type" name="card_type" value="{$row.card_number}">
+                                                            <input class="form-control" id="card_number" name="card_number" value="{$row.card_number}">
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
                                                             <label class=" control-label spacing"><span style="color: red">*</span>性别</label>                                                            

app/enterprise/view/talent/first.html

@@ -93,7 +93,7 @@
                                                         {/if}
                                                         <div class="rowGroup col-sm-3">
                                                             <label class="control-label spacing"><span style="color: red">*</span>单位标签</label>
-                                                            <select class="form-control" id="enterprise_tag"  value="{$row.enterprise.talentType}" disabled="disabled">
+                                                            <select class="form-control" id="enterprise_tag"  value="{$row.enterprise.enterpriseTag}" disabled="disabled">
                                                             </select>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">