更新合同修改方式

app/admin/controller/TalentBasicChange.php

@@ -131,7 +131,7 @@ class TalentBasicChange extends AdminController {
                 $upd["card_type"] = $info["newCardType"];
                 $upd["card_number"] = $info["newIdCard"];
                 $upd["email"] = $info["newEmail"];
-                $upd["labor_contract_rangetime"] = $info["newContractTime"];
+                $upd["labor_contract_rangetime"] = $info["newContractStartTime"] . " - " . $info["newContractEndTime"];
                 Db::table("new_talent_info")->save($upd);
 
                 $talentLog["id"] = getStringId();

app/common/controller/Data.php

@@ -8,6 +8,7 @@ use app\common\api\CompanyApi;
 use app\common\api\TalentConditionApi;
 use app\common\api\TalentLogApi;
 use app\common\api\TalentState;
+use app\common\model\LivingAllowance as LaModel;
 use app\common\model\TalentChecklog;
 use app\common\state\IntegralState;
 use app\common\state\ProjectState;
@@ -409,6 +410,13 @@ class Data extends BaseController {
         return $ret;
     }
 
+    public function getShuoBo(\think\Request $request){
+        $pageSize = $request->param('pageSize',20);
+        $page = $request->param('page',1);
+        $list = laModel::limit(($page-1)*$pageSize, $page*$pageSize)->select()->toArray();
+
+    }
+
     public function test(){
         $str = "Hello World!";
         //$encrypt = openssl_encrypt(json_encode($str),'sm4-cbc','3eh2rxdtkULT2zpkDdRiRGH8PL5J0LsZ',OPENSSL_RAW_DATA,'jKihG4wF622ocb8z');

app/enterprise/controller/TalentBasicChange.php

@@ -282,8 +282,12 @@ class TalentBasicChange extends EnterpriseController {
             $response->msg = "现电子邮箱不能为空";
             return $response;
         }
-        if (\StrUtil::isEmpOrNull($data["newContractTime"])) {
-            $response->msg = "现劳动合同起止时间不能为空";
+        if (\StrUtil::isEmpOrNull($data["newContractStartTime"])) {
+            $response->msg = "现劳动合同开始时间不能为空";
+            return $response;
+        }
+        if (\StrUtil::isEmpOrNull($data["newContractEndTime"])) {
+            $response->msg = "现劳动合同结束时间不能为空";
             return $response;
         }
         if (!preg_match("/[\\w!#$%&'*+\/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+\/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[\\w](?:[\\w-]*[\\w])?/", $data["newEmail"])) {
@@ -302,7 +306,9 @@ class TalentBasicChange extends EnterpriseController {
             $response->msg = "护照格式不合法";
             return $response;
         }
-        list($startTime, $endTime) = explode(" - ", $data["newContractTime"]);
+        //list($startTime, $endTime) = explode(" - ", $data["newContractTime"]);
+        $startTime = $data["newContractStartTime"];
+        $endTime = $data["newContractEndTime"];
         if (!strtotime($startTime) || !strtotime($endTime) || strtotime($startTime) > strtotime($endTime)) {
             $response->msg = "劳动合同起止时间不合法";
             return $response;

app/enterprise/view/talent_basic_change/apply.html

@@ -140,8 +140,12 @@
                                                             <input type="text" class="form-control" id="newEmail" name="newEmail" value="{$row.newEmail}"/>
                                                         </div>
                                                         <div class="rowGroup col-sm-3">
-                                                            <label class=" control-label spacing"><span style="color: red">*</span>现劳动合同起止时间</label>
-                                                            <input class="form-control date" id="newContractTime" name="newContractTime" value="{$row.newContractTime}">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>现劳动合同开始时间</label>
+                                                            <input class="form-control date" name="newContractStartTime" type="text" value="{$row.newContractStartTime}">
+                                                        </div>
+                                                        <div class="rowGroup col-sm-3">
+                                                            <label class=" control-label spacing"><span style="color: red">*</span>现劳动合同结束时间(无期限请输入9999-12-31)</label>
+                                                            <input class="form-control date" name="newContractEndTime" type="text" value="{$row.newContractEndTime}">
                                                         </div>
                                                     </div>
                                                 </div>