diff --git a/wms/contract-repair/api/getContractData.php b/wms/contract-repair/api/getContractData.php
index 59e6752e..aadc45cd 100644
--- a/wms/contract-repair/api/getContractData.php
+++ b/wms/contract-repair/api/getContractData.php
@@ -57,6 +57,7 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
     }catch (PDOException $e ){
         die("ERROR!!!: ". $e->getMessage());
     }
+<<<<<<< HEAD
 }
 //////////////////////////////
 ////   合約簽回(修理) 
@@ -86,4 +87,6 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
     }catch(PDOException $e){
         die("ERROR!!:".$e->getMessage());
     }
+=======
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
 }
\ No newline at end of file
diff --git a/wms/contract-repair/api/postContractData.php b/wms/contract-repair/api/postContractData.php
index d7eee3cd..4f66cefe 100644
--- a/wms/contract-repair/api/postContractData.php
+++ b/wms/contract-repair/api/postContractData.php
@@ -315,6 +315,7 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['co
 }
 
 
+<<<<<<< HEAD
 //////////////////////////////
 ////   合約簽回(修理) 
 ////
@@ -330,5 +331,7 @@ if(isset($_POST['contractno']) && $_POST['contractno'] != "" && isset($_POST['co
         die('Error!' .$e->getMessage());
     }
 }
+=======
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
 
 
diff --git a/wms/contract-repair/contract-repair-input.php b/wms/contract-repair/contract-repair-input.php
index 2925f9a6..54839574 100644
--- a/wms/contract-repair/contract-repair-input.php
+++ b/wms/contract-repair/contract-repair-input.php
@@ -51,9 +51,13 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
             </tbody>
             </template>
             <template x-if="step==2">
+<<<<<<< HEAD
             <!-- <template x-if="step==1"> -->
             <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==2">
             <!-- <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==1"> -->
+=======
+            <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==2">
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
                 <tr>
                     <td colspan="7" style='vertical-align: middle;border-right:0px;'>
                         <h4>業務確認項</h4>
@@ -66,6 +70,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 <tr>
                     <td style="vertical-align: middle">立約人</td>
                     <td>
+<<<<<<< HEAD
                        <input type="text" x-model="data.company"/>
                        <p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                     </td>
@@ -112,12 +117,53 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     
                    
                     <!-- <td style="vertical-align: middle">維修型態</td>
+=======
+                       <input type="text" x-model="data.customer" />
+                       <p class="alerttext" x-show="data.customer==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">營業員</td>
+                    <td>
+                        <select class="ui fluid search dropdown" name="promiser" x-model="data.salesman">
+                            <option value="">選擇營業員</option>
+                            <?php foreach($contractpersons as $person){ ?>
+                            <option value="<?php echo $person['accountid'] ?>"><?php echo $person['name'] ?></option>
+                            <?php } ?>
+                        </select>
+                        <p class="alerttext" x-show="data.salesman==''"><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" name="start_date" x-model="data.contract_begin_date" >
+                        <p class="alerttext" x-show="data.contract_begin_date==''"><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" name="end_date" x-model="data.contract_end_date" >
+                        <p class="alerttext" x-show="data.contract_end_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">電梯台數</td>
+                    <td>
+                        <input class="form-control disabled_select" type="number" x-model="data.num" :disabled="data.disabled">
+                        <p class="alerttext" x-show="data.num==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        <p class="alerttext" x-show="data.num==0 && data.num!=''"><i class="fa-solid fa-circle-xmark"></i>電梯數量需大於0</p>   
+                    </td>
+                    
+                    <td style="vertical-align: middle">統一編號/身分證</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="uscc" x-model="data.vat" >
+                        <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">維修型態</td>
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
                     <td style="vertical-align: middle">
                         <select class="ui search dropdown" name="" x-model="data.mtype">
                             <option value="" >選擇維修型態</option>
                             <option value="A">定期保養</option>
                         </select>
                         <p class="alerttext" x-show="data.mtype==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+<<<<<<< HEAD
                     </td> -->
 
                     <!-- <td></td> -->
@@ -133,24 +179,228 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     <td style="vertical-align: middle">
                         <input class="form-control disabled_select" type="text" name="repair_no" x-model="data.repair_no" >
                         <p class="alerttext" x-show="data.repair_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+=======
+                    </td>
+                    <td></td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">客戶電話</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="tel" x-model="data.phone" >
+                        <p class="alerttext" x-show="data.phone==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">Email</td>
+                    <td style="vertical-align: middle">
+                        <input class="form-control disabled_select" type="email" name="email" x-model="data.email" >
+                        <p class="alerttext" x-show="data.email==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">保養員</td>
+                    <td>
+                        <select class="ui search dropdown" name="repairer_name" x-model="data.mworker">
+                            <option value="">選擇保養員</option>
+                            <?php foreach($workers as $worker){ ?>
+                            <option value="<?php echo $worker['accountid']; ?>"><?php echo $worker['name'] ?></option>
+                            <?php } ?>
+                        </select>
+                        <p class="alerttext" x-show="data.mworker==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">保養頻率</td>
+                    <td>
+                        <select class="ui search dropdown" name="repairer_name" x-model="data.mcycle">
+                            <option value="">選擇保養頻率</option>
+                            <option value="bw">雙週保</option>
+                            <option value="em">月保</option>
+                        </select>
+                        <p class="alerttext" x-show="data.mcycle==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">業務聯繫人</td>
+                    <td>
+                        <input type="text" x-model="data.partyA" name="partyA" />
+                        <p class="alerttext" x-show="data.partyA==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">業務聯繫人地址</td>
+                    <td>
+                        <input class="form-control disabled_select" x-model="data.partyAaddress" type="text" name="contractaddress" value="" >
+                        <p class="alerttext" x-show="data.partyAaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">業務聯繫人電話</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="contracttel" x-model="data.partyAphone" >
+                        <p class="alerttext" x-show="data.partyAphone==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                    <td style="vertical-align: middle">業務聯繫人Email</td>
+                    <td>
+                        <input class="form-control disabled_select" type="email" name="contracttel" x-model="data.partyAemail" >
+                        <p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">區域</td>
+                    <td>
+                        <select class="ui search dropdown"  x-model="data.area">
+                            <option value="">選擇區域</option>
+                            <template x-for="city in cities" :key="city.code">
+                                <option x-bind:selected="city.name === data.area" x-text="city.name" :value="city.name"></option>
+                            </template>
+                        </select>
+                        <p class="alerttext" x-show="data.area==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                    </td>
+                    <td style="vertical-align: middle">詳細地址</td>
+                    <td colspan="2">
+                        <input type="text" x-model="data.address" />
+                        <p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
                     </td>
                     <td style="vertical-align: middle">附件</td>
                     <td colspan="2">
                         <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                     </td>
+<<<<<<< HEAD
                     <td></td>
                 </tr>
 
+=======
+                </tr>
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
                
                 <tr>
                     
                 </tr>
             </tbody>
             </template>
+<<<<<<< HEAD
         </table>
         
         
         <button x-show="step==2" @click="save()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+=======
+            <template x-if="step==3">
+                <template x-for="(elevator, idx) in data.elevators" :key="elevator.apply_key + elevator.register_code">
+                    <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==3">
+                    <tr>
+                        <td colspan=8><p x-text="'電梯' + Number(idx+1)"></p></td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">機種</td>
+                        <td>
+                            <select class="ui search dropdown" name="spec" x-model="data.elevators[idx].spec" >
+                                <option value="">選擇規格</option>
+                                <option value="MAE100">MAE100</option>
+                                <option value="MAM200">MAM200</option>
+                                <option value="MAH100">MAH100</option>
+                                <option value="MAQ100">MAQ100</option>
+                                <option value="MAF100">MAF100</option>
+                                <option value="MAZ100">MAZ100</option>
+                            </select>
+                            <p class="alerttext" x-show="!(data.elevators[idx].spec=='MAE100' || data.elevators[idx].spec=='MAM200' || data.elevators[idx].spec=='MAH100' || data.elevators[idx].spec=='MAQ100' || data.elevators[idx].spec=='MAF100' || data.elevators[idx].spec=='MAZ100')"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">載重</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].weight" />
+                            <p class="alerttext" x-show="data.elevators[idx].weight==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">速度</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].speed" />
+                            <p class="alerttext" x-show="data.elevators[idx].speed==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        
+                        <td style="vertical-align: middle">人乘</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].persons" />
+                            <p class="alerttext" x-show="data.elevators[idx].persons==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">樓停</td>
+                        <td>
+                            <input type="number" class="form-control" x-model="data.elevators[idx].stop" />
+                            <p class="alerttext" x-show="data.elevators[idx].stop=='' || !data.elevators[idx].stop"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">樓層</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].floors" />
+                            <p class="alerttext" x-show="data.elevators[idx].floors=='' || !data.elevators[idx].floors"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">緯度</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].latitude" />
+                            <p class="alerttext" x-show="data.elevators[idx].latitude=='' || !data.elevators[idx].latitude"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        
+                        <td style="vertical-align: middle">經度</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].longitude" />
+                            <p class="alerttext" x-show="data.elevators[idx].longitude=='' || !data.elevators[idx].longitude"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr> 
+                    <tr>
+                        <td style="vertical-align: middle">廠牌</td>
+                        <td>
+                            <input type="text" x-model="data.elevators[idx].elevator_brand" class="form-control" /> 
+                            <p class="alerttext" x-show="data.elevators[idx].elevator_brand==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                        </td>
+                        <td style="vertical-align: middle">
+                            開門方式
+                        </td>
+                        <td style="vertical-align: middle">
+                            <select class="ui search dropdown" name="" x-model="data.elevators[idx].opendoor">
+                                <option value="">選擇開門方式</option>
+                                <option value="2PCO">2PCO</option>
+                                <option value="2S">2S</option>
+                                <option value="2SL">2SL</option>
+                                <option value="2SR">2SR</option>
+                                <option value="2U">2U</option>
+                                <option value="3S">3S</option>
+                                <option value="4PCO">4PCO</option>
+                                <option value="6PCO">6PCO</option>
+                                <option value="CO">CO</option>
+                            </select>
+                            <p class="alerttext" x-show="data.elevators[idx].opendoor=='' || !data.elevators[idx].opendoor "><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                        </td>
+                        <td style="vertical-align: middle">保養別</td>
+                        <td>
+                            <select class="ui search dropdown"  x-model="data.elevators[idx].maintainance">
+                                <option value="">選擇保養別</option>
+                                <option value="A">全包</option>
+                                <option value="B">半包</option>
+                                <option value="C">清包</option>
+                            </select>
+                            <p class="alerttext" x-show="data.elevators[idx].maintainance=='' || !data.elevators[idx].maintainance"><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.elevators[idx].takecertificatedate">
+                            <p class="alerttext" x-show="data.elevators[idx].takecertificatedate=='' || !data.elevators[idx].takecertificatedate"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>    
+                        </td>
+                    </tr>
+                    <tr>
+                       
+                        <td style="vertical-align: middle">許可證有效時間</td>
+                        <td>
+                            <input class="form-control disabled_select" type="date" x-model="data.elevators[idx].useful_date">
+                            <p class="alerttext" x-show="data.elevators[idx].useful_date=='' || !data.elevators[idx].useful_date"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr>
+                    <tr><td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td></tr>
+                    </tbody>
+                </template>
+            </template>
+        </table>
+        
+        
+        <button x-show="step==3" @click="save()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
             <template x-if="!isLoading">
                 <span>存檔</span>
             </template>
@@ -158,7 +408,11 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 <div class="loader"></div>
             </template>
         </button>
+<<<<<<< HEAD
         <button x-show="step<=1" @click="nextStepFn()" type="button" class="btn btn-primary btn-lg pull-right savebtn" :disabled="isLoading">
+=======
+        <button x-show="step<=2" @click="nextStepFn()" type="button" class="btn btn-primary btn-lg pull-right savebtn" :disabled="isLoading">
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
             <template x-if="!isLoading">
                 <span>下一步</span>
             </template>
diff --git a/wms/contract-repair/js/alpine.js b/wms/contract-repair/js/alpine.js
index 128ff2d8..d767e9b8 100644
--- a/wms/contract-repair/js/alpine.js
+++ b/wms/contract-repair/js/alpine.js
@@ -930,6 +930,7 @@ const contractNewInput =()=> {
     }
 };
 
+<<<<<<< HEAD
 //////////////////////////////
 ////   合約簽回(修理) 
 ////
@@ -1042,6 +1043,8 @@ const contractRepair = ()=>{
     }
 }
 
+=======
+>>>>>>> 1e6352f45c1f05ebbeb9736555124e07ff5fc958
 const contractInput =()=> {
     return{
         init(){