去高雄囉

wms/contract/js/alpine.js

@@ -948,7 +948,7 @@ const contractInput = () => {
         },
         cities: [],
         data: {
-            contractno: 'B23100060',
+            contractno: 'B24010030',
             total_price: '', //合約總價
             vat: '', //統一編號
             mtype: 'A', //維修型態

wms/mkt/assets/js/pricereviewAlpine.js

@@ -0,0 +1,7 @@
+const pricereviewCreate = ()=>{
+    return {
+        init(){
+            console.log(123)
+        }
+    }
+}

wms/mkt/conn.php

@@ -20,11 +20,11 @@ $db_name     = getenv('DB_DATABASE');            //使用的資料庫
 $db_charset  = 'utf8';             //設定字元編碼
 
 
-// $db_hostname = 'localhost';        //資料庫主機名稱
+$db_hostname = 'localhost';        //資料庫主機名稱
-// $db_username = 'masadaroot';             //登入資料庫的管理者的帳號
+$db_username = 'root';             //登入資料庫的管理者的帳號
-// $db_password = 'x6h5E5p#u8y';        //登入密碼
+$db_password = '';        //登入密碼
-// $db_name     = 'appwms';            //使用的資料庫
+$db_name     = 'appwms';            //使用的資料庫
-// $db_charset  = 'utf8';             //設定字元編碼
+$db_charset  = 'utf8';             //設定字元編碼
 //建立PDO的指定工作
 $dsn = "mysql:host=$db_hostname;dbname=$db_name;charset=$db_charset";
  

wms/mkt/css/pricereview.css

@@ -0,0 +1,90 @@
+#pricereviewCreate table, #pricereviewCreate th, #pricereviewCreate td {
+  border: 1px #ccc solid;
+  padding: 15px;
+}
+#pricereviewCreate table thead th {
+  background-color: #6D9EEB;
+}
+#pricereviewCreate table tbody td input {
+  font-size: 14px;
+}
+#pricereviewCreate table tbody th {
+  background-color: #CCE4F8;
+  font-size: 14px;
+  padding: 15px 2px;
+  min-width: 100px;
+  text-align: center;
+}
+#pricereviewCreate table input {
+  font-size: 13px;
+}
+#pricereviewCreate .pricreviewmain {
+  background-color: #F2F2F2;
+  padding: 20px;
+  border-radius: 6px;
+}
+#pricereviewCreate .pricreviewmain button {
+  color: #fff;
+  width: 55px;
+  height: 30px;
+  padding: 0;
+  margin-left: 10px;
+  font-size: 13px;
+}
+#pricereviewCreate .pricreviewmain button.addbtn {
+  background-color: #337AB7;
+  width: 30px;
+}
+#pricereviewCreate .pricreviewmain button.deleteBtn {
+  background-color: #D9534F;
+  color: #fff;
+  font-size: 12px;
+  width: 30px;
+}
+#pricereviewCreate .pricreviewmain button.selectElevator {
+  background-color: #D9534F;
+  color: #fff;
+}
+#pricereviewCreate .pricreviewmain > .divitem {
+  border: 1px #ccc solid;
+  padding: 10px;
+  border-radius: 4px;
+}
+#pricereviewCreate .pricreviewmain > .divitem .title {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px #ccc solid;
+  padding: 10px 0;
+  margin-bottom: 10px;
+}
+#pricereviewCreate .pricreviewmain > .divitem .title h6 {
+  font-weight: 600;
+}
+#pricereviewCreate .pricreviewmain > .divitem table, #pricereviewCreate .pricreviewmain > .divitem th, #pricereviewCreate .pricreviewmain > .divitem td {
+  font-size: 14px;
+  background-color: transparent;
+}
+#pricereviewCreate .pricreviewmain > .divitem table input, #pricereviewCreate .pricreviewmain > .divitem table select, #pricereviewCreate .pricreviewmain > .divitem table textarea, #pricereviewCreate .pricreviewmain > .divitem th input, #pricereviewCreate .pricreviewmain > .divitem th select, #pricereviewCreate .pricreviewmain > .divitem th textarea, #pricereviewCreate .pricreviewmain > .divitem td input, #pricereviewCreate .pricreviewmain > .divitem td select, #pricereviewCreate .pricreviewmain > .divitem td textarea {
+  font-size: 13px;
+}
+#pricereviewCreate .pricreviewmain > .divitem table input[type=number]::-webkit-outer-spin-button,
+#pricereviewCreate .pricreviewmain > .divitem table input[type=number]::-webkit-inner-spin-button, #pricereviewCreate .pricreviewmain > .divitem th input[type=number]::-webkit-outer-spin-button,
+#pricereviewCreate .pricreviewmain > .divitem th input[type=number]::-webkit-inner-spin-button, #pricereviewCreate .pricreviewmain > .divitem td input[type=number]::-webkit-outer-spin-button,
+#pricereviewCreate .pricreviewmain > .divitem td input[type=number]::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+#pricereviewCreate .pricreviewmain > .divitem table tr:hover .deleteBtn {
+  opacity: 1;
+}
+#pricereviewCreate .pricreviewmain > .divitem table .saletd {
+  position: relative;
+}
+#pricereviewCreate .pricreviewmain > .divitem table .saletd > .deleteBtn {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 2px;
+  opacity: 0;
+  transition: 0.3s;
+}/*# sourceMappingURL=pricereview.css.map */

