M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug修復

main
Cheng 1 year ago
parent
b1dfd4f924
commit
fd89ea5305
3 changed files with 786 additions and 774 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      wms/contract-repair/api/getContractData.php
  2. 99
      wms/contract-repair/contract-repair-edit.php
  3. 1337
      wms/contract-repair/js/alpine.js

52
wms/contract-repair/api/getContractData.php
View File

@ -1,7 +1,7 @@
<?php <?php
require_once('../conn.php'); require_once('../conn.php');
if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contracttype']) && $_GET['contracttype']=='b'){ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'b') {
try{ try {
$contractno = $_GET['contractno']; $contractno = $_GET['contractno'];
$sql_str = "SELECT con_maintance_examine_apply.*, con_maintance_examine_clear.* FROM con_maintance_examine_apply $sql_str = "SELECT con_maintance_examine_apply.*, con_maintance_examine_clear.* FROM con_maintance_examine_apply
JOIN con_maintance_examine_clear on con_maintance_examine_apply.apply_key=con_maintance_examine_clear.apply_key JOIN con_maintance_examine_clear on con_maintance_examine_apply.apply_key=con_maintance_examine_clear.apply_key
@ -10,9 +10,9 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':vol_no', $contractno); $stmt->bindParam(':vol_no', $contractno);
$stmt->execute(); $stmt->execute();
$contract= $stmt->fetch(PDO::FETCH_ASSOC); $contract = $stmt->fetch(PDO::FETCH_ASSOC);
if(empty($contract)){ if (empty($contract)) {
echo false; echo false;
exit; exit;
} }
@ -21,7 +21,7 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':apply_key', $apply_key); $stmt->bindParam(':apply_key', $apply_key);
$stmt->execute(); $stmt->execute();
$elevators= $stmt->fetchAll(PDO::FETCH_ASSOC); $elevators = $stmt->fetchAll(PDO::FETCH_ASSOC);
$count = COUNT($elevators); $count = COUNT($elevators);
$contract['elevators'] = $elevators; $contract['elevators'] = $elevators;
$contract['num'] = $count; $contract['num'] = $count;
@ -34,19 +34,19 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
// 將 JSON 回應返回給客戶端 // 將 JSON 回應返回給客戶端
echo $contractResponse; echo $contractResponse;
// echo json_encode($contractResponse); // echo json_encode($contractResponse);
}catch (PDOException $e ){ } catch (PDOException $e) {
die("ERROR!!!: ". $e->getMessage()); die("ERROR!!!: " . $e->getMessage());
} }
} }
if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contracttype']) && $_GET['contracttype']=='m'){ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'm') {
try{ try {
$contractno = $_GET['contractno']; $contractno = $_GET['contractno'];
$sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC"; $sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':vol_no', $contractno); $stmt->bindParam(':vol_no', $contractno);
$stmt->execute(); $stmt->execute();
$contract= $stmt->fetch(PDO::FETCH_ASSOC); $contract = $stmt->fetch(PDO::FETCH_ASSOC);
$contractResponse = json_encode($contract); $contractResponse = json_encode($contract);
// 設定回應標頭為 JSON // 設定回應標頭為 JSON
@ -54,8 +54,8 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
// 將 JSON 回應返回給客戶端 // 將 JSON 回應返回給客戶端
echo $contractResponse; echo $contractResponse;
}catch (PDOException $e ){ } catch (PDOException $e) {
die("ERROR!!!: ". $e->getMessage()); die("ERROR!!!: " . $e->getMessage());
} }
} }
////////////////////////////// //////////////////////////////
@ -64,9 +64,25 @@ 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
@ -74,9 +90,9 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
WHERE a.contractno = :contractno "; WHERE a.contractno = :contractno ";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt -> bindParam(':contractno',$contractno); $stmt->bindParam(':contractno', $contractno);
$stmt->execute(); $stmt->execute();
$contract = $stmt -> fetch(PDO::FETCH_ASSOC); $contract = $stmt->fetch(PDO::FETCH_ASSOC);
$contractResponse = json_encode($contract); $contractResponse = json_encode($contract);
// 設定回應標頭為 JSON // 設定回應標頭為 JSON
@ -84,7 +100,7 @@ if(isset($_GET['contractno']) && $_GET['contractno']!='' && isset($_GET['contrac
// 將 JSON 回應給客戶端 // 將 JSON 回應給客戶端
echo $contractResponse; echo $contractResponse;
}catch(PDOException $e){ } catch (PDOException $e) {
die("ERROR!!:".$e->getMessage()); die("ERROR!!:" . $e->getMessage());
} }
} }

