Browse Source

價審新梯、api修正0103

main
10994015 1 year ago
parent
commit
56218c35d2
  1. 4
      wms/contract/api/postContractNewApplyData.php
  2. 61
      wms/contract/contract-new-apply.php
  3. 7
      wms/contract/insertData.php
  4. 14
      wms/contract/js/alpine.js
  5. 20
      wms/mkt/pricereview-check.php
  6. 40
      wms/mkt/pricereview-create.php
  7. 7
      wms/mkt/pricereview-edit.php
  8. 2
      wms/mkt/pricereview_mi-api.php

4
wms/contract/api/postContractNewApplyData.php

@ -31,6 +31,7 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
$contact_address = $_POST['address']; $contact_address = $_POST['address'];
$workdeadline_a = $_POST['workdeadline_a']; $workdeadline_a = $_POST['workdeadline_a'];
$workdeadline_b = $_POST['workdeadline_b']; $workdeadline_b = $_POST['workdeadline_b'];
$workdeadline_note = $_POST['workdeadline_note'];
$test_time = $_POST['regulations']; $test_time = $_POST['regulations'];
$freedeadline = $_POST['freedeadline']; $freedeadline = $_POST['freedeadline'];
$trade_address = $_POST['tradeaddress']; $trade_address = $_POST['tradeaddress'];
@ -162,7 +163,7 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
header("HTTP/1.1 201 success!"); header("HTTP/1.1 201 success!");
$conn->commit(); $conn->commit();
} else { } else {
$sql_str = "UPDATE contract_new_apply SET status = :status, apply_date=:apply_date, apply_type=:apply_type, case_name=:case_name, customer=:customer, manager=:manager, vat=:vat, total_price=:total_price, total_items=:total_items, buy_fee=:buy_fee, install_fee=:install_fee, contact_address=:contact_address, trade_address=:trade_address, workdeadline_a=:workdeadline_a, workdeadline_b=:workdeadline_b, test_time=:test_time, freedeadline=:freedeadline, trade_address=:trade_address, trade_address=:trade_address, tradedeadline=:tradedeadline, secondPayDeadline=:secondPayDeadline, progress=:progress, person=:person, personname=:personname, submit_date=:submit_date, updated_at=:updated_at, updated_by=:updated_by, description=:description WHERE mid = :mid"; $sql_str = "UPDATE contract_new_apply SET status = :status, apply_date=:apply_date, apply_type=:apply_type, case_name=:case_name, customer=:customer, manager=:manager, vat=:vat, total_price=:total_price, total_items=:total_items, buy_fee=:buy_fee, install_fee=:install_fee, contact_address=:contact_address, trade_address=:trade_address, workdeadline_a=:workdeadline_a, workdeadline_b=:workdeadline_b, workdeadline_note=:workdeadline_note, test_time=:test_time, freedeadline=:freedeadline, trade_address=:trade_address, trade_address=:trade_address, tradedeadline=:tradedeadline, secondPayDeadline=:secondPayDeadline, progress=:progress, person=:person, personname=:personname, submit_date=:submit_date, updated_at=:updated_at, updated_by=:updated_by, description=:description WHERE mid = :mid";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':mid', $mid); $stmt->bindParam(':mid', $mid);
$stmt->bindParam(':status', $status); $stmt->bindParam(':status', $status);
@ -179,6 +180,7 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
$stmt->bindParam(':contact_address', $contact_address); $stmt->bindParam(':contact_address', $contact_address);
$stmt->bindParam(':workdeadline_a', $workdeadline_a); $stmt->bindParam(':workdeadline_a', $workdeadline_a);
$stmt->bindParam(':workdeadline_b', $workdeadline_b); $stmt->bindParam(':workdeadline_b', $workdeadline_b);
$stmt->bindParam(':workdeadline_note', $workdeadline_note);
$stmt->bindParam(':test_time', $test_time); $stmt->bindParam(':test_time', $test_time);
$stmt->bindParam(':freedeadline', $freedeadline); $stmt->bindParam(':freedeadline', $freedeadline);
$stmt->bindParam(':trade_address', $trade_address); $stmt->bindParam(':trade_address', $trade_address);