wms/mkt/css/pricereview.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["pricereview.scss","pricereview.css"],"names":[],"mappings":"AACI;EACI,sBAAA;EACA,aAAA;ACAR;ADGQ;EACI,yBAAA;ACDZ;ADIY;EACI,eAAA;ACFhB;ADIY;EACI,yBAAA;EACA,eAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;ACFhB;ADKQ;EACI,eAAA;ACHZ;ADMI;EACI,yBAAA;EACA,aAAA;EACA,kBAAA;ACJR;ADKQ;EACI,WAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;EACA,iBAAA;EACA,eAAA;ACHZ;ADIY;EACI,yBAAA;EACA,WAAA;ACFhB;ADIY;EACI,yBAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;ACFhB;ADIY;EACI,yBAAA;EACA,WAAA;ACFhB;ADMQ;EACI,sBAAA;EACA,aAAA;EACA,kBAAA;ACJZ;ADKY;EACI,aAAA;EACA,mBAAA;EACA,6BAAA;EACA,eAAA;EACA,mBAAA;ACHhB;ADIgB;EACI,gBAAA;ACFpB;ADMY;EACI,eAAA;EACA,6BAAA;ACJhB;ADKgB;EACI,eAAA;ACHpB;ADKgB;;;;EAEA,wBAAA;EACA,SAAA;ACDhB;ADKgB;EACI,UAAA;ACHpB;ADKgB;EACI,kBAAA;ACHpB;ADIoB;EACI,kBAAA;EACA,QAAA;EACA,2BAAA;EACA,UAAA;EACA,UAAA;EACA,gBAAA;ACFxB","file":"pricereview.css"}

wms/mkt/css/pricereview.scss

@@ -0,0 +1,98 @@
+#pricereviewCreate{
+    table, th, td{
+        border:1px #ccc solid;
+        padding: 15px;
+    }
+    table{
+        thead th{
+            background-color: #6D9EEB;
+        }
+        tbody {
+            td input{
+                font-size: 14px;
+            }
+            th{
+                background-color: #CCE4F8;
+                font-size: 14px;
+                padding: 15px 2px;
+                min-width: 100px;
+                text-align: center;
+            }
+        }
+        input{
+            font-size: 13px;
+        }
+    }
+    .pricreviewmain{
+        background-color: #F2F2F2;
+        padding: 20px;
+        border-radius: 6px ;
+        button{
+            color:#fff;
+            width: 55px;
+            height: 30px;
+            padding: 0;
+            margin-left: 10px;
+            font-size: 13px;
+            &.addbtn{
+                background-color: #337AB7;
+                width: 30px;
+            }
+            &.deleteBtn{
+                background-color: #D9534F;
+                color:#fff;
+                font-size: 12px;
+                width: 30px;
+            }
+            &.selectElevator{
+                background-color: #D9534F;
+                color:#fff;
+            }
+        }
+        
+        >.divitem{
+            border:1px #ccc solid;
+            padding: 10px;
+            border-radius: 4px ;
+            .title{
+                display: flex;
+                align-items: center;
+                border-bottom: 1px #ccc solid;
+                padding: 10px 0;
+                margin-bottom: 10px;
+                h6{
+                    font-weight: 600;
+                }
+                
+            }
+            table, th, td{
+                font-size: 14px;
+                background-color: transparent;
+                input, select, textarea{
+                    font-size: 13px;
+                }
+                input[type=number]::-webkit-outer-spin-button,
+                input[type=number]::-webkit-inner-spin-button {
+                -webkit-appearance: none;
+                margin: 0;
+                }
+            }
+            table {
+                tr:hover .deleteBtn{
+                    opacity: 1;
+                }
+                .saletd{
+                    position: relative;
+                    >.deleteBtn{
+                        position: absolute;
+                        top: 50%;
+                        transform: translateY(-50%);
+                        right:2px;
+                        opacity: 0;
+                        transition: .3s;
+                    }
+                }
+            }
+        }
+    }
+}

