diff --git a/wms/contract/api/getComboNo.php b/wms/contract/api/getComboNo.php index 6c1b0f29..c258be15 100644 --- a/wms/contract/api/getComboNo.php +++ b/wms/contract/api/getComboNo.php @@ -1,28 +1,19 @@ >>>>>> f6b04618 (1106) 'week'=>'BW002', 'month'=>'EM002', 'quarter'=>'EQ002', 'half'=>'HY002', 'year'=>'EY002' ]; -<<<<<<< HEAD private $bwarr = [ -======= - public $bwarr = [ ->>>>>>> f6b04618 (1106) 'week','month','week','month','week','quarter', 'week','month','week','month','week','half', 'week','month','week','month','week','quarter', 'week','month','week','month','week','year' ]; -<<<<<<< HEAD private $emarr = [ 'month','month','quarter','month','month','half', 'month','month','quarter','month','month','year' @@ -64,18 +55,5 @@ class CreateComboNo{ } } return json_encode($newarr); -======= - public $emarr = [ - 'month','month','quarter','month','month','half', - 'month','month','quarter','month','month','year' - ]; - public $combo; - public $startdate; - public $enddate; - public function __construct($combo, $startdate, $enddate){ - } - public function getComboNo(){ - ->>>>>>> f6b04618 (1106) } } \ No newline at end of file diff --git a/wms/contract/api/getContractData.php b/wms/contract/api/getContractData.php index 86d8301c..7e6107fc 100644 --- a/wms/contract/api/getContractData.php +++ b/wms/contract/api/getContractData.php @@ -3,20 +3,37 @@ require_once('../conn.php'); if(isset($_GET['contractno']) && $_GET['contractno']!=''){ try{ $contractno = $_GET['contractno']; - $sql_str = "SELECT COUNT(con_maintance_examine_clear.apply_key) as count,con_maintance_examine_apply.*, con_maintance_examine_clear.* FROM con_maintance_examine_apply - LEFT JOIN con_maintance_examine_clear on con_maintance_examine_apply.apply_key=con_maintance_examine_clear.apply_key - WHERE con_maintance_examine_apply.vol_no = :vol_no GROUP BY con_maintance_examine_apply.apply_key;"; + $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 + WHERE con_maintance_examine_apply.vol_no = :vol_no ;"; + $sql_str = "SELECT * FROM con_maintance_examine_apply WHERE vol_no = :vol_no ORDER BY create_at DESC;"; $stmt = $conn->prepare($sql_str); $stmt->bindParam(':vol_no', $contractno); $stmt->execute(); - $contract = $stmt->fetch(PDO::FETCH_ASSOC); + $contract= $stmt->fetch(PDO::FETCH_ASSOC); + + if(empty($contract)){ + echo false; + exit; + } + $apply_key = $contract['apply_key']; + $sql_str = "SELECT * FROM con_maintance_examine_clear WHERE apply_key = :apply_key"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':apply_key', $apply_key); + $stmt->execute(); + $elevators= $stmt->fetchAll(PDO::FETCH_ASSOC); + $count = COUNT($elevators); + $contract['elevators'] = $elevators; + $contract['num'] = $count; + $contractResponse = json_encode($contract); // 設定回應標頭為 JSON header('Content-Type: application/json'); // 將 JSON 回應返回給客戶端 - echo json_encode($contract); + echo $contractResponse; + // echo json_encode($contractResponse); }catch (PDOException $e ){ die("ERROR!!!: ". $e->getMessage()); } diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php index 7da028d0..802e2a42 100644 --- a/wms/contract/api/postContractData.php +++ b/wms/contract/api/postContractData.php @@ -5,11 +5,7 @@ include_once("./getComboNo.php"); ini_set ( 'date.timezone' , 'Asia/Taipei' ); if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { try{ -<<<<<<< HEAD $created_at = date('Y-m-d H:i:s'); -======= - ->>>>>>> f6b04618 (1106) $contractno = !empty($_POST['contractno'])? $_POST['contractno'] : null; $total_price = !empty($_POST['total_price']) ? $_POST['total_price'] : null; $vat = !empty($_POST['vat']) ? $_POST['vat'] : null; @@ -43,9 +39,8 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { $latitude = !empty($_POST['latitude']) ? $_POST['latitude'] : null; $longitude = !empty($_POST['longitude']) ? $_POST['longitude'] : null; $num = !empty($_POST['num']) ? $_POST['num'] : null; -<<<<<<< HEAD $files = !empty($_FILES['files']) ? $_FILES['files'] : null; - + $elevators = !empty($_POST['elevators']) ? json_decode($_POST['elevators'], true) : []; // validate $fail_arr = []; if($contractno === '') return $fail_arr[] = '合約號為必填'; @@ -53,7 +48,6 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { if($total_price == '') $fail_arr[] = '合約總價為必填'; if($vat == '') $fail_arr[] = '統一編號為必填'; if($mtype == '') $fail_arr[] = '維修型態為必填'; - if($opendoor == '') $fail_arr[] = '開門方式為必填'; if($phone == '') $fail_arr[] = '客戶電話為必填'; if($email == '') $fail_arr[] = 'Email為必填'; if($mworker == '') $fail_arr[] = '保養員為必填'; @@ -64,33 +58,17 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { if($address == '') $fail_arr[] = '地址為必填'; if($area == '') $fail_arr[] = '區域為必填'; if($customer == '') $fail_arr[] = '客戶為必填'; - if($partyA == '') $fail_arr[] = '甲方為必填'; - if($partyAaddress == '') $fail_arr[] = '甲方地址為必填'; - if($partyAphone == '') $fail_arr[] = '甲方電話為必填'; - if($partyAemail == '') $fail_arr[] = '甲方Email為必填'; - if($spec == '') $fail_arr[] = '規格為必填'; - if($weight == '') $fail_arr[] = '重量為必填'; - if($numberofpassenger == '') $fail_arr[] = '乘客人數為必填'; - if($numberofstop == '') $fail_arr[] = '停留站數為必填'; - if($numberoffloor == '') $fail_arr[] = '停留樓層為必填'; - if($speed == '') $fail_arr[] = '速度為必填'; - if($takecertificatedate == '') $fail_arr[] = '取標日期為必填'; - if($maintainance == '') $fail_arr[] = '保養為必填'; - if($licensedate == '') $fail_arr[] = '營業員為必填'; - if($latitude == '') $fail_arr[] = '緯度為必填'; - if($longitude == '') $fail_arr[] = '經度為必填'; - if($num == '') $fail_arr[] = '數量為必填'; + if($partyA == '') $fail_arr[] = '業務聯繫人為必填'; + if($partyAaddress == '') $fail_arr[] = '業務聯繫人地址為必填'; + if($partyAphone == '') $fail_arr[] = '業務聯繫人電話為必填'; + if($partyAemail == '') $fail_arr[] = '業務聯繫人Email為必填'; + if($num == '') $fail_arr[] = '電梯數量為必填'; if(count($fail_arr) > 0) { header("HTTP/1.1 422 Unprocessable Entity"); echo json_encode($fail_arr); exit(); } -======= - - $files = !empty($_FILES['files']) ? $_FILES['files'] : null; - ->>>>>>> f6b04618 (1106) //create account table $accounttype = "A"; $accountid = $vat; @@ -156,60 +134,62 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { //create facility table $createFacilityNo = new CreateFacilityNo(); $dailyNecessities = [ - 'MAE100'=>'X', - 'MAM200'=>'W', - 'MAH100'=>'H', - 'MAQ100'=>'Z', - 'MAF100'=>'F', - 'MAZ100'=>'B', - ]; - $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid"; - $stmt = $conn->prepare($sql_str); - $stmt->bindParam(':accountid',$mworker); - $stmt->execute(); - $worker = $stmt->fetch(PDO::FETCH_ASSOC); - - $facilityno = $createFacilityNo->makeBFacilityNo("T", $dailyNecessities[$spec], (int)$num); - $define = "B"; - $customerid = $vat; - $opentype = $opendoor; - $repairtype = "A"; - $facility_kind = $spec; - $maintainance = "E"; - $repairerid = $mworker; - $repairername = $worker['name']; - - foreach($facilityno as $fno){ + 'MAE100'=>'X', + 'MAM200'=>'W', + 'MAH100'=>'H', + 'MAQ100'=>'Z', + 'MAF100'=>'F', + 'MAZ100'=>'B', + ]; + $facility_arr = []; + foreach($elevators as $elevator){ + $facility_arr[] = $elevator['spec']; + } + + $facilityno = $createFacilityNo->makeBFacilityNo("T", $dailyNecessities[$elevator['spec']], (int)$num); - $sql_str = "INSERT INTO facility (contractno, define, facilityno, latitude, longitude, customerid, weight, numberofpassenger, numberofstop, numberoffloor, opentype, speed, repairtype, maintainance, facility_kind, address, repairerid, repairername, creater, create_at, area, takecertificatedate, licensedate) - VALUES (:contractno, :define, :facilityno, :latitude, :longitude, :customerid, :weight, :numberofpassenger, :numberofstop, :numberoffloor, :opentype, :speed, :repairtype, :maintainance, :facility_kind, :address, :repairerid, :repairername, :creater, :create_at, :area, :takecertificatedate, :licensedate)"; - $stmt = $conn -> prepare($sql_str); - $stmt -> bindParam(':contractno' ,$contractno); - $stmt -> bindParam(':define' ,$define); - $stmt -> bindParam(':facilityno' ,$fno); - $stmt -> bindParam(':latitude' ,$latitude); - $stmt -> bindParam(':longitude' ,$longitude); - $stmt -> bindParam(':customerid' ,$customerid); - $stmt -> bindParam(':weight' ,$weight); - $stmt -> bindParam(':numberofpassenger' ,$numberofpassenger); - $stmt -> bindParam(':numberofstop' ,$numberofstop); - $stmt -> bindParam(':numberoffloor' ,$numberoffloor); - $stmt -> bindParam(':opentype' ,$opentype); - $stmt -> bindParam(':speed' ,$speed); - $stmt -> bindParam(':repairtype' ,$repairtype); - $stmt -> bindParam(':maintainance' ,$maintainance); - $stmt -> bindParam(':facility_kind' ,$facility_kind); - $stmt -> bindParam(':address' ,$address); - $stmt -> bindParam(':repairerid' ,$repairerid); - $stmt -> bindParam(':repairername' ,$repairername); - $stmt -> bindParam(':creater' ,$creater); - $stmt -> bindParam(':create_at' ,$create_at); - $stmt -> bindParam(':area' ,$area); - $stmt -> bindParam(':takecertificatedate' ,$takecertificatedate); - $stmt -> bindParam(':licensedate' ,$licensedateeeee); + $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':accountid',$mworker); + $stmt->execute(); + $worker = $stmt->fetch(PDO::FETCH_ASSOC); + $customerid = $vat; + $define = "B"; + $repairtype = "A"; + $repairerid = $mworker; + $repairername = $worker['name']; + foreach($elevators as $idx=>$elevator){ + $sql_str = "INSERT INTO facility (contractno, define, facilityno, latitude, longitude, customerid, weight, numberofpassenger, numberofstop, numberoffloor, opentype, speed, repairtype, maintainance, facility_kind, address, repairerid, repairername, creater, create_at, area, takecertificatedate, licensedate) + VALUES (:contractno, :define, :facilityno, :latitude, :longitude, :customerid, :weight, :numberofpassenger, :numberofstop, :numberoffloor, :opentype, :speed, :repairtype, :maintainance, :facility_kind, :address, :repairerid, :repairername, :creater, :create_at, :area, :takecertificatedate, :licensedate)"; + $stmt = $conn -> prepare($sql_str); + $stmt -> bindParam(':contractno' ,$contractno); + $stmt -> bindParam(':define' ,$define); + $stmt -> bindParam(':facilityno' ,$facilityno[$idx]); + $stmt -> bindParam(':latitude' ,$elevator['latitude']); + $stmt -> bindParam(':longitude' ,$elevator['longitude']); + $stmt -> bindParam(':customerid' ,$customerid); + $stmt -> bindParam(':weight' ,$elevator['weight']); + $stmt -> bindParam(':numberofpassenger' ,$elevator['persons']); + $stmt -> bindParam(':numberofstop' ,$elevator['stop']); + $stmt -> bindParam(':numberoffloor' ,$elevator['floors']); + $stmt -> bindParam(':opentype' ,$elevator['opendoor']); + $stmt -> bindParam(':speed' ,$elevator['speed']); + $stmt -> bindParam(':repairtype' ,$repairtype); + $stmt -> bindParam(':maintainance' ,$maintainance); + $stmt -> bindParam(':facility_kind' ,$elevator['spec']); + $stmt -> bindParam(':address' ,$address); + $stmt -> bindParam(':repairerid' ,$repairerid); + $stmt -> bindParam(':repairername' ,$repairername); + $stmt -> bindParam(':creater' ,$creater); + $stmt -> bindParam(':create_at' ,$create_at); + $stmt -> bindParam(':area' ,$area); + $stmt -> bindParam(':takecertificatedate' ,$elevator['takecertificatedate']); + $stmt -> bindParam(':licensedate' ,$elevator['licensedateeeee']); + $result = $stmt -> execute(); + } - $result = $stmt -> execute(); - } + + //create schedule table @@ -247,62 +227,65 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { $bonus = 1000; $max_bonus = 2000; - $englisharr = range('a', 'z'); - $file = $_FILES['files']; - $file_name = $file['name']; - $file_type = $file['type']; - $tmp_name = $file['tmp_name']; - $file_size = $file['size']; - $error = $file['error']; - $newfiles = []; - foreach( $files as $file ){ - $i = 0; //新陣列的索引編號 - foreach( $file as $key => $val ){ - $newfiles[$i]['name'] = $files['name'][$key]; - $newfiles[$i]['type'] = $files['type'][$key]; - $newfiles[$i]['tmp_name'] = $files['tmp_name'][$key]; - $newfiles[$i]['error'] = $files['error'][$key]; - $newfiles[$i]['size'] = $files['size'][$key]; - $i++; - } //foreach 第2層 end - } - echo json_encode($newfiles); - $max_size = 4096*4096; //設定允許上傳檔案容量的最大值(1M) - $allow_ext = array('jpeg', 'jpg', 'png','JPG','JPEG','PNG','GIF'); //設定允許上傳檔案的類型 - $path = '../images/contracts/'; - if (!file_exists($path)) { mkdir($path); } - $msg_result = ''; //負責接收所有檔案檢測後的回傳訊息 - $datetime = (string)date('YmdHis'); - $files_id = 'c' . $datetime; - foreach( $newfiles as $key => $file ){ - $randNum = rand(1000,9999); - $randEnglish = $englisharr[rand(0,25)]; - $file_name = 'c' . (string)date('YmdHis') . $randNum . $randEnglish . $randNum.$file['name']; - $msg = upload_chk( $file,$path, $max_size, $allow_ext, $file_name ); - if($msg==1){ - $msg = '檔案傳送成功！'; - $sql_str = "INSERT INTO contract_back_files (files_id, file_name, file_mime, file_size, created_at, created_by) VALUES (:files_id, :file_name, :file_mime, :file_size, :created_at, :created_by)"; - $stmt = $conn -> prepare($sql_str); - $stmt -> bindParam(':files_id' ,$files_id); - $stmt -> bindParam(':file_name' ,$file_name); - $stmt -> bindParam(':file_mime' ,$file['type']); - $stmt -> bindParam(':file_size' ,$file['size']); - $stmt -> bindParam(':created_at' ,$created_at); - $stmt -> bindParam(':created_by' ,$user_id); - $stmt ->execute(); - } - $msg_result .= '第' . ($key+1) . '個上傳檔案的結果：' . $msg . '
'; - $src_name = $path.$file['name']; - if( file_exists($src_name) ){ - //副檔名 - $extname = pathinfo($src_name, PATHINFO_EXTENSION); - //主檔名 - $basename = basename($src_name, '.'.$extname); - } - + if(!empty($files)){ + $englisharr = range('a', 'z'); + $file = $_FILES['files']; + $file_name = $file['name']; + $file_type = $file['type']; + $tmp_name = $file['tmp_name']; + $file_size = $file['size']; + $error = $file['error']; + $newfiles = []; + foreach( $files as $file ){ + $i = 0; //新陣列的索引編號 + foreach( $file as $key => $val ){ + $newfiles[$i]['name'] = $files['name'][$key]; + $newfiles[$i]['type'] = $files['type'][$key]; + $newfiles[$i]['tmp_name'] = $files['tmp_name'][$key]; + $newfiles[$i]['error'] = $files['error'][$key]; + $newfiles[$i]['size'] = $files['size'][$key]; + $i++; + } //foreach 第2層 end + } + $max_size = 4096*4096; //設定允許上傳檔案容量的最大值(1M) + $allow_ext = array('jpeg', 'jpg', 'png','JPG','JPEG','PNG','GIF'); //設定允許上傳檔案的類型 + $path = '../images/contracts/'; + if (!file_exists($path)) { mkdir($path); } + $msg_result = ''; //負責接收所有檔案檢測後的回傳訊息 + $datetime = (string)date('YmdHis'); + $files_id = 'c' . $datetime; + foreach( $newfiles as $key => $file ){ + $randNum = rand(1000,9999); + $randEnglish = $englisharr[rand(0,25)]; + $file_name = 'c' . (string)date('YmdHis') . $randNum . $randEnglish . $randNum.$file['name']; + $msg = upload_chk( $file,$path, $max_size, $allow_ext, $file_name ); + if($msg==1){ + $msg = '檔案傳送成功！'; + $sql_str = "INSERT INTO contract_back_files (files_id, file_name, file_mime, file_size, created_at, created_by) VALUES (:files_id, :file_name, :file_mime, :file_size, :created_at, :created_by)"; + $stmt = $conn -> prepare($sql_str); + $stmt -> bindParam(':files_id' ,$files_id); + $stmt -> bindParam(':file_name' ,$file_name); + $stmt -> bindParam(':file_mime' ,$file['type']); + $stmt -> bindParam(':file_size' ,$file['size']); + $stmt -> bindParam(':created_at' ,$created_at); + $stmt -> bindParam(':created_by' ,$user_id); + $stmt ->execute(); + } + $msg_result .= '第' . ($key+1) . '個上傳檔案的結果：' . $msg . '
'; + $src_name = $path.$file['name']; + if( file_exists($src_name) ){ + //副檔名 + $extname = pathinfo($src_name, PATHINFO_EXTENSION); + //主檔名 + $basename = basename($src_name, '.'.$extname); + } + + } + }else{ + $files = null; } - $sql_str = "INSERT INTO contract_b_signed_back (contract_no, contract_type, company, customer_no, salesperson, contract_start_date, contract_end_date, total_price, opendoor, customer_phone, customer_email, repairman, cycle, contact_person, contact_address, contact_phone, contact_email, takecertificatedate, license_date, elevators_number, spec, weight, speed, numberofpassenger, numberofstop, numberoffloor, latitude, longitude, area, address, files_id, bonus, max_bonus, created_at, created_by) - VALUES (:contract_no, :contract_type, :company, :customer_no, :salesperson, :contract_start_date, :contract_end_date, :total_price, :opendoor, :customer_phone, :customer_email, :repairman, :cycle, :contact_person, :contact_address, :contact_phone, :contact_email, :takecertificatedate, :license_date, :elevators_number, :spec, :weight, :speed, :numberofpassenger, :numberofstop, :numberoffloor, :latitude, :longitude, :area, :address, :files_id, :bonus, :max_bonus, :created_at, :created_by)"; + $sql_str = "INSERT INTO contract_b_signed_back (contract_no, contract_type, company, customer_no, salesperson, contract_start_date, contract_end_date, total_price, customer_phone, customer_email, repairman, cycle, contact_person, contact_address, contact_phone, contact_email, elevators_number, area, address, files_id, bonus, max_bonus, created_at, created_by) + VALUES (:contract_no, :contract_type, :company, :customer_no, :salesperson, :contract_start_date, :contract_end_date, :total_price, :customer_phone, :customer_email, :repairman, :cycle, :contact_person, :contact_address, :contact_phone, :contact_email, :elevators_number, :area, :address, :files_id, :bonus, :max_bonus, :created_at, :created_by)"; $stmt = $conn -> prepare($sql_str); $stmt -> bindParam(":contract_no",$contractno); $stmt -> bindParam(":contract_type",$contract_type); @@ -312,7 +295,6 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { $stmt -> bindParam(":contract_start_date",$contract_begin_date); $stmt -> bindParam(":contract_end_date",$contract_end_date); $stmt -> bindParam(":total_price",$total_price); - $stmt -> bindParam(":opendoor",$opendoor); $stmt -> bindParam(":customer_phone",$customer_phone); $stmt -> bindParam(":customer_email",$customer_email); $stmt -> bindParam(":repairman",$repairman); @@ -321,17 +303,7 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { $stmt -> bindParam(":contact_address",$contact_address); $stmt -> bindParam(":contact_phone",$contact_phone); $stmt -> bindParam(":contact_email",$contact_email); - $stmt -> bindParam(":takecertificatedate",$takecertificatedate); - $stmt -> bindParam(":license_date",$license_date); $stmt -> bindParam(":elevators_number",$elevators_number); - $stmt -> bindParam(":spec",$spec); - $stmt -> bindParam(":weight",$weight); - $stmt -> bindParam(":speed",$speed); - $stmt -> bindParam(":numberofpassenger",$numberofpassenger); - $stmt -> bindParam(":numberofstop",$numberofstop); - $stmt -> bindParam(":numberoffloor",$numberoffloor); - $stmt -> bindParam(":latitude",$latitude); - $stmt -> bindParam(":longitude",$longitude); $stmt -> bindParam(":area",$area); $stmt -> bindParam(":address",$address); $stmt -> bindParam(":files_id",$files_id); @@ -347,8 +319,8 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "") { $conn->commit(); }catch(PDOException $e){ - $r = $conn->rollback(); - echo $r; + $conn->rollback(); + echo $e->getMessage(); die('Error!:'.$e->getMessage()); } } @@ -411,4 +383,4 @@ function upload_chk( $file, $path, $max_size, $allow_ext, $file_name ){ } //if( $error == 0 ){ ..... end return $msg; //回傳$msg的結果 - }// function end \ No newline at end of file + } \ No newline at end of file diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php index e41013ee..b9afb815 100644 --- a/wms/contract/contract-input.php +++ b/wms/contract/contract-input.php @@ -20,6 +20,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); ?> + @@ -33,11 +34,10 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); }, cities:[], data:{ - contractno:'Q23080026', + contractno:'B23100060', total_price:'', //合約總價 vat:'', //統一編號 mtype:'A', //維修型態 - opendoor:'', //開門方式 phone:'', //客戶電話 email:'', //Email mworker:'', //保養員 @@ -54,19 +54,9 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); partyAphone:'', //業務聯繫人電話 partyAemail:'', //業務聯繫人email files:[], //附件檔案 - spec:'', //機種 - brand:'', //廠牌 - weight: '', //載重 - numberofpassenger: '', //人乘 - numberofstop:'', //樓停 - numberoffloor:'', //樓層 - speed:'', //速度 - maintainance:'', //保養別 - takecertificatedate:'', //交車日、竣檢日 - licensedate:'', //許可證有效日期 num:'', //電梯數量 - latitude:'', //緯度 - longitude:'', //經度 + disabled:false, //資料庫是否有電梯數量資料 + elevators:[], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期 }, customize:false, step:1, @@ -78,6 +68,11 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); this.isLoading = true this.getContractDate(); }else if(this.step == 2){ + if(this.data.num <= 0) return alert('請填寫電梯數量！') + if(!this.data.disabled){ + this.createElevator(); + + } this.step = 3 } }, @@ -91,8 +86,32 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); this.step = 3 } }, + createElevator(){ + for(let i=0;i 0) ? true : false; + this.data.elevators = res.data.elevators let cityIndex = this.data.address.indexOf('市'); + console.log(cityIndex); + if(cityIndex == -1) { + cityIndex = this.data.address.indexOf('縣'); + } if (cityIndex > 1) { // 獲取''市''前面的兩個字 let city = this.data.address.substring(cityIndex - 2, cityIndex + 1); @@ -128,7 +154,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); }, preStepFn(){ if(this.step==2){ - if(confirm('回到上一頁會將本頁資料清空，確定返回嗎？')){ + if(confirm('回到上一頁會將會初始化資料，確定返回嗎？')){ this.step = 1 this.data.total_price = '' this.data.salesman = '' @@ -146,6 +172,9 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); this.data.speed = '' this.data.takecertificatedate = '' this.step = 1 + this.data.num = '' + this.data.disabled = false + this.data.elevators = [] return; } }else if(this.step == 3){ @@ -159,7 +188,6 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); form.append('total_price', this.data.total_price); form.append('vat', this.data.vat); form.append('mtype', this.data.mtype); - form.append('opendoor', this.data.opendoor); form.append('phone', this.data.phone); form.append('email', this.data.email); form.append('mworker', this.data.mworker); @@ -174,20 +202,11 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); form.append('partyAaddress', this.data.partyAaddress); form.append('partyAphone', this.data.partyAphone); form.append('partyAemail', this.data.partyAemail); - form.append('spec', this.data.spec); - form.append('weight', this.data.weight); - form.append('numberofpassenger', this.data.numberofpassenger); - form.append('numberofstop', this.data.numberofstop); - form.append('numberoffloor', this.data.numberoffloor); - form.append('speed', this.data.speed); - form.append('takecertificatedate', this.data.takecertificatedate); - form.append('maintainance', this.data.maintainance); - form.append('licensedate', this.data.licensedate); - form.append('latitude', this.data.latitude); - form.append('longitude', this.data.longitude); form.append('user_id', ''); form.append('user_name', ''); form.append('num', this.data.num); + console.log(this.data.elevators); + form.append('elevators', JSON.stringify(this.data.elevators)); // 如果有附件檔案，可以逐一加入 for (var i = 0; i < this.data.files.length; i++) { @@ -260,7 +279,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); 立約人 -