61
wms/contract/contract-new-apply.php

@ -140,7 +140,7 @@ $person = $contract['person'];
<!-- <input class="form-control disabled_select" type="text" x-model="data.vol_no" > --> <!-- <input class="form-control disabled_select" type="text" x-model="data.vol_no" > -->
<!-- <p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> --> <!-- <p class="alerttext" x-show="data.vol_no==''"><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" x-model="data.vat" disabled > <input class="form-control disabled_select" type="text" x-model="data.vat" disabled >
<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>
@ -198,27 +198,20 @@ $person = $contract['person'];
<input class="form-control disabled_select" type="text" x-model="data.address" disabled> <input class="form-control disabled_select" type="text" x-model="data.address" disabled>
<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>
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
<div class="ui labeled input"> <div class="ui labeled input">
<div class="ui label"> <input type="text" placeholder="18" style="width:45px;padding:0 12px;" x-model="data.freedeadline">
貨抵工地 <div class="ui label">
</div> 個月
<input type="text" placeholder="30" style="width:45px;padding:0 12px;" x-model="data.workdeadline_a"> </div>
<div class="ui label">
天內安裝完成,甲方應於貨底工地前
</div>
<input type="text" placeholder="7" style="width:45px;padding:0 12px;" x-model="data.workdeadline_b">
<div class="ui label">
天完成並整理完善。
</div> </div>
</div> <p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
<!-- <input class="form-control disabled_select" type="text" x-model="data.deadline" > -->
<p class="alerttext" x-show="data.deadline==''"><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 style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
<div class="ui labeled input"> <div class="ui labeled input">
<div class="ui label"> <div class="ui label">
@ -230,16 +223,21 @@ $person = $contract['person'];
</div> </div>
</div> </div>
<p class="alerttext" x-show="data.regulations==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.regulations==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td> -->
<td style="vertical-align: middle">免保期限</td> <td style="vertical-align: middle">完工期限</td>
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=7>
<div class="ui labeled input"> <div class="ui labeled input">
<input type="text" placeholder="18" style="width:45px;padding:0 12px;" x-model="data.freedeadline"> <div class="ui label">
<div class="ui label"> 乙方應於貨抵工地後每台
個月
</div>
</div> </div>
<p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <input type="text" placeholder="30" style="width:45px;padding:0 12px;" x-model="data.workdeadline_a">
<div class="ui label">
日內安裝完成
</div>
<div class="note label" x-show="data.workdeadline_note && data.workdeadline_note != 'null'" style="font-size:14px;color:#BD0606" x-text="'說明:' + data.workdeadline_note"></div>
</div>
<!-- <input class="form-control disabled_select" type="text" x-model="data.deadline" > -->
<p class="alerttext" x-show="data.deadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
@ -255,7 +253,7 @@ $person = $contract['person'];
<div class="ui label"> <div class="ui label">
圖色確認第 圖色確認第
</div> </div>
<input type="text" placeholder="90" style="width:45px;padding:0 12px;" x-model="data.tradedeadline"> <input type="text" placeholder="180" style="width:60px;padding:0 12px;" x-model="data.tradedeadline">
<div class="ui label"> <div class="ui label">
天出貨 天出貨
</div> </div>
@ -288,15 +286,14 @@ $person = $contract['person'];
<td style="vertical-align: middle"><p x-text="idx+1"></p></td> <td style="vertical-align: middle"><p x-text="idx+1"></p></td>
<td colspan="3" style="vertical-align: middle"> <td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select lock" type="text" x-model="item.item_spec" > <input class="form-control disabled_select lock" type="text" x-model="item.item_spec" >
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.item_spec==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<span x-text="item.item_qty + '台'" style="padding:0 20px"></span> <span x-text="item.item_qty + '台'" style="padding:0 20px"></span>
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td colspan="3" style="vertical-align: middle"> <td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select lock" type="number" x-model="item.item_price_ct" > <input class="form-control disabled_select lock" type="number" x-model="item.item_price_ct" >
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.item_price_ct==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
</template> </template>
@ -633,11 +630,12 @@ $person = $contract['person'];
const pays = [...<?php echo json_encode($pays) ?? []; ?>]; const pays = [...<?php echo json_encode($pays) ?? []; ?>];
const secondPayDeadline = ''; const secondPayDeadline = '';
const tradeaddress = '<?php echo $contract['address'] ?? ''; ?>'; const tradeaddress = '<?php echo $contract['address'] ?? ''; ?>';
const tradedeadline = 90 const tradedeadline = 180
const freedeadline = 18; const freedeadline = 18;
const regulations = 10; const regulations = 10;
const workdeadline_a = 60; const workdeadline_a = 60;
const workdeadline_b = 7; const workdeadline_b = 7;
const workdeadline_note = '';
const total_items = <?php echo $total_items ?? ''; ?>; const total_items = <?php echo $total_items ?? ''; ?>;
const isFirst = <?php echo $isFirst; ?>; const isFirst = <?php echo $isFirst; ?>;
const originfiles = []; const originfiles = [];
@ -670,6 +668,7 @@ $person = $contract['person'];
const regulations = '<?php echo $contract['test_time'] ?? ''; ?>'; const regulations = '<?php echo $contract['test_time'] ?? ''; ?>';
const workdeadline_a = '<?php echo $contract['workdeadline_a'] ?? ''; ?>'; const workdeadline_a = '<?php echo $contract['workdeadline_a'] ?? ''; ?>';
const workdeadline_b = '<?php echo $contract['workdeadline_b'] ?? ''; ?>'; const workdeadline_b = '<?php echo $contract['workdeadline_b'] ?? ''; ?>';
const workdeadline_note = '<?php echo $contract['workdeadline_note'] ?? ''; ?>';
const secondPayDeadline = <?php echo $secondPayDeadline ?? ''; ?>; const secondPayDeadline = <?php echo $secondPayDeadline ?? ''; ?>;
const total_items = <?php echo $contract['total_items'] ?? ''; ?>; const total_items = <?php echo $contract['total_items'] ?? ''; ?>;
const contract_new_apply_id = <?php echo $contract_new_apply_id; ?>; const contract_new_apply_id = <?php echo $contract_new_apply_id; ?>;

