10994015 1 year ago
parent
commit
cb0bab16fe
  1. 2
      wms/contract/api/getFacilityNo.php
  2. 7
      wms/contract/api/postContractData.php
  3. 234
      wms/contract/contract-input.php

2
wms/contract/api/getFacilityNo.php

@ -504,7 +504,7 @@ class CreateFacilityNo
} }
$cfn = new CreateFacilityNo; // $cfn = new CreateFacilityNo;
// // 建立作番號 - 新梯 // // 建立作番號 - 新梯
// print_r($cfn->makeMFacilityNo("M", "X", 5)); // print_r($cfn->makeMFacilityNo("M", "X", 5));
// echo "<br/><br/>"; // echo "<br/><br/>";

7
wms/contract/api/postContractData.php

@ -145,8 +145,8 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") {
foreach($elevators as $elevator){ foreach($elevators as $elevator){
$facility_arr[] = $elevator['spec']; $facility_arr[] = $elevator['spec'];
} }
echo $dailyNecessities[$elevator['spec']];
$facilityno = $createFacilityNo->makeBFacilityNo("T", $dailyNecessities[$elevator['spec']], (int)$num); $facilityno = $createFacilityNo->makeBFacilityNo("T", $facility_arr, (int)$num);
$sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid"; $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
@ -188,9 +188,6 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") {
$result = $stmt -> execute(); $result = $stmt -> execute();
} }
//create schedule table //create schedule table
$comboNo = new CreateComboNo($mcycle, $contract_begin_date, $contract_end_date); $comboNo = new CreateComboNo($mcycle, $contract_begin_date, $contract_end_date);

234
wms/contract/contract-input.php

