新梯價審BUG修正

wms/bons/api/get.php

@@ -1,9 +1,11 @@
 <?php
 require_once('../../contract/connt8.php');
 
-if (!empty($_GET['contract_no'])) {
+// if (!empty($_GET['contract_no'])) {
-    $contract_no = $_GET['contract_no'];
+// $contract_no = $_GET['contract_no'];
-    $sql = "SELECT 
+$contract_no = 'Q23080067';
+
+$sql = "SELECT 
             a.BillNo,
             b.OTaxAmt as amount,
             a.CU_EstPayDate as createDate,
@@ -20,14 +22,14 @@ if (!empty($_GET['contract_no'])) {
         WHERE a.BillNo = 'Q23080067'
         AND a.RowNo = '1'
         ";
-    $stmt = $connT8->prepare($sql);
+$stmt = $connT8->prepare($sql);
-    $stmt->execute();
+$stmt->execute();
-    $data = $stmt->fetch(PDO::FETCH_ASSOC);
+$data = $stmt->fetch(PDO::FETCH_ASSOC);
-    $data['amount'] = intval($data['amount']);
+$data['amount'] = intval($data['amount']);
-    $checkBillNo = $data['CBno'];
+$checkBillNo = $data['CBno'];
 
 
-    $sql = "SELECT 
+$sql = "SELECT 
         c.BillDate AS CheckBillDate
         FROM arWriteOffBill AS a 
         LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo 
@@ -44,26 +46,30 @@ if (!empty($_GET['contract_no'])) {
         WHERE c.checkBillNo = '$checkBillNo'
     ";
 
-    $stmt = $connT8->prepare($sql);
+$stmt = $connT8->prepare($sql);
-    $stmt->execute();
+$stmt->execute();
-    $check = $stmt->fetch(PDO::FETCH_ASSOC);
+$check = $stmt->fetch(PDO::FETCH_ASSOC);
+
 
 
-    $sql = "SELECT SQuantity FROM salIncomeApplyMaster WHERE BillNo = '$contract_no'";
+$CU_MaterialId = $data['facility'];
-    $stmt = $connT8->prepare($sql);
+$sql = "SELECT SQuantity FROM salIncomeApplyDetail WHERE BillNo = :contract_no AND CU_MaterialId = :CU_MaterialId";
-    $stmt->execute();
+$stmt = $connT8->prepare($sql);
-    $result = $stmt->fetch(PDO::FETCH_ASSOC);
+$stmt->bindParam(':contract_no', $contract_no);
-    $count = COUNT($result);
+$stmt->bindParam(':CU_MaterialId', $CU_MaterialId);
-    $data['maintain_month'] = intval($conunt * $result['Squantity']);
+$stmt->execute();
+$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+$count = COUNT($result);
+$data['maintain_month'] = intval($count * $result[0]['SQuantity']);
 
 
 
 
-    if (!empty($check['CheckBillDate'])) {
+if (!empty($check['CheckBillDate'])) {
     header('Content-Type: application/json');
     echo json_encode($data);
-    } else {
+} else {
     echo false;
     exit;
-    }
 }
+// }

wms/bons/bons_index.php

@@ -87,6 +87,23 @@ require_once('../contract-repair/conn.php');
                         </tr>
                     </tbody>
                 </template>
+                <!-- 獎金計算頁面 -->
+                <template x-if="step == 3">
+                    <tbody style="font-weight: bolder;margin-bottom:20px">
+                        <tr>
+                            <td colspan="7" style="vertical-align:middle;border-right:0px">
+                                <h4>獎金確認項</h4>
+                            </td>
+                            <td class="text-right" style="border: left 0px;">
+                                <button type="button" id="btn_back" class="btn btn-default" onclick="window.history.back();">返回</button>
+                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.close()">關閉</button>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align:middle"></td>
+                        </tr>
+                    </tbody>
+                </template>
             </table>
 
             <button x-show="step==3" @click="save()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">

wms/contract-repair/js/alpine.js

@@ -895,7 +895,7 @@ const bonsIndex = () => {
                 this.getContractData();
             } else if (this.step == 2) {
                 if (!this.data.disabled) {
-                    this.createElevator();
+                    this.calBons();
                 }
             }
             this.step = 3;
@@ -925,6 +925,7 @@ const bonsIndex = () => {
                     this.data.receiver = res.data.personId;
                     this.data.maintain_price_toal = res.data.amount;
                     this.data.bons_verson = 2;
+                    this.data.maintain_month = res.data.maintain_month;
                 }
                 this.step = 2;
                 this.isLoading = false;
@@ -933,12 +934,16 @@ const bonsIndex = () => {
             })
         },
         preStepFn() {
+            this.step = 1
             if (this.step == 2) {
-                console.log
+
             }
         },
         save() {
 
+        },
+        calBons() {
+            console.log('123');
         },
         errorFn() {
             let msg = '';

wms/mkt/pricereview-edit.php

@@ -1021,6 +1021,11 @@ foreach ($res as $data) {
                 })
                 $('#mn_kind_all').val(mnKindArr);
                 var mnSeatArr = [];
+                $("td[name='Exclusions']").each(function() {
+                    exRelateFacilArr.push($(this).html());
+                })
+                $('#Exclusions_all').val(exRelateFacilArr);
+                var exSpecArr = [];
                 $("select[name='mn_seat']").each(function() {
                     mnSeatArr.push($(this).val());
                 })
@@ -1519,7 +1524,6 @@ foreach ($res as $data) {
                                     <!-- <a href="javascript:void(0);" name="btndel3" class="btn btn-danger btn-sm">X</a> -->
                                 </td>
                                 <td name='Exclusions'></td>
-
                                 <td name="mn_relate_facil">
                                     <a href="javascript:void(0);" name="btnfaci" class="btn btn-danger btn-sm">電梯</a>
                                     <a href="javascript:void(0);" name="btndel3" class="btn btn-danger btn-sm">X</a>
@@ -1996,6 +2000,7 @@ foreach ($res as $data) {
     <input type="hidden" name="mn_seat_all" id="mn_seat_all">
     <input type="hidden" name="mn_numberofstop_all" id="mn_numberofstop_all">
     <input type="hidden" name="mn_speed_all" id="mn_speed_all">
+    <input type="hidden" name="Exclusions_all" id="Exclusions_all">
     <input type="hidden" name="mn_unit_price_all" id="mn_unit_price_all">
     <input type="hidden" name="mn_qty_all" id="mn_qty_all">
     <input type="hidden" name="mn_price_bp_all" id="mn_price_bp_all">