option更新

wms/contract/insertData.php

@@ -140,7 +140,7 @@ foreach ($sheet->getRowIterator() as $key => $row) {
 
             $option_price_id = $last_id;
             $option_price = $cost;
-            $quotation_no = 'Q2401001';
+            $quotation_no = 'Q2401002';
             foreach ($open_kind_arr as $kind) {
                 $min_weight = 1;
                 $max_weight = 1600;

wms/frame/pending.php

@@ -89,6 +89,7 @@ function here() {
         url: URL,
         success: function (msg) {
             var obj = JSON.parse(msg);
+            console.log(obj);
             var myhtml = '';
             if (obj.st == 'ok') {
                 myhtml += '<ul class="nav nav-pills flex-column">';

wms/header.php

@@ -1,5 +1,5 @@
 <?php
-ini_set('display_errors', 'off');
+// ini_set('display_errors', 'off');
 
 // 維護專用 
 // include "maintenance.php";

wms/mkt/assets/js/alpine.js

@@ -11,8 +11,9 @@ const priceOptionIndex = ()=>{
         orioptions: options,
         options: options,
         options_arr: {
-            1:'標',
+            1:'標配',
-            2:'選',
+            2:'選配',
+            3:'加價'
         },
         btntype:1,
         buttons:[],
@@ -131,8 +132,9 @@ const priceOptionSelect = ()=>{
         orioptions: options,
         options: options,
         options_arr: {
-            1:'標',
+            1:'標配',
-            2:'選',
+            2:'選配',
+            3:'加價'
         },
         btntype:1,
         buttons:[],

wms/mkt/price_option-index.php

@@ -93,7 +93,7 @@ $optional_arr = [1 => '標', 2 => '選'];
                             <td x-text="option.memo"></td>
                             <td x-text="options_arr[option.optional]"></td>
                             <td x-text="option.unit"></td>
-                            <td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : ''"></td>
+                            <td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : '$0'"></td>
                             <?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225") : ?>
                                 <td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : ''"></td>
                             <?php endif; ?>

wms/mkt/price_option-select.php

@@ -2,11 +2,11 @@
 include "../header.php";
 require_once('./conn.php');
 $sql_str = "SELECT * FROM option_price   WHERE  status ='Y'";
-$sql_str = "SELECT option_price.*, option_mi.price as mi FROM option_price LEFT JOIN (SELECT option_mi.option_price_id, option_mi.price  FROM option_mi GROUP BY option_mi.option_price_id) option_mi ON option_price.id = option_mi.option_price_id WHERE status ='Y'";
+$sql_str = "SELECT option_price.*, option_mi.price as mi FROM option_price LEFT JOIN (SELECT option_mi.option_price_id, option_mi.price  FROM option_mi GROUP BY option_mi.option_price_id) option_mi ON option_price.id = option_mi.option_price_id WHERE status ='Y' ORDER BY kind ASC";
 $stmt = $conn->prepare($sql_str);
 $stmt->execute();
 $options = $stmt->fetchAll(PDO::FETCH_ASSOC);
-$optional_arr = [1 => '標', 2 => '選'];
+$optional_arr = [1 => '標配', 2 => '選配',3=>'加價'];
 ?>
 <link rel="stylesheet" href="./css/style.css">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -77,9 +77,9 @@ $optional_arr = [1 => '標', 2 => '選'];
                             <td x-text="option.memo"></td>
                             <td x-text="options_arr[option.optional]"></td>
                             <td x-text="option.unit"></td>
-                            <td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : ''"></td>
+                            <td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : '$0'"></td>
                             <?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225") : ?>
-                                <td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : ''"></td>
+                                <td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : '$0'"></td>
                             <?php endif; ?>
                         </tr>
                     </template>

wms/mkt/pricereview_renovate-create.php

@@ -1319,6 +1319,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
 }
 */
     ?>
+    
     <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
 
         <div class="table-responsive">