diff --git a/wms/bonus/api/get.php b/wms/bonus/api/get.php index ef18e03d..6b391c62 100644 --- a/wms/bonus/api/get.php +++ b/wms/bonus/api/get.php @@ -62,12 +62,18 @@ if (!empty($_GET['contract_no'])) { // $result = $stmt->fetchAll(PDO::FETCH_ASSOC); // $count = COUNT($result); // $data['maintain_month'] = intval($count * $result[0]['SQuantity']); + $reult = true; echo '1'; + // return true; } else { + $result = false; echo '2'; + // return false; } } catch (PDOException $e) { - echo '123'; + echo '111'; + return false; + // exit; } // if (($check['CheckBillDate']) !== '') { // header('Content-Type: application/json'); @@ -76,4 +82,6 @@ if (!empty($_GET['contract_no'])) { // echo false; // exit; // } +} else { + exit(); } diff --git a/wms/bonus/api/insertBonus.php b/wms/bonus/api/updateBonus.php similarity index 100% rename from wms/bonus/api/insertBonus.php rename to wms/bonus/api/updateBonus.php diff --git a/wms/bonus/bonus.php b/wms/bonus/bonus.php index 79900417..829f29ad 100644 --- a/wms/bonus/bonus.php +++ b/wms/bonus/bonus.php @@ -1,7 +1,7 @@ modify('+1 month'); // 查看 T8 是否有收款明細 // require("./api/get.php"); -function isPay($contract_no) +function isPay($contract_no, $connT8) { - $api_url = './api/get.php?contract_no=' . $contract_no; - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $api_url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_HTTPHEADER, array($contract_no)); - - $response = curl_exec($ch); - echo $response; - if ($response === false) { - echo '123Curl error: ' . curl_error($ch); + // echo $contract_no; + $sql = "SELECT + a.BillNo, + b.OTaxAmt as amount, + a.CU_EstPayDate as createDate, + b.PersonId as personId, + c.BillNo as CBno, + c.CU_MaterialId as facility +FROM salIncomeApplyDetail as a +LEFT JOIN salIncomeApplyMaster as b ON a.BillNo = b.BillNo +LEFT JOIN ( + SELECT aMaster.BillNo,aMaster.BizPartnerId,aDetail.CU_MaterialId FROM arCheckBill as aMaster + LEFT JOIN arCheckBillDetail as aDetail ON aMaster.BizPartnerId = aDetail.FromBillNo + WHERE aMaster.BizPartnerId = 'Q23080067' AND aMaster.TypeId = 'RVS' + ) AS c ON a.BillNo = c.BizPartnerId +WHERE a.BillNo = '$contract_no' +AND a.RowNo = '1' +"; + $stmt = $connT8->prepare($sql); + $stmt->execute(); + $data = $stmt->fetch(PDO::FETCH_ASSOC); + // $data['amount'] = intval($data['amount']); + if (!empty($data['CBno']) && $data['CBno'] != '') { + $checkBillNo = $data['CBno']; + + $sql = "SELECT +c.BillDate AS CheckBillDate +FROM arWriteOffBill AS a +LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo +LEFT JOIN +(SELECT temp1.*,arWriteOffBillDetail.* FROM arWriteOffBillDetail +LEFT JOIN + (SELECT + arCheckBill.BillNo AS checkBillNo, arCheckBill.BillDate,arCheckBillInvInfo.InvoiceNo + FROM arCheckBill + LEFT JOIN arCheckBillInvInfo + ON arCheckBill.InvoiceBillNo=arCheckBillInvInfo.InvoiceBillNo) AS temp1 +ON temp1.checkBillNo = arWriteOffBillDetail.FromBillNo) AS c +ON a.BillNo=c.BillNo +WHERE c.checkBillNo = '$checkBillNo' +"; + + $stmt = $connT8->prepare($sql); + $stmt->execute(); + + return '1'; } else { - $result = json_decode($response, true); - if ($result['Status'] == 'Success') - return $result; - if ($result['Status'] == 'Error') - return $result; + return '2'; } - - curl_close($ch); } ?> + - -
+ +
@@ -98,9 +129,14 @@ function isPay($contract_no) $data) : - $isPay = isPay($data['contract_no']); + + $contract_no = $data['contract_no']; + $isPay = isPay($contract_no, $connT8); + // echo '
';
+                        // print($isPay);
+                        // echo '
'; ?> - + @@ -111,19 +147,21 @@ function isPay($contract_no) - + + - +
發放獎金 + - 查看詳情 + 查看詳情 @@ -171,14 +209,51 @@ function isPay($contract_no) } + .btn-secondary { + color: #fff; + background-color: #6c757d; + border-color: #6c757d; + } + + .btn-secondary:hover { + color: #fff; + background-color: #5a6268; + border-color: #545b62; + } + .applybtn { color: #fff; background-color: #1484c4; - display: block; + /* display: block; */ + border-radius: 5px; + padding: 5px 2px; + font-size: 13px; + line-height: 1; + display: grid; + place-items: center; + /* 水平和垂直居中 */ + height: 2%vh; + /* 100%视窗高度,可根据需要调整 */ + } + + .applybtncheck { + color: #fff; + background-color: #eea236; + /* display: block; */ border-radius: 4px; padding: 4px 2px; font-size: 13px; + line-height: 1; + display: grid; + place-items: center; + /* 水平和垂直居中 */ + height: 2%vh; + /* 100%视窗高度,可根据需要调整 */ + } + .applybtncheck:hover { + background-color: #f0ad4e; + color: #fff; } .applybtn:hover { @@ -190,18 +265,26 @@ function isPay($contract_no) \ No newline at end of file diff --git a/wms/bonus/bonus_detail.php b/wms/bonus/bonus_detail.php index d32848d2..d86b09d6 100644 --- a/wms/bonus/bonus_detail.php +++ b/wms/bonus/bonus_detail.php @@ -7,9 +7,9 @@ $stmt = $conn->prepare($sql); $stmt->bindParam(':id', $_GET['id']); $stmt->execute(); $result = $stmt->fetch(PDO::FETCH_ASSOC); -echo '
';
-print_r($result);
-echo '
'; +// echo '
';
+// print_r($result);
+// echo '
'; ?> @@ -86,16 +86,20 @@ echo ''; - 發放日期 + 發放日期 - + +

未填寫

+ + 應發日期 + + +

未填寫

發放金額 - - 地區經理經理員 @@ -191,7 +195,7 @@ echo ''; const facility_no = ''; const bonus_verson = ''; const receiver = ''; - const payDay = ''; + const payDaydue = ''; const maintain_price_total = ''; const contract_type = ''; // const bonus_verson = ''; diff --git a/wms/contract-repair/js/alpine.js b/wms/contract-repair/js/alpine.js index 9fba4bf0..99291141 100644 --- a/wms/contract-repair/js/alpine.js +++ b/wms/contract-repair/js/alpine.js @@ -883,14 +883,14 @@ const bonunsIndexTest = () => { receiver: receiver, maintain_month: '', maintain_price_total: maintain_price_total, - payDay: payDay, + payDaydue: payDaydue, bonusArr: [], contract_type: contract_type, manager: '', bonus_type: '', bouns_receiver: '', bouns_amount: '', - dayDus: '', + payDay: '', bouns_regulation: '', contract_manger: 'M0001', user_id: user_id @@ -956,14 +956,11 @@ const bonunsIndexTest = () => { // }) }, save() { - if (this.step == 3) { + if (this.step == 1) { const form = new FormData(); form.append('contract_no', this.data.contract_no); - form.append('facility_no', this.data.facility_no); - form.append('bonuns_verson', this.data.bonus_verson); - form.append('user_id', this.data.user_id); - form.append('bonusArr', JSON.stringify(this.data.bonusArr)); - axios.post('./api/insertBonus.php', form).then(res => { + form.append('payDay', this.data.payDay); + axios.post('./api/updateBonus.php', form).then(res => { console.log(res.data); }).catch(err => { @@ -975,7 +972,7 @@ const bonunsIndexTest = () => { const form = new FormData(); form.append('cotract_no', this.data.contract_no); form.append('bonuns_verson', this.data.bonus_verson); - form.append('c[ontract_type', this.data.contract_type); + form.append('contract_type', this.data.contract_type); form.append('maintain_month', this.data.maintain_month); form.append('maintain_price_total', this.data.maintain_price_total); form.append('payDay', this.data.payDay); @@ -1004,26 +1001,32 @@ const bonunsIndexTest = () => { } } {/* */ } -const bonusIndex = () => { - return { - init() { - // console.log(datas) - // console.log(Array(datas)); - for (let i = 0; i < datas.length; i++) { - this.data[i] = this.isPay(datas[i].contract_no); - } - console.log(this.data); - }, - data: [], - step: 1, - isPay(data) { - axios.get('./api/get.php?contract_no=' + data.contract_no).then(res => { - console.log(res.data); - let isPay = res.data; - return isPay; - }).catch(err => { +// const bonusIndex = () => { +// return { +// init() { +// window.onload = () => { +// this.isPay(); +// } +// }, +// initbtn: null, +// data: { +// isPay: [] +// }, +// isPays: [], +// step: 1, +// async isPay() { +// // console.log(this.data) +// for (let i = 0; i < datas.length; i++) { +// await axios.get('./api/get.php?contract_no=' + datas[i].contract_no).then(res => { +// let isPay = res.data; +// this.isPays.push(isPay); +// }).catch(err => { - }) - } - } -} \ No newline at end of file +// }) +// } + +// console.log(this.isPays); + +// } +// } +// } \ No newline at end of file diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php index e7a85071..59730e98 100644 --- a/wms/contract/api/testT8API.php +++ b/wms/contract/api/testT8API.php @@ -1,19 +1,21 @@ '; // print_r($countDay); // echo ''; // exit(); -$a = 0; +$SQuantity = 2; // $b = 24 / $a; -for ($i = 0; $i < 2; $i++) { - for ($j = 0; $j < 12; $j++) { - $a++; - echo '
';
-        print_r($a);
-        echo '
'; - } +for ($i = 0; $i < 12; $i++) { + $paymonth = $i * $SQuantity; + $countDay = date('Y-m-d', strtotime("$date + $paymonth months")); + $payDay = str_replace('-', '', $countDay); + echo '
';
+    print_r($payDay);
+    echo '
'; } diff --git a/wms/contract/conn.php b/wms/contract/conn.php index 78007657..a795b27c 100644 --- a/wms/contract/conn.php +++ b/wms/contract/conn.php @@ -33,6 +33,11 @@ try { //PDO::ERRMODE_EXCEPTION: 主動抛出 exceptions 異常,需要以try{}cath(){}輸出錯誤資訊。 //設定主動以警告的形式報錯 $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + $connT8 = new PDO("sqlsrv:Server=220.130.203.251;Database=T8masada", "M0225", "IFFBU1E="); + if ($connT8) { + $connT8->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + } //如果連接錯誤,將抛出一個PDOException異常對象 } catch (PDOException $e) { //如果連結資料庫失敗則顯示錯誤訊並停止本頁的工作