diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index 361ae9ba..e098a317 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -13,18 +13,6 @@ $stmt = $conn->prepare($sql_str);
 $stmt->bindParam(':accounttype',$accounttype);
 $stmt->execute();
 $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
-$accounttype = "B";
-$sql_str = "SELECT accountid, name FROM account WHERE accounttype = :accounttype";
-$stmt = $conn->prepare($sql_str);
-$stmt->bindParam(':accounttype',$accounttype);
-$stmt->execute();
-$workers = $stmt->fetchAll(PDO::FETCH_ASSOC);
-$accounttype = "M";
-$sql_str = "SELECT id,accountid, name FROM account WHERE accounttype = :accounttype";
-$stmt = $conn->prepare($sql_str);
-$stmt->bindParam(':accounttype',$accounttype);
-$stmt->execute();
-$contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
 ?>
 <link rel="stylesheet" href="./styles/style.css">
 <link rel="stylesheet" href="semantic/dist/semantic.min.css">
@@ -172,7 +160,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
         this.data.numberoffloor = ''
         this.data.speed = ''
         this.data.takecertificatedate = ''
-        this.data.step = 1
+        this.step = 1
     },
     save(){
         this.isLoading = true
@@ -257,25 +245,6 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
             </tbody>
             </template>
             <template x-if="step==2">
-            <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==2">
-            <template x-if="step==1">
-            <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==1">
-                <tr>
-                    <td style="vertical-align: middle">合約號</td>
-                    <td>
-                        <input class="form-control" @keyup="nextStepKeyupFn($event)" type="text" name="contractno" x-model="data.contractno" >
-                      
-                    </td>
-                    <td style="vertical-align: middle">
-                        <label for="customize">
-                            <input type="checkbox" x-model="customize" id="customize" />自定義欄位
-                        </label>
-                    </td>
-                   
-                </tr>
-            </tbody>
-            </template>
-            <template x-if="step==2">
             <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==2">
                 <tr>
                     <td colspan="7" style='vertical-align: middle;border-right:0px;'>
@@ -319,12 +288,9 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     <td style="vertical-align: middle">統一編號/身分證</td>
                     <td>
                         <input class="form-control disabled_select" type="text" name="uscc" x-model="data.vat" >
-                        <input class="form-control disabled_select" type="text" name="uscc" x-model="data.vat" >
                     </td>
                     <td style="vertical-align: middle">維修型態</td>
                     <td style="vertical-align: middle">
-                        <select class="ui search dropdown" name="repairtype" x-model="data.mtype">
-                            <option value="" >選擇維修型態</option>
                         <select class="ui search dropdown" name="repairtype" x-model="data.mtype">
                             <option value="" >選擇維修型態</option>
                             <option value="A">定期保養</option>
@@ -334,7 +300,6 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                         開門方式
                     </td>
                     <td style="vertical-align: middle">
-                        <select class="ui search dropdown" name="repairtype" x-model="data.opendoor">
                         <select class="ui search dropdown" name="repairtype" x-model="data.opendoor">
                             <option value="">選擇開門方式</option>
                             <option value="2PCO">2PCO</option>
@@ -353,33 +318,22 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     <td style="vertical-align: middle">客戶電話</td>
                     <td>
                         <input class="form-control disabled_select" type="text" name="tel" x-model="data.phone" >
-                        <input class="form-control disabled_select" type="text" name="tel" x-model="data.phone" >
                     </td>
                     <td style="vertical-align: middle">Email</td>
                     <td style="vertical-align: middle">
                         <input class="form-control disabled_select" type="text" name="email" x-model="data.email" >
-                        <input class="form-control disabled_select" type="text" name="email" x-model="data.email" >
                     </td>
                     <td style="vertical-align: middle">保養員</td>
                     <td>
-                        <select class="ui search dropdown" name="repairer_name" x-model="data.mworker">
                         <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 } ?>
-                            <?php foreach($workers as $worker){ ?>
-                            <option value="<?php echo $worker['accountid']; ?>"><?php echo $worker['name'] ?></option>
-                            <?php } ?>
                         </select>
                     </td>
                     <td style="vertical-align: middle">保養頻率</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="A">雙週保</option>
-                            <option value="B">月保</option>
                         <select class="ui search dropdown" name="repairer_name" x-model="data.mcycle">
                             <option value="">選擇保養頻率</option>
                             <option value="A">雙週保</option>
@@ -391,22 +345,18 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                     <td style="vertical-align: middle">業務聯繫人</td>
                     <td>
                         <input type="text" x-model="data.partyA" name="partyA" />
-                        <input type="text" x-model="data.partyA" name="partyA" />
                     </td>
                     <td style="vertical-align: middle">業務聯繫人地址</td>
                     <td>
                         <input class="form-control disabled_select" x-model="data.partyAaddress" type="text" name="contractaddress" value="" >
-                        <input class="form-control disabled_select" x-model="data.partyAaddress" type="text" name="contractaddress" value="" >
                     </td>
                     <td style="vertical-align: middle">業務聯繫人電話</td>
                     <td>
                         <input class="form-control disabled_select" type="text" name="contracttel" x-model="data.partyAphone" >
-                        <input class="form-control disabled_select" type="text" name="contracttel" x-model="data.partyAphone" >
                     </td>
                     <td style="vertical-align: middle">業務聯繫人Email</td>
                     <td>
                         <input class="form-control disabled_select" type="text" name="contracttel" x-model="data.partyAemail" >
-                        <input class="form-control disabled_select" type="text" name="contracttel" x-model="data.partyAemail" >
                     </td>
                 </tr>
                 <tr>
@@ -504,7 +454,6 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 </tr>
             </tbody>
             </template>
-            </template>
         </table>
         <button x-show="step==1" @click="nextStepFn()" type="button" class="btn btn-primary btn-lg pull-right savebtn" :disabled="isLoading ? true : false">
             <template x-if="!isLoading">
@@ -514,15 +463,6 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                 <div class="loader"></div>
             </template>
         </button>
-        <button x-show="step==2" @click="save()" :disabled="isLoading ? true : false" type="button" class="btn btn-primary btn-lg pull-right savebtn">
-        <button x-show="step==1" @click="nextStepFn()" type="button" class="btn btn-primary btn-lg pull-right savebtn" :disabled="isLoading ? true : false">
-            <template x-if="!isLoading">
-                <span>下一步</span>
-            </template>
-            <template x-if="isLoading">
-                <div class="loader"></div>
-            </template>
-        </button>
         <button x-show="step==2" @click="save()" :disabled="isLoading ? true : false" type="button" class="btn btn-primary btn-lg pull-right savebtn">
             <template x-if="!isLoading">
                 <span>存檔</span>
@@ -540,17 +480,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
             </template>
         </button>
     </div>
-        <button x-show="step>1" @click="preStepFn()" :disabled="isLoading ? true : false" 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>
     </div>
-    </div>
-
 
 </div>
 <script