From 7ebc08834cb3fd6e3c075112baf8ba7265c1abdf Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Fri, 26 Jan 2024 17:05:33 +0800
Subject: [PATCH] rebase main

---
 wms/bons/api/get.php           |  2 +-
 wms/mkt/pricereview-create.php | 35 +++++++++++++++++-----------------
 wms/mkt/pricereview-index.php  |  4 ----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/wms/bons/api/get.php b/wms/bons/api/get.php
index 90490197..f2ad2a5e 100644
--- a/wms/bons/api/get.php
+++ b/wms/bons/api/get.php
@@ -54,7 +54,7 @@ if (!empty($_GET['contract_no'])) {
     $stmt->execute();
     $result = $stmt->fetch(PDO::FETCH_ASSOC);
     $count = COUNT($result);
-    $data['maintain_month'] = intval($conunt * $result['Squantity'])
+    $data['maintain_month'] = intval($conunt * $result['Squantity']);
 
 
 
diff --git a/wms/mkt/pricereview-create.php b/wms/mkt/pricereview-create.php
index ae64948b..369cb1fa 100644
--- a/wms/mkt/pricereview-create.php
+++ b/wms/mkt/pricereview-create.php
@@ -754,7 +754,7 @@ $option_str .= "</tbody></table>";
 
             $("#optionModal").modal('show');
             var jobj = $(this); // 父視窗
-            $("#optionModal .modal-body td").unbind().click(function(){
+            $("#optionModal .modal-body td").unbind().click(function() {
                 var pobj = $(this).closest('td').parent();
                 selectOptionFn(pobj, jobj)
             });
@@ -1198,7 +1198,7 @@ $option_str .= "</tbody></table>";
                     return rv3 = false;
                 }
             });
-            if ((rv3 === false)) return rv3; 
+            if ((rv3 === false)) return rv3;
 
             var rv4 = true;
             $("input[name='item_unit_price']").each(function() {
@@ -2061,7 +2061,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
                                 <td name="Exclusions"></td>
                                 <td name="mn_relate_facil" nowrap>
                                     <input type="hidden" name="item_group" value="E">
-                                    <a href="javascript:void(0);" name="btnfaci" class="btn btn-danger btn-sm">電梯</a>
+                                    <a href="javascript:void(0);" name="F" class="btn btn-danger btn-sm">電梯</a>
                                     <a href="javascript:void(0);" name="btndel3" class="btn btn-danger btn-sm">X</a>
                                 </td>
                             </tr>
@@ -2486,7 +2486,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
 <input type="file" name="attatch2" id="attatch2"><a href="javascript:void(0);" name="filedel2" class="btn btn-danger btn-sm">X</a>
 <div class="nextline"></div><br>
 <button type="submit" name="save" id="save" value="save">保存</button>&nbsp;
-<button type="submit" name="submit" id="submit" value="tosign" >提交</button>
+<button type="submit" name="submit" id="submit" value="tosign">提交</button>
 
 <input type="hidden" name="fp_id_all" id="fp_id_all">
 <input type="hidden" name="fp_kind_all" id="fp_kind_all">
@@ -2549,21 +2549,22 @@ include "../footer.php";
 
 <script>
     const options = [...<?php echo json_encode($options); ?>];
-    
-    function selectOptionFn(pobj, jobj){
-            // var pobj = $(this).closest('td').parent();
-            console.log(pobj);
-            // console.log(pobj.find('input[name=optionID]').val());
-            // console.log(jobj.html(pobj.find('td').eq(0).html() + ' ' + pobj.find('td').eq(1).html()));
-            console.log(pobj.find('td').eq(0).html());
-            jobj.html(pobj.find('td').eq(1).html() + " " + pobj.find('td').eq(2).html() + '<br />(' + pobj.find('td').eq(3).html() + ')');
-            jobj.closest('td').parent().find('input[name=option_unit_price]').val(pobj.find('td').eq(6).html());
-            jobj.closest('td').parent().find('input[name=option_price_bp]').val(commafy(pobj.find('td').eq(6).html().replace(/[,]+/g, "") * jobj.closest('td').parent().find('input[name=option_qty]').val().replace(/[,]+/g, "")));
-            jobj.closest('td').parent().find('input[name=op_id]').val(pobj.find('td').eq(0).html());
-            $("#optionModal").modal('hide');
+
+    function selectOptionFn(pobj, jobj) {
+        // var pobj = $(this).closest('td').parent();
+        console.log(pobj);
+        // console.log(pobj.find('input[name=optionID]').val());
+        // console.log(jobj.html(pobj.find('td').eq(0).html() + ' ' + pobj.find('td').eq(1).html()));
+        console.log(pobj.find('td').eq(0).html());
+        jobj.html(pobj.find('td').eq(1).html() + " " + pobj.find('td').eq(2).html() + '<br />(' + pobj.find('td').eq(3).html() + ')');
+        jobj.closest('td').parent().find('input[name=option_unit_price]').val(pobj.find('td').eq(6).html());
+        jobj.closest('td').parent().find('input[name=option_price_bp]').val(commafy(pobj.find('td').eq(6).html().replace(/[,]+/g, "") * jobj.closest('td').parent().find('input[name=option_qty]').val().replace(/[,]+/g, "")));
+        jobj.closest('td').parent().find('input[name=op_id]').val(pobj.find('td').eq(0).html());
+        $("#optionModal").modal('hide');
 
     }
-    function checkSubmit(){
+
+    function checkSubmit() {
         const price_total = document.getElementById('price_total')
 
         if (Number(price_total.value.replace(",", "")) > 0) {
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 3fff3ce6..0919e468 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -332,14 +332,10 @@ function get_pending($token)
 
 $result = get_pending($token);
 // print_r($result);
-<<<<<<< HEAD
 if (count($result) > 0) {
     $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm';
     $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';
 }
-=======
-
->>>>>>> 5b4e2536 (0125)
 
 if ($data) :
     /*