未填寫

+

未填寫

營業員 @@ -270,30 +289,31 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); -

未填寫

+

未填寫

合約開始時間 -

未填寫

+

未填寫

合約終止時間 -

未填寫

+

未填寫

電梯台數 - -

未填寫

+ +

未填寫

+

電梯數量需大於0

統一編號/身分證 -

未填寫

+

未填寫

維修型態 @@ -301,37 +321,21 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); -

未填寫

- - - 開門方式 - - - -

未填寫

+

未填寫

+ + 客戶電話 -

未填寫

+

未填寫

Email -

未填寫

+

未填寫

保養員 @@ -341,7 +345,7 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); -

未填寫

+

未填寫

保養頻率 @@ -350,37 +354,32 @@ $facilityno = $createFacilityNo->makeTFacilityNo("T", 'X', 5); -

未填寫

+

未填寫

業務聯繫人 -

未填寫

+

未填寫

業務聯繫人地址 -

未填寫

+

未填寫

業務聯繫人電話 -

未填寫

+

未填寫

業務聯繫人Email -

未填寫

+

未填寫

- 廠牌 - - -

未填寫

- 區域 -

未填寫

+

未填寫

詳細地址 -

未填寫

- - - - 保養別 - - -

未填寫

- - 竣檢日 - - -