99
wms/contract-repair/contract-repair-edit.php
View File

@ -6,7 +6,7 @@ $sql_str = "SELECT * FROM contract_r_signed_back WHERE id = :id ORDER BY id DE
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':id', $id); $stmt->bindParam(':id', $id);
$stmt->execute(); $stmt->execute();
$contract= $stmt->fetch(PDO::FETCH_ASSOC); $contract = $stmt->fetch(PDO::FETCH_ASSOC);
// echo '<pre>'; // echo '<pre>';
// print_r($contract); // print_r($contract);
// echo '</pre>'; // echo '</pre>';
@ -21,13 +21,13 @@ $accounttype = "M";
$sql_str = "SELECT accountid, name FROM account WHERE accounttype = :accounttype"; $sql_str = "SELECT accountid, name FROM account WHERE accounttype = :accounttype";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(":accounttype", $accounttype); $stmt->bindParam(":accounttype", $accounttype);
$stmt -> execute(); $stmt->execute();
$persons = $stmt->fetchAll(PDO::FETCH_ASSOC); $persons = $stmt->fetchAll(PDO::FETCH_ASSOC);
$persons = array_map(function($person){ $persons = array_map(function ($person) {
return [ return [
'view'=>$person['accountid'] .'-'. $person['name'], 'view' => $person['accountid'] . '-' . $person['name'],
'value'=>$person['accountid'], 'value' => $person['accountid'],
'name'=>$person['name'] 'name' => $person['name']
]; ];
}, $persons); }, $persons);
?> ?>
@ -39,12 +39,9 @@ $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" <div class="contract-management" x-data='contract_edit'>
href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css" <div class="form" method="post" id="form" enctype="multipart/form-data">
/>
<div class="contract-management" x-data='contract_edit'>
<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" />
<div> <div>
<table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%"> <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@ -56,7 +53,7 @@ $persons = array_map(function($person){
</tr> </tr>
</thead> </thead>
<tbody style="font-weight: bolder;margin-bottom: 20px" > <tbody style="font-weight: bolder;margin-bottom: 20px">
<tr> <tr>
<td colspan="7" style='vertical-align: middle;border-right:0px;'> <td colspan="7" style='vertical-align: middle;border-right:0px;'>
<h4>檢視合約</h4> <h4>檢視合約</h4>
@ -69,7 +66,7 @@ $persons = array_map(function($person){
<tr> <tr>
<td style="vertical-align: middle">立約人</td> <td style="vertical-align: middle">立約人</td>
<td> <td>
<input class="form-control disabled_select" type="text" x-model="data.company" > <input class="form-control disabled_select" type="text" x-model="data.company">
<p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
@ -77,51 +74,51 @@ $persons = array_map(function($person){
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<select class="repaireid" id="repaireid" x-model="data.repaireid"> <select class="repaireid" id="repaireid" x-model="data.repaireid">
<option value="">選擇營業員</option> <option value="">選擇營業員</option>
<?php foreach($persons as $person): ?> <?php foreach ($persons as $person) : ?>
<option value="<?php echo $person['value']; ?>"><?php echo $person['view']; ?></option> <option value="<?php echo $person['value']; ?>"><?php echo $person['view']; ?></option>
<?php endforeach ?> <?php endforeach ?>
</select> </select>
<p class="alerttext" x-show="data.repaireid==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.repaireid==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">電梯編號</td> <td style="vertical-align: middle">電梯編號</td>
<td> <td>
<input class="form-control disabled_select" type="text" name="uscc" x-model="data.facilityno" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.facilityno">
<p class="alerttext" x-show="data.facilityno==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.facilityno==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">報價單編號</td> <td style="vertical-align: middle">報價單編號</td>
<td> <td>
<input class="form-control disabled_select" type="text" name="uscc" x-model="data.repair_no" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.repair_no">
<p class="alerttext" x-show="data.repair_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.repair_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">工程類別</td> <td style="vertical-align: middle">工程類別</td>
<td> <td>
<input class="form-control disabled_select" type="text" name="uscc" x-model="data.type" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.type">
<p class="alerttext" x-show="data.type==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.type==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">簽訂時間</td> <td style="vertical-align: middle">簽訂時間</td>
<td> <td>
<input class="form-control disabled_select" type="text" name="sign_date" x-model="data.sign_date" > <input class="form-control disabled_select" type="text" name="sign_date" x-model="data.sign_date">
<p class="alerttext" x-show="data.sign_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.sign_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">發票抬頭</td> <td style="vertical-align: middle">發票抬頭</td>
<td> <td>
<input class="form-control disabled_select" type="text" name="uscc" x-model="data.invoice" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.invoice">
<p class="alerttext" x-show="data.invoice==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.invoice==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">統一編號</td> <td style="vertical-align: middle">統一編號</td>
<td> <td>
<input class="form-control disabled_select" type="text" name="uscc" x-model="data.taxid" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.taxid">
<p class="alerttext" x-show="data.taxid==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.taxid==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">工程地址</td> <td style="vertical-align: middle">工程地址</td>
<td colspan=3> <td colspan=3>
<input class="form-control disabled_select" type="text" name="uscc" x-model="data.address" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.address">
<p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<!-- <td style="vertical-align: middle">附件上傳</td> <!-- <td style="vertical-align: middle">附件上傳</td>
@ -154,7 +151,7 @@ $persons = array_map(function($person){
</tbody> </tbody>
</table> </table>
<button @click="save()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn"> <button @click="save()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
<template x-if="!isLoading"> <template x-if="!isLoading">
<span>更新</span> <span>更新</span>
</template> </template>
@ -169,33 +166,31 @@ $persons = array_map(function($person){
<script src="./js/jquery/jquery-3.1.1.min.js"></script> <script src="./js/jquery/jquery-3.1.1.min.js"></script>
<script src="semantic/dist/semantic.min.js" ></script> <script src="semantic/dist/semantic.min.js"></script>
<script src="./js/alpine.js"></script> <script src="./js/alpine.js"></script>
<script> <script>
const user_id = '<?php echo $user_id; ?>'; const user_id = '<?php echo $user_id; ?>';
const user_name = '<?php echo $user_name; ?>'; const user_name = '<?php echo $user_name; ?>';
const id = <?php echo $contract['id']?>; const id = <?php echo $contract['id'] ?>;
const repair_no = '<?php echo $contract['repair_no'];?>' const repair_no = '<?php echo $contract['repair_no']; ?>'
const contractno = '<?php echo $contract['contractno'];?>' const contractno = '<?php echo $contract['contractno']; ?>'
const company = '<?php echo $contract['company'];?>' const company = '<?php echo $contract['company']; ?>'
const taxid = '<?php echo $contract['taxid'];?>' const taxid = '<?php echo $contract['taxid']; ?>'
const facilityno = '<?php echo $contract['facilityno'];?>' const facilityno = '<?php echo $contract['facilityno']; ?>'
const address = '<?php echo $contract['address'];?>' const address = '<?php echo $contract['address']; ?>'
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>

1337
wms/contract-repair/js/alpine.js
View File

File diff suppressed because it is too large
Write Preview
Loading…
Cancel
Save