wms/mkt/pricereview-check.php

@@ -52,6 +52,7 @@ $res = mysqli_query($link, $db_query);
 foreach ($res as $data) {
     // 上層主管
     $sql = "select manager from account where accountid = '" . $data["person"] . "'";
+    echo $sql;
     $res_a = mysqli_query($link, $sql);
     $row_a = mysqli_fetch_row($res_a);
     $manager = $row_a[0];

wms/mkt/pricereview-index.php

@@ -358,7 +358,7 @@ if ($data) :
     </style>
     <link rel="stylesheet" href="common.css">
     <div style="overflow-x:auto; white-space:nowrap;">
-        <<<<<<< HEAD <?php if (($user_id === "M0060" || $user_id === "M0107" || $user_id === "M0175" || $user_id === "M0174" || $user_id === "M0225")) { ?> <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['system_id']) && !isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有價審</a>
+        <?php if (($user_id === "M0060" || $user_id === "M0107" || $user_id === "M0175" || $user_id === "M0174" || $user_id === "M0225")) { ?> <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['system_id']) && !isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有價審</a>
             <?php if (count($result) > 0) : ?>
                 <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
             <?php else : ?>
@@ -368,15 +368,7 @@ if ($data) :
             <a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案同意</a>
             <a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案不同意</a>
         <?php } ?>
-        =======
+      
-        <?php if ($user_id === "M0060" || $user_id === "M0107" || $user_id === "M0175" || $user_id === "M0174" || $user_id === "M0225") { ?>
-            <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['system_id']) && !isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有價審</a>
-            <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
-            <a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 1) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 簽核完畢</a>
-            <a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案同意</a>
-            <a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案不同意</a>
-        <?php } ?>
-        >>>>>>> c91540c2 (0125)
         <table id="table_index" class="table table-striped table-bordered" style="width:100%">
             <thead>
                 <tr>

wms/mkt/pricereviewCreate.php

