Browse Source

bug修復

main
Cheng 1 year ago
parent
commit
fd89ea5305
  1. 16
      wms/contract-repair/api/getContractData.php
  2. 27
      wms/contract-repair/contract-repair-edit.php
  3. 5
      wms/contract-repair/js/alpine.js

16
wms/contract-repair/api/getContractData.php

@ -67,6 +67,22 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'r') { if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'r') {
try { try {
$contractno = $_GET['contractno']; $contractno = $_GET['contractno'];
$fail_arr = [];
$sql = "SELECT COUNT(*) AS num FROM pricereview_repair_main WHERE contractno = :contractno";
$stmt = $conn->prepare($sql);
$stmt->bindParam(":contractno", $contractno);
$stmt->execute();
$result = $stmt->fetch(PDO::FETCH_ASSOC);
$count = $result['num'];
if ($count > 1) {
$fail_arr[] = '合約單號重複,請至契約管理(修理)查看。';
header("HTTP/1.1 422 Unprocessable Entity");
echo json_encode($fail_arr);
exit();
}
// $contractno = $_GET['contractno'];
$sql = "SELECT a.*,b.name,b.accountid $sql = "SELECT a.*,b.name,b.accountid
FROM pricereview_repair_main AS a FROM pricereview_repair_main AS a
LEFT JOIN account AS b LEFT JOIN account AS b

27
wms/contract-repair/contract-repair-edit.php

@ -39,10 +39,7 @@ $persons = array_map(function($person){
<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script> <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.umd.js"></script> <script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.umd.js"></script>
<link <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css" />
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css"
/>
<div class="contract-management" x-data='contract_edit'> <div class="contract-management" x-data='contract_edit'>
<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" /> <input type="hidden" name='form_name' value="main_form" />
@ -184,18 +181,16 @@ $persons = array_map(function($person){
const type = '<?php echo $contract['type']; ?>' const type = '<?php echo $contract['type']; ?>'
const invoice = '<?php echo $contract['invoice']; ?>' const invoice = '<?php echo $contract['invoice']; ?>'
const repaireid = '<?php echo $contract['repaireid']; ?>' const repaireid = '<?php echo $contract['repaireid']; ?>'
// const total_price = '<?php echo $contract['total_price'];?>' const total_price = '<?php echo $contract['total_price']; ?>'
const sign_date = '<?php echo $contract['sign_date']; ?>' const sign_date = '<?php echo $contract['sign_date']; ?>'
$('#table_index').DataTable( // $('#table_index').DataTable(
{ // {
"order": [ // "order": [
[0, "desc"], // [0, "desc"],
] // ]
} // }
); // );
Fancybox.bind('[data-fancybox="gallery"]', { // Fancybox.bind('[data-fancybox="gallery"]', {
});
// });
</script> </script>

5
wms/contract-repair/js/alpine.js

@ -998,9 +998,10 @@ const contractRepair = ()=>{
this.step = 2; this.step = 2;
this.isLoading = false; this.isLoading = false;
// console.log(user_name); // console.log(user_name);
console.log(this.data.sign_date); // console.log(this.data.sign_date);
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
alert(err.response.data);
this.isLoading = false this.isLoading = false
}) })
}, },
@ -1432,7 +1433,7 @@ const contract_edit = ()=>{
repaireid: repaireid, repaireid: repaireid,
total_price: total_price, total_price: total_price,
sign_date: sign_date, sign_date: sign_date,
// user_id : user_id, user_id: user_id,
}, },
fail_arr: [], fail_arr: [],

Loading…
Cancel
Save