0202

wms/bonus/bonus.php

@@ -18,7 +18,7 @@ $bonus_type = [
 $clause = '';
 if (!empty($_GET['check'])) {
     if ($_GET['check'] == 1) {
-        $clause .= "AND pay_day > DATE_SUB(NOW(), INTERVAL 1 MONTH)";
+        $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) {

wms/mkt/pricereview-check.php

@@ -320,9 +320,9 @@ foreach ($res as $data) {
         function getMI(id) {
             var formdata = new FormData();
             formdata.append('pa', id);
-            // formdata.append('user_id', <?= $user_id ?>);
             var xhr = new XMLHttpRequest();
             xhr.onreadystatechange = function() {
+                console.log(this.responseText);
                 if (this.readyState == 4 && this.status == 200) {
                     data = JSON.parse(this.responseText);
                     console.log(data);
@@ -338,8 +338,8 @@ foreach ($res as $data) {
                     }
                     // console.log(data.content);
                     Object.keys(data.content).forEach(function(k) {
-                        console.log('k=>', k);
+                        // console.log('k=>', k);
-                        console.log(data.content);
+                        // console.log(data.content);
                         //console.log(data.content[k][0]);
                         // 有值表示先前已寫入MI
                         if ($("#tb1").find("input[name=mi_fix]").eq(k).val() == "") {

wms/mkt/pricereview_mi-api.php

@@ -91,7 +91,6 @@ try {
     if ($elev_qty_all == 0) {
         $specarr[1] = 0;
         $specarr[1] = round($special_fee / 1, 0);
-
     } else {
         $specarr[1] = round($special_fee / $elev_qty_all, 0);
     }
@@ -208,7 +207,7 @@ try {
     // echo json_encode($elev_arr);
     require_once("./conn.php");
     // echo json_encode($elev_arr);
-    foreach ((Array)$elev_arr as $item_no => $v) {
+    foreach ((array)$elev_arr as $item_no => $v) {
         if ($item_no == "") {
             continue;
         }
@@ -230,7 +229,6 @@ try {
         $stmt->bindParam(':quotation_no', $quotation_no);
         $stmt->execute();
         $row_e = $stmt->fetch(PDO::FETCH_ASSOC);
-
         // $sql2  = "select o.*, r.* from elevator_mi_option o, elevator_quotation_rule r ";
         // $sql2 .= "where o.quotation_no = r.quotation_no and o.elevator_type = '" . $v['etype'] . "' ";
         // $sql2 .= "and ($v[item_weight] between o.min_weight and o.max_weight) ";
@@ -246,7 +244,6 @@ try {
             // 加價：先不納入
             $row_e["option_price"] = 0;
             if (!isset($row_e["purchase_cost"])) {
-
             }
             // 基准采购成本+±1停材料费+设计费+出口费用
             $part1 = $row_e["purchase_cost"] + ($v["floors"] - $row_e["base_floor"]) * $row_e["material_plus"] + $row_e["design"] * $row_e["design_hour"] + $row_e["export_fee"];
@@ -508,7 +505,6 @@ try {
                     round($itemoption['option_mi'] * $itemoption['item_qty'], 0),
                 ];
             }
-            
         }
 
         foreach ($item[14] as $option) {
@@ -522,7 +518,6 @@ try {
 
         $item[13] = $newTotal;
     }
-
 } catch (\Exception $e) {
     $rarr['st'] = 'err';
     $rarr['err'] = $e->getMessage();