@@ -0,0 +1,516 @@
+<?php
+
+// include "../header.php";
+require_once("./conn.php");
+
+?>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css">
+<link rel="stylesheet" href="./css/pricereview.css">
+<script src="./assets/js/alpinejs/cdn.min.js"></script>
+<script src="./assets/js/pricereviewAlpine.js"></script>
+<div id="pricereviewCreate" x-data="pricereviewCreate()">
+    <div class="container">
+        <table class="table" border="1">
+            <thead >
+                <tr class="" >
+                <th scope="col" class="text-center " colspan="8">有望客戶基本資料</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th >卷號</th>
+                    <td><input class="form-control" type="text" disabled value="B123456789" /></td>
+                    <th>客戶名稱</th>
+                    <td><input class="form-control" type="text" disabled value="中華民國" /></td>
+                    <th>負責人</th>
+                    <td><input class="form-control" type="text" disabled value="馬英九" /></td>
+                    <th>客戶來源</th>
+                    <td><input class="form-control" type="text" disabled value="朋友介紹" /></td>
+                </tr>
+                <tr>
+                    <th>地址</th>
+                    <td><input class="form-control" type="text" disabled value="嘉義市東區日新街55巷13號" /></td>
+                    <th>案件名稱</th>
+                    <td><input class="form-control" type="text" disabled value="川勝開發營造(興美七街)" /></td>
+                    <th>統編/身份證</th>
+                    <td><input class="form-control" type="text" disabled value="83557587" /></td>
+                    <th>業主方聯係人</th>
+                    <td><input class="form-control" type="text" disabled value="曾祈達" /></td>
+                </tr>
+                <tr>
+                    <th>市話/手機</th>
+                    <td><input class="form-control" type="text" disabled value="0921361700" /></td>
+                    <th>營業員</th>
+                    <td><input class="form-control" type="text" disabled value="林易增" /></td>
+                    <th>台數</th>
+                    <td><input class="form-control" type="number" disabled value="1" /></td>
+                    <th>預定成交日</th>
+                    <td><input class="form-control" type="text" disabled value="2024/02/01" /></td>
+                </tr>
+                <tr>
+                    <th>有望客戶狀態</th>
+                    <td><input class="form-control" type="text" disabled value="有望簽約(已報價)" /></td>
+                    <th>汰改</th>
+                    <td><input class="form-control" type="text" disabled value="否" /></td>
+                </tr>
+            </tbody>
+        </table>
+
+        <table class="table" border="1">
+            <thead >
+                <tr class="" >
+                <th scope="col" class="text-center " colspan="8">洽商進度</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td colspan=8>
+                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="5" disabled ></textarea>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <table class="table" border="1">
+            <thead >
+                <tr class="" >
+                <th scope="col" class="text-center " colspan="8">電梯規格訊息</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th >序號</th>
+                    <th >規格</th>
+                    <th >人乘/載重</th>
+                    <th >停數</th>
+                    <th >開門方式</th>
+                    <th >速度(m/min)</th>
+                    <th >數量</th>
+                    <th >單價</th>
+                </tr>
+                <tr>
+                    <td ><input type="text" disabled class="form-control disabled" value="1"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="MAH100(家庭梯)"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="6人"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="4人"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="2S"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="45"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="1"></td>
+                    <td ><input type="text" disabled class="form-control disabled" value="100000"></td>
+                </tr>
+            </tbody>
+        </table>
+        <div class="pricreviewmain container">
+            <div class="divitem">
+                <div class="title">
+                    <h6>整機單價</h6>
+                    <button class="addbtn btn" x-ref="addElevatorBtn">+</button>
+                </div>
+                <table class="table" border=1>
+                    <thead>
+                        <tr>
+                            <td>電梯</td>
+                            <td>人乘/載重</td>
+                            <td>停數</td>
+                            <td>速度(m/min)</td>
+                            <td>開門方式</td>
+                            <td>規格</td>
+                            <td>單價</td>
+                            <td>數量</td>
+                            <td>複價</td>
+                            <td>售價 </td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>
+                                <select name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="MAE100">MAE100有機房</option>
+                                    <option value="MAM200">MAM200無機房</option>
+                                    <option value="MAH100">MAH100小電梯</option>
+                                    <option value="MAF100">MAE100貨梯(有機房)</option>
+                                    <option value="MAQ100">MAQ100強趨梯</option>
+                                    <option value="MAP100">MAP100平台梯</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="6">6</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                    <option value="11">11</option>
+                                    <option value="12">12</option>
+                                    <option value="13">13</option>
+                                    <option value="15">15</option>
+                                    <option value="17">17</option>
+                                    <option value="20">20</option>
+                                    <option value="24">24</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input class="form-control" type="number" style="width:50px;padding-left:5px" />
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control" style="width:80px">
+                                    <option value="">請選擇</option>
+                                    <option value="9">9</option>
+                                    <option value="24">24</option>
+                                    <option value="30">30</option>
+                                    <option value="45">45</option>
+                                    <option value="60">60</option>
+                                    <option value="90">90</option>
+                                    <option value="105">105</option>
+                                    <option value="120">120</option>
+                                    <option value="150">150</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control" style="width:80px">
+                                    <option value="CO">CO</option>
+                                    <option value="2S">2S</option>
+                                    <option value="2U">CO</option>
+                                    <option value="4PCO">4PCO</option>
+                                    <option value="6PCO">6PCO</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="text" class="form-control" disabled value="MAE100-6*7-CO45">
+                            </td>
+                            <td><input type="text" class="form-control" disabled value="750000" style="width:100px"></td>
+                            <td><input type="number" class="form-control " disabled value="1" style="width:40px;padding-left:5px"></td>
+                            <td><input type="number" class="form-control " disabled value="750000" style="width:100px"></td>
+                            <td class="saletd">
+                                <input type="number" class="form-control " disabled value="690000" style="width:100px">
+                                <button class="deleteBtn btn btn-danger">X</button>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=7>小計</td>
+                            <td><input type="number" class="form-control" disabled value="1" style="width:40px;padding-left:5px"></td>
+                            <td><input type="text" class="form-control" disabled value="750000" style="width:100px"></td>
+                            <td><input type="text" class="form-control" disabled value="690000" style="width:100px"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="divitem">
+                <div class="title">
+                    <h6>Option加價</h6>
+                    <button class="addbtn btn" x-ref="addElevatorBtn">+</button>
+                </div>
+                <table class="table" border=1>
+                    <thead>
+                        <tr>
+                            <td>選配規格</td>
+                            <td>單價</td>
+                            <td>數量</td>
+                            <td>複價</td>
+                            <td>備註</td>
+                            <td>所屬電梯</td>
+                            <td>功能</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td><button class="btn btn-success">選擇</button></td>
+                            <td><input type="text" class="form-control" value="35000"></td>
+                            <td><input type="number" class="form-control" value="1"></td>
+                            <td><input type="text" class="form-control" disabled value="35000"></td>
+                            <td><input type="text" class="form-control"></td>
+                            <td>MAE100-6*7-CO45</td>
+                            <td>
+                                <div class="d-flex">
+                                    <button class="selectElevator btn btn-danger">電梯</button>
+                                    <button class="deleteBtn btn btn-danger">X</button>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=3>小計</td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="350000" ></td>
+                            <td colspan=4 ></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="divitem">
+                <div class="title">
+                    <h6>除外項目</h6>
+                    <button class="addbtn btn" x-ref="addElevatorBtn">+</button>
+                </div>
+                <table class="table" border=1>
+                    <thead>
+                        <tr>
+                            <td>詢價單號</td>
+                            <td>名稱</td>
+                            <td>單價</td>
+                            <td>數量</td>
+                            <td>複價</td>
+                            <td>所屬電梯</td>
+                            <td>功能</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td><input type="text" class="form-control" value=""></td>
+                            <td><input type="text" class="form-control" value=""></td>
+                            <td><input type="text" class="form-control" value=""></td>
+                            <td><input type="number" class="form-control"  value=""></td>
+                            <td><input type="text" class="form-control" disabled></td>
+                            <td>MAE100-6*7-CO45</td>
+                            <td>
+                                <div class="d-flex">
+                                    <button class="selectElevator btn btn-danger">電梯</button>
+                                    <button class="deleteBtn btn btn-danger">X</button>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=3>小計</td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="0" ></td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="0" ></td>
+                            <td colspan=3 ></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="divitem">
+                <div class="title">
+                    <h6>保固延長</h6>
+                    <button class="addbtn btn" x-ref="addElevatorBtn">+</button>
+                </div>
+                <table class="table" border=1>
+                    <thead>
+                        <tr>
+                            <td>電梯</td>
+                            <td>人乘/載重</td>
+                            <td>停數</td>
+                            <td>速度</td>
+                            <td>單價</td>
+                            <td>數量(月)</td>
+                            <td>複價</td>
+                            <td>備註</td>
+                            <td>所屬電梯</td>
+                            <td>功能</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>
+                                <select name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="MAE100">MAE100有機房</option>
+                                    <option value="MAM200">MAM200無機房</option>
+                                    <option value="MAH100">MAH100小電梯</option>
+                                    <option value="MAF100">MAE100貨梯(有機房)</option>
+                                    <option value="MAQ100">MAQ100強趨梯</option>
+                                    <option value="MAP100">MAP100平台梯</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="6">6</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                    <option value="11">11</option>
+                                    <option value="12">12</option>
+                                    <option value="13">13</option>
+                                    <option value="15">15</option>
+                                    <option value="17">17</option>
+                                    <option value="20">20</option>
+                                    <option value="24">24</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input class="form-control" type="number" style="width:50px;padding-left:5px" />
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control" style="width:80px">
+                                    <option value="">請選擇</option>
+                                    <option value="9">9</option>
+                                    <option value="24">24</option>
+                                    <option value="30">30</option>
+                                    <option value="45">45</option>
+                                    <option value="60">60</option>
+                                    <option value="90">90</option>
+                                    <option value="105">105</option>
+                                    <option value="120">120</option>
+                                    <option value="150">150</option>
+                                </select>
+                            </td>
+                            <td><input type="text" class="form-control"></td>
+                            <td><input type="number" class="form-control "  value="1" style="width:40px;padding-left:5px"></td>
+                            <td><input type="number" class="form-control " disabled value="750000" style="width:100px"></td>
+                            <td><input type="text" class="form-control"></td>
+                            <td>MAE100-6*7-CO45</td>
+                            <td>
+                                <div class="d-flex">
+                                    <button class="selectElevator btn btn-danger">電梯</button>
+                                    <button class="deleteBtn btn btn-danger">X</button>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=5>小計</td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="0" ></td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="0" ></td>
+                            <td colspan=3 ></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="divitem">
+                <table style="width:800px" class="table" border=1>
+                    <thead>
+                        <tr>
+                            <td>付款辦法</td>
+                            <td>款別</td>
+                            <td >比例(%)</td>
+                            <td>金額</td>
+                            <td>票期</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td rowspan="4">材料</td>
+                            <td >1.訂金</td>
+                            <td ><input type="number" class="form-control" value="20"></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td >2.二次款</td>
+                            <td ><input type="number" class="form-control" ></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td >3.貨到工地款</td>
+                            <td ><input type="number" class="form-control" value="50"></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td >4.其他</td>
+                            <td ><input type="number" class="form-control"></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td rowspan="3">安裝</td>
+                            <td >5.安裝完畢款</td>
+                            <td ><input type="number" class="form-control" value="20"></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td >6.驗收款</td>
+                            <td ><input type="number" class="form-control" value="10"></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td >7.其他</td>
+                            <td ><input type="number" class="form-control"></td>
+                            <td><input type="number" class="form-control" disabled></td>
+                            <td>
+                                <select  name="" id="" class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="7">7天</option>
+                                    <option value="30" selected>30天</option>
+                                    <option value="60">60天</option>
+                                    <option value="90">90天</option>
+                                    <option value="120">120天</option>
+                                    <option value="180">180天</option>
+                                    <option value="">其他</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=2>合計</td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="0" ></td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled value="0" ></td>
+                            <td colspan=3 ></td>
+                        </tr>
+                        <tr>
+                            <td colspan=2>備註</td>
+                            <td colspan=4 >
+                                <textarea name="" class="form-control" id="" cols="30" rows="5"></textarea>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>

