diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index 00a9ddb2..8714671b 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> 7b37600f (合約書申請 新梯 1116)
 <?php
 include_once("../header.php");
 require_once("./conn.php");
@@ -12,7 +8,6 @@ if(!(isset($_GET['id']) && !empty($_GET['id']))){
     exit;
 }
 $id = $_GET["id"];
-<<<<<<< HEAD
 
 $sql_str = "SELECT * FROM contract_new_apply WHERE mid = :mid";
 $stmt = $conn->prepare($sql_str);
@@ -70,36 +65,6 @@ if(empty($contract_new_apply)){
 <link rel="stylesheet" href="semantic/dist/semantic.min.css">
 <script defer src="./js/alpinejs/cdn.min.js"></script>
 <script src="./js/axios/axios.min.js"></script>
-=======
-$sql_str = "SELECT pricereview_main.*, account.name as accountname
-            FROM pricereview_main
-            JOIN account ON pricereview_main.person = account.accountid
-            WHERE pricereview_main.id = :id";
-$stmt = $conn->prepare($sql_str);
-$stmt->bindParam(':id',$id);
-$stmt->execute();
-$contract = $stmt->fetch(PDO::FETCH_ASSOC);
-
-$accounttype = "M";
-$sql_str = "SELECT * FROM account WHERE accounttype = :accounttype";
-$stmt = $conn->prepare($sql_str);
-$stmt->bindParam(':accounttype',$accounttype);
-$stmt->execute();
-$persons = $stmt->fetchAll(PDO::FETCH_ASSOC);
-
-$sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC";
-$stmt = $conn->prepare($sql_str);
-$stmt->bindParam(':vol_no', $contract['contractno']);
-$stmt->execute();
-$customer = $stmt->fetch(PDO::FETCH_ASSOC);
-print_r($customer);
-?>
-<link rel="stylesheet" href="./styles/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" />
-<script defer src="./js/alpinejs/cdn.min.js"></script>
-<script src="./js/axios/axios.min.js"></script>
-
->>>>>>> 7b37600f (合約書申請 新梯 1116)
 <div class="contract-new-apply-component" x-data="contractNewApply">
 <div class="form" method="post" id="form" enctype="multipart/form-data" >
         <input type="hidden" name='form_name' value="main_form" />
@@ -125,7 +90,6 @@ print_r($customer);
                     <tr>
                         <td style="vertical-align: middle">卷號</td>
                         <td>
-<<<<<<< HEAD
                             <div class="fixed" x-text="data.vol_no"></div>
                             <!-- <input class="form-control disabled_select" type="text"  x-model="data.vol_no" > -->
                             <!-- <p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>    -->
@@ -133,19 +97,6 @@ print_r($customer);
                         <td style="vertical-align: middle">統一編號</td>
                         <td>
                             <input class="form-control disabled_select" type="text"  x-model="data.vat" >
-=======
-                            <input class="form-control disabled_select" type="text"  x-model="data.vol_no" >
-                            <p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                        <td style="vertical-align: middle">營業員</td>
-                        <td>
-                            <select name="" id="" x-model="data.salesman">
-                                <option value="">請選擇營業員</option>
-                                <?php foreach($persons as $person) : ?>
-                                    <option value="<?= $person["accountid"] ?>"><?= $person['accountid'] . ' - ' . $person["name"] ?></option>
-                                <?php endforeach ?>        
-                            </select>
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                             <p class="alerttext" x-show="data.salesman==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                         <td style="vertical-align: middle">合約書申請日期</td>
@@ -163,11 +114,7 @@ print_r($customer);
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">案件名稱</td>
-<<<<<<< HEAD
                         <td style="vertical-align: middle" colspan="3">
-=======
-                        <td style="vertical-align: middle">
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                             <input class="form-control disabled_select" type="text"  x-model="data.case_name" >
                             <p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
@@ -181,14 +128,6 @@ print_r($customer);
                             <input class="form-control disabled_select" type="text"  x-model="data.manager" >
                             <p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
-<<<<<<< HEAD
-=======
-                        <td style="vertical-align: middle">統一編號</td>
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.vat" >
-                            <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">含稅給約總價</td>
@@ -215,7 +154,6 @@ print_r($customer);
                         </td>
                         <td style="vertical-align: middle">完工期限</td>
                         <td style="vertical-align: middle" colspan=3>
-<<<<<<< HEAD
                         <div class="ui labeled input">
                             <div class="ui label">
                                 貨抵工地
@@ -230,15 +168,11 @@ print_r($customer);
                             </div>
                         </div>
                             <!-- <input class="form-control disabled_select" type="text"  x-model="data.deadline" > -->
-=======
-                            <input class="form-control disabled_select" type="text"  x-model="data.deadline" >
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                             <p class="alerttext" x-show="data.deadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">附則</td>
-<<<<<<< HEAD
                         <td style="vertical-align: middle" colspan=3>
                             <div class="ui labeled input">
                                 <div class="ui label">
@@ -266,24 +200,10 @@ print_r($customer);
                     <tr>
                         <td style="vertical-align: middle">交貨地點</td>
                         <td style="vertical-align: middle" colspan=3>
-=======
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.regulations" >
-                            <p class="alerttext" x-show="data.regulations==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                        <td style="vertical-align: middle">免保期限</td>
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.freedeadline" >
-                            <p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                        <td style="vertical-align: middle">交貨地點</td>
-                        <td style="vertical-align: middle">
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                             <input class="form-control disabled_select" type="text"  x-model="data.tradeaddress" >
                             <p class="alerttext" x-show="data.tradeaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                         <td style="vertical-align: middle">交貨期限</td>
-<<<<<<< HEAD
                         <td style="vertical-align: middle" colspan=3>
                             <div class="ui labeled input">
                                 <div class="ui label">
@@ -294,10 +214,6 @@ print_r($customer);
                                     天出貨
                                 </div>
                             </div>
-=======
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.tradedeadline" >
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                             <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                     </tr>
@@ -321,7 +237,6 @@ print_r($customer);
                     </tr>
                 </thead>
                 <tbody style="font-weight: bolder;margin-bottom: 20px">
-<<<<<<< HEAD
                     <template x-for="(item, idx) in data.items">
                     <tr>
                         <td style="vertical-align: middle"><p x-text="idx+1"></p></td>
@@ -339,23 +254,6 @@ print_r($customer);
                         </td>
                     </tr>
                     </template>
-=======
-                    <tr>
-                        <td style="vertical-align: middle">1</td>
-                        <td colspan="3" style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  value="MAE100-6 *4-2S45" >
-                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="number"  value="6" >
-                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                        <td colspan="3" style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="number"  value="3180000" >
-                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                    </tr>
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                 </tbody>
             </table>
             <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@@ -387,7 +285,6 @@ print_r($customer);
                         </td>
                     </tr>
                 </thead>
-<<<<<<< HEAD
                 <tbody style="font-weight: bolder;margin-bottom: 20px" >
                 <?php 
                     $day = 0;
@@ -482,191 +379,6 @@ print_r($customer);
                         </td>
                     </tr>
                     <?php endforeach; ?>
-=======
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>銷售</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>訂金</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>簽約後X天付訂金</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>合約日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>20%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>636000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>銷售</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>二次款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>簽約後X天付二次款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>合約日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>0%%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>0</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>銷售</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>貨到款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>貨抵工地付貨到款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>出貨日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>-</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>50%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>1590000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>安裝</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>安裝款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>安裝完成後X天收款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>竣檢日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>20%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>636000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>安裝</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>尾款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>交車後X天付尾款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>交車日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>0天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>10%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>318000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                    </tr>
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                 </tbody>
             </table>
             <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@@ -680,7 +392,6 @@ print_r($customer);
                 <tbody>
                     <tr>
                         <td style="font-weight:bold">業務部協理</td>
-<<<<<<< HEAD
                         <td>
                             <template x-if="false">
                                 <span class="failtext">已退件</span>
@@ -718,15 +429,6 @@ print_r($customer);
                         </td>
                         <td style="font-weight:bold">營業員</td>
                         <td><span x-text="data.salesmanname + '(' + data.salesman + ')'"></span></td>
-=======
-                        <td><span class="successtext">已通過</span></td>
-                        <td style="font-weight:bold">業務部承辦人</td>
-                        <td><span class="successtext">已通過</span></td>
-                        <td style="font-weight:bold">營業經理</td>
-                        <td><span class="successtext">已通過</span></td>
-                        <td style="font-weight:bold">營業員</td>
-                        <td><span class="successtext">已通過</span></td>
->>>>>>> 7b37600f (合約書申請 新梯 1116)
                     </tr>
                 </tbody>
             </table>
@@ -738,7 +440,6 @@ print_r($customer);
                     <div class="loader"></div>
                 </template>
             </button>
-<<<<<<< HEAD
             <button x-show="true" x-on:click="storageFn()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
                 <template x-if="!isLoading">
                     <span>暫存</span>
@@ -747,13 +448,10 @@ print_r($customer);
                     <div class="loader"></div>
                 </template>
             </button>
-=======
->>>>>>> 7b37600f (合約書申請 新梯 1116)
         </div>
     </div>
 </div>
 
-<<<<<<< HEAD
 <script src="./js/jquery/jquery-3.1.1.min.js"></script>
 <script src="semantic/dist/semantic.min.js" ></script>
 <script src="./js/alpine.js"></script>
@@ -775,19 +473,3 @@ print_r($customer);
     const mid = '<?php echo $_GET['id']; ?>';
     console.log(items)
 </script>
-=======
-<script src="./js/alpine.js"></script>
-<script>
-    const contractno = '<?php echo $contract['contractno'] ?>'
-    const salesman = '<?php echo $contract['person'] ?>';
-    const apply_date = '<?php echo date('Y-m-d') ?>';
-    const case_name = '<?php echo $contract['case_name'] ?>'
-    const company = '<?php echo $contract['company'] ?>'
-    const manager = '<?php  echo $customer['manager'] ?>'
-    const vat = '<?php echo $customer['uscc'] ?>'
-    const price_total = <?php echo $contract['price_total'] ?>
-
-
-    console.log(123)
-</script>
->>>>>>> 7b37600f (合約書申請 新梯 1116)
diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php
index 23dad8e4..b1cb75e3 100644
--- a/wms/mkt/pricereview-check.php
+++ b/wms/mkt/pricereview-check.php
@@ -310,6 +310,7 @@ $(function () {
     $("#checker").prop("disabled", false);
     $("#status_n").prop("disabled", false);
     $("#status_y").prop("disabled", false);
+    $("#status_yy").prop("disabled", false);
     $("#id").prop("disabled", false);
     $("#st").prop("disabled", false);
     $('#btn_close').prop("disabled", false);
@@ -974,8 +975,11 @@ hr {
             </table>
             <label>審核人員</label>
             <input type="text" name="checker" id="checker" value="<?=$user_id;?>" readonly>
-            <button type="submit" name="status" id="status_n" value="N" onclick="if (!confirm('確定不同意？')) return false;"><?php echo ($sign_total==$st) ? "結案(不同意)" : "不同意"; ?></button>
-            <button type="submit" name="status" id="status_y" value="Y" onclick="if (!confirm('確定同意？')) return false;"><?php echo ($sign_total==$st) ? "結案(同意)" : "同意"; ?></button>
+            <button type="submit" name="status" id="status_n" value="N" onclick="if (!confirm('確定不同意？')) return false;"><?php echo ($sign_total==$st) ? "結案(不同意)" : "不同意(退回)"; ?></button>
+            <button type="submit" name="status" id="status_y" value="Y" onclick="if (!confirm('確定同意？')) return false;">同意(上呈)</button>
+            <?php if($st == 3): ?>
+                <button type="submit" name="status" id="status_yy" value="YY" onclick="if (!confirm('確定同意？')) return false;">同意(結案)</button>
+            <?php endif; ?>
             <?php } else { ?>
             <button type="button" id="btn_close" class="btn btn-default">回上頁</button>
             <?php } ?>
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 44e06e1f..a08ca5f9 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -357,7 +357,7 @@ if ($user_id=="M0023") {
             $str = $uperson = $ustatus = $udtte = "";
             if (!empty($sign3)) list($uperson, $ustatus, $udtte) = explode(",", $sign3);
             if ($ustatus) {
-                if ($ustatus == "Y") $str = "<span class=\"glyphicon glyphicon-ok\" title=\"同意\"></span>";
+                if ($ustatus == "Y" || $ustatus == "YY") $str = "<span class=\"glyphicon glyphicon-ok\" title=\"同意\"></span>";
                 elseif ($ustatus == "N") $str = "<span class=\"glyphicon glyphicon-ban-circle\" title=\"不同意\"></span>";
                 $str .= "<br>".$accountname_arr[$uperson]."<br>".$udtte;
             } else {
diff --git a/wms/mkt/pricereview-record-check.php b/wms/mkt/pricereview-record-check.php
index b8bf6b48..064c6781 100644
--- a/wms/mkt/pricereview-record-check.php
+++ b/wms/mkt/pricereview-record-check.php
@@ -59,7 +59,11 @@ if (isset($_POST['status'])) {
                 $sql2 .= "status = 'YY'";
             }
             $end_flow = 1;
-        } else {
+        }elseif($status == 'YY'){
+            $sql2 .= "status = 'YY'";
+            $end_flow = 1;
+        } 
+        else {
             $do_assign = 1;
         }
         if ($item_no_all) {
@@ -82,7 +86,7 @@ if (isset($_POST['status'])) {
                 mysqli_query($link, $db_query);
             }
         }
-
+        echo $status;
         if ($sql) {
             $db_query = "update pricereview_sign set $sql where mid = '$id'";
             mysqli_query($link, $db_query);
diff --git a/wms/mkt/pricereview_renovate-check.php b/wms/mkt/pricereview_renovate-check.php
index 79e51e12..0fde252d 100644
--- a/wms/mkt/pricereview_renovate-check.php
+++ b/wms/mkt/pricereview_renovate-check.php
@@ -1018,7 +1018,22 @@ hr {
                         <td><?php echo $dtte2; ?></td>
                     </tr>
                     <tr>
-                        <td>業務部協理</td>
+                        <td>
+                            <?php 
+                            require_once('./conn.php');
+                            if(!empty($accountname_arr[$person3])){
+                                $sql_str = "SELECT account.accountid, account.department_id, account.role_id,department.* FROM account JOIN department ON account.department_id = department.department_id AND account.role_id = department.role_id WHERE account.name = :name";
+                                $stmt = $conn->prepare($sql_str);
+                                $stmt->bindParam(':name',$accountname_arr[$person3]);
+                                $stmt->execute();
+                                $user = $stmt->fetch(PDO::FETCH_ASSOC);
+                                echo $user['role'];
+                            }else{
+                                echo "業務部協理";
+                            }
+                          
+                            ?>
+                        </td>
                         <td><?php echo (empty($accountname_arr[$person3])) ? "---" : $accountname_arr[$person3]; ?></td>
                         <td><?php echo $checker_3_result; ?></td>
                         <td><?php echo nl2br($sign3_note); ?></td>