diff --git a/wms/cont/apply_form.php b/wms/cont/apply_form.php
index 2c9f1d73..42589e9e 100644
--- a/wms/cont/apply_form.php
+++ b/wms/cont/apply_form.php
@@ -67,11 +67,10 @@ $subflow_assign_opinions = SubflowManager::getCounterSignComments($form_key);
 $wf->setFormData(['discount' => 100]);
 $flowName = $wf->getFlowName();
 $assigner = $wf->getAssignerList();
-
 $assign_status = $wf->getAssignStatus($assigner);
-echo '<pre>';
-print_r($assigner);
-echo '</pre>';
+// echo '<pre>';
+// print_r($assign_status);
+// echo '</pre>';
 $if_show_assign  = true;
 //加載流程圖
 //$fc = WorkFLowItems::get_records($flow->getSystemID(), $flow->getFlowID());
@@ -247,8 +246,8 @@ if ($result['department_id'] == '511') {
 	$managerid = 'M0137';
 	$managername = '劉永德';
 } else if ($result['department_id'] == '512') {
-	$managerid = 'M0137';
-	$managername = '劉永德';
+	$managerid = 'M0054';
+	$managername = '陳志文';
 } else if ($result['department_id'] == '513') {
 	$managerid = 'M0086';
 	$managername = '李烘銘';
@@ -662,7 +661,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |
 									</td>
 								</tr>
 								<tr>
-									<td colspan='18' ;><button onClick='addRow()' type="button" style='float:right' class="btn btn-link btn-md">+新增</button></td>
+									<td colspan='18'><button onClick='addRow()' type="button" style='float:right' class="btn btn-link btn-md">+新增</button></td>
 								</tr>
 								<!-- <tr style='margin-top:0px;text-align:center'> -->
 								<?php
diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php
index 39354c9b..2a28efc2 100644
--- a/wms/contract/api/testT8API.php
+++ b/wms/contract/api/testT8API.php
@@ -1,86 +1,66 @@
 <?php
 require_once('../../T8_Authorization_from_bpm.php');
 require_once('../connt8.php');
-$sql = "SELECT * FROM salIncomeApplyMaster WHERE BillNo = '3TX10701' ";
-$stmt = $connT8->prepare($sql);
-$stmt->execute();
-$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
-echo '<pre>';
-print_r($result);
-echo '</pre>';
-// $date = date("Y-m-d");
-// $date1 = str_replace('-', '', $date);
 
-// $arr = [
-//     "date" => $date1
-// ];
+$validation = get_Auth();
+$data = [
+    [
+        "name" => "OtherStockOutMtable",
+        "rows" => [
+            [
+                "BillNo" => "00850110", // 單據編號 varchar(20)
+                "BillDate" => 20210427, // 單據日期 int
+                "OrgId" => "1000",      //組織  varchar(20)
+                "FOrgId" => "1000",     //核算組織 varchar(20)
+                "TypeId" => "OS",       //單據類型  varchar(10)
+                "BizPartnerId" => "",   //往來對象(供應商) 可為空
+                "PersonId" => "C0003",  // 經辦人員 varchar(20)
+                "DeptId" => "250",      // 經辦部門 varchar(20)
+                "CompId" => "1001"      // 公司 varchar(20)
+            ]
+        ]
+    ], [
+        "name" => "OtherStockOutDetail",
+        "rows" => [
+            [
+                "BillNo" => "00850110", //單據編號 varchar(20)
+                "RowCode" => 1,         // 序號  int(10)
+                "MaterialId" => "MX00021003",  // 產品代碼 -> 產品集成 varchar(40)
+                "SupplyOrgId" => "1000", // 供貨組織代碼 varchar(20)
+                "SQuantity" => 1,       // 交易數量 numeric(19)
+                "WarehouseId" => "100"  // 倉庫代碼 varchar(20)
+            ]
+        ]
+    ]
+];
+$api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKOTHERSTOCKOUT/PostERPData';
+$header = [
+    "CHI_Authorization :" . $validation
+];
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+curl_setopt($ch, CURLOPT_POST, 1);
+curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
 
-// echo '<pre>';
-// print_r($arr);
-// echo '</pre>';
-// $validation = get_Auth();
-// $data = [
-//     [
-//         "name" => "OtherStockOutMtable",
-//         "rows" => [
-//             [
-//                 "BillNo" => "00850110", // 單據編號 varchar(20)
-//                 "BillDate" => 20210427, // 單據日期 int
-//                 "OrgId" => "1000",      //組織  varchar(20)
-//                 "FOrgId" => "1000",     //核算組織 varchar(20)
-//                 "TypeId" => "OS",       //單據類型  varchar(10)
-//                 "BizPartnerId" => "",   //往來對象(供應商) 可為空
-//                 "PersonId" => "C0003",  // 經辦人員 varchar(20)
-//                 "DeptId" => "250",      // 經辦部門 varchar(20)
-//                 "CompId" => "1001"      // 公司 varchar(20)
-//             ]
-//         ]
-//     ], [
-//         "name" => "OtherStockOutDetail",
-//         "rows" => [
-//             [
-//                 "BillNo" => "00850110", //單據編號 varchar(20)
-//                 "RowCode" => 1,         // 序號  int(10)
-//                 "MaterialId" => "MX00021003",  // 產品代碼 -> 產品集成 varchar(40)
-//                 "SupplyOrgId" => "1000", // 供貨組織代碼 varchar(20)
-//                 "SQuantity" => 1,       // 交易數量 numeric(19)
-//                 "WarehouseId" => "100"  // 倉庫代碼 varchar(20)
-//             ]
-//         ]
-//     ]
-// ];
-// $data = file_get_contents('test.json');
-// echo '<pre>';
-// print_r($data);
-// echo '</pre>';
-// $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKOTHERSTOCKOUT/PostERPData';
-// $header = [
-//     "CHI_Authorization :" . $validation
-// ];
-// $ch = curl_init();
-// curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
-// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-// curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-// curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-// curl_setopt($ch, CURLOPT_POST, 1);
-// curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+$response = curl_exec($ch);
+if ($response === false) {
+    echo 'Curl error: ' . curl_error($ch);
+} else {
+    $result = json_decode($response, true);
+    if ($result['Status'] == 'Error') {
+        echo '<pre>';
+        print_r($result);
+        echo '</pre>';
+        echo 'API 傳入錯誤，' . $result['ErrorMsg'];
+    } else {
+        echo '<pre>';
+        print_r($result['Status']);
+        echo '</pre>';
+        return $result;
+    }
+}
 
-// $response = curl_exec($ch);
-// if ($response === false) {
-//     echo 'Curl error: ' . curl_error($ch);
-// } else {
-//     $result = json_decode($response, true);
-//     if ($result['Status'] == 'Error') {
-//         echo '<pre>';
-//         print_r($result);
-//         echo '</pre>';
-//         echo 'API 傳入錯誤，' . $result['ErrorMsg'];
-//     } else {
-//         echo '<pre>';
-//         print_r($result['Status']);
-//         echo '</pre>';
-//         return $result;
-//     }
-// }
-
-// curl_close($ch);
+curl_close($ch);
diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php
index dee15d1f..f5851ed5 100644
--- a/wms/contract/contract-download.php
+++ b/wms/contract/contract-download.php
@@ -26,7 +26,7 @@ if (isset($_GET['id']) && $_GET['id'] != "") {
         $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $contract = $contracts[0];
         $contract_apply_id = $contract['id'];
-        if (($contract['status'] !== "YY" && $user_id != 'M0107') && $user_id != 'M0174' && $user_id != 'M0225') {
+        if (($contract['status'] !== "YY" && $user_id != 'M0107' && $user_id != "TEST02" && $user_id == "TEST01") && $user_id != 'M0174' && $user_id != 'M0225') {
             echo '<script type="text/javascript">
                     alert("非法訪問。");
                     window.history.back();
diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index a9b53fbf..11b5962a 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -1,8 +1,8 @@
 <?php
 include_once("../header.php");
 require_once("./conn.php");
-if(!(isset($_GET['id']) && !empty($_GET['id']))){
-    $para = "function_name=pricereview&".$token_link;
+if (!(isset($_GET['id']) && !empty($_GET['id']))) {
+    $para = "function_name=pricereview&" . $token_link;
     echo "<script>alert('非法訪問!!!');</script>";
     echo "<script>window.history.go(-1);</script>";
     exit;
@@ -15,25 +15,25 @@ LEFT JOIN account AS person_account ON contract_new_apply.review_person_id = per
 LEFT JOIN account AS person_final_account ON contract_new_apply.review_final_person_id = person_final_account.accountid
 WHERE contract_new_apply.mid = :mid";
 $stmt = $conn->prepare($sql_str);
-$stmt->bindParam(':mid',$id);
+$stmt->bindParam(':mid', $id);
 $stmt->execute();
 $contract_new_apply = $stmt->fetch(PDO::FETCH_ASSOC);
 $contract = $contract_new_apply;
 $isFirst = empty($contract_new_apply) ? 1 : 0;
-if(empty($contract_new_apply)){
+if (empty($contract_new_apply)) {
     $sql_str = "SELECT pricereview_main.contractno, pricereview_main.ekind, pricereview_main.person, pricereview_main.company, pricereview_main.case_name, pricereview_main.address, pricereview_main.price_lowest, pricereview_main.price_total, pricereview_main.price_rate, pricereview_main.status as priceview_status, pricereview_main.id as mainid, 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->bindParam(':id', $id);
     $stmt->execute();
     $contract = $stmt->fetch(PDO::FETCH_ASSOC);
     // print_r($contract);
     $accounttype = "M";
     $sql_str = "SELECT * FROM account WHERE accounttype = :accounttype";
     $stmt = $conn->prepare($sql_str);
-    $stmt->bindParam(':accounttype',$accounttype);
+    $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";
@@ -43,14 +43,14 @@ if(empty($contract_new_apply)){
     $customer = $stmt->fetch(PDO::FETCH_ASSOC);
 
     $mid = $contract['mainid'];
-    
+
     $sql_str = "SELECT * FROM pricereview_item WHERE mid = :mid AND item_group = 'A'";
     $stmt = $conn->prepare($sql_str);
     $stmt->bindParam(':mid', $mid);
     $stmt->execute();
     $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
     $total_items = 0;
-    foreach($items as $item){
+    foreach ($items as $item) {
         $total_items += $item['item_qty'];
     }
     $sql_str = "SELECT * FROM pricereview_pay WHERE mid = :mid ORDER BY pay_kind ASC";
@@ -60,15 +60,14 @@ if(empty($contract_new_apply)){
     $pays = $stmt->fetchAll(PDO::FETCH_ASSOC);
     $price_a = 0;
     $price_b = 0;
-    foreach($pays as $pay){
-        if($pay['pay_kind'] <= 4){
+    foreach ($pays as $pay) {
+        if ($pay['pay_kind'] <= 4) {
             $price_a = $price_a + $pay['pay_amount'];
-        }else{
+        } else {
             $price_b = $price_b + $pay['pay_amount'];
         }
     }
-
-}else{
+} else {
     $mid = $contract['mid'];
     $contract_new_apply_id = $contract_new_apply['id'];
     $sql_str = "SELECT * FROM contract_new_apply_pays  WHERE mid = :mid ORDER BY pay_kind ASC";
@@ -84,10 +83,10 @@ if(empty($contract_new_apply)){
     $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
     $price_a = 0;
     $price_b = 0;
-    foreach($pays as $pay){
-        if($pay['pay_kind'] <= 4){
+    foreach ($pays as $pay) {
+        if ($pay['pay_kind'] <= 4) {
             $price_a = $price_a + $pay['pay_amount'];
-        }else{
+        } else {
             $price_b = $price_b + $pay['pay_amount'];
         }
     }
@@ -112,7 +111,7 @@ $person = $contract['person'];
 <script defer src="./js/alpinejs/cdn.min.js"></script>
 <script src="./js/axios/axios.min.js"></script>
 <div class="contract-new-apply-component" x-data="contractNewApply">
-<div class="form" method="post" id="form" enctype="multipart/form-data" >
+    <div class="form" method="post" id="form" enctype="multipart/form-data">
         <input type="hidden" name='form_name' value="main_form" />
         <div>
             <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@@ -142,61 +141,61 @@ $person = $contract['person'];
                         </td>
                         <td style="vertical-align: middle">統一編號/身分證字號</td>
                         <td>
-                            <input class="form-control disabled_select" type="text"  x-model="data.vat" disabled >
-                            <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select" type="text" x-model="data.vat" disabled>
+                            <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                         <td style="vertical-align: middle">合約書申請日期</td>
                         <td>
                             <input class="form-control disabled_select" type="date" x-model="data.apply_date" disabled>
-                            <p class="alerttext" x-show="data.apply_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <p class="alerttext" x-show="data.apply_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                         <td style="vertical-align: middle">申請類別</td>
                         <td style="vertical-align: middle">
                             <select class="" id="apply_type" x-model="data.apply_type">
                                 <option value="A">制式新合約</option>
                             </select>
-                            <p class="alerttext" x-show="data.apply_type==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <p class="alerttext" x-show="data.apply_type==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">案件名稱</td>
                         <td style="vertical-align: middle" colspan="3">
-                            <input class="form-control disabled_select" type="text"  x-model="data.case_name" disabled >
-                            <p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select" type="text" x-model="data.case_name" disabled>
+                            <p class="alerttext" x-show="data.case_name==''"><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.company" disabled>
-                            <p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select" type="text" x-model="data.company" disabled>
+                            <p class="alerttext" x-show="data.company==''"><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.manager" disabled >
-                            <p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select" type="text" x-model="data.manager" disabled>
+                            <p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">含稅給約總價</td>
                         <td colspan="3" style="vertical-align: middle">
-                            <input class="form-control disabled_select lock" type="number"  x-model="data.total_price" >
-                            <p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select lock" type="number" x-model="data.total_price">
+                            <p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                         <td style="vertical-align: middle">含稅貸款(A)</td>
                         <td style="vertical-align: middle">
-                            <input class="form-control disabled_select lock" type="number"  x-model="data.price_a" >
-                            <p class="alerttext" x-show="data.price_a==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select lock" type="number" x-model="data.price_a">
+                            <p class="alerttext" x-show="data.price_a==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                         <td style="vertical-align: middle">含稅安裝款(A)</td>
                         <td style="vertical-align: middle">
-                            <input class="form-control disabled_select lock" type="number"  x-model="data.price_b" >
-                            <p class="alerttext" x-show="data.price_b==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select lock" type="number" x-model="data.price_b">
+                            <p class="alerttext" x-show="data.price_b==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">聯絡地址</td>
                         <td style="vertical-align: middle" colspan=3>
-                            <input class="form-control disabled_select" type="text"  x-model="data.address" disabled>
-                            <p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <input class="form-control disabled_select" type="text" x-model="data.address" disabled>
+                            <p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                         <td style="vertical-align: middle">免保期限</td>
                         <td style="vertical-align: middle" colspan=3>
@@ -206,9 +205,9 @@ $person = $contract['person'];
                                     個月
                                 </div>
                             </div>
-                            <p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
-                        
+
                     </tr>
                     <tr>
                         <!-- <td style="vertical-align: middle">附則</td>
@@ -226,26 +225,26 @@ $person = $contract['person'];
                         </td> -->
                         <td style="vertical-align: middle">完工期限</td>
                         <td style="vertical-align: middle" colspan=7>
-                        <div class="ui labeled input">
-                            <div class="ui label">
-                            乙方應於貨抵工地後每台
-                            </div>
-                            <input type="text" placeholder="30" style="width:45px;padding:0 12px;" x-model="data.workdeadline_a">
-                            <div class="ui label">
-                                日內安裝完成
+                            <div class="ui labeled input">
+                                <div class="ui label">
+                                    乙方應於貨抵工地後每台
+                                </div>
+                                <input type="text" placeholder="30" style="width:45px;padding:0 12px;" x-model="data.workdeadline_a">
+                                <div class="ui label">
+                                    日內安裝完成
+                                </div>
+                                <div class="note label" x-show="data.workdeadline_note && data.workdeadline_note != 'null'" style="font-size:14px;color:#BD0606" x-text="'說明:' + data.workdeadline_note"></div>
                             </div>
-                            <div class="note label" x-show="data.workdeadline_note && data.workdeadline_note != 'null'" style="font-size:14px;color:#BD0606" x-text="'說明:' + data.workdeadline_note"></div>
-                        </div>
                             <!-- <input class="form-control disabled_select" type="text"  x-model="data.deadline" > -->
-                            <p class="alerttext" x-show="data.deadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <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>
                         <td style="vertical-align: middle" colspan=3>
-                            <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>   
+                            <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>
                         <td style="vertical-align: middle" colspan=3>
@@ -258,7 +257,7 @@ $person = $contract['person'];
                                     天出貨
                                 </div>
                             </div>
-                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
                     </tr>
                 </tbody>
@@ -282,29 +281,31 @@ $person = $contract['person'];
                 </thead>
                 <tbody style="font-weight: bolder;margin-bottom: 20px">
                     <template x-for="(item, idx) in data.items">
-                    <tr>
-                        <td style="vertical-align: middle"><p x-text="idx+1"></p></td>
-                        <td colspan="3" style="vertical-align: middle">
-                            <input class="form-control disabled_select lock" type="text"  x-model="item.item_spec" >
-                            <p class="alerttext" x-show="data.item_spec==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                        <td style="vertical-align: middle">
-                            <span x-text="item.item_qty + '台'" style="padding:0 20px"></span>
-                        </td>
-                        <td colspan="3" style="vertical-align: middle">
-                            <input class="form-control disabled_select lock" type="number"  x-model="item.item_price_ct" >
-                            <p class="alerttext" x-show="data.item_price_ct==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
-                        </td>
-                    </tr>
+                        <tr>
+                            <td style="vertical-align: middle">
+                                <p x-text="idx+1"></p>
+                            </td>
+                            <td colspan="3" style="vertical-align: middle">
+                                <input class="form-control disabled_select lock" type="text" x-model="item.item_spec">
+                                <p class="alerttext" x-show="data.item_spec==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                            </td>
+                            <td style="vertical-align: middle">
+                                <span x-text="item.item_qty + '台'" style="padding:0 20px"></span>
+                            </td>
+                            <td colspan="3" style="vertical-align: middle">
+                                <input class="form-control disabled_select lock" type="number" x-model="item.item_price_ct">
+                                <p class="alerttext" x-show="data.item_price_ct==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                            </td>
+                        </tr>
                     </template>
                     <tr>
                         <td colspan=4></td>
                         <td>電梯總數</td>
-                        <td colspan='3'> <span x-text="data.total_items + '台'"  style="padding:0 20px"></span></td>
+                        <td colspan='3'> <span x-text="data.total_items + '台'" style="padding:0 20px"></span></td>
                     </tr>
                 </tbody>
             </table>
-           
+
             <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
                 <thead style="font-weight: bolder;margin-bottom: 20px">
                     <tr>
@@ -334,99 +335,99 @@ $person = $contract['person'];
                         </td>
                     </tr>
                 </thead>
-                <tbody style="font-weight: bolder;margin-bottom: 20px" >
-                <?php 
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <?php
                     $day = 0;
                     $styles = [
-                        1=> "訂金",
-                        2=> "二次款",
-                        3=>"貨到款",
-                        4=>"",
-                        5=>"安裝款",
-                        6=>"尾款",
-                        7=>"",
+                        1 => "訂金",
+                        2 => "二次款",
+                        3 => "貨到款",
+                        4 => "",
+                        5 => "安裝款",
+                        6 => "尾款",
+                        7 => "",
                     ];
                     $paydate = [
-                        1=>"合約日",
-                        2=>"合約日",
-                        3=>"出貨日",
-                        4=>"",
-                        5=>"竣檢日",
-                        6=>"交車日",
-                        7=>""
+                        1 => "合約日",
+                        2 => "合約日",
+                        3 => "出貨日",
+                        4 => "",
+                        5 => "竣檢日",
+                        6 => "交車日",
+                        7 => ""
                     ];
-                ?>
-                    <?php foreach($pays as $pay): 
-                        if($pay['pay_scale'] == 0) continue;
                     ?>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'><?php echo ($pay['pay_kind'] <=4) ? "銷售" : "按裝"; ?></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'><?php echo $styles[$pay['pay_kind']]; ?></p>
-                        </td>
-                        <td>
-                            <?php if($pay['pay_kind'] == 1){ ?>
-                                <template x-if="pays[1] > 0">
-                                <p style='text-align:center'>簽約後<span x-text="pays[1]"></span>天付訂金</p>
-                                </template>
-                                <template x-if="pays[1] <= 0">
-                                <p style='text-align:center'>簽約後付訂金</p>
-                                </template>
-                            <?php } elseif($pay['pay_kind'] == 2){ ?>
-                                <template x-if="pays[2] > 0">
-                                <p style='text-align:center'>簽約後<span x-text="pays[2]"></span>天付二次款</p>
-                                </template>
-                                <template x-if="pays[2] <= 0">
-                                <p style='text-align:center'>簽約後付二次款</p>
-                                </template>
-                            <?php } elseif($pay['pay_kind'] == 3){ ?>
-                                <p style='text-align:center'>貨抵工地付貨到款</p>
-                            <?php } elseif($pay['pay_kind'] == 5){ ?>
-                                <template x-if="pays[5] > 0">
-                                <p style='text-align:center'>安裝完成後<span x-text="pays[5]"></span>天收款</p>
-                                </template>
-                                <template x-if="pays[5] <= 0">
-                                <p style='text-align:center'>安裝完成後收款</p>
-                                </template>
-                            <?php } elseif($pay['pay_kind'] == 6){ ?>
-                                <template x-if="pays[6] > 0">
-                                <p style='text-align:center'>交車後<span x-text="pays[6]"></span>天付尾款</p>
-                                </template>
-                                <template x-if="pays[6] <= 0">
-                                <p style='text-align:center'>交車後付尾款</p>
-                                </template>
-                            <?php } else{ ?>
-                                <p style='text-align:center'>-</p>
-                            <?php } ?>
-                        </td>
-                        <td>
-                            <p style='text-align:center'><?php echo $paydate[$pay['pay_kind']]; ?></p>
-                        </td>
-                        <td>
-                            <div class="ui labeled input">
-                                <input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind'];?>].condition_date" disabled >
-                                <div class="ui label">
-                                    天
+                    <?php foreach ($pays as $pay) :
+                        if ($pay['pay_scale'] == 0) continue;
+                    ?>
+                        <tr>
+                            <td>
+                                <p style='text-align:center'><?php echo ($pay['pay_kind'] <= 4) ? "銷售" : "按裝"; ?></p>
+                            </td>
+                            <td>
+                                <p style='text-align:center'><?php echo $styles[$pay['pay_kind']]; ?></p>
+                            </td>
+                            <td>
+                                <?php if ($pay['pay_kind'] == 1) { ?>
+                                    <template x-if="pays[1] > 0">
+                                        <p style='text-align:center'>簽約後<span x-text="pays[1]"></span>天付訂金</p>
+                                    </template>
+                                    <template x-if="pays[1] <= 0">
+                                        <p style='text-align:center'>簽約後付訂金</p>
+                                    </template>
+                                <?php } elseif ($pay['pay_kind'] == 2) { ?>
+                                    <template x-if="pays[2] > 0">
+                                        <p style='text-align:center'>簽約後<span x-text="pays[2]"></span>天付二次款</p>
+                                    </template>
+                                    <template x-if="pays[2] <= 0">
+                                        <p style='text-align:center'>簽約後付二次款</p>
+                                    </template>
+                                <?php } elseif ($pay['pay_kind'] == 3) { ?>
+                                    <p style='text-align:center'>貨抵工地付貨到款</p>
+                                <?php } elseif ($pay['pay_kind'] == 5) { ?>
+                                    <template x-if="pays[5] > 0">
+                                        <p style='text-align:center'>安裝完成後<span x-text="pays[5]"></span>天收款</p>
+                                    </template>
+                                    <template x-if="pays[5] <= 0">
+                                        <p style='text-align:center'>安裝完成後收款</p>
+                                    </template>
+                                <?php } elseif ($pay['pay_kind'] == 6) { ?>
+                                    <template x-if="pays[6] > 0">
+                                        <p style='text-align:center'>交車後<span x-text="pays[6]"></span>天付尾款</p>
+                                    </template>
+                                    <template x-if="pays[6] <= 0">
+                                        <p style='text-align:center'>交車後付尾款</p>
+                                    </template>
+                                <?php } else { ?>
+                                    <p style='text-align:center'>-</p>
+                                <?php } ?>
+                            </td>
+                            <td>
+                                <p style='text-align:center'><?php echo $paydate[$pay['pay_kind']]; ?></p>
+                            </td>
+                            <td>
+                                <div class="ui labeled input">
+                                    <input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind']; ?>].condition_date" disabled>
+                                    <div class="ui label">
+                                        天
+                                    </div>
                                 </div>
-                            </div>
-                        </td>
-                        <td>
-                            <div class="ui labeled input">
-                                <input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind'];?>].pay_period" disabled >
-                                <div class="ui label">
-                                    天
+                            </td>
+                            <td>
+                                <div class="ui labeled input">
+                                    <input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind']; ?>].pay_period" disabled>
+                                    <div class="ui label">
+                                        天
+                                    </div>
                                 </div>
-                            </div>
-                        </td>
-                        <td>
-                            <p style='text-align:center' x-text="pays[<?php echo $pay['pay_kind'];?>].scale + '%'"><?php echo $pay['pay_scale'] ?>%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center' x-text="localnumber(data.total_price * pays[<?php echo $pay['pay_kind'];?>].scale/100)"></p>
-                        </td>
-                    </tr>
+                            </td>
+                            <td>
+                                <p style='text-align:center' x-text="pays[<?php echo $pay['pay_kind']; ?>].scale + '%'"><?php echo $pay['pay_scale'] ?>%</p>
+                            </td>
+                            <td>
+                                <p style='text-align:center' x-text="localnumber(data.total_price * pays[<?php echo $pay['pay_kind']; ?>].scale/100)"></p>
+                            </td>
+                        </tr>
                     <?php endforeach; ?>
                 </tbody>
             </table>
@@ -437,7 +438,7 @@ $person = $contract['person'];
                             <td>第二期款交貨期限(日)</td>
                             <td>
                                 <input type="number" class="form-control" x-model="data.secondPayDeadline" />
-                                <p class="alerttext" x-show="data.secondPayDeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> 
+                                <p class="alerttext" x-show="data.secondPayDeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
                     </tbody>
@@ -459,20 +460,20 @@ $person = $contract['person'];
                         </td>
                         <td colspan="1">附件上傳</td>
                         <td colspan="4">
-                            <?php if($status < 1): ?>
-                            <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
+                            <?php if ($status < 1) : ?>
+                                <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                             <?php endif; ?>
                             <template x-for="file in data.originfiles">
                                 <template x-if="file">
                                     <div>
-                                        <a :href="'./images/contracts_new_files/' + file.file_name" download x-text="file.file_name" ></a>
-                                        <?php if($status <= 0): ?>
-                                        <span @click="removeFile(file.id)" style="margin-left:10px;cursor:pointer;color:#f019">X</span>
+                                        <a :href="'./images/contracts_new_files/' + file.file_name" download x-text="file.file_name"></a>
+                                        <?php if ($status <= 0) : ?>
+                                            <span @click="removeFile(file.id)" style="margin-left:10px;cursor:pointer;color:#f019">X</span>
                                         <?php endif; ?>
                                     </div>
                                 </template>
                             </template>
-                           
+
                         </td>
                     </tr>
                 </tbody>
@@ -484,7 +485,7 @@ $person = $contract['person'];
                             <h4 style='text-align:center;font-weight: bolder'>簽核流程</h4>
                         </td>
                     </tr>
-                </thead>    
+                </thead>
                 <tbody>
                     <tr>
                         <td>審核</td>
@@ -492,43 +493,43 @@ $person = $contract['person'];
                         <td>結果</td>
                         <td colspan=2>意見</td>
                         <td>時間</td>
-                        <td colspan=2><?php if(($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060") && $status == 1): ?>審核意見<?php endif; ?></td>
+                        <td colspan=2><?php if (($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060" || $user_id == "TEST02" || $user_id == "TEST03") && $status == 1) : ?>審核意見<?php endif; ?></td>
                     </tr>
                     <tr>
                         <td>營業員</td>
                         <td><span x-text="data.salesmanname + '(' + data.salesman + ')'"></span></td>
                         <td>
-                            <?php if($status >= 1): ?><span class="successtext">已送審</span><?php endif; ?>
-                            <?php if($status == 0): ?><span class="readtext">暫存</span><?php endif; ?>
-                            <?php if($status == -1): ?><span class="">未提交</span><?php endif; ?>
+                            <?php if ($status >= 1) : ?><span class="successtext">已送審</span><?php endif; ?>
+                            <?php if ($status == 0) : ?><span class="readtext">暫存</span><?php endif; ?>
+                            <?php if ($status == -1) : ?><span class="">未提交</span><?php endif; ?>
                         </td>
                         <td colspan=2>---</td>
                         <td><?php echo ($contract['submit_date']) ?? "---"; ?> </td>
                         <td colspan=2 rowspan="3">
-                            <?php if(($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060") && $status == 1): ?>
-                            <textarea class="form-control opinion"  x-model="data.review_comment"></textarea>
+                            <?php if (($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060" || $user_id == "TEST02" || $user_id == "TEST03") && $status == 1) : ?>
+                                <textarea class="form-control opinion" x-model="data.review_comment"></textarea>
                             <?php endif; ?>
                         </td>
                     </tr>
                     <tr>
                         <td>業務承辦人</td>
-                        <td><span><?php echo (!isset($contract['review_person_name']) || empty($contract['review_person_name'])) ? "---" : $contract['review_person_name'] ."(".$contract['review_person_id'].")";  ?></span></td>
+                        <td><span><?php echo (!isset($contract['review_person_name']) || empty($contract['review_person_name'])) ? "---" : $contract['review_person_name'] . "(" . $contract['review_person_id'] . ")";  ?></span></td>
                         <td>
-                            <?php if(($status == 1 || $status == 3) && $progress >= 2): ?><span class="successtext">已同意</span><?php endif; ?>
-                            <?php if($status == 2): ?><span class="failtext">結案不同意</span><?php endif; ?>
-                            <?php if($status < 2 && $progress < 2): ?><span>---</span><?php endif; ?>
-                            </td>
+                            <?php if (($status == 1 || $status == 3) && $progress >= 2) : ?><span class="successtext">已同意</span><?php endif; ?>
+                            <?php if ($status == 2) : ?><span class="failtext">結案不同意</span><?php endif; ?>
+                            <?php if ($status < 2 && $progress < 2) : ?><span>---</span><?php endif; ?>
+                        </td>
                         <td colspan=2><?php echo $contract['review_comment'] ?? "---"; ?></td>
                         <td><?php echo $contract['review_date'] ?? "---"; ?></td>
                     </tr>
                     <tr>
                         <td>業務部協理</td>
-                        <td><span><?php echo (!isset($contract['review_final_person_name']) || empty($contract['review_final_person_name'])) ? "---" : $contract['review_final_person_name'] ."(".$contract['review_final_person_id'].")";  ?></span></td>
+                        <td><span><?php echo (!isset($contract['review_final_person_name']) || empty($contract['review_final_person_name'])) ? "---" : $contract['review_final_person_name'] . "(" . $contract['review_final_person_id'] . ")";  ?></span></td>
                         <td>
-                            <?php if($status == 3): ?><span class="successtext">結案同意</span><?php endif; ?>
-                            <?php if($status == 2): ?><span class="failtext">結案不同意</span><?php endif; ?>
-                            <?php if($status < 2): ?><span>---</span><?php endif; ?>
-                            </td>
+                            <?php if ($status == 3) : ?><span class="successtext">結案同意</span><?php endif; ?>
+                            <?php if ($status == 2) : ?><span class="failtext">結案不同意</span><?php endif; ?>
+                            <?php if ($status < 2) : ?><span>---</span><?php endif; ?>
+                        </td>
                         <td colspan=2><?php echo $contract['review_final_comment'] ?? "---"; ?></td>
                         <td><?php echo $contract['review_final_date'] ?? "---"; ?></td>
                     </tr>
@@ -538,7 +539,7 @@ $person = $contract['person'];
                             <template x-if="false">
                                 <span class="failtext">已退件</span>
                             </template>
-                            <?php if($status == 1): ?>
+                            <?php if ($status == 1) : ?>
                             <span class="readtext">審核中...</span>
                             <?php endif; ?>
                             <template x-if="false">
@@ -550,155 +551,155 @@ $person = $contract['person'];
                     </tr> -->
                 </tbody>
             </table>
-            <button @click="window.history.go(-1)" type="button" class="btn btn-primary btn-lg pull-right savebtn" >回前頁</button>
-            <?php if(($isFirst == 1 && ($person == $user_id || $user_id == "M0174")) || ($isFirst==0 && $status == 0 && ($person == $user_id || $user_id == "M0174"))): ?>
-            <button x-show="true" x-on:click="submit()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
-                <template x-if="!isLoading">
-                    <span>送審</span>
-                </template>
-                <template x-if="isLoading">
-                    <div class="loader"></div>
-                </template>
-            </button>
-            <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>
-                </template>
-                <template x-if="isLoading">
-                    <div class="loader"></div>
-                </template>
-            </button>
+            <button @click="window.history.go(-1)" type="button" class="btn btn-primary btn-lg pull-right savebtn">回前頁</button>
+            <?php if (($isFirst == 1 && ($person == $user_id || $user_id == "M0174")) || ($isFirst == 0 && $status == 0 && ($person == $user_id || $user_id == "M0174"))) : ?>
+                <button x-show="true" x-on:click="submit()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+                    <template x-if="!isLoading">
+                        <span>送審</span>
+                    </template>
+                    <template x-if="isLoading">
+                        <div class="loader"></div>
+                    </template>
+                </button>
+                <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>
+                    </template>
+                    <template x-if="isLoading">
+                        <div class="loader"></div>
+                    </template>
+                </button>
             <?php endif; ?>
-            <?php if($status == 1 && (($user_id == "M0107" && $contract['progress'] <= 1 ) || ($user_id == "M0060" && $contract['progress'] == 2 ) || $user_id == "M0174")): ?>
-            <button x-show="true" x-on:click="agree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
-                <template x-if="!isLoading">
-                    <span>
-                        <?php 
-                        if($user_id === "M0107" && $contract['progress'] <= 1 ){
-                            echo "同意(上呈)";
-                        }elseif($user_id === "M0060" && $contract['progress'] == 2){
-                            echo "同意(結案)";
-                        }
-                        ?>
-                    </span>
-                </template>
-                <template x-if="isLoading">
-                    <div class="loader"></div>
-                </template>
-            </button>
-            <button x-show="true" x-on:click="disagree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
-                <template x-if="!isLoading">
-                    <span>不同意(退回)</span>
-                </template>
-                <template x-if="isLoading">
-                    <div class="loader"></div>
-                </template>
-            </button>
+            <?php if ($status == 1 && ((($user_id == "M0107" || $user_id == "TEST02") && $contract['progress'] <= 1) || (($user_id == "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) || $user_id == "M0174")) : ?>
+                <button x-show="true" x-on:click="agree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+                    <template x-if="!isLoading">
+                        <span>
+                            <?php
+                            if (($user_id === "M0107" || $user_id == "TEST02") && $contract['progress'] <= 1) {
+                                echo "同意(上呈)";
+                            } elseif (($user_id === "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) {
+                                echo "同意(結案)";
+                            }
+                            ?>
+                        </span>
+                    </template>
+                    <template x-if="isLoading">
+                        <div class="loader"></div>
+                    </template>
+                </button>
+                <button x-show="true" x-on:click="disagree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+                    <template x-if="!isLoading">
+                        <span>不同意(退回)</span>
+                    </template>
+                    <template x-if="isLoading">
+                        <div class="loader"></div>
+                    </template>
+                </button>
             <?php endif; ?>
         </div>
     </div>
 </div>
 
 <script src="./js/jquery/jquery-3.1.1.min.js"></script>
-<script src="semantic/dist/semantic.min.js" ></script>
+<script src="semantic/dist/semantic.min.js"></script>
 <script src="./js/alpine.js"></script>
 <script>
-    window.onload = ()=>{
+    window.onload = () => {
         const lock = document.getElementsByClassName('lock');
-        for(let i=0;i<lock.length;i++){
+        for (let i = 0; i < lock.length; i++) {
             lock[i].disabled = true
         }
     }
 </script>
-<?php if(empty($contract_new_apply)): ?>
-<script>
-    const contractno = '<?php echo $contract['contractno'] ?? ''; ?>';
-    const salesman = '<?php echo $contract['person'] ?? ''; ?>';
-    const salesmanname = '<?php echo $contract['accountname'] ?? ''; ?>';
-    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'] ?? ''; ?>;
-    const address = '<?php echo $contract['address'] ?? ''; ?>';
-    const price_a = <?php echo $price_a ?? ''; ?>;
-    const price_b = <?php echo $price_b ?? ''; ?>;
-    const items = [...<?php echo json_encode($items) ?? [];?>];
-    const user_id = '<?php echo $user_id ?>';
-    const mid = '<?php echo $_GET['id']; ?>';
-    const pays = [...<?php echo json_encode($pays) ?? []; ?>];
-    const secondPayDeadline = '';
-    const tradeaddress = '<?php echo $contract['address'] ?? ''; ?>';
-    const tradedeadline = 180
-    const freedeadline = 18;
-    const regulations = 10;
-    const workdeadline_a = 60;
-    const workdeadline_b = 7;
-    const workdeadline_note = '';
-    const total_items = <?php echo $total_items ?? ''; ?>;
-    const isFirst = <?php echo $isFirst; ?>;
-    const originfiles = [];
-    const description = '';
-    const contractstatus = null;
-    const progress = 0;
-</script>
-<?php else: ?>
-<script>
-    const contractno = '<?php echo $contract['contractno'] ?? ''; ?>';
-    const salesman = '<?php echo $contract['person'] ?? ''; ?>';
-    const salesmanname = '<?php echo $contract['personname'] ?? ''; ?>';
-    const apply_date = '<?php echo date('Y-m-d') ?>';
-    const case_name = '<?php echo $contract['case_name'] ?? ''; ?>';
-    const company = '<?php echo $contract['customer'] ?? ''; ?>';
-    const manager = '<?php  echo $contract['manager'] ?? ''; ?>';
-    const vat = '<?php echo $contract['vat'] ?? ''; ?>';
-    const price_total = <?php echo $contract['total_price'] ?? ''; ?>;
-    const address = '<?php echo $contract['contact_address'] ?? ''; ?>';
-    const price_a = <?php echo $contract['buy_fee'] ?? ''; ?>;
-    const price_b = <?php echo $contract['install_fee'] ?? ''; ?>;
-    const items = [...<?php echo json_encode($items) ?? []; ?>];
-    const user_id = '<?php echo $user_id ?? ''; ?>';
-    const mid = '<?php echo $_GET['id']; ?>';
-    const pays = [...<?php echo json_encode($pays) ?? []; ?>];
-    const isFirst = <?php echo $isFirst; ?>;
-    const tradeaddress = '<?php echo $contract['trade_address'] ?? ''; ?>';
-    const tradedeadline = '<?php echo $contract['tradedeadline'] ?? ''; ?>';
-    const freedeadline = '<?php echo $contract['freedeadline'] ?? ''; ?>';
-    const regulations = '<?php echo $contract['test_time'] ?? ''; ?>';
-    const workdeadline_a = '<?php echo $contract['workdeadline_a'] ?? ''; ?>';
-    const workdeadline_b = '<?php echo $contract['workdeadline_b'] ?? ''; ?>';
-    const workdeadline_note = '<?php echo $contract['workdeadline_note'] ?? ''; ?>';
-    const secondPayDeadline = <?php echo $secondPayDeadline ?? ''; ?>;
-    const total_items = <?php echo $contract['total_items'] ?? ''; ?>;
-    const contract_new_apply_id = <?php echo $contract_new_apply_id; ?>;
-    const originfiles = [...<?php echo json_encode($files) ?? []; ?>];
-    const description = '<?php echo $contract['description']; ?>';
-    const contractstatus = <?php echo $contract['status']; ?>;
-    const progress = <?php echo $contract['progress']; ?>;
-</script>
+<?php if (empty($contract_new_apply)) : ?>
+    <script>
+        const contractno = '<?php echo $contract['contractno'] ?? ''; ?>';
+        const salesman = '<?php echo $contract['person'] ?? ''; ?>';
+        const salesmanname = '<?php echo $contract['accountname'] ?? ''; ?>';
+        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'] ?? ''; ?>;
+        const address = '<?php echo $contract['address'] ?? ''; ?>';
+        const price_a = <?php echo $price_a ?? ''; ?>;
+        const price_b = <?php echo $price_b ?? ''; ?>;
+        const items = [...<?php echo json_encode($items) ?? []; ?>];
+        const user_id = '<?php echo $user_id ?>';
+        const mid = '<?php echo $_GET['id']; ?>';
+        const pays = [...<?php echo json_encode($pays) ?? []; ?>];
+        const secondPayDeadline = '';
+        const tradeaddress = '<?php echo $contract['address'] ?? ''; ?>';
+        const tradedeadline = 180
+        const freedeadline = 18;
+        const regulations = 10;
+        const workdeadline_a = 60;
+        const workdeadline_b = 7;
+        const workdeadline_note = '';
+        const total_items = <?php echo $total_items ?? ''; ?>;
+        const isFirst = <?php echo $isFirst; ?>;
+        const originfiles = [];
+        const description = '';
+        const contractstatus = null;
+        const progress = 0;
+    </script>
+<?php else : ?>
+    <script>
+        const contractno = '<?php echo $contract['contractno'] ?? ''; ?>';
+        const salesman = '<?php echo $contract['person'] ?? ''; ?>';
+        const salesmanname = '<?php echo $contract['personname'] ?? ''; ?>';
+        const apply_date = '<?php echo date('Y-m-d') ?>';
+        const case_name = '<?php echo $contract['case_name'] ?? ''; ?>';
+        const company = '<?php echo $contract['customer'] ?? ''; ?>';
+        const manager = '<?php echo $contract['manager'] ?? ''; ?>';
+        const vat = '<?php echo $contract['vat'] ?? ''; ?>';
+        const price_total = <?php echo $contract['total_price'] ?? ''; ?>;
+        const address = '<?php echo $contract['contact_address'] ?? ''; ?>';
+        const price_a = <?php echo $contract['buy_fee'] ?? ''; ?>;
+        const price_b = <?php echo $contract['install_fee'] ?? ''; ?>;
+        const items = [...<?php echo json_encode($items) ?? []; ?>];
+        const user_id = '<?php echo $user_id ?? ''; ?>';
+        const mid = '<?php echo $_GET['id']; ?>';
+        const pays = [...<?php echo json_encode($pays) ?? []; ?>];
+        const isFirst = <?php echo $isFirst; ?>;
+        const tradeaddress = '<?php echo $contract['trade_address'] ?? ''; ?>';
+        const tradedeadline = '<?php echo $contract['tradedeadline'] ?? ''; ?>';
+        const freedeadline = '<?php echo $contract['freedeadline'] ?? ''; ?>';
+        const regulations = '<?php echo $contract['test_time'] ?? ''; ?>';
+        const workdeadline_a = '<?php echo $contract['workdeadline_a'] ?? ''; ?>';
+        const workdeadline_b = '<?php echo $contract['workdeadline_b'] ?? ''; ?>';
+        const workdeadline_note = '<?php echo $contract['workdeadline_note'] ?? ''; ?>';
+        const secondPayDeadline = <?php echo $secondPayDeadline ?? ''; ?>;
+        const total_items = <?php echo $contract['total_items'] ?? ''; ?>;
+        const contract_new_apply_id = <?php echo $contract_new_apply_id; ?>;
+        const originfiles = [...<?php echo json_encode($files) ?? []; ?>];
+        const description = '<?php echo $contract['description']; ?>';
+        const contractstatus = <?php echo $contract['status']; ?>;
+        const progress = <?php echo $contract['progress']; ?>;
+    </script>
 
 <?php endif; ?>
-<?php if($status > 0 ||( $person != $user_id && $user_id != "M0174")): ?>
-<script>
-    window.onload = ()=>{
-        const input = document.querySelectorAll('input');
-        const alerttext = document.querySelectorAll('p.alerttext');
-        const select = document.querySelectorAll('select');
-        const textarea = document.querySelectorAll('textarea');
-        for(let i=0;i<input.length;i++){
-            input[i].disabled = true
-        }
-        for(let i=0;i<select.length;i++){
-            select[i].disabled = true
-        }
-        for(let i=0;i<textarea.length;i++){
-            textarea[i].disabled = true
+<?php if ($status > 0 || ($person != $user_id && $user_id != "M0174")) : ?>
+    <script>
+        window.onload = () => {
+            const input = document.querySelectorAll('input');
+            const alerttext = document.querySelectorAll('p.alerttext');
+            const select = document.querySelectorAll('select');
+            const textarea = document.querySelectorAll('textarea');
+            for (let i = 0; i < input.length; i++) {
+                input[i].disabled = true
+            }
+            for (let i = 0; i < select.length; i++) {
+                select[i].disabled = true
+            }
+            for (let i = 0; i < textarea.length; i++) {
+                textarea[i].disabled = true
+            }
+            for (let i = 0; i < alerttext.length; i++) {
+                alerttext[i].style.display = "none"
+            }
         }
-        for(let i=0;i<alerttext.length;i++){
-            alerttext[i].style.display = "none"
-        }
-    }
-</script>
+    </script>
 
 <?php endif; ?>
\ No newline at end of file
diff --git a/wms/crm/crmm03-edit.php b/wms/crm/crmm03-edit.php
index a08b40db..cc5b2a98 100644
--- a/wms/crm/crmm03-edit.php
+++ b/wms/crm/crmm03-edit.php
@@ -1,524 +1,523 @@
-<?php
-error_reporting(E_ALL);
-ini_set("display_errors", "On");
-require_once '../header_nomenu.php';
-
-require_once './FormHelper.php';
-require_once './wf_common.php';
-//echo $user_id;
-//錶單數據
-#客戶錶
-#1.電梯品牌選項
-$sql = "select code_name value ,content label from code where field_name='elevator_brand' order by convert(content using gbk) asc ";
-$elevator_brand_opt = DB::result($sql);
-#2.客戶來源
-$sql = "select code_name value ,content label from code where field_name='customer_source'";
-$customer_source_opt = DB::result($sql);
-#3.電梯類型
-$sql = "select code_name value ,content label from code where field_name='elevator_kind'";
-$elevator_kind_opt = DB::result($sql);
-#4.營業員
-$sql = "select employee_no  value ,name label from employee  where depart_no in ('320','311','312','313','314','511','512','513','514')";
-$salesman_opt = DB::result($sql);
-#5.有望客戶狀態
-$sql = "select code_name value ,content label from code where field_name='hope_customer_status'";
-$hope_customer_status_opt = DB::result($sql);
-
-#6.是否汰改
-$is_renovation_opt = ["N"=>"新梯(M)", "Y"=>"汰改(T)"];
-/*
-    ['label' => '是', 'value' => 'Y'],
-    ['label' => '否', 'value' => 'N'],
-*/
-
-#7.開門方式
-$sql = "select code_name value ,content label from code where field_name='open_kind' and content not in ('2PCO', '3S', '2SL', '2SR')";
-$open_kind_opt = DB::result($sql);
-#8.機種
-$sql = "select code_name value ,content label from code where field_name='fp_kind' order by create_at";
-$fp_kind_opt = DB::result($sql);
-#9.人乘/載重
-$sql = "select code_name value ,content label from code where field_name='person_weight' order by remark";
-$person_opt = DB::result($sql);
-#10.速度
-$sql = "select code_name value ,content label from code where field_name='speed_range' order by remark";
-$speed_opt = DB::result($sql);
-#卷號
-$vol_no = "";
-#抓取有望客戶資料
-
-$hope_elevator_customer_column = [
-    'is_renovation' => ['label' => "產品屬性", "tag" => 'radio', 'attr' => ['required', 'class' => ' form-control form-control-sm'], 'options' => $is_renovation_opt],
-    'vol_no' => ['label' => "卷號",  "tag" => 'text', 'attr' => ['required', 'readonly=true ', "value" => "$vol_no", 'class' => 'form-control form-control-sm']],
-    //'form_key' => ['label' => "錶單號","tag" => 'text', 'attr'=>['class' => 'form-control form-control-sm' ]],
-    'customer' => ['label' => "客戶名稱", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-    'manager' => ['label' => "負責人", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
-    'source' => ['label' => "客戶來源", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm'], 'options' => $customer_source_opt],
-    'address' => ['label' => "地址", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
-   // 'company' => ['label' => "公司名稱", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-    'case_name' => ['label' => "案件名稱", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
-
-    //統編/身份證字號
-    'uscc' => ['label' => "統編/身份證", "tag" => 'text', 'attr' => [ 'class' => 'form-control form-control-sm']],
-
-    'linkman' => ['label' => "業主方聯係人", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
-    'lm_tel' => ['label' => "市話/手機", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
-    'salesman' => ['label' => "營業員", "tag" => 'select', 'attr' => ["value" => "$user_id", 'class' => 'form-control form-control-sm'], 'options' => $salesman_opt],
-    'num' => ['label' => "台數", "tag" => 'digits', 'attr' => ['min=1', 'digits', 'class' => 'form-control form-control-sm']],
-    'pre_order_date' => ['label' => "預定成交日", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
-    'status' => ['label' => "有望客戶狀態", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm'], 'options' => $hope_customer_status_opt],
-    //'next_visit_date' => ['label' => "下次拜訪時間", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
-    // 'brand' => ['label' => "廠牌", "tag" => 'select', 'attr' => ['required', 'class' => ' form-control form-control-sm '], 'options' => $elevator_brand_opt],
-    //'quote_date' => ['label' => "報價日期", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
-
-    //	'postgress_remark' => ['label' => "洽商進度","tag" => 'text', 'attr'=>['class' => 'form-control form-control-sm' ]]
-
-];
-$data = [
-    'salesman' => $user_id
-];
-
-#電梯規格錶
-$table_hope_project_elevator_spec = 'hope_project_elevator_spec';
-$hope_project_elevator_spec_columm = [
-    'specifications' => ['label' => "規格",         "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'specifications[]', 'class' => 'form-control form-control-sm'], 'options' => $fp_kind_opt],
-    'person' =>         ['label' => "人乘/載重",    "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'person[]', 'class' => 'form-control form-control-sm'],'options' => $person_opt],
-    //'weight' =>         ['label' => "載重(KG)",     "tag" => 'number', 'attr' => ['name' => 'weight[]', 'gt=0', 'min=0', 'class' => 'form-control form-control-sm']],
-    'stop' =>           ['label' => "停數",         "tag" => 'number', 'attr' => ['name' => 'stop[]', 'min=1', 'class' => 'form-control form-control-sm']],
-    'open' =>           ['label' => "開門方式",     "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'open[]', 'class' => 'form-control form-control-sm'], 'options' => $open_kind_opt],
-    'speed' =>          ['label' => "速度(m/min)",  "tag" => 'select', 'attr' => ['name' => 'speed[]', 'class' => 'form-control form-control-sm'],'options' => $speed_opt],
-    'spec_num' =>       ['label' => "數量",         "tag" => 'digits', 'attr' => ['name' => 'spec_num[]', 'min=1', 'class' => 'form-control form-control-sm']],
-    'spec_price' =>     ['label' => "單價",         "tag" => 'number', 'attr' => ['name' => 'spec_price[]', 'min=0', 'class' => 'form-control form-control-sm']],
-
-];
-
-
-
-$i = 0;
-$cmecRow = "  <tr>";
-foreach ($hope_project_elevator_spec_columm as $key => $val) {
-    $fieldVal = "";
-    $_input = $val['tag'] == 'select' ?
-        FormHelper::select('', $val['options'], $fieldVal, $val['attr'])
-        : FormHelper::text("$key",  $fieldVal, $val['attr'], $val['tag']);
-    //	: "<input type='" . $val['tag'] . "' class=' form-control   form-control-sm'   " . $val['attr'] . " value='" .    $fieldVal . "' name='${key}[]'  id='$key' placeholder='請輸入'>";
-    $cmecRow .= "<td  colspan='" . (empty($val['attr']['colspan']) ? '' : $val['attr']['colspan']) . "' ><div class=' col-12' >	$_input</td>";
-}
-$cmecRow .= "<td><button onClick='delCmecRow(this)' type='button' class='btn btn-link btn-md'>刪除</button></td>";
-
-#電梯Option 
-$table_option_price = 'hope_elevator_option_price';
-$option_price_column = [
-    'id' =>  ['label' => "序號", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'id[]',   'class' => 'form-control form-control-sm']],
-    'spec' =>  ['label' => "規格.仕樣", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 2, 'name' => 'spec[]',   'class' => 'form-control form-control-sm']],
-    'memo' => ['label' => "備註", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 7, 'name' => 'memo[]', 'class' => 'form-control form-control-sm']],
-    'optional' => ['label' => "配置", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'optional[]', 'class' => 'form-control form-control-sm']],
-    'unit' =>  ['label' => "單位", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'unit[]',   'class' => 'form-control form-control-sm']],
-    'price' =>  ['label' => "價格", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'price[]',   'class' => 'form-control form-control-sm']],
-
-];
-
-$hpeoRow = "  <tr>";
-foreach ($option_price_column as $key => $val) {
-    $fieldVal = "";
-    $_input = $val['tag'] == 'select' ?
-        FormHelper::select('', $val['options'], $fieldVal, $val['attr'])
-        : FormHelper::text("$key",  $fieldVal, $val['attr'], $val['tag']);
-    //	: "<input type='" . $val['tag'] . "' class=' form-control   form-control-sm'   " . $val['attr'] . " value='" .    $fieldVal . "' name='${key}[]'  id='$key' placeholder='請輸入'>";
-    $hpeoRow .= "<td  colspan='" . (empty($val['attr']['colspan']) ? '' : $val['attr']['colspan']) . "' ><div class=' col-12' >	$_input</td>";
-}
-$hpeoRow .= "<td><button onClick='delHpeoRow(this)' type='button' class='btn btn-link btn-md'>刪除</button></td>";
-
-
-//linkman,
-$sql = " SELECT id,spec,memo,case when optional then  '1-選配' when 2 then '2-標配' end optional ,unit,price  FROM option_price where status='Y'";
-$option_price = DB::result($sql);
-
-
-
-
-
-function  base_url($url)
-{
-    return "https://www.masada.com.tw/static/" . $url;
-}
-#生成卷號
-function   get_sequnece_no($seq_name = '', $p_yyyymm = '')
-{
-
-    if (empty($p_yyyymm) || empty($seq_name)) return null;
-    #當前年月
-
-    //echo  "select  yyyymm  from sequence  where seq_name='$seq_name'  ";
-    list($yyyymm, $prefix)    = DB::fields("select  yyyymm ,prefix  from sequence  where seq_name='$seq_name'  ");
-    if ($p_yyyymm != $yyyymm) {
-        DB::query("update sequence set yyyymm='$p_yyyymm' , current_val='10000' where seq_name='$seq_name'  ");
-    }
-    //	echo "SELECT  concat( $prefix,,substring(nextval('$seq_name'),2)) seq_no  ";
-    list($seq_no) = DB::fields("SELECT  concat( '$prefix','$p_yyyymm',substring( appwms.nextval('$seq_name'),2)) seq_no    ");
-    //  echo "SELECT  concat( '$prefix','$p_yyyymm',substring( appwms.nextval('$seq_name'),2)) seq_no ";
-
-    return $seq_no;
-}
-
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>有望客戶新增</title>
-    <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/jquery.cleditor.css'); ?>" />
-    <link rel="stylesheet" type="text/css" href="<?php echo base_url('bootstrap4/css/bootstrap.min.css'); ?>" />
-    <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/layui.css'); ?>" />
-    <script type="text/javascript" src="<?php echo base_url('js/jquery3.7.js'); ?>"></script>
-    <script type="text/javascript" src="<?php echo base_url('js/selectpage.min.js'); ?>"></script>
-    <script type="text/javascript" src="<?php echo base_url('js/jquery.cleditor.min.js'); ?>"></script>
-    <script type="text/javascript" src="<?php echo base_url('bootstrap4/js/bootstrap.min.js'); ?>"></script>
-    <script type="text/javascript" src="<?php echo base_url('js/layui.js?' . rand(10, 100)); ?>"></script>
-    <script type="text/javascript" src="<?php echo base_url('js/wf_property.js?') . rand(10, 100); ?>"></script>
-    <script type="text/javascript" src="<?php echo base_url('js/flow_chart.js?' . rand(10, 100)); ?>"></script>
-    <script src="<?php echo base_url('js/validate/jquery.validate.min.js?' . rand(10, 100)); ?>"></script>
-    <script src="<?php echo base_url('js/validate/messages_zh_TW.js?' . rand(10, 100)); ?>"></script>
-    <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/form.css?') . rand(10, 100);; ?>" />
-    <style>
-    label {
-        margin-right:10px;
-    }
-    </style>
-    <script type="text/javascript">
-        $(document).ready(function() {
-            $("input[name=is_renovation]").click(function(){
-                if ($(this).val() == "Y") {
-                    var volNo = "<?php echo get_sequnece_no('rt_vol_no', date('ym')); ?>";
-                } else if ($(this).val() == "N") {
-                    var volNo = "<?php echo get_sequnece_no('xt_vol_no', date('ym')); ?>";
-                }
-                $("#vol_no").val(volNo);
-            });
-            var cmecRow = "<?= str_replace('"', '\'', $cmecRow) ?>";
-            var hpeoRow = "<?= str_replace('"', '\'', $hpeoRow) ?>";
-
-
-            //	$('#cmecTbody').append(cmecRow);
-            $('.sp_element_box').attr("disabled", true);
-            $("#assign_opinion").cleditor({
-                height: 100, // height not including margins, borders or padding
-                controls: // controls to add to the toolbar
-                    "bold italic underline strikethrough subscript superscript | font size " +
-                    "style | color highlight removeformat | bullets numbering | outdent " +
-                    "indent | alignleft center alignright justify | undo redo | "
-            });
-            $.validator.addMethod('gt', function(value, element, param) {
-                return value > param;
-            }, $.validator.format("輸入值必須大於0"));
-
-            $('#cmecTbody').on('click', 'input[name^=spec_num]', function(){
-                $(this).unbind().keyup(function(){
-                    $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ","));
-                    sumNum();
-                });
-            });
-
-            $("#form").validate();
-        });
-        sumNum = function() {
-            var numAll = 0;
-            $("input[name^=spec_num]").each(function(){
-                numAll += Number($(this).val().replace(/[,]+/g,""));
-            });
-            $('#num').val(numAll);
-        }
-        addCmecRow = function() {
-            var cmecRow = "<?= $cmecRow ?>";
-            $('#cmecTbody').append(cmecRow);
-        }
-        delCmecRow = function(btn) {
-            $('#num').val($('#num').val() - Number($(btn).closest('tr').find('input[id=spec_num').val()));
-            $(btn).parent().parent().remove();
-
-        }
-        addHpeoRow = function() {
-            var hpeoRow = "<?= $hpeoRow ?>";
-            $('#hpeoTbody').append(hpeoRow);
-        }
-        delHpeoRow = function(btn) {
-            $(btn).parent().parent().remove();
-
-        }
-        selectHpeoRow = function(obj) {
-           var id = $(obj).parent().parent().find('td:nth-child(1)>div').text();
-            var spec = $(obj).parent().parent().find('td:nth-child(2)>div').text();
-            var memo = $(obj).parent().parent().find('td:nth-child(3)>div').text();
-            var optional = $(obj).parent().parent().find('td:nth-child(4)>div').text();
-            var unit = $(obj).parent().parent().find('td:nth-child(5)>div').text();
-            var price = $(obj).parent().parent().find('td:nth-child(6)>div').text();
-
-            var hpeoRow = "<?= $hpeoRow ?>";
-            $('#hpeoTbody').append(hpeoRow);
-            //').last()
-            var tr = $('#hpeoTbody tr').last();
-            $(tr).children('td').each(function(i) {
-               $(this).find("input[name^='id']").val(id.trim());
-                $(this).find("input[name^='spec']").val(spec.trim());
-                $(this).find("input[name^='memo']").val(memo.trim());
-                $(this).find("input[name^='optional']").val(optional.trim());
-                $(this).find("input[name^='unit']").val(unit.trim());
-                $(this).find("input[name^='price']").val(price.trim());
-        
-            });
-        }
-    </script>
-
-</head>
-
-<body>
-    <div id="toolbarmenu">
-        <ul class="nav nav-tabs" role="tablist" id="tablist">
-            <li class=" nav-item ">
-                <a href="#tabassign" aria-controls="tabassign" role="tab" class=" active nav-link" data-toggle="tab">申請單</a>
-            </li>
-        </ul>
-    </div>
-    <div class="tab-content   ">
-        <div class="tab-pane active    assign_content  " id="tabassign">
-            <form action="crmm03_submit.php?token=<?= $_GET['token'] ?>" id='form' method="post" style='width:98%;margin:0 auto'>
-                <!-- hidden域 -->
-                <input type='hidden' name='token' value='<?= $_GET['token'] ?>' />
-                <!--錶單start-->
-                <div class=" form    container-fluid  pt-5">
-                    <div class="row form_head ">
-                        <div class=" col-12 form_head_title ">
-                            <h4> 有望客戶(新梯/汰改)新增</h4>
-                        </div>
-                    </div>
-
-                    <div class="row  " style='padding-top:30px;'>
-                        <div class=" col-lg-12  form_row_header ">
-                            <b>有望客戶資料</b>
-                        </div>
-                    </div>
-
-                    <?php
-                    //一行顯示三列
-                    $i = 0;
-                    echo "  <div class='row '>";
-                    foreach ($hope_elevator_customer_column as $key => $val) {
-                        $j = (($i++) % 4);
-                        $fieldVal = (empty($data) or !array_key_exists($key, $data)) ? "" : $data[$key];
-
-                        if ($val['tag'] == 'select') {
-                            $_input = FormHelper::select("$key", $val['options'], $fieldVal, $val['attr']);
-                        } elseif ($val['tag'] == 'radio') {
-                            $_input = FormHelper::collectionRadios("$key", $val['options'],"");
-                        } else {
-                            $_input = FormHelper::text("$key", $fieldVal, $val['attr'], $val['tag']);
-                        }
-                        /*
-                        $_input = $val['tag'] == 'select' ?
-                            FormHelper::select("$key", $val['options'],     $fieldVal, $val['attr'])
-                            : FormHelper::text("$key", $fieldVal, $val['attr'], $val['tag']);
-                        */
-                        if ($i != 1 && $j == 0) {
-                            echo "
-							       </div>
-                                   <div class='row'>
-								 ";
-                        }
-                        echo "  <div class='col-1 form_field_title'>
-                                    " . $val['label'] . "
-                                </div>
-                                <div class=' col-2 form_field_content ' >
-								  $_input
-                                 </div>
-                                ";
-                    }
-                    echo "</div>";
-
-                    ?>
-
-                    <div id="assign_area " class="row ">
-                        <div class="col-12 form_row_header ">
-                            <b>洽商進度</b>
-                        </div>
-                        <div class="col-12  " style="padding:0">
-
-                            <textarea class='form-control textarea' id="progress_status" name="progress_status" 
-                            value='' rows='6'></textarea>
-                        </div>
-                    </div>
-                    <div id="elevator_list_area" class="row ">
-                        <div class="col-12 form_row_header ">
-                            <b>電梯規格信息</b>
-                        </div>
-                        <table style='margin-top:0px;text-align:center' id='elevator_list'>
-
-                            <thead>
-                                <tr>
-                                    <td colspan='11' ;><button onClick='addCmecRow()' type="button" style='float:right' class="btn btn-link btn-md">+新增</button></td>
-                                </tr>
-                                <tr style='margin-top:0px;text-align:center'>
-                                    <?php
-                                    foreach ($hope_project_elevator_spec_columm  as $val) {
-                                        echo     FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']);
-                                    }
-                                    echo "<th>操作</th>";
-                                    ?>
-
-                                </tr>
-                            </thead>
-                            <tbody id='cmecTbody'>
-                                <?php
-                                $cmecRow = "<tr>";
-                                foreach ($hope_project_elevator_spec_columm as $col => $col_def) {
-
-                                    $fieldVal = '';
-                                    $_input = $col_def['tag'] == 'select' ?
-                                        FormHelper::select(
-                                            $col,
-                                            $col_def['options'],
-                                            $fieldVal,
-                                            $col_def['attr']
-                                        )
-                                        : FormHelper::text(
-                                            $col,
-                                            $fieldVal,
-                                            $col_def['attr'],
-                                            $col_def['tag']
-                                        );
-                                    $cmecRow .= "<td colspan='"
-                                        . (empty($col_def['attr']['colspan']) ? '' :
-                                            $col_def['attr']['colspan']) . "' >
-                                         <div class=' col-12'>	$_input</td>";
-                                }
-                                echo $cmecRow . "<td><button onClick='delCmecRow(this)' type='button' class='btn btn-link btn-md '>刪除</button></td></tr>";
-
-                                ?>
-                            </tbody>
-                        </table>
-
-                    </div>
-                    <div id="option_list_area" class="row ">
-                        <div class="col-12 form_row_header ">
-                            <b>Option報價</b>
-                        </div>
-                        <table style='margin-top:0px;text-align:center' id='option_list'>
-
-                            <thead>
-                                <tr>
-
-                                    <td colspan='14' ;><button class="btn btn-link btn-md" type='button' data-toggle="modal" data-target="#myModal" style='float:right'>+新增</button>
-                                    </td>
-                                </tr>
-                                <tr style='margin-top:0px;text-align:center'>
-                                    <?php
-                                    foreach ($option_price_column  as $val) {
-                                        echo     FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']);
-                                        //echo "<th>" . $val['label'] . "</th>";
-                                    }
-                                    echo "<th>操作</th>";
-                                    ?>
-
-                                </tr>
-                            </thead>
-                            <tbody id='hpeoTbody'>
-                                <?php
-                                // $cmecRow = "<tr>";
-                                // foreach ($option_price_column as $col => $col_def) {
-
-                                //     $fieldVal = '';
-                                //     $_input = $col_def['tag'] == 'select' ?
-                                //         FormHelper::select(
-                                //             $col,
-                                //             $col_def['options'],
-                                //             $fieldVal,
-                                //             $col_def['attr']
-                                //         )
-                                //         : FormHelper::text(
-                                //             $col,
-                                //             $fieldVal,
-                                //             $col_def['attr'],
-                                //             $col_def['tag']
-                                //         );
-                                //     $cmecRow .= "<td colspan='"
-                                //         . (empty($col_def['attr']['colspan']) ? '' :
-                                //             $col_def['attr']['colspan']) . "' >
-                                //          <div class=' col-12'>	$_input</td>";
-                                // }
-                                // echo $cmecRow . "<td><button onClick='delHpeoRow(this)' type='button' class='btn btn-link btn-md '>刪除</button></td></tr>";
-
-                                ?>
-                            </tbody>
-                        </table>
-
-                    </div>
-                    <button style='margin:20px auto;width:50px' type="submit" class="btn btn-primary btn-sm">保存</button>
-                </div>
-
-            </form>
-
-            <!-- 按鈕觸發模態框 -->
-            <!-- 模態框（Modal） -->
-            <div class="modal fade  " id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                <div class="modal-dialog modal-xl">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <b>OPTION選擇</b>
-                        </div>
-                        <div class="modal-body">
-
-                            <table style='margin-top:0px;text-align:center;font-size:13px' id='option_list_select'>
-
-                                <thead>
-
-                                    <tr style='margin-top:0px;text-align:center'>
-                                        <?php
-                                        foreach ($option_price_column  as $val) {
-                                            echo     FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']);
-                                            //echo "<th>" . $val['label'] . "</th>";
-                                        }
-                                        echo "<th>操作</th>";
-                                        ?>
-
-                                    </tr>
-                                </thead>
-                                <tbody class='hpeoTbody'>
-                                    <?php
-
-                                    foreach ($option_price as $key => $val) {
-                                        $cmecRow = "<tr >";
-                                        foreach ($option_price_column as $col => $col_def) {
-
-                                            $fieldVal = empty($val) ? "" : $val[$col];
-                                            $_input = FormHelper::tag(
-                                                'label',
-                                                ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']],
-                                                $fieldVal
-
-                                            );
-                                            $cmecRow .= "<td style='text-align:left' colspan='"
-                                                . (empty($col_def['attr']['colspan']) ? '' :
-                                                    $col_def['attr']['colspan']) . "' >
-                                                  <div class=' col-12' >	$_input</td>";
-                                        }
-                                        echo $cmecRow . "<td><button onClick='selectHpeoRow(this)' type='button' class='btn btn-link btn-md '>選中</button></td></tr>";
-                                    }
-                                    ?>
-                                </tbody>
-                            </table>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" class="btn btn-default" data-dismiss="modal">關閉</button>
-                        </div>
-                    </div><!-- /.modal-content -->
-                </div><!-- /.modal-dialog -->
-            </div>
-        </div>
-
-
-
-    </div>
-
+<?php
+error_reporting(E_ALL);
+ini_set("display_errors", "On");
+require_once '../header_nomenu.php';
+
+require_once './FormHelper.php';
+require_once './wf_common.php';
+//echo $user_id;
+//錶單數據
+#客戶錶
+#1.電梯品牌選項
+$sql = "select code_name value ,content label from code where field_name='elevator_brand' order by convert(content using gbk) asc ";
+$elevator_brand_opt = DB::result($sql);
+#2.客戶來源
+$sql = "select code_name value ,content label from code where field_name='customer_source'";
+$customer_source_opt = DB::result($sql);
+#3.電梯類型
+$sql = "select code_name value ,content label from code where field_name='elevator_kind'";
+$elevator_kind_opt = DB::result($sql);
+#4.營業員
+$sql = "select employee_no  value ,name label from employee  where depart_no in ('320','311','312','313','314','511','512','513','514','322','515')";
+$salesman_opt = DB::result($sql);
+#5.有望客戶狀態
+$sql = "select code_name value ,content label from code where field_name='hope_customer_status'";
+$hope_customer_status_opt = DB::result($sql);
+
+#6.是否汰改
+$is_renovation_opt = ["N" => "新梯(M)", "Y" => "汰改(T)"];
+/*
+    ['label' => '是', 'value' => 'Y'],
+    ['label' => '否', 'value' => 'N'],
+*/
+
+#7.開門方式
+$sql = "select code_name value ,content label from code where field_name='open_kind' and content not in ('2PCO', '3S', '2SL', '2SR')";
+$open_kind_opt = DB::result($sql);
+#8.機種
+$sql = "select code_name value ,content label from code where field_name='fp_kind' order by create_at";
+$fp_kind_opt = DB::result($sql);
+#9.人乘/載重
+$sql = "select code_name value ,content label from code where field_name='person_weight' order by remark";
+$person_opt = DB::result($sql);
+#10.速度
+$sql = "select code_name value ,content label from code where field_name='speed_range' order by remark";
+$speed_opt = DB::result($sql);
+#卷號
+$vol_no = "";
+#抓取有望客戶資料
+
+$hope_elevator_customer_column = [
+    'is_renovation' => ['label' => "產品屬性", "tag" => 'radio', 'attr' => ['required', 'class' => ' form-control form-control-sm'], 'options' => $is_renovation_opt],
+    'vol_no' => ['label' => "卷號",  "tag" => 'text', 'attr' => ['required', 'readonly=true ', "value" => "$vol_no", 'class' => 'form-control form-control-sm']],
+    //'form_key' => ['label' => "錶單號","tag" => 'text', 'attr'=>['class' => 'form-control form-control-sm' ]],
+    'customer' => ['label' => "客戶名稱", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'manager' => ['label' => "負責人", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+    'source' => ['label' => "客戶來源", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm'], 'options' => $customer_source_opt],
+    'address' => ['label' => "地址", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+    // 'company' => ['label' => "公司名稱", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'case_name' => ['label' => "案件名稱", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+
+    //統編/身份證字號
+    'uscc' => ['label' => "統編/身份證", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+
+    'linkman' => ['label' => "業主方聯係人", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
+    'lm_tel' => ['label' => "市話/手機", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
+    'salesman' => ['label' => "營業員", "tag" => 'select', 'attr' => ["value" => "$user_id", 'class' => 'form-control form-control-sm'], 'options' => $salesman_opt],
+    'num' => ['label' => "台數", "tag" => 'digits', 'attr' => ['min=1', 'digits', 'class' => 'form-control form-control-sm']],
+    'pre_order_date' => ['label' => "預定成交日", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
+    'status' => ['label' => "有望客戶狀態", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm'], 'options' => $hope_customer_status_opt],
+    //'next_visit_date' => ['label' => "下次拜訪時間", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
+    // 'brand' => ['label' => "廠牌", "tag" => 'select', 'attr' => ['required', 'class' => ' form-control form-control-sm '], 'options' => $elevator_brand_opt],
+    //'quote_date' => ['label' => "報價日期", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
+
+    //	'postgress_remark' => ['label' => "洽商進度","tag" => 'text', 'attr'=>['class' => 'form-control form-control-sm' ]]
+
+];
+$data = [
+    'salesman' => $user_id
+];
+
+#電梯規格錶
+$table_hope_project_elevator_spec = 'hope_project_elevator_spec';
+$hope_project_elevator_spec_columm = [
+    'specifications' => ['label' => "規格",         "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'specifications[]', 'class' => 'form-control form-control-sm'], 'options' => $fp_kind_opt],
+    'person' =>         ['label' => "人乘/載重",    "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'person[]', 'class' => 'form-control form-control-sm'], 'options' => $person_opt],
+    //'weight' =>         ['label' => "載重(KG)",     "tag" => 'number', 'attr' => ['name' => 'weight[]', 'gt=0', 'min=0', 'class' => 'form-control form-control-sm']],
+    'stop' =>           ['label' => "停數",         "tag" => 'number', 'attr' => ['name' => 'stop[]', 'min=1', 'class' => 'form-control form-control-sm']],
+    'open' =>           ['label' => "開門方式",     "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'open[]', 'class' => 'form-control form-control-sm'], 'options' => $open_kind_opt],
+    'speed' =>          ['label' => "速度(m/min)",  "tag" => 'select', 'attr' => ['name' => 'speed[]', 'class' => 'form-control form-control-sm'], 'options' => $speed_opt],
+    'spec_num' =>       ['label' => "數量",         "tag" => 'digits', 'attr' => ['name' => 'spec_num[]', 'min=1', 'class' => 'form-control form-control-sm']],
+    'spec_price' =>     ['label' => "單價",         "tag" => 'number', 'attr' => ['name' => 'spec_price[]', 'min=0', 'class' => 'form-control form-control-sm']],
+
+];
+
+
+
+$i = 0;
+$cmecRow = "  <tr>";
+foreach ($hope_project_elevator_spec_columm as $key => $val) {
+    $fieldVal = "";
+    $_input = $val['tag'] == 'select' ?
+        FormHelper::select('', $val['options'], $fieldVal, $val['attr'])
+        : FormHelper::text("$key",  $fieldVal, $val['attr'], $val['tag']);
+    //	: "<input type='" . $val['tag'] . "' class=' form-control   form-control-sm'   " . $val['attr'] . " value='" .    $fieldVal . "' name='${key}[]'  id='$key' placeholder='請輸入'>";
+    $cmecRow .= "<td  colspan='" . (empty($val['attr']['colspan']) ? '' : $val['attr']['colspan']) . "' ><div class=' col-12' >	$_input</td>";
+}
+$cmecRow .= "<td><button onClick='delCmecRow(this)' type='button' class='btn btn-link btn-md'>刪除</button></td>";
+
+#電梯Option 
+$table_option_price = 'hope_elevator_option_price';
+$option_price_column = [
+    'id' =>  ['label' => "序號", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'id[]',   'class' => 'form-control form-control-sm']],
+    'spec' =>  ['label' => "規格.仕樣", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 2, 'name' => 'spec[]',   'class' => 'form-control form-control-sm']],
+    'memo' => ['label' => "備註", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 7, 'name' => 'memo[]', 'class' => 'form-control form-control-sm']],
+    'optional' => ['label' => "配置", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'optional[]', 'class' => 'form-control form-control-sm']],
+    'unit' =>  ['label' => "單位", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'unit[]',   'class' => 'form-control form-control-sm']],
+    'price' =>  ['label' => "價格", "tag" => 'text', 'attr' => ['readonly', 'colspan' => 1, 'name' => 'price[]',   'class' => 'form-control form-control-sm']],
+
+];
+
+$hpeoRow = "  <tr>";
+foreach ($option_price_column as $key => $val) {
+    $fieldVal = "";
+    $_input = $val['tag'] == 'select' ?
+        FormHelper::select('', $val['options'], $fieldVal, $val['attr'])
+        : FormHelper::text("$key",  $fieldVal, $val['attr'], $val['tag']);
+    //	: "<input type='" . $val['tag'] . "' class=' form-control   form-control-sm'   " . $val['attr'] . " value='" .    $fieldVal . "' name='${key}[]'  id='$key' placeholder='請輸入'>";
+    $hpeoRow .= "<td  colspan='" . (empty($val['attr']['colspan']) ? '' : $val['attr']['colspan']) . "' ><div class=' col-12' >	$_input</td>";
+}
+$hpeoRow .= "<td><button onClick='delHpeoRow(this)' type='button' class='btn btn-link btn-md'>刪除</button></td>";
+
+
+//linkman,
+$sql = " SELECT id,spec,memo,case when optional then  '1-選配' when 2 then '2-標配' end optional ,unit,price  FROM option_price where status='Y'";
+$option_price = DB::result($sql);
+
+
+
+
+
+function  base_url($url)
+{
+    return "https://www.masada.com.tw/static/" . $url;
+}
+#生成卷號
+function   get_sequnece_no($seq_name = '', $p_yyyymm = '')
+{
+
+    if (empty($p_yyyymm) || empty($seq_name)) return null;
+    #當前年月
+
+    //echo  "select  yyyymm  from sequence  where seq_name='$seq_name'  ";
+    list($yyyymm, $prefix)    = DB::fields("select  yyyymm ,prefix  from sequence  where seq_name='$seq_name'  ");
+    if ($p_yyyymm != $yyyymm) {
+        DB::query("update sequence set yyyymm='$p_yyyymm' , current_val='10000' where seq_name='$seq_name'  ");
+    }
+    //	echo "SELECT  concat( $prefix,,substring(nextval('$seq_name'),2)) seq_no  ";
+    list($seq_no) = DB::fields("SELECT  concat( '$prefix','$p_yyyymm',substring( appwms.nextval('$seq_name'),2)) seq_no    ");
+    //  echo "SELECT  concat( '$prefix','$p_yyyymm',substring( appwms.nextval('$seq_name'),2)) seq_no ";
+
+    return $seq_no;
+}
+
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>有望客戶新增</title>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/jquery.cleditor.css'); ?>" />
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('bootstrap4/css/bootstrap.min.css'); ?>" />
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/layui.css'); ?>" />
+    <script type="text/javascript" src="<?php echo base_url('js/jquery3.7.js'); ?>"></script>
+    <script type="text/javascript" src="<?php echo base_url('js/selectpage.min.js'); ?>"></script>
+    <script type="text/javascript" src="<?php echo base_url('js/jquery.cleditor.min.js'); ?>"></script>
+    <script type="text/javascript" src="<?php echo base_url('bootstrap4/js/bootstrap.min.js'); ?>"></script>
+    <script type="text/javascript" src="<?php echo base_url('js/layui.js?' . rand(10, 100)); ?>"></script>
+    <script type="text/javascript" src="<?php echo base_url('js/wf_property.js?') . rand(10, 100); ?>"></script>
+    <script type="text/javascript" src="<?php echo base_url('js/flow_chart.js?' . rand(10, 100)); ?>"></script>
+    <script src="<?php echo base_url('js/validate/jquery.validate.min.js?' . rand(10, 100)); ?>"></script>
+    <script src="<?php echo base_url('js/validate/messages_zh_TW.js?' . rand(10, 100)); ?>"></script>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/form.css?') . rand(10, 100);; ?>" />
+    <style>
+        label {
+            margin-right: 10px;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("input[name=is_renovation]").click(function() {
+                if ($(this).val() == "Y") {
+                    var volNo = "<?php echo get_sequnece_no('rt_vol_no', date('ym')); ?>";
+                } else if ($(this).val() == "N") {
+                    var volNo = "<?php echo get_sequnece_no('xt_vol_no', date('ym')); ?>";
+                }
+                $("#vol_no").val(volNo);
+            });
+            var cmecRow = "<?= str_replace('"', '\'', $cmecRow) ?>";
+            var hpeoRow = "<?= str_replace('"', '\'', $hpeoRow) ?>";
+
+
+            //	$('#cmecTbody').append(cmecRow);
+            $('.sp_element_box').attr("disabled", true);
+            $("#assign_opinion").cleditor({
+                height: 100, // height not including margins, borders or padding
+                controls: // controls to add to the toolbar
+                    "bold italic underline strikethrough subscript superscript | font size " +
+                    "style | color highlight removeformat | bullets numbering | outdent " +
+                    "indent | alignleft center alignright justify | undo redo | "
+            });
+            $.validator.addMethod('gt', function(value, element, param) {
+                return value > param;
+            }, $.validator.format("輸入值必須大於0"));
+
+            $('#cmecTbody').on('click', 'input[name^=spec_num]', function() {
+                $(this).unbind().keyup(function() {
+                    $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ","));
+                    sumNum();
+                });
+            });
+
+            $("#form").validate();
+        });
+        sumNum = function() {
+            var numAll = 0;
+            $("input[name^=spec_num]").each(function() {
+                numAll += Number($(this).val().replace(/[,]+/g, ""));
+            });
+            $('#num').val(numAll);
+        }
+        addCmecRow = function() {
+            var cmecRow = "<?= $cmecRow ?>";
+            $('#cmecTbody').append(cmecRow);
+        }
+        delCmecRow = function(btn) {
+            $('#num').val($('#num').val() - Number($(btn).closest('tr').find('input[id=spec_num').val()));
+            $(btn).parent().parent().remove();
+
+        }
+        addHpeoRow = function() {
+            var hpeoRow = "<?= $hpeoRow ?>";
+            $('#hpeoTbody').append(hpeoRow);
+        }
+        delHpeoRow = function(btn) {
+            $(btn).parent().parent().remove();
+
+        }
+        selectHpeoRow = function(obj) {
+            var id = $(obj).parent().parent().find('td:nth-child(1)>div').text();
+            var spec = $(obj).parent().parent().find('td:nth-child(2)>div').text();
+            var memo = $(obj).parent().parent().find('td:nth-child(3)>div').text();
+            var optional = $(obj).parent().parent().find('td:nth-child(4)>div').text();
+            var unit = $(obj).parent().parent().find('td:nth-child(5)>div').text();
+            var price = $(obj).parent().parent().find('td:nth-child(6)>div').text();
+
+            var hpeoRow = "<?= $hpeoRow ?>";
+            $('#hpeoTbody').append(hpeoRow);
+            //').last()
+            var tr = $('#hpeoTbody tr').last();
+            $(tr).children('td').each(function(i) {
+                $(this).find("input[name^='id']").val(id.trim());
+                $(this).find("input[name^='spec']").val(spec.trim());
+                $(this).find("input[name^='memo']").val(memo.trim());
+                $(this).find("input[name^='optional']").val(optional.trim());
+                $(this).find("input[name^='unit']").val(unit.trim());
+                $(this).find("input[name^='price']").val(price.trim());
+
+            });
+        }
+    </script>
+
+</head>
+
+<body>
+    <div id="toolbarmenu">
+        <ul class="nav nav-tabs" role="tablist" id="tablist">
+            <li class=" nav-item ">
+                <a href="#tabassign" aria-controls="tabassign" role="tab" class=" active nav-link" data-toggle="tab">申請單</a>
+            </li>
+        </ul>
+    </div>
+    <div class="tab-content   ">
+        <div class="tab-pane active    assign_content  " id="tabassign">
+            <form action="crmm03_submit.php?token=<?= $_GET['token'] ?>" id='form' method="post" style='width:98%;margin:0 auto'>
+                <!-- hidden域 -->
+                <input type='hidden' name='token' value='<?= $_GET['token'] ?>' />
+                <!--錶單start-->
+                <div class=" form    container-fluid  pt-5">
+                    <div class="row form_head ">
+                        <div class=" col-12 form_head_title ">
+                            <h4> 有望客戶(新梯/汰改)新增</h4>
+                        </div>
+                    </div>
+
+                    <div class="row  " style='padding-top:30px;'>
+                        <div class=" col-lg-12  form_row_header ">
+                            <b>有望客戶資料</b>
+                        </div>
+                    </div>
+
+                    <?php
+                    //一行顯示三列
+                    $i = 0;
+                    echo "  <div class='row '>";
+                    foreach ($hope_elevator_customer_column as $key => $val) {
+                        $j = (($i++) % 4);
+                        $fieldVal = (empty($data) or !array_key_exists($key, $data)) ? "" : $data[$key];
+
+                        if ($val['tag'] == 'select') {
+                            $_input = FormHelper::select("$key", $val['options'], $fieldVal, $val['attr']);
+                        } elseif ($val['tag'] == 'radio') {
+                            $_input = FormHelper::collectionRadios("$key", $val['options'], "");
+                        } else {
+                            $_input = FormHelper::text("$key", $fieldVal, $val['attr'], $val['tag']);
+                        }
+                        /*
+                        $_input = $val['tag'] == 'select' ?
+                            FormHelper::select("$key", $val['options'],     $fieldVal, $val['attr'])
+                            : FormHelper::text("$key", $fieldVal, $val['attr'], $val['tag']);
+                        */
+                        if ($i != 1 && $j == 0) {
+                            echo "
+							       </div>
+                                   <div class='row'>
+								 ";
+                        }
+                        echo "  <div class='col-1 form_field_title'>
+                                    " . $val['label'] . "
+                                </div>
+                                <div class=' col-2 form_field_content ' >
+								  $_input
+                                 </div>
+                                ";
+                    }
+                    echo "</div>";
+
+                    ?>
+
+                    <div id="assign_area " class="row ">
+                        <div class="col-12 form_row_header ">
+                            <b>洽商進度</b>
+                        </div>
+                        <div class="col-12  " style="padding:0">
+
+                            <textarea class='form-control textarea' id="progress_status" name="progress_status" value='' rows='6'></textarea>
+                        </div>
+                    </div>
+                    <div id="elevator_list_area" class="row ">
+                        <div class="col-12 form_row_header ">
+                            <b>電梯規格信息</b>
+                        </div>
+                        <table style='margin-top:0px;text-align:center' id='elevator_list'>
+
+                            <thead>
+                                <tr>
+                                    <td colspan='11' ;><button onClick='addCmecRow()' type="button" style='float:right' class="btn btn-link btn-md">+新增</button></td>
+                                </tr>
+                                <tr style='margin-top:0px;text-align:center'>
+                                    <?php
+                                    foreach ($hope_project_elevator_spec_columm  as $val) {
+                                        echo     FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']);
+                                    }
+                                    echo "<th>操作</th>";
+                                    ?>
+
+                                </tr>
+                            </thead>
+                            <tbody id='cmecTbody'>
+                                <?php
+                                $cmecRow = "<tr>";
+                                foreach ($hope_project_elevator_spec_columm as $col => $col_def) {
+
+                                    $fieldVal = '';
+                                    $_input = $col_def['tag'] == 'select' ?
+                                        FormHelper::select(
+                                            $col,
+                                            $col_def['options'],
+                                            $fieldVal,
+                                            $col_def['attr']
+                                        )
+                                        : FormHelper::text(
+                                            $col,
+                                            $fieldVal,
+                                            $col_def['attr'],
+                                            $col_def['tag']
+                                        );
+                                    $cmecRow .= "<td colspan='"
+                                        . (empty($col_def['attr']['colspan']) ? '' :
+                                            $col_def['attr']['colspan']) . "' >
+                                         <div class=' col-12'>	$_input</td>";
+                                }
+                                echo $cmecRow . "<td><button onClick='delCmecRow(this)' type='button' class='btn btn-link btn-md '>刪除</button></td></tr>";
+
+                                ?>
+                            </tbody>
+                        </table>
+
+                    </div>
+                    <div id="option_list_area" class="row ">
+                        <div class="col-12 form_row_header ">
+                            <b>Option報價</b>
+                        </div>
+                        <table style='margin-top:0px;text-align:center' id='option_list'>
+
+                            <thead>
+                                <tr>
+
+                                    <td colspan='14' ;><button class="btn btn-link btn-md" type='button' data-toggle="modal" data-target="#myModal" style='float:right'>+新增</button>
+                                    </td>
+                                </tr>
+                                <tr style='margin-top:0px;text-align:center'>
+                                    <?php
+                                    foreach ($option_price_column  as $val) {
+                                        echo     FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']);
+                                        //echo "<th>" . $val['label'] . "</th>";
+                                    }
+                                    echo "<th>操作</th>";
+                                    ?>
+
+                                </tr>
+                            </thead>
+                            <tbody id='hpeoTbody'>
+                                <?php
+                                // $cmecRow = "<tr>";
+                                // foreach ($option_price_column as $col => $col_def) {
+
+                                //     $fieldVal = '';
+                                //     $_input = $col_def['tag'] == 'select' ?
+                                //         FormHelper::select(
+                                //             $col,
+                                //             $col_def['options'],
+                                //             $fieldVal,
+                                //             $col_def['attr']
+                                //         )
+                                //         : FormHelper::text(
+                                //             $col,
+                                //             $fieldVal,
+                                //             $col_def['attr'],
+                                //             $col_def['tag']
+                                //         );
+                                //     $cmecRow .= "<td colspan='"
+                                //         . (empty($col_def['attr']['colspan']) ? '' :
+                                //             $col_def['attr']['colspan']) . "' >
+                                //          <div class=' col-12'>	$_input</td>";
+                                // }
+                                // echo $cmecRow . "<td><button onClick='delHpeoRow(this)' type='button' class='btn btn-link btn-md '>刪除</button></td></tr>";
+
+                                ?>
+                            </tbody>
+                        </table>
+
+                    </div>
+                    <button style='margin:20px auto;width:50px' type="submit" class="btn btn-primary btn-sm">保存</button>
+                </div>
+
+            </form>
+
+            <!-- 按鈕觸發模態框 -->
+            <!-- 模態框（Modal） -->
+            <div class="modal fade  " id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+                <div class="modal-dialog modal-xl">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <b>OPTION選擇</b>
+                        </div>
+                        <div class="modal-body">
+
+                            <table style='margin-top:0px;text-align:center;font-size:13px' id='option_list_select'>
+
+                                <thead>
+
+                                    <tr style='margin-top:0px;text-align:center'>
+                                        <?php
+                                        foreach ($option_price_column  as $val) {
+                                            echo     FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']);
+                                            //echo "<th>" . $val['label'] . "</th>";
+                                        }
+                                        echo "<th>操作</th>";
+                                        ?>
+
+                                    </tr>
+                                </thead>
+                                <tbody class='hpeoTbody'>
+                                    <?php
+
+                                    foreach ($option_price as $key => $val) {
+                                        $cmecRow = "<tr >";
+                                        foreach ($option_price_column as $col => $col_def) {
+
+                                            $fieldVal = empty($val) ? "" : $val[$col];
+                                            $_input = FormHelper::tag(
+                                                'label',
+                                                ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']],
+                                                $fieldVal
+
+                                            );
+                                            $cmecRow .= "<td style='text-align:left' colspan='"
+                                                . (empty($col_def['attr']['colspan']) ? '' :
+                                                    $col_def['attr']['colspan']) . "' >
+                                                  <div class=' col-12' >	$_input</td>";
+                                        }
+                                        echo $cmecRow . "<td><button onClick='selectHpeoRow(this)' type='button' class='btn btn-link btn-md '>選中</button></td></tr>";
+                                    }
+                                    ?>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-default" data-dismiss="modal">關閉</button>
+                        </div>
+                    </div><!-- /.modal-content -->
+                </div><!-- /.modal-dialog -->
+            </div>
+        </div>
+
+
+
+    </div>
+
 </body>
\ No newline at end of file
diff --git a/wms/crm/crmm06-edit.php b/wms/crm/crmm06-edit.php
index bcd24d29..fbf21dfd 100644
--- a/wms/crm/crmm06-edit.php
+++ b/wms/crm/crmm06-edit.php
@@ -19,7 +19,7 @@ $customer_source_opt = DB::result($sql);
 $sql = "select code_name value ,content label  from code where field_name='elevator_kind'";
 $elevator_kind_opt = DB::result($sql);
 #4.營業員
-$sql = "select employee_no  value ,name label    from employee  where depart_no in ('511','512','513','514')";
+$sql = "select employee_no  value ,name label    from employee  where depart_no in ('511','512','513','514','515')";
 $salesman_opt = DB::result($sql);
 #5.有望客戶狀態
 $sql = "select code_name value ,content label    from code where field_name='hope_customer_status'";
diff --git a/wms/fun_global.php b/wms/fun_global.php
index a9fa465f..0c2ab8db 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -97,6 +97,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee)
             $ret[3] =   "test03,,";
             $ret[4] =   "test05,,";
             return $ret;
+            exit;
         } else {
             if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
                 $ret[1] = $row["manager"] . ",,";
@@ -130,12 +131,13 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
     $res = mysqli_query($link, $sql);
     if ($row = mysqli_fetch_assoc($res)) {
         if ($row["manager"] == "M0001") return; // 董事長略過
-        if ($row["manager"] == "TEST04" || $user_id = 'TEST01') {
+        if ($row["manager"] == "TEST04" || $user_id == 'TEST01') {
             $ret[1] =   "test04,,";
             $ret[2] =   "test02,,";
             $ret[3] =   "test03,,";
             $ret[4] =   "test05,,";
             return $ret;
+            exit();
         } else {
             if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
                 $ret[1] = $row["manager"];
@@ -144,7 +146,7 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
             }
         }
     }
-    $ret[1] = "M0029";
+    // $ret[1] = "M0029";
     mysqli_free_result($res);
     $ret[2] = 'M0012';
     if ($renovate_flag == "REN") {
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 90796cfd..b5acebdc 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -550,14 +550,14 @@ if ($data) :
 
                             <?php endif; ?>
 
-                            <?php if ($data['status'] == 'YY' && (($user_id == "M0060" && $data['applyprogress'] == 2) || (($user_id == "M0107" || $user_id == "M0175") && $data['applyprogress'] <= 1) || $user_id == "M0174" || $user_id == 'M0225') && $data['applystatus'] == 1) : ?>
+                            <?php if ($data['status'] == 'YY' && ((($user_id == "M0060" || $user_id === "TEST03") && $data['applyprogress'] == 2) || (($user_id == "M0107" || $user_id == "M0175" || $user_id == "TEST02") && $data['applyprogress'] <= 1) || $user_id == "M0174" || $user_id == 'M0225') && $data['applystatus'] == 1) : ?>
                                 <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">待簽核</a><br>
                             <?php endif; ?>
                             <?php if ($data['status'] != 'YY') : ?>
                                 <span style="font-size:13px;font-weight:600">--</span>
                             <?php endif; ?>
                             <!-- 工號M0107、M0174有所有權限 -->
-                            <?php if (($data['status'] === 'YY' && $data['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060" || $user_id == "M0175")) || $user_id == "M0174" || $user_id == 'M0225') : ?>
+                            <?php if (($data['status'] === 'YY' && $data['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060" || $user_id == "M0175" || $user_id === "TEST02")) || $user_id == "M0174" || $user_id == 'M0225') : ?>
                                 <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para ?>">下載</a>
                             <?php endif; ?>
                         </td>