";
+ };
+ echo "-------------------------" . "
";
+
+};
+
+
+?>
diff --git a/wms/contract-repair/contract-repair-input.php b/wms/contract-repair/contract-repair-input.php
index 67c069e4..d85fa1bd 100644
--- a/wms/contract-repair/contract-repair-input.php
+++ b/wms/contract-repair/contract-repair-input.php
@@ -48,7 +48,6 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修
報價單編號 |
-
|
|
-
+
|
diff --git a/wms/contract-repair/js/alpine.js b/wms/contract-repair/js/alpine.js
index 8877b11b..326d6908 100644
--- a/wms/contract-repair/js/alpine.js
+++ b/wms/contract-repair/js/alpine.js
@@ -872,4 +872,86 @@ const contract_edit = () => {
}
}
+}
+
+const bonsIndex = () => {
+ return {
+ data: {
+ contract_no: 'Q23080067',
+ client_type: '',
+ facility_no: '',
+ bons_verson: '',
+ receiver: '',
+ maintain_month: '',
+ maintain_price_toal: ''
+ },
+ step: 1,
+ isLoading: false,
+ fail_arr: [],
+ nextStepFn() {
+ if (this.step == 1) {
+ if (this.data.contract_no == '') return alert('請輸入合約號');
+ this.isLoading = true;
+ this.getContractData();
+ } else if (this.step == 2) {
+ if (!this.data.disabled) {
+ this.calBons();
+ }
+ }
+ this.step = 3;
+
+ },
+ nextStepKeyupFn(e) {
+ if (e.keyCode !== 13) return;
+ if (this.step == 1) {
+ if (this.data.contract_no == '') return alert('請輸入合約號');
+ this.isLoading = true;
+ this.getContractData();
+ } else if (this.step == 2) {
+ this.step = 3; s
+ }
+ },
+ getContractData() {
+ axios.get('./api/get.php?contract_no=' + this.data.contract_no).then(res => {
+ if (!res.data) {
+ this.step = 2;
+ this.isLoading = false;
+ return;
+ }
+ if (!this.customize) {
+ this.data.contract_no = res.data.BillNo;
+ this.data.facility_no = res.data.facility;
+ this.data.bons_verson = res.data.bons_verson;
+ this.data.receiver = res.data.personId;
+ this.data.maintain_price_toal = res.data.amount;
+ this.data.bons_verson = 2;
+ this.data.maintain_month = res.data.maintain_month;
+ }
+ this.step = 2;
+ this.isLoading = false;
+ }).catch(err => {
+
+ })
+ },
+ preStepFn() {
+ this.step = 1
+ if (this.step == 2) {
+
+ }
+ },
+ save() {
+
+ },
+ calBons() {
+ console.log('123');
+ },
+ errorFn() {
+ let msg = '';
+ for (let i = 0; i < this.fail_arr.length; i++) {
+ msg += this.fail_arr[i] + '、';
+ }
+ alert(msg);
+ },
+
+ }
}
\ No newline at end of file
diff --git a/wms/contract/api/T8salIncomeApply.php b/wms/contract/api/T8salIncomeApply.php
index 96246a7c..0a3d7698 100644
--- a/wms/contract/api/T8salIncomeApply.php
+++ b/wms/contract/api/T8salIncomeApply.php
@@ -29,9 +29,7 @@ function T8API($data)
echo 'API傳入失敗，' . $result['ErrorMsg'];
return $result;
} else {
- // echo '';
// print_r($result);
- // echo '';
return $result;
}
}
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index d9b9f8b8..2a9e082c 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -459,12 +459,12 @@ function T8insert($data, $facilityno)
// print_r($elevators['maintainance']);
// echo '';
foreach ($elevators as $index => $elevator) {
- $type[] = $elevator['maintainance'];
- if ($type[$index] == 'A') {
+ $maintainance_type = $elevator['maintainance'];
+ if ($maintainance_type == 'A') {
$type = 'C3';
- } else if ($type[$index] == 'B') {
+ } else if ($maintainance_type == 'B') {
$type = 'C4';
- } else if ($type[$index] == 'C') {
+ } else if ($maintainance_type == 'C') {
$type = 'C5';
}
}
@@ -487,7 +487,7 @@ function T8insert($data, $facilityno)
$stmt->bindParam(':CreatorId', $user_id);
$stmt->execute();
}
-
+ $row = 0;
// // 新增電梯數
foreach ($elevators as $index => $elevator) {
// echo '';
@@ -535,23 +535,24 @@ function T8insert($data, $facilityno)
// 依每台電梯去加入各個的付款項
for ($i = 0; $i < $IncomeId[$payType]; $i++) {
+ $row++;
// 計算分期款的收款月份
$paymonth = $i * $SQuantity;
- $payday = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
-
+ $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
+ $payDay = str_replace('-', '', $countDay);
$rows_data = [
"BillNo" => "$contractno",
"IncomeId" => "$payType",
"TaxId" => "ST005",
- "RowCode" => $i + 1,
- "RowNo" => $i + 1,
+ "RowCode" => $row,
+ "RowNo" => $row,
"ItemType" => 1,
"SPrice" => $elevator['sold_price'],
"SQuantity" => $SQuantity,
"ProjectId" => "$contractno",
"FromSourceTag" => 0,
"CU_MaterialId" => "$facilityno[$index]",
- "CU_EstPayDate" => "$payday"
+ "CU_EstPayDate" => "$payDay"
];
$salIncomeApplyDetail_rows[] = $rows_data;
}
@@ -594,7 +595,8 @@ function T8insert($data, $facilityno)
// 呼叫 API
$result = T8API($API_body);
- if ($result['Status'] == 'Error') {
+ if ($result['Status'] == 'Error' || $result['Status'] == 'Fails') {
+
http_response_code(404);
die('Error!:' . $result['ErrorMsg']);
}
diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php
index 3718df5d..e7a85071 100644
--- a/wms/contract/api/testT8API.php
+++ b/wms/contract/api/testT8API.php
@@ -2,13 +2,18 @@
$date = Date('Y-m-d');
$date1 = Date('Y-m-d', strtotime("$date +1 months"));
-
-$a = 1;
-$b = 12 / $a;
-for ($i = 0; $i < $b; $i++) {
- $c = $i * $a;
- $date1 = Date('Y-m-d', strtotime("$date + $c months"));
- echo '';
- print_r($date1);
- echo '
';
+// $countDay = date('Ymd', strtotime("$date1 + 1 months"));
+// echo '';
+// print_r($countDay);
+// echo '
';
+// exit();
+$a = 0;
+// $b = 24 / $a;
+for ($i = 0; $i < 2; $i++) {
+ for ($j = 0; $j < 12; $j++) {
+ $a++;
+ echo '';
+ print_r($a);
+ echo '
';
+ }
}
diff --git a/wms/contract/connt8.php b/wms/contract/connt8.php
index 59f2b247..2a40e459 100644
--- a/wms/contract/connt8.php
+++ b/wms/contract/connt8.php
@@ -4,7 +4,7 @@ include "/Users/LO_2342/Desktop/httpdocs/wms/fun_global.php";
// phpinfo();
// exit();
try {
- $connT8 = new PDO("sqlsrv:Server=220.130.203.251;Database=T8TEST", "M0225", "IFFBU1E=");
+ $connT8 = new PDO("sqlsrv:Server=220.130.203.251;Database=T8masada", "M0225", "IFFBU1E=");
if ($connT8) {
$connT8->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
diff --git a/wms/contract/connt8_test.php b/wms/contract/connt8_test.php
new file mode 100644
index 00000000..a13f85d2
--- /dev/null
+++ b/wms/contract/connt8_test.php
@@ -0,0 +1,15 @@
+setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+ }
+} catch (PDOException $e) {
+ // echo "fail";
+ // echo $e->getMessage();
+ die("ERROR!!!: " . $e->getMessage());
+}
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index d13d8389..35f81f58 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -734,7 +734,7 @@ const contractDownload = () => {
this.standardData.list.plaintext[10].text = '電梯保養：
一、乙方完工交車後，期後 ' + this.installfill2 + ' 個月內應負責免費定期保養，及履行免費保固，於免費保養期間屆至後，雙方再協商嗣後保養事宜。
二、如因可歸責乙方因素致安裝產品有所瑕疵時，乙方應負責修復或修繕，惟非因乙方因素致有修復產品需要時，乙方仍負責修復或修繕，惟得向甲方酌收基本材料與人工費用。
三、另依法令規定，非經竣工檢查合格後取得使用許可證之電梯，依法不得使用。'
this.onstandardViewData.list.plaintext[10].text = '電梯保養：
一、乙方完工交車後，期後 ' + this.installfill2 + ' 個月內應負責免費定期保養，及履行免費保固，於免費保養期間屆至後，雙方再協商嗣後保養事宜。
二、如因可歸責乙方因素致安裝產品有所瑕疵時，乙方應負責修復或修繕，惟非因乙方因素致有修復產品需要時，乙方仍負責修復或修繕，惟得向甲方酌收基本材料與人工費用。
三、另依法令規定，非經竣工檢查合格後取得使用許可證之電梯，依法不得使用。'
},
- errorFn(){
+ errorFn() {
alert("資料有誤，請先填完整資料進行保存")
},
sendBuyInputFn() {
diff --git a/wms/mkt/pricereview-create.php b/wms/mkt/pricereview-create.php
index cc95eadf..ea0033f5 100644
--- a/wms/mkt/pricereview-create.php
+++ b/wms/mkt/pricereview-create.php
@@ -754,7 +754,7 @@ $option_str .= "";
$("#optionModal").modal('show');
var jobj = $(this); // 父視窗
- $("#optionModal .modal-body td").unbind().click(function(){
+ $("#optionModal .modal-body td").unbind().click(function() {
var pobj = $(this).closest('td').parent();
selectOptionFn(pobj, jobj)
});
@@ -832,7 +832,7 @@ $option_str .= "";
jobj.closest('td').parent().find('td[name=Exclusions]').html(str);
});
} else {
- alert("請先新增OPTION");
+ alert("請先新增除外項目");
return false;
}
});
@@ -1198,7 +1198,7 @@ $option_str .= "";
return rv3 = false;
}
});
- if ((rv3 === false)) return rv3;
+ if ((rv3 === false)) return rv3;
var rv4 = true;
$("input[name='item_unit_price']").each(function() {
@@ -2486,7 +2486,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
X
-
+
@@ -2564,7 +2564,8 @@ include "../footer.php";
jobj.closest('td').parent().find('input[name=op_id]').val(pobj.find('td').eq(0).html());
$("#optionModal").modal('hide');
}
- function checkSubmit(){
+
+ function checkSubmit() {
const price_total = document.getElementById('price_total')
if (Number(price_total.value.replace(",", "")) > 0) {
diff --git a/wms/mkt/pricereview-edit.php b/wms/mkt/pricereview-edit.php
index d4361dbe..3868a44f 100644
--- a/wms/mkt/pricereview-edit.php
+++ b/wms/mkt/pricereview-edit.php
@@ -10,7 +10,7 @@ $row = mysqli_fetch_row($res);
if ($row[0] > 0) {
echo "";
exit;
}
@@ -117,12 +117,12 @@ foreach ($res as $data) {
if ($v3["optional"] == "1") $optional = "標";
elseif ($v3["optional"] == "2") $optional = "選";
$option_str .= "";
- $option_str .= "| ".$k2." | ";
- $option_str .= "".$v3["spec"]." | ";
- $option_str .= "".$v3["memo"]." | ";
- $option_str .= "".$optional." | ";
- $option_str .= "".$v3["unit"]." | ";
- $option_str .= "".number_format($v3["price"])." | ";
+ $option_str .= "" . $k2 . " | ";
+ $option_str .= "" . $v3["spec"] . " | ";
+ $option_str .= "" . $v3["memo"] . " | ";
+ $option_str .= "" . $optional . " | ";
+ $option_str .= "" . $v3["unit"] . " | ";
+ $option_str .= "" . number_format($v3["price"]) . " | ";
$option_str .= "
";
}
}
@@ -152,1290 +152,1495 @@ foreach ($res as $data) {
}
$option_str .= "";
?>
-
-
-
+
-
-
- - 「保存」：儲存價審單內容
- - 「提交」：儲存價審單內容並進行簽核作業
- - 檔案上傳：可上傳報價單或附表一
-
-
-
-
-
-
-
-
-
-
-
+ if ($("#pay_all_amount").val() != $("#price_total").val()) {
+ alert("【付款辦法】金額合計有誤！");
+ $("input[name=pay_scale]").eq(0).trigger("focus");
+ return false;
+ }
+ if ($(this).val() == "tosign") {
+ if (!confirm("是否確認提交？")) return false;
+ }
+
+ //console.log(itemNameArr);
+ //return false;
+ });
+ });
+
+
+
+ - 「保存」：儲存價審單內容
+ - 「提交」：儲存價審單內容並進行簽核作業
+ - 檔案上傳：可上傳報價單或附表一
+
+
+
+
+
-
-
-
-