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

新梯價審修正、簽核成功重新導向

main
10994015 1 year ago
parent
53ab8d0fd4
commit
c8c0f0baf0
3 changed files with 58 additions and 8 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. 14
      wms/mkt/pricereview-check.php
  2. 37
      wms/mkt/pricereview-create.php
  3. 13
      wms/mkt/pricereview_mi-api.php

14
wms/mkt/pricereview-check.php
View File

@ -326,6 +326,11 @@ foreach ($res as $data) {
if (this.readyState == 4 && this.status == 200) { if (this.readyState == 4 && this.status == 200) {
data = JSON.parse(this.responseText); data = JSON.parse(this.responseText);
console.log(data); console.log(data);
if(data.err == "notfoundmi"){
for(let i=0;i<document.getElementsByClassName('total_mi_fix').length;i++){
document.getElementsByClassName('total_mi_fix')[i].value = "找不到此MI"
}
}
//console.log(data);return false; //console.log(data);return false;
if (data.st == 'err') { if (data.st == 'err') {
//alert(data.err); //alert(data.err);
@ -334,7 +339,7 @@ foreach ($res as $data) {
// console.log(data.content); // console.log(data.content);
Object.keys(data.content).forEach(function(k) { Object.keys(data.content).forEach(function(k) {
console.log('k=>', k); console.log('k=>', k);
// console.log(data.content); console.log(data.content);
//console.log(data.content[k][0]); //console.log(data.content[k][0]);
// 有值表示先前已寫入MI // 有值表示先前已寫入MI
if ($("#tb1").find("input[name=mi_fix]").eq(k).val() == "") { if ($("#tb1").find("input[name=mi_fix]").eq(k).val() == "") {
@ -356,7 +361,7 @@ foreach ($res as $data) {
mihtml += "<li>一年免保：" + commafy(data.content[k][6]) + "</li>"; mihtml += "<li>一年免保：" + commafy(data.content[k][6]) + "</li>";
mihtml += "<li>起吊+木箱+耗材：" + commafy(data.content[k][7]) + "</li>"; mihtml += "<li>起吊+木箱+耗材：" + commafy(data.content[k][7]) + "</li>";
//mihtml += "<li>加價："+commafy(data.content[k][9])+"</li>"; //mihtml += "<li>加價："+commafy(data.content[k][9])+"</li>";
mihtml += "以上合計：" + commafy(data.content[k][12]) + "/台"; mihtml += "以上合計：" + commafy(data.content[k][12]) + "/台" ;
mihtml += "<hr>"; mihtml += "<hr>";
mihtml += "<h5>OPTION</h5>"; mihtml += "<h5>OPTION</h5>";
total_mi = total_mi + data.content[k][12]; total_mi = total_mi + data.content[k][12];
@ -385,6 +390,7 @@ foreach ($res as $data) {
} }
$("#tb1").find("tr[name=facil_templ2]").eq(k).find('td').eq(1).html(mihtml); $("#tb1").find("tr[name=facil_templ2]").eq(k).find('td').eq(1).html(mihtml);
//$("#tb1").find("input[name=mi_fix]").eq(k).closest('td').append(mihtml); //$("#tb1").find("input[name=mi_fix]").eq(k).closest('td').append(mihtml);
console.log(document.getElementsByClassName('total_mi_fix')[k]);
document.getElementsByClassName('total_mi_fix')[k].value = commafy(total_mi) document.getElementsByClassName('total_mi_fix')[k].value = commafy(total_mi)
// document.getElementsByClassName('item_price_ct')[k].value =commafy(total_mi) // document.getElementsByClassName('item_price_ct')[k].value =commafy(total_mi)
@ -392,8 +398,6 @@ foreach ($res as $data) {
document.getElementsByClassName('gross_profit_rate')[k].value = Math.round((Number(document.getElementsByClassName('gross_profit')[k].value.replace(/[,]+/g, "")) / Number(document.getElementsByClassName('item_price_ct')[k].value.replace(/[,]+/g, "")) * 100) * 10) / 10 document.getElementsByClassName('gross_profit_rate')[k].value = Math.round((Number(document.getElementsByClassName('gross_profit')[k].value.replace(/[,]+/g, "")) / Number(document.getElementsByClassName('item_price_ct')[k].value.replace(/[,]+/g, "")) * 100) * 10) / 10
}); });
} }
} }
xhr.open('POST', 'pricereview_mi-api.php', true); xhr.open('POST', 'pricereview_mi-api.php', true);
xhr.send(formdata); xhr.send(formdata);
@ -588,7 +592,7 @@ foreach ($res as $data) {
<td nowrap><a href="" data-toggle="modal"><?= $val["item_spec"]; ?> [規調]</a></td> <td nowrap><a href="" data-toggle="modal"><?= $val["item_spec"]; ?> [規調]</a></td>
<td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?= number_format($val["item_unit_price"]); ?>"></td> <td><input type="text" name="item_unit_price" class="form-control dollar-right" size="8" value="<?= number_format($val["item_unit_price"]); ?>"></td>
<td><input type="text" name="item_qty" class="form-control" size="2" value="1"></td> <td><input type="text" name="item_qty" class="form-control" size="2" value="1"></td>
<td><input type="text" name="item_price_bp" class="form-control dollar-right" size="9" value="<?= number_format($val["item_unit_price"]); ?>"></td> <td><input type="text" name="item_price_bp" class="form-control dollar-right" size="9" value="<?= number_format(1 * $val['item_unit_price']); ?>"></td>
<td><input type="text" name="mi_fix" class="form-control dollar-right total_mi_fix" size="9" value="<?php echo ($val["mi_fix"]) ? number_format($val["mi_fix"]) : ""; ?>" disabled></td> <td><input type="text" name="mi_fix" class="form-control dollar-right total_mi_fix" size="9" value="<?php echo ($val["mi_fix"]) ? number_format($val["mi_fix"]) : ""; ?>" disabled></td>
<td><input type="text" name="item_price_ct" class="form-control dollar-right item_price_ct" size="9" value="<?= number_format($val["item_price_ct"] / $val["item_qty"]); ?>"></td> <td><input type="text" name="item_price_ct" class="form-control dollar-right item_price_ct" size="9" value="<?= number_format($val["item_price_ct"] / $val["item_qty"]); ?>"></td>
<!--<td><input type="text" name="item_price" class="form-control dollar-right" size="8" value="<?php echo ($val["item_price"]) ? number_format($val["item_price"]) : ""; ?>"></td> <!--<td><input type="text" name="item_price" class="form-control dollar-right" size="8" value="<?php echo ($val["item_price"]) ? number_format($val["item_price"]) : ""; ?>"></td>

37
wms/mkt/pricereview-create.php
View File

@ -29,9 +29,10 @@ if (!empty($row)) {
} }
// 同一卷號只限一筆價審 // 同一卷號只限一筆價審
$sql = "select count(*) from pricereview_main where contractno = '$vol_no' and status in ('Y1', 'YS', 'YY')"; $sql = "select count(*), price_total from pricereview_main where contractno = '$vol_no' and status in ('Y1', 'YS', 'YY')";
$res = mysqli_query($link, $sql); $res = mysqli_query($link, $sql);
$row = mysqli_fetch_row($res); $row = mysqli_fetch_row($res);
if ($row[0] > 0) { if ($row[0] > 0) {
echo "<script>"; echo "<script>";
echo "alert('請勿重覆價審!');"; echo "alert('請勿重覆價審!');";
@ -1189,6 +1190,26 @@ $option_str .= "</tbody></table>";
}); });
if ((rv2 === false)) return rv2; if ((rv2 === false)) return rv2;
var rv3 = true;
$("input[name='price_total']").each(function() {
if (Number(this.value.replace(",", "")) <= 0) {
alert("售價總額需大於0!!!");
location.href = '#price_total';
return rv3 = false;
}
});
if ((rv3 === false)) return rv3;
var rv4 = true;
$("input[name='item_unit_price']").each(function() {
if (Number(this.value.replace(",", "")) <= 0) {
alert("請輸入正確規格!!!");
location.href = '#tb1';
return rv4 = false;
}
});
if ((rv4 === false)) return rv4; //item_unit_price
if ($("#pay_all_amount").val() != $("#price_total").val()) { if ($("#pay_all_amount").val() != $("#price_total").val()) {
alert("【付款辦法】金額合計有誤！"); alert("【付款辦法】金額合計有誤！");
$("input[name=pay_scale]").eq(0).trigger("focus"); $("input[name=pay_scale]").eq(0).trigger("focus");
@ -2465,7 +2486,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<input type="file" name="attatch2" id="attatch2"><a href="javascript:void(0);" name="filedel2" class="btn btn-danger btn-sm">X</a> <input type="file" name="attatch2" id="attatch2"><a href="javascript:void(0);" name="filedel2" class="btn btn-danger btn-sm">X</a>
<div class="nextline"></div><br> <div class="nextline"></div><br>
<button type="submit" name="save" id="save" value="save">保存</button>&nbsp; <button type="submit" name="save" id="save" value="save">保存</button>&nbsp;
<button type="submit" name="submit" id="submit" value="tosign">提交</button> <button type="submit" name="submit" id="submit" value="tosign" >提交</button>
<input type="hidden" name="fp_id_all" id="fp_id_all"> <input type="hidden" name="fp_id_all" id="fp_id_all">
<input type="hidden" name="fp_kind_all" id="fp_kind_all"> <input type="hidden" name="fp_kind_all" id="fp_kind_all">
@ -2542,4 +2563,16 @@ include "../footer.php";
$("#optionModal").modal('hide'); $("#optionModal").modal('hide');
} }
function checkSubmit(){
const price_total = document.getElementById('price_total')
if (Number(price_total.value.replace(",", "")) > 0) {
// 如果条件满足，允许表单提交
return true;
} else {
// 如果条件不满足，阻止表单提交
alert("售價總額需大於0!!");
return false;
}
}
</script> </script>

13
wms/mkt/pricereview_mi-api.php
View File

@ -322,6 +322,18 @@ try {
$sql4 .= "and o.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " "; $sql4 .= "and o.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " ";
$sql4 .= "and ($v[item_weight] between o.min_weight and o.max_weight) and o.open_kind = '" . $v["item_op"] . "'"; $sql4 .= "and ($v[item_weight] between o.min_weight and o.max_weight) and o.open_kind = '" . $v["item_op"] . "'";
$sql4 = "SELECT option_price.id,elevator_quotation_rule.equipment, option_mi.base_floor, option_mi.quotation_no, option_mi.base_floor_plus, option_mi.price, option_price.price as OP FROM option_price
LEFT JOIN option_mi ON option_price.id = option_mi.option_price_id
LEFT JOIN elevator_quotation_rule ON option_mi.quotation_no = elevator_quotation_rule.quotation_no
WHERE option_price.status = 'Y' ";
$sql4 = "SELECT option_price.id, elevator_quotation_rule.equipment, option_mi.base_floor, option_mi.quotation_no, option_mi.base_floor_plus, option_mi.price, option_price.price as OP
FROM option_price
LEFT JOIN option_mi ON option_price.id = option_mi.option_price_id
LEFT JOIN elevator_quotation_rule ON option_mi.quotation_no = elevator_quotation_rule.quotation_no
WHERE option_price.status = 'Y'
AND option_mi.option_price_id = " . $opt_elev_arr[$val]["price_id"] . "
AND (" . $v["item_weight"] . " BETWEEN option_mi.min_weight AND option_mi.max_weight)
AND option_mi.open_kind = '" . $v["item_op"] . "'";
$res_om = mysqli_query($link, $sql4); $res_om = mysqli_query($link, $sql4);
if ($row_om = mysqli_fetch_assoc($res_om)) { if ($row_om = mysqli_fetch_assoc($res_om)) {
$row_om['price'] = (int)ceil($row_om['price']); $row_om['price'] = (int)ceil($row_om['price']);
@ -337,6 +349,7 @@ try {
} }
// 分配：OPTION數量除以電梯總台數 // 分配：OPTION數量除以電梯總台數
$option_amt = round(0 + ($row_om["price"] + $plus) * ($opt_elev_arr[$val]["item_qty"] / $myelev_qty) * $row_om["equipment"], 0); $option_amt = round(0 + ($row_om["price"] + $plus) * ($opt_elev_arr[$val]["item_qty"] / $myelev_qty) * $row_om["equipment"], 0);
// $option_amt = round($row_om['price'] * $opt_elev_arr[$val]["item_qty"], 0);
$option_fee += $option_amt; // option總金額 $option_fee += $option_amt; // option總金額
$oparr[$j][1] = $option_amt; $oparr[$j][1] = $option_amt;

Write Preview
Loading…
Cancel
Save