1215 commit 價審bug

wms/contract/contract-new-apply.php

@@ -67,21 +67,6 @@ if(empty($contract_new_apply)){
 
 }else{
     $mid = $contract['mid'];
-    // echo "\$contract['contractno']===>". $contract['contractno'] . "<br>";
-    // echo "\$contract['person']===>". $contract['person'] . "<br>";
-    // echo "\$contract['personname']===>". $contract['personname'] . "<br>";
-    // echo "\date('Y-m-d')===>". date('Y-m-d') . "<br>";
-    // echo "\$contract['case_name']===>". $contract['case_name'] . "<br>";
-    // echo "\$contract['customer']===>". $contract['customer'] . "<br>";
-    // echo "\$contract['manager']===>". $contract['manager'] . "<br>";
-    // echo "\$contract['vat']===>". $contract['vat'] . "<br>";
-    // echo "\$contract['total_price']===>". $contract['total_price'] . "<br>";
-    // echo "\$contract['contact_address']===>". $contract['contact_address'] . "<br>";
-    // echo "\$contract['buy_fee']===>". $contract['buy_fee'] . "<br>";
-    // echo "\$contract['install_fee']===>". $contract['install_fee'] . "<br>";
-    // echo "\json_encode(\$items)===>". json_encode($items) . "<br>";
-    // echo "\$user_id===>". $user_id . "<br>";
-    // echo "\$_GET['id']===>". $_GET['id'] . "<br>";
     $contract_new_apply_id = $contract_new_apply['id'];
     $sql_str = "SELECT * FROM contract_new_apply_pays  WHERE mid = :mid ORDER BY pay_kind ASC";
     $stmt = $conn->prepare($sql_str);
@@ -573,7 +558,7 @@ $person = $contract['person'];
     const tradeaddress = "";
     const tradedeadline = 90
     const freedeadline = 18;
-    const regulations = 10;
+    const regulations = 45;
     const workdeadline_a = 30;
     const workdeadline_b = 7;
     const total_items = <?php echo $total_items ?? ''; ?>;
@@ -612,6 +597,21 @@ $person = $contract['person'];
 
 <?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');
+        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<alerttext.length;i++){
+            alerttext[i].style.display = "none"
+        }
+    }
+</script>
 
 <?php endif; ?>

wms/contract/js/alpine.js

@@ -1181,20 +1181,7 @@ const contractNewApply = ()=>{
                 this.pays[idx+1].scale = (pay.pay_scale == "" || pay.pay_scale == null) ? 0 : pay.pay_scale;
                 this.pays[idx+1].amount = (pay.pay_amount == "" || pay.pay_amount == null) ? 0: pay.pay_amount;
             });
-            window.onload = ()=>{
+            
-                const input = document.querySelectorAll('input');
-                const alerttext = document.querySelectorAll('p.alerttext');
-                const select = document.querySelectorAll('select');
-                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<alerttext.length;i++){
-                    alerttext[i].style.display = "none"
-                }
-            }
         },
         step:1,
         isLoading:false,
@@ -1343,6 +1330,7 @@ const contractNewApply = ()=>{
             form.append('manager', this.data.manager);
             form.append('vat', this.data.vat);
             form.append('total_price', this.data.total_price);
+            form.append('total_items', this.data.total_items);
             form.append('price_a', this.data.price_a);
             form.append('price_b', this.data.price_b);
             form.append('address', this.data.address);