@ -14,9 +14,6 @@ $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':accounttype',$accounttype); $stmt->bindParam(':accounttype',$accounttype);
$stmt->execute(); $stmt->execute();
$contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
$createFacilityNo = new CreateFacilityNo();
$facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
?> ?>
<link rel="stylesheet" href="./styles/style.css"> <link rel="stylesheet" href="./styles/style.css">
<link rel="stylesheet" href="semantic/dist/semantic.min.css"> <link rel="stylesheet" href="semantic/dist/semantic.min.css">
@ -34,11 +31,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
}, },
cities:[], cities:[],
data:{ data:{
<<<<<<< HEAD
contractno:'Q23080026',
=======
contractno:'B23100060', contractno:'B23100060',
>>>>>>> yan
total_price:'', //合約總價 total_price:'', //合約總價
vat:'', //統一編號 vat:'', //統一編號
mtype:'A', //維修型態 mtype:'A', //維修型態
@ -58,25 +51,9 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
partyAphone:'', //業務聯繫人電話 partyAphone:'', //業務聯繫人電話
partyAemail:'', //業務聯繫人email partyAemail:'', //業務聯繫人email
files:[], //附件檔案 files:[], //附件檔案
<<<<<<< HEAD
spec:'', //機種
brand:'', //廠牌
weight: '', //載重
numberofpassenger: '', //人乘
numberofstop:'', //樓停
numberoffloor:'', //樓層
speed:'', //速度
maintainance:'', //保養別
takecertificatedate:'', //交車日、竣檢日
licensedate:'', //許可證有效日期
num:'', //電梯數量
latitude:'', //緯度
longitude:'', //經度
=======
num:'', //電梯數量 num:'', //電梯數量
disabled:false, //資料庫是否有電梯數量資料 disabled:false, //資料庫是否有電梯數量資料
elevators:[], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期 elevators:[], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期
>>>>>>> yan
}, },
customize:false, customize:false,
step:1, step:1,
@ -88,14 +65,11 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
this.isLoading = true this.isLoading = true
this.getContractDate(); this.getContractDate();
}else if(this.step == 2){ }else if(this.step == 2){
<<<<<<< HEAD
=======
if(this.data.num <= 0) return alert('請填寫電梯數量!') if(this.data.num <= 0) return alert('請填寫電梯數量!')
if(!this.data.disabled){ if(!this.data.disabled){
this.createElevator(); this.createElevator();
} }
>>>>>>> yan
this.step = 3 this.step = 3
} }
}, },
@ -109,10 +83,6 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
this.step = 3 this.step = 3
} }
}, },
<<<<<<< HEAD
getContractDate(){
axios.get('./api/getContractData.php?contractno=' + this.data.contractno).then(res=>{
=======
createElevator(){ createElevator(){
for(let i=0;i<this.data.num;i++){ for(let i=0;i<this.data.num;i++){
this.data.elevators.push({ this.data.elevators.push({
@ -139,7 +109,6 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
this.isLoading = false this.isLoading = false
return return
} }
>>>>>>> yan
if(!this.customize){ if(!this.customize){
console.log(res.data); console.log(res.data);
this.data.total_price = res.data.sold_price this.data.total_price = res.data.sold_price
@ -182,11 +151,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
}, },
preStepFn(){ preStepFn(){
if(this.step==2){ if(this.step==2){
<<<<<<< HEAD
if(confirm('回到上一頁會將本頁資料清空,確定返回嗎?')){
=======
if(confirm('回到上一頁會將會初始化資料,確定返回嗎?')){ if(confirm('回到上一頁會將會初始化資料,確定返回嗎?')){
>>>>>>> yan
this.step = 1 this.step = 1
this.data.total_price = '' this.data.total_price = ''
this.data.salesman = '' this.data.salesman = ''
@ -204,12 +169,9 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
this.data.speed = '' this.data.speed = ''
this.data.takecertificatedate = '' this.data.takecertificatedate = ''
this.step = 1 this.step = 1
<<<<<<< HEAD
=======
this.data.num = '' this.data.num = ''
this.data.disabled = false this.data.disabled = false
this.data.elevators = [] this.data.elevators = []
>>>>>>> yan
return; return;
} }
}else if(this.step == 3){ }else if(this.step == 3){
@ -240,11 +202,8 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
form.append('user_id', '<?php echo $user_id; ?>'); form.append('user_id', '<?php echo $user_id; ?>');
form.append('user_name', '<?php echo $user_name; ?>'); form.append('user_name', '<?php echo $user_name; ?>');
form.append('num', this.data.num); form.append('num', this.data.num);
<<<<<<< HEAD
=======
console.log(this.data.elevators); console.log(this.data.elevators);
form.append('elevators', JSON.stringify(this.data.elevators)); form.append('elevators', JSON.stringify(this.data.elevators));
>>>>>>> yan
// 如果有附件檔案,可以逐一加入 // 如果有附件檔案,可以逐一加入
for (var i = 0; i < this.data.files.length; i++) { for (var i = 0; i < this.data.files.length; i++) {
@ -317,11 +276,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
<td style="vertical-align: middle">立約人</td> <td style="vertical-align: middle">立約人</td>
<td> <td>
<input type="text" x-model="data.customer" /> <input type="text" x-model="data.customer" />
<<<<<<< HEAD
<p class="alerttext" x-show="data.customer==''">未填寫</p>
=======
<p class="alerttext" x-show="data.customer==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.customer==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">營業員</td> <td style="vertical-align: middle">營業員</td>
<td> <td>
@ -331,52 +286,31 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
<option value="<?php echo $person['accountid'] ?>"><?php echo $person['name'] ?></option> <option value="<?php echo $person['accountid'] ?>"><?php echo $person['name'] ?></option>
<?php } ?> <?php } ?>
</select> </select>
<<<<<<< HEAD
<p class="alerttext" x-show="data.salesman==''">未填寫</p>
=======
<p class="alerttext" x-show="data.salesman==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.salesman==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">合約開始時間</td> <td style="vertical-align: middle">合約開始時間</td>
<td> <td>
<input class="form-control disabled_select" type="date" name="start_date" x-model="data.contract_begin_date" > <input class="form-control disabled_select" type="date" name="start_date" x-model="data.contract_begin_date" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.contract_begin_date==''">未填寫</p>
=======
<p class="alerttext" x-show="data.contract_begin_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.contract_begin_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">合約終止時間</td> <td style="vertical-align: middle">合約終止時間</td>
<td> <td>
<input class="form-control disabled_select" type="date" name="end_date" x-model="data.contract_end_date" > <input class="form-control disabled_select" type="date" name="end_date" x-model="data.contract_end_date" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.contract_end_date==''">未填寫</p>
=======
<p class="alerttext" x-show="data.contract_end_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.contract_end_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">電梯台數</td> <td style="vertical-align: middle">電梯台數</td>
<td> <td>
<<<<<<< HEAD
<input class="form-control disabled_select" type="number" x-model="data.num">
<p class="alerttext" x-show="data.num==''">未填寫</p>
=======
<input class="form-control disabled_select" type="number" x-model="data.num" :disabled="data.disabled"> <input class="form-control disabled_select" type="number" x-model="data.num" :disabled="data.disabled">
<p class="alerttext" x-show="data.num==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.num==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
<p class="alerttext" x-show="data.num==0 && data.num!=''"><i class="fa-solid fa-circle-xmark"></i>電梯數量需大於0</p> <p class="alerttext" x-show="data.num==0 && data.num!=''"><i class="fa-solid fa-circle-xmark"></i>電梯數量需大於0</p>
>>>>>>> yan
</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.vat" > <input class="form-control disabled_select" type="text" name="uscc" x-model="data.vat" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.vat==''">未填寫</p>
=======
<p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">維修型態</td> <td style="vertical-align: middle">維修型態</td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
@ -384,52 +318,21 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
<option value="" >選擇維修型態</option> <option value="" >選擇維修型態</option>
<option value="A">定期保養</option> <option value="A">定期保養</option>
</select> </select>
<<<<<<< HEAD
<p class="alerttext" x-show="data.mtype==''">未填寫</p>
</td>
<td style="vertical-align: middle">
開門方式
</td>
<td style="vertical-align: middle">
<select class="ui search dropdown" name="repairtype" x-model="data.opendoor">
<option value="">選擇開門方式</option>
<option value="2PCO">2PCO</option>
<option value="2S">2S</option>
<option value="2SL">2SL</option>
<option value="2SR">2SR</option>
<option value="2U">2U</option>
<option value="3S">3S</option>
<option value="4PCO">4PCO</option>
<option value="6PCO">6PCO</option>
<option value="CO">CO</option>
</select>
<p class="alerttext" x-show="data.opendoor==''">未填寫</p>
</td>
=======
<p class="alerttext" x-show="data.mtype==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.mtype==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td></td> <td></td>
<td></td> <td></td>
>>>>>>> yan
</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="tel" x-model="data.phone" > <input class="form-control disabled_select" type="text" name="tel" x-model="data.phone" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.phone==''">未填寫</p>
=======
<p class="alerttext" x-show="data.phone==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.phone==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">Email</td> <td style="vertical-align: middle">Email</td>
<td style="vertical-align: middle"> <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" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.email==''">未填寫</p>
=======
<p class="alerttext" x-show="data.email==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.email==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">保養員</td> <td style="vertical-align: middle">保養員</td>
<td> <td>
@ -439,11 +342,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
<option value="<?php echo $worker['accountid']; ?>"><?php echo $worker['name'] ?></option> <option value="<?php echo $worker['accountid']; ?>"><?php echo $worker['name'] ?></option>
<?php } ?> <?php } ?>
</select> </select>
<<<<<<< HEAD
<p class="alerttext" x-show="data.mworker==''">未填寫</p>
=======
<p class="alerttext" x-show="data.mworker==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.mworker==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">保養頻率</td> <td style="vertical-align: middle">保養頻率</td>
<td> <td>
@ -452,160 +351,28 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
<option value="bw">雙週保</option> <option value="bw">雙週保</option>
<option value="em">月保</option> <option value="em">月保</option>
</select> </select>
<<<<<<< HEAD
<p class="alerttext" x-show="data.mcycle==''">未填寫</p>
=======
<p class="alerttext" x-show="data.mcycle==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.mcycle==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">業務聯繫人</td> <td style="vertical-align: middle">業務聯繫人</td>
<td> <td>
<input type="text" x-model="data.partyA" name="partyA" /> <input type="text" x-model="data.partyA" name="partyA" />
<<<<<<< HEAD
<p class="alerttext" x-show="data.partyA==''">未填寫</p>
=======
<p class="alerttext" x-show="data.partyA==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.partyA==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">業務聯繫人地址</td> <td style="vertical-align: middle">業務聯繫人地址</td>
<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="" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.partyAaddress==''">未填寫</p>
=======
<p class="alerttext" x-show="data.partyAaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.partyAaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</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="contracttel" x-model="data.partyAphone" > <input class="form-control disabled_select" type="text" name="contracttel" x-model="data.partyAphone" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.partyAphone==''">未填寫</p>
=======
<p class="alerttext" x-show="data.partyAphone==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.partyAphone==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
>>>>>>> yan
</td> </td>
<td style="vertical-align: middle">業務聯繫人Email</td> <td style="vertical-align: middle">業務聯繫人Email</td>
<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" >
<<<<<<< HEAD
<p class="alerttext" x-show="data.partyAemail==''">未填寫</p>
</td>
</tr>
<tr>
<td style="vertical-align: middle">廠牌</td>
<td>
<input type="text" x-model="data.brand" class="form-control" />
<p class="alerttext" x-show="data.brand==''">未填寫</p>
</td>
<td style="vertical-align: middle">區域</td>
<td>
<select class="ui search dropdown" x-model="data.area">
<option value="">選擇區域</option>
<template x-for="city in cities" :key="city.code">
<option x-bind:selected="city.name === data.area" x-text="city.name" :value="city.name"></option>
</template>
</select>
<p class="alerttext" x-show="data.area==''">未填寫</p>
</td>
<td style="vertical-align: middle">詳細地址</td>
<td colspan="3">
<input type="text" x-model="data.address" />
<p class="alerttext" x-show="data.address==''">未填寫</p>
</td>
</tr>
<tr>
<td style="vertical-align: middle">保養別</td>
<td>
<select class="ui search dropdown" x-model="data.maintainance">
<option value="">選擇保養別</option>
<option value="A">全包</option>
<option value="B">半包</option>
<option value="C">清包</option>
</select>
<p class="alerttext" x-show="data.maintainance==''">未填寫</p>
</td>
<td style="vertical-align: middle">竣檢日</td>
<td>
<input class="form-control disabled_select" type="date" x-model="data.takecertificatedate">
<p class="alerttext" x-show="data.takecertificatedate==''">未填寫</p>
</td>
<td style="vertical-align: middle">許可證有效時間</td>
<td>
<input class="form-control disabled_select" type="date" x-model="data.licensedate">
<p class="alerttext" x-show="data.licensedate==''">未填寫</p>
</td>
<td style="vertical-align: middle">附件</td>
<td >
<input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
<p class="alerttext" x-show="data.files==''">未填寫</p>
</td>
</tr>
<tr>
</tr>
</tbody>
</template>
<template x-if="step==3">
<tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==3">
<tr>
<td style="vertical-align: middle">機種</td>
<td>
<select class="ui search dropdown" name="spec" x-model="data.spec">
<option value="">選擇規格</option>
<option value="MAE100">MAE100</option>
<option value="MAM200">MAM200</option>
<option value="MAH100">MAH100</option>
<option value="MAQ100">MAQ100</option>
<option value="MAF100">MAF100</option>
<option value="MAZ100">MAZ100</option>
</select>
<p class="alerttext" x-show="data.spec==''">未填寫</p>
</td>
<td style="vertical-align: middle">載重</td>
<td>
<input type="text" x-model="data.weight" />
<p class="alerttext" x-show="data.weight==''">未填寫</p>
</td>
<td style="vertical-align: middle">速度</td>
<td>
<input type="text" x-model="data.speed" />
<p class="alerttext" x-show="data.speed==''">未填寫</p>
</td>
<td style="vertical-align: middle">人乘</td>
<td>
<input type="text" x-model="data.numberofpassenger" />
<p class="alerttext" x-show="data.numberofpassenger==''">未填寫</p>
</td>
</tr>
<tr>
<td style="vertical-align: middle">樓停</td>
<td>
<input type="number" class="form-control" x-model="data.numberofstop" />
<p class="alerttext" x-show="data.numberofstop==''">未填寫</p>
</td>
<td style="vertical-align: middle">樓層</td>
<td>
<input type="text" x-model="data.numberoffloor" />
<p class="alerttext" x-show="data.numberoffloor==''">未填寫</p>
</td>
<td style="vertical-align: middle">緯度</td>
<td>
<input type="text" x-model="data.latitude" />
<p class="alerttext" x-show="data.latitude==''">未填寫</p>
</td>
<td style="vertical-align: middle">經度</td>
<td>
<input type="text" x-model="data.longitude" />
<p class="alerttext" x-show="data.longitude==''">未填寫</p>
</td>
</tr>
</tbody>
=======
<p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
@ -636,7 +403,6 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5);
</tr> </tr>
</tbody> </tbody>
>>>>>>> yan
</template> </template>
<template x-if="step==3"> <template x-if="step==3">
<template x-for="(elevator, idx) in data.elevators" :key="elevator.apply_key + elevator.register_code"> <template x-for="(elevator, idx) in data.elevators" :key="elevator.apply_key + elevator.register_code">

Loading…
Cancel
Save