option final

wms/contract/js/alpine.js

@@ -1176,15 +1176,10 @@ const contractNewApply = ()=>{
         step:1,
         isLoading:false,
         data:{
-<<<<<<< HEAD
             mid: mid,
             vol_no: contractno,
             salesman: salesman,
             salesmanname:salesmanname,
-=======
-            vol_no: contractno,
-            salesman: salesman,
->>>>>>> 7b37600f (合約書申請 新梯 1116)
             apply_date: apply_date,
             apply_type:'A',
             case_name: case_name,
@@ -1192,7 +1187,6 @@ const contractNewApply = ()=>{
             manager: manager,
             vat: vat,
             total_price: price_total,
-<<<<<<< HEAD
             price_a: price_a,
             price_b: price_b,
             address: address,
@@ -1260,16 +1254,6 @@ const contractNewApply = ()=>{
                 alert('儲存失敗！可能為以下錯誤:\n' + error.response.data)
                 this.isLoading = false
             })
-=======
-            price_a:'',
-            price_b:'',
-            address:'',
-            deadline:'',
-            regulations:'', //附則
-            freedeadline:'', //免保期限
-            tradeaddress:'', //交貨地點
-            tradedeadline:'', //交貨期限
->>>>>>> 7b37600f (合約書申請 新梯 1116)
         }
     }
 }

wms/mkt/price_option-index.php

@@ -106,6 +106,5 @@ $optional_arr = [1=>'標', 2=>'選'];
 <script src="./assets/js/alpine.js"></script>
 <script>
     const options = [...<?php echo json_encode($options); ?>];
-    console.log(options);
     const kind = '<?php echo $kind; ?>';
 </script>