wms/mkt/pricereview_mi-api.php

@@ -106,6 +106,7 @@ try {
         $opt_elev_arr[$row[0]]["item_qty"] = $row[3];
         $tmp_arr = explode(",", $row[4]);
         $opt_elev_arr[$row[0]]["elev_no"] = $tmp_arr;
+
         if (!empty($opt_elev_arr[$row[0]]["elev_no"][0])) {
             foreach ($tmp_arr as $v) {
                 $elev_arr[$v]["option"][] = $row[0];
@@ -125,6 +126,7 @@ try {
         }
         */
     }
+
     mysqli_free_result($res);
     $opt_nosel_id_arr = array_diff(array_keys($opt_elev_arr), $opt_sel_id_arr);
 
@@ -337,6 +339,7 @@ try {
                     AND option_mi.open_kind = '" . $v["item_op"] . "'";
 
                     $res_om = mysqli_query($link, $sql4);
+                    
                     if ($row_om = mysqli_fetch_assoc($res_om)) {
                         $row_om['price'] = (int)ceil($row_om['price']);
                         $plus = ($v["floors"] > $row_om["base_floor"]) ? ($v["floors"] - $row_om["base_floor"]) * $row_om["base_floor_plus"] : 0;
@@ -488,6 +491,8 @@ try {
         }
     }
     // $rarr["content"][] = $exceptArr;
+    print_r($rarr["content"]);
+    exit;
     foreach($rarr["content"] as $idx=>&$item){
         $newTotal = 0;
         $item[16] = [];

wms/schedule-index.php

@@ -24,7 +24,7 @@ $data = array();
 // sql語法存在變數中
 $page_close = 0;
 $sql_cmd2 = "";
-$sql_cmd = sql_myself($user_id, "repairedid");
+$sql_cmd = sql_myself($user_id, "repairerid");
 if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105") $sql_cmd = "";
 if (in_array($user_department_id . $user_role_id, $dr_arr)) $sql_cmd = "";
 //if (empty($sql_cmd)) $sql_cmd = "where ";
@@ -177,17 +177,17 @@ if ($data) :
                     <th>保養人員姓名</th>
                     <th>應保養日期</th>
                     <th>實際保養日期</th>
-                    <th>保養項目編號</th>
+                    <!-- <th>保養項目編號</th>
-                    <th>保養項目內容</th>
+                    <th>保養項目內容</th> -->
                     <th>保養結果</th>
-                    <th>上傳照片</th>
+                    <th>保養照片/保養品質</th>
                     <th>說明</th>
-                    <th>客戶評價登入帳號</th>
+                    <!-- <th>客戶評價登入帳號</th> -->
                     <th>客戶姓名</th>
-                    <th>評價/保養品質</th>
+                    <!-- <th>評價/保養品質</th>
-                    <th>評價/服務態度</th>
+                    <th>評價/服務態度</th> -->
-                    <th>內容</th>
+                    <!-- <th>內容</th>
-                    <th>簽名檔</th>
+                    <th>簽名檔</th> -->
                     <th>建檔人</th>
                     <th>建檔時間</th>
                     <?php if ($user_auth & 2) { ?>
@@ -208,16 +208,22 @@ if ($data) :
                         <td><?php echo $data['repairername']; ?></td>
                         <td><?php echo $data['duedate']; ?></td>
                         <td><?php echo $data['actualdate']; ?></td>
-                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item']; ?></td>
+                        <!-- <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item']; ?></td>
-                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item_detail']; ?></td>
+                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item_detail']; ?></td> -->
-                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['result']; ?></td>
+                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;">
-                        <td><?php if ($data['evidences']) {
+                            <?php //echo $data['result']; ?>
-                                echo "<a href=\"/app/" . $data['evidences'] . "\">瀏覽</a>";
+                            <a href="/app/app-maintenance-uploadsuccess-survey.php?id_schedule=<?php echo $data['id']; ?>&<?php echo $token_link; ?>">查看明細</a>
+                        </td>
+                        <td>
+                        <a href="/app/app-maintenance-uploadsuccess-photo-review_v2.php?id_schedule=<?php echo $data['id']; ?>&<?php echo $token_link; ?>">瀏覽</a>
+                            <?php if ($data['evidences']) {
+                            
+                                // echo "<a href=\"/app/" . $data['evidences'] . "\">瀏覽</a>";
                             } ?></td>
                         <td><?php echo $data['descriptons']; ?></td>
-                        <td><?php echo $data['customer_login_id']; ?></td>
+                        <!-- <td><?php echo $data['customer_login_id']; ?></td> -->
                         <td><?php echo $data['customer_login_name']; ?></td>
-                        <td>
+                        <!-- <td>
                             <?php
                             $stars_1 = ($data['stars_c1']) ? $data['stars_c1'] : $data['stars'];
                             echo $stars_1;
@@ -228,9 +234,9 @@ if ($data) :
                             $stars_2 = ($data['stars_c2']) ? $data['stars_c2'] : $data['stars_b2'];
                             echo $stars_2;
                             ?>
-                        </td>
+                        </td> -->
-                        <td><?php echo $data['details']; ?></td>
+                        <!-- <td><?php echo $data['details']; ?></td>
-                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['customer_signature']; ?></td>
+                        <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['customer_signature']; ?></td> -->
                         <td><?php echo $data['creater']; ?></td>
                         <td><?php echo $data['create_at']; ?></td>
                         <?php if ($user_auth & 2) { ?>