未填寫

- - 許可證有效時間 - - -

未填寫

+

未填寫

附件 -

未填寫

+

未填寫

+ diff --git a/wms/contract/images/contracts/c202311101747315948u59481697165865064.jpg b/wms/contract/images/contracts/c202311101747315948u59481697165865064.jpg new file mode 100644 index 00000000..ce3085e4 Binary files /dev/null and b/wms/contract/images/contracts/c202311101747315948u59481697165865064.jpg differ diff --git a/wms/contract/images/contracts/c202311101747319269t92691697599065970.jpg b/wms/contract/images/contracts/c202311101747319269t92691697599065970.jpg new file mode 100644 index 00000000..c6609c2e Binary files /dev/null and b/wms/contract/images/contracts/c202311101747319269t92691697599065970.jpg differ diff --git a/wms/contract/images/contracts/c202311101747481959u19591697165865064.jpg b/wms/contract/images/contracts/c202311101747481959u19591697165865064.jpg new file mode 100644 index 00000000..ce3085e4 Binary files /dev/null and b/wms/contract/images/contracts/c202311101747481959u19591697165865064.jpg differ diff --git a/wms/contract/images/contracts/c202311101747483858a38581697599065970.jpg b/wms/contract/images/contracts/c202311101747483858a38581697599065970.jpg new file mode 100644 index 00000000..c6609c2e Binary files /dev/null and b/wms/contract/images/contracts/c202311101747483858a38581697599065970.jpg differ diff --git a/wms/contract/images/contracts/c202311101750548465f84651697599065970.jpg b/wms/contract/images/contracts/c202311101750548465f84651697599065970.jpg new file mode 100644 index 00000000..c6609c2e Binary files /dev/null and b/wms/contract/images/contracts/c202311101750548465f84651697599065970.jpg differ diff --git a/wms/contract/images/contracts/c202311101758595752g57521697599065970.jpg b/wms/contract/images/contracts/c202311101758595752g57521697599065970.jpg new file mode 100644 index 00000000..c6609c2e Binary files /dev/null and b/wms/contract/images/contracts/c202311101758595752g57521697599065970.jpg differ diff --git a/wms/contract/styles/style.css b/wms/contract/styles/style.css index 4b2a83a8..2a08e2b5 100644 --- a/wms/contract/styles/style.css +++ b/wms/contract/styles/style.css @@ -561,7 +561,8 @@ main table td, main table th { font-size: 13px; color: #a00; font-weight: 500; - margin: 0; + margin: 3px; + font-weight: 900; padding: 0; } .contract-input-component .form input[type=file] { diff --git a/wms/contract/styles/style.css.map b/wms/contract/styles/style.css.map index ac083781..b9b51a04 100644 --- a/wms/contract/styles/style.css.map +++ b/wms/contract/styles/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/wms/contract/styles/style.scss b/wms/contract/styles/style.scss index 3e593c0f..96757025 100644 --- a/wms/contract/styles/style.scss +++ b/wms/contract/styles/style.scss @@ -583,7 +583,8 @@ main{ font-size: 13px; color:#a00; font-weight: 500; - margin: 0; + margin: 3px; + font-weight: 900; padding: 0; } }