7
wms/contract/insertData.php

@ -46,10 +46,13 @@ foreach ($sheet->getRowIterator() as $key => $row) {
$memo = $cell->getValue(); $memo = $cell->getValue();
echo $memo; echo $memo;
} elseif ($idx == 'E') { } elseif ($idx == 'E') {
$optional = '';
if ($cell->getValue() == "標配") { if ($cell->getValue() == "標配") {
$optional = 1; $optional = 1;
} else { } else if($cell->getValue() == "選配") {
$optional = 2; $optional = 2;
}else if($cell->getValue() == "加價") {
$optional = 3;
} }
echo $optional; echo $optional;
} elseif ($idx == 'F') { } elseif ($idx == 'F') {
@ -137,7 +140,7 @@ foreach ($sheet->getRowIterator() as $key => $row) {
$option_price_id = $last_id; $option_price_id = $last_id;
$option_price = $cost; $option_price = $cost;
$quotation_no = 'Q2311001'; $quotation_no = 'Q2401001';
foreach ($open_kind_arr as $kind) { foreach ($open_kind_arr as $kind) {
$min_weight = 1; $min_weight = 1;
$max_weight = 1600; $max_weight = 1600;

14
wms/contract/js/alpine.js

@ -1202,6 +1202,7 @@ const contractNewApply = () => {
address: address, address: address,
workdeadline_a: workdeadline_a, //完工期限: 幾天內安裝完成,預設30 workdeadline_a: workdeadline_a, //完工期限: 幾天內安裝完成,預設30
workdeadline_b: workdeadline_b, //完工期限: 幾天內整理完善,預設7 workdeadline_b: workdeadline_b, //完工期限: 幾天內整理完善,預設7
workdeadline_note: workdeadline_note,
regulations: regulations, //附則 regulations: regulations, //附則
freedeadline: freedeadline, //免保期限(月) freedeadline: freedeadline, //免保期限(月)
tradeaddress: tradeaddress, //交貨地點 tradeaddress: tradeaddress, //交貨地點
@ -1270,10 +1271,7 @@ const contractNewApply = () => {
alert('試車時間不能低於10天') alert('試車時間不能低於10天')
return; return;
} }
if (this.data.workdeadline_a < 30) {
alert('安裝時間不能低於30天')
return;
}
this.isLoading = true this.isLoading = true
const form = new FormData(); const form = new FormData();
form.append('mid', this.data.mid); form.append('mid', this.data.mid);
@ -1293,6 +1291,7 @@ const contractNewApply = () => {
form.append('address', this.data.address); form.append('address', this.data.address);
form.append('workdeadline_a', this.data.workdeadline_a); form.append('workdeadline_a', this.data.workdeadline_a);
form.append('workdeadline_b', this.data.workdeadline_b); form.append('workdeadline_b', this.data.workdeadline_b);
form.append('workdeadline_note', this.data.workdeadline_note);
form.append('regulations', this.data.regulations); form.append('regulations', this.data.regulations);
form.append('freedeadline', this.data.freedeadline); form.append('freedeadline', this.data.freedeadline);
form.append('tradeaddress', this.data.tradeaddress); form.append('tradeaddress', this.data.tradeaddress);
@ -1333,8 +1332,10 @@ const contractNewApply = () => {
return; return;
} }
if (this.data.workdeadline_a < 30) { if (this.data.workdeadline_a < 30) {
alert('安裝時間不能低於30天') while(this.data.workdeadline_note=='') {
return; this.data.workdeadline_note = prompt('安裝時間需低於30天,請說明原因')
}
} }
this.isLoading = true this.isLoading = true
const form = new FormData(); const form = new FormData();
@ -1355,6 +1356,7 @@ const contractNewApply = () => {
form.append('address', this.data.address); form.append('address', this.data.address);
form.append('workdeadline_a', this.data.workdeadline_a); form.append('workdeadline_a', this.data.workdeadline_a);
form.append('workdeadline_b', this.data.workdeadline_b); form.append('workdeadline_b', this.data.workdeadline_b);
form.append('workdeadline_note', this.data.workdeadline_note);
form.append('regulations', this.data.regulations); form.append('regulations', this.data.regulations);
form.append('freedeadline', this.data.freedeadline); form.append('freedeadline', this.data.freedeadline);
form.append('tradeaddress', this.data.tradeaddress); form.append('tradeaddress', this.data.tradeaddress);

20
wms/mkt/pricereview-check.php

@ -263,6 +263,7 @@ foreach ($res as $data) {
//alert(data.err); //alert(data.err);
return false; return false;
} }
console.log(data.content);
Object.keys(data.content).forEach(function(k) { Object.keys(data.content).forEach(function(k) {
//console.log(data.content[k][0]); //console.log(data.content[k][0]);
// 有值表示先前已寫入MI // 有值表示先前已寫入MI
@ -283,11 +284,16 @@ foreach ($res as $data) {
mihtml += "以上合計:" + commafy(data.content[k][12]) + "/台"; mihtml += "以上合計:" + commafy(data.content[k][12]) + "/台";
mihtml += "<hr>"; mihtml += "<hr>";
mihtml += "<h5>OPTION</h5>"; mihtml += "<h5>OPTION</h5>";
console.log(data.content[k]);
Object.keys(data.content[k][14]).forEach(function(m) { Object.keys(data.content[k][14]).forEach(function(m) {
mihtml += "<li>" + data.content[k][14][m][0] + ":" + commafy(data.content[k][14][m][1]) + "</li>"; if(data.content[k][14][m][0] != '') {
mihtml += "<li>" + data.content[k][14][m][0] + ":" + commafy(data.content[k][14][m][1]) + "</li>";
}
}); });
Object.keys(data.content[k][16]).forEach(function(m) { Object.keys(data.content[k][16]).forEach(function(m) {
mihtml += "<li>" + data.content[k][16][m][0] + ":" + commafy(data.content[k][16][m][1]) + "</li>"; if(data.content[k][16][m][0] != ''){
mihtml += "<li>" + data.content[k][16][m][0] + ":" + commafy(data.content[k][16][m][1]) + "</li>";
}
}); });
Object.keys(data.content[k][18]).forEach(function(m) { Object.keys(data.content[k][18]).forEach(function(m) {
mihtml += "<li>" + data.content[k][18][m][0] + ":" + commafy(data.content[k][18][m][1]) + "</li>"; mihtml += "<li>" + data.content[k][18][m][0] + ":" + commafy(data.content[k][18][m][1]) + "</li>";
@ -548,7 +554,12 @@ foreach ($res as $data) {
<?php <?php
$idx = 1; $idx = 1;
$item_amt_B_all = 0; $item_amt_B_all = 0;
$total_qty = 0;
foreach ($option_arr as $item_no => $val) { foreach ($option_arr as $item_no => $val) {
if($val['item_qty'] <= 0){
continue;
}
$total_qty = $total_qty + $val['item_qty'];
$item_amt_B_all += $val["item_price_bp"]; $item_amt_B_all += $val["item_price_bp"];
?> ?>
<tr> <tr>
@ -564,10 +575,12 @@ foreach ($res as $data) {
$idx++; $idx++;
} }
?> ?>
<?php if($total_qty > 0): ?>
<tr> <tr>
<td colspan="4">小計</td> <td colspan="4">小計</td>
<td colspan="3"><input type="text" name="option_amt" id="option_amt" class="form-control dollar-right" size="8" value="<?= number_format($item_amt_B_all); ?>"></td> <td colspan="3"><input type="text" name="option_amt" id="option_amt" class="form-control dollar-right" size="8" value="<?= number_format($item_amt_B_all); ?>"></td>
</tr> </tr>
<?php endif; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -923,6 +936,9 @@ foreach ($res as $data) {
</tr> </tr>
</tbody> </tbody>
</table> </table>
<ul style="display:block">
<li>營業權限85%以上;85-80%呈至區處長審核;80%以下呈至總經理審核。</li>
</ul>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">

40
wms/mkt/pricereview-create.php

@ -1,6 +1,6 @@
<?php <?php
include "../header.php"; include "../header.php";
require_once('./conn.php');
$vol_no = $_REQUEST["vol_no"]; // 從有望客戶過來:卷號 $vol_no = $_REQUEST["vol_no"]; // 從有望客戶過來:卷號
// 營業員只建自己客戶的價審單 // 營業員只建自己客戶的價審單
@ -143,8 +143,9 @@ while ($row = mysqli_fetch_assoc($res)) {
$opt_data_arr[$row["kind"]][$row["group_name"]][$row["id"]]["unit"] = $row["unit"]; $opt_data_arr[$row["kind"]][$row["group_name"]][$row["id"]]["unit"] = $row["unit"];
$opt_data_arr[$row["kind"]][$row["group_name"]][$row["id"]]["price"] = $row["price"]; $opt_data_arr[$row["kind"]][$row["group_name"]][$row["id"]]["price"] = $row["price"];
} }
$option_str = $opt_data_arr[$row["kind"]][$row["group_name"]][$row["id"]]["spec"];
mysqli_free_result($res); mysqli_free_result($res);
$option_str = '<table id="table_index2" class="table table-striped table-bordered" style="width:100%">'; $option_str .= '<table id="table_index2" class="table table-striped table-bordered" style="width:100%">';
$option_str .= '<thead> $option_str .= '<thead>
<tr class="kind-col"> <tr class="kind-col">
<th scope="col" nowrap>名稱</th> <th scope="col" nowrap>名稱</th>
@ -1018,6 +1019,12 @@ $(function(){
</div> </div>
</div> </div>
<!--子窗:option加價--> <!--子窗:option加價-->
<?php
$sql_str = "SELECT * FROM option_price WHERE status='Y' ORDER BY kind ASC";
$stmt = $conn->prepare($sql_str);
$stmt->execute();
$options = $stmt->fetchAll(PDO::FETCH_ASSOC);
?>
<div class="modal fade" id="optionModal" tabindex="-1" role="dialog" aria-labelledby="optionModalTitle" aria-hidden="true"> <div class="modal fade" id="optionModal" tabindex="-1" role="dialog" aria-labelledby="optionModalTitle" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
@ -1028,7 +1035,30 @@ $(function(){
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<?php echo $option_str; ?> <table id="table_index2" class="table table-striped table-bordered" style="width:100%">
<thead>
<tr class="kind-col">
<th scope="col" nowrap>名稱</th>
<th scope="col" nowrap>規格</th>
<th scope="col" nowrap>備註</th>
<th scope="col" nowrap>配置</th>
<th scope="col" nowrap>單位</th>
<th scope="col" nowrap>定價</th>
</tr>
</thead>
<tbody>
<?php foreach($options as $option): ?>
<tr>
<td>1</td>
<td>2</td>
<td>3</td>
<td>4</td>
<td>5</td>
<td>6</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>
@ -2162,8 +2192,10 @@ if (count($last_pritem_arr) > 0 && isset($last_pritem_arr["B"])) {
</table> </table>
</div> </div>
<div class="nextline"></div>
<ul> <ul>
<li>營業權限>=85%以上;<88-80%呈至區處長審核<80%以下呈至總經理審核</li> <li>營業權限85%以上;85-80%呈至區處長審核;80%以下呈至總經理審核。</li>
</ul> </ul>
<div class="nextline"></div> <div class="nextline"></div>
<label for="attatch1">報價單</label> <label for="attatch1">報價單</label>

7
wms/mkt/pricereview-edit.php

@ -1732,11 +1732,10 @@ $(function(){
</tr> </tr>
</tbody> </tbody>
</table> </table>
<ul>
<li>營業權限85%以上;85-80%呈至區處長審核;80%以下呈至總經理審核。。</li>
</ul>
</div> </div>
<ul>
<li>業務員權限>=85%以上;<80-75%呈至業務協理審核<75%以下呈至總經理審核</li>
</ul>
<div class="nextline"></div> <div class="nextline"></div>
<label for="attatch1">報價單</label> <label for="attatch1">報價單</label>
<?php <?php

2
wms/mkt/pricereview_mi-api.php

@ -265,6 +265,7 @@ try {
$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"]."'";
$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']);
$plus = ($v["floors"] > $row_om["base_floor"]) ? ($v["floors"] - $row_om["base_floor"])*$row_om["base_floor_plus"] : 0; $plus = ($v["floors"] > $row_om["base_floor"]) ? ($v["floors"] - $row_om["base_floor"])*$row_om["base_floor_plus"] : 0;
// 特例 // 特例
if ($opt_elev_arr[$val]["price_id"] == "256" && ($v["floors"] < $row_om["base_floor"])) $row_om["price"] = 9815; if ($opt_elev_arr[$val]["price_id"] == "256" && ($v["floors"] < $row_om["base_floor"])) $row_om["price"] = 9815;
@ -287,7 +288,6 @@ try {
$j++; $j++;
} }
} }
// 保固延長 // 保固延長
$mnarr = []; $mnarr = [];
$mn_fee = $j = 0; $mn_fee = $j = 0;

Loading…
Cancel
Save