From 6a8ffe182eba41f25add7a130095cd57ae9c7fbc Mon Sep 17 00:00:00 2001 From: Cheng Date: Thu, 15 Feb 2024 17:56:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8D=8E=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/bonus/api/postStatus.php | 60 ++++ wms/bonus/bonus.php | 477 +++++++++++++++----------- wms/bonus/bonus_detail.php | 21 +- wms/contract-repair/js/alpine.js | 47 ++- wms/contract-repair/styles/style.css | 423 +++++++++++++++-------- wms/contract-repair/styles/style.scss | 2 +- wms/contract/contract-new-apply.php | 10 +- 7 files changed, 679 insertions(+), 361 deletions(-) create mode 100644 wms/bonus/api/postStatus.php diff --git a/wms/bonus/api/postStatus.php b/wms/bonus/api/postStatus.php new file mode 100644 index 00000000..a7abb7b8 --- /dev/null +++ b/wms/bonus/api/postStatus.php @@ -0,0 +1,60 @@ +prepare($sql); + $stmt->execute(); + + echo 'Success'; +} +// 獎金確認發放，並更新獎金 OR 實際發放時間 +if (!empty($_POST['postType']) && $_POST['postType'] == 'b') { + + $id = empty($_POST['id']) ? '' : $_POST['id']; + $pay_day = empty($_POST['pay_day']) ? '' : $_POST['pay_day']; + $bonus_actual = empty($_POST['bonus_issue']) ? '' : $_POST['bonus_issue']; + $note = empty($_POST['note']) ? '' : $_POST['note']; + $user_id = empty($_POST['user_id']) ? '' : $_POST['user_id']; + $review_at = date("Y-m-d"); + try { + $sql = "UPDATE bonus SET status = 2,review_hr='$user_id',review_at='$review_at',pay_day='$pay_day',note='$note' WHERE id = $id"; + $stmt = $conn->prepare($sql); + $stmt->execute(); + header("HTTP/1.1 200 success!"); + } catch (PDOException $e) { + header("HTTP/1.1 500 failed!"); + echo $e->getMessage(); + die('Error!:' . $e->getMessage()); + } +} + +// 獎金暫不發放 +if (!empty($_POST['postType']) && $_POST['postType'] == 'c') { + // echo 'cccccc'; + $id = empty($_POST['id']) ? '' : $_POST['id']; + $pay_day = empty($_POST['pay_day']) ? '' : $_POST['pay_day']; + $bonus_actual = empty($_POST['bonus_issue']) ? '' : $_POST['bonus_issue']; + $user_id = empty($_POST['user_id']) ? '' : $_POST['user_id']; + $note = empty($_POST['note']) ? '' : $_POST['note']; + try { + $sql = "UPDATE bonus SET status = 4,review_hr='$user_id',review_at='$review_at',pay_day='$pay_day',note='$note' WHERE id = $id"; + $stmt = $conn->prepare($sql); + $stmt->execute(); + header("HTTP/1.1 200 success!"); + } catch (PDOException $e) { + header("HTTP/1.1 500 failed!"); + echo $e->getMessage(); + die('Error!:' . $e->getMessage()); + } +} + +if (!empty($_POST['postType']) && $_POST['postType'] == 'd') { + $id = empty($_POST['id']) ? '' : $_POST['id']; + print_r($id); + // echo 'ddddd'; +} diff --git a/wms/bonus/bonus.php b/wms/bonus/bonus.php index eb1959a2..4e5b3f8d 100644 --- a/wms/bonus/bonus.php +++ b/wms/bonus/bonus.php @@ -15,10 +15,22 @@ $bonus_type = [ '2' => '區經理獎金', '3' => '專任契約經理獎金' ]; + +$bonus_status = [ + '1' => '未確認', + '2' => '應發已確認', + '3' => '應發未確認', + '4' => '暫不發放', + '5' => '人事審核確認' +]; $clause = ''; +if ($user_id != 'M0225') { + $clause .= "AND receiver == '$user_id'"; +} if (!empty($_GET['check'])) { - if ($_GET['check'] == 1) { - $clause .= "AND pay_day > DATE_SUB(NOW(), INTERVAL 1 MONTH)"; + // 人事發放作業，應為一個月內 + if ($_GET['check'] == 4) { + $clause .= "AND pay_day_due > DATE_SUB(NOW(), INTERVAL 1 MONTH)"; } else if ($_GET['check'] == 2) { $clause .= "AND status = 1"; } else if ($_GET['check'] == 3) { @@ -35,6 +47,14 @@ $datas = $stmt->fetchAll(PDO::FETCH_ASSOC); $now = new DateTime(); $oneMonthAgo = $now->modify('+1 month'); +$id = []; +foreach ($datas as $data) { + $id[] = $data['id']; +} +$id_str = implode(',', $id); +echo "
";
+print_r($id_str);
+echo '
'; // 查看 T8 是否有收款明細 // require("./api/get.php"); function isPay($contract_no, $connT8) @@ -98,204 +118,257 @@ function isPay($contract_no, $connT8) -
- - -
- - - - btn-sm categoryBtn"> 所有獎金 - btn-sm categoryBtn"> 應發獎金 - btn-sm categoryBtn"> 未發獎金 - btn-sm categoryBtn"> 已發獎金 - - - - - - - - - - - - - - - - - - - - - - - $data) : - - $contract_no = $data['contract_no']; - $json = json_decode($data['bonus_json']); - - $total = empty($json->total) ? 0 : $json->total; - $fee_per_st = empty($json->fee_per_st) ? 0 : $json->fee_per_st; - $commission_fee = empty($json->commission_fee) ? 0 : $json->commission_fee; - $isPay = isPay($data['contract_no'], $connT8); - - ?> - - - - - - - - - - - - - - - - - - - - -
項次合約類別合約號作番號獎金類別獎金版本作番總價牌價服務費應發人員預計發放時間獎金水庫狀態檢視/發放
- - - - - 發放獎金 - - 查看詳情 - -
+
+
+
+ + + + btn-sm categoryBtn"> 所有獎金 + + btn-sm categoryBtn"> 未發獎金 + btn-sm categoryBtn"> 已發獎金 + btn-sm categoryBtn"> 人事發放作業 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $data) : + + $contract_no = $data['contract_no']; + $json = json_decode($data['bonus_json']); + + $total = empty($json->total) ? 0 : $json->total; + $fee_per_st = empty($json->fee_per_st) ? 0 : $json->fee_per_st; + $commission_fee = empty($json->commission_fee) ? 0 : $json->commission_fee; + // $isPay = isPay($data['contract_no'], $connT8); + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
項次合約類別合約號作番號獎金類別獎金版本作番總價牌價服務費應發人員預計發放時間獎金水庫狀態實際發放時間發放 / 詳情
+ + + -- + + + + 查看詳情 + +
+
-
- - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/wms/bonus/bonus_detail.php b/wms/bonus/bonus_detail.php index 93762ac3..0ca70c7b 100644 --- a/wms/bonus/bonus_detail.php +++ b/wms/bonus/bonus_detail.php @@ -111,7 +111,7 @@ $maintain_type = [ 應發獎金 - + @@ -133,6 +133,17 @@ $maintain_type = [ + + 實發獎金 + + + + 實發時間 + + + 備註 + + @@ -145,6 +156,14 @@ $maintain_type = [
+ + 分期方式 + + +

未填寫

@@ -184,21 +196,13 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);

未填寫

- 分期方式 + 附件 - -

未填寫

+ - + + + - - +
+ + + + + + + + + + + + + + + + + + + + + +
項次電梯人乘/
載重		停數速度(m/min)保養月數保養次數(月)保養方式公司發布價(月)數量公司發布價(總價)售價(月)售價(總價)
+
+ + + + + \ No newline at end of file