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

merge

main
10994015 1 year ago
parent
fce5ff799b
commit
a1e7dcafd9
8 changed files with 15 additions and 14 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. 2
      wms/contract-repair/prviewPdf.php
  2. 2
      wms/contract/prviewPdf.php
  3. 4
      wms/fun_global.php
  4. 6
      wms/mkt/assets/js/alpine.js
  5. 4
      wms/mkt/price_option-index.php
  6. 4
      wms/mkt/price_option-select.php
  7. 2
      wms/mkt/pricereview-check.php
  8. 5
      wms/mkt/pricereview-create.php

2
wms/contract-repair/prviewPdf.php
View File

@ -509,7 +509,7 @@ if ($_POST['list']) {
</tr> </tr>
</table> </table>
</td> </td>
<td style="border:none">&nbsp;臺北市中山區敬業一路128巷39號3樓之1</td> <td style="border:none">&nbsp;桃園市觀音區崙坪村8鄰140號</td>
</tr> </tr>
</table> </table>
<p>&nbsp;</p> <p>&nbsp;</p>

2
wms/contract/prviewPdf.php
View File

@ -495,7 +495,7 @@ if($_POST['list']){
</tr> </tr>
</table> </table>
</td> </td>
<td style="border:none">&nbsp;臺北市中山區敬業一路128巷39號3樓之1</td> <td style="border:none">&nbsp;桃園市觀音區崙坪村8鄰140號</td>
</tr> </tr>
</table> </table>
<p>&nbsp;</p> <p>&nbsp;</p>

4
wms/fun_global.php
View File

@ -102,7 +102,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
// 若為第一層且使用者ID為區經理，直接訂好接下來的簽核人員並跳出。 // 若為第一層且使用者ID為區經理，直接訂好接下來的簽核人員並跳出。
if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) { if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) {
$ret[1] = $user_id . ",,"; $ret[1] = $user_id . ",,";
$ret[2] = "M0107,,<##>M0175,,"; // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人) // $ret[2] = "M0107,,<##>M0175,,"; // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
$ret[3] = "M0060,,"; // 業務協理 $ret[3] = "M0060,,"; // 業務協理
if ($rate < 80 || $special_fee > 0) { if ($rate < 80 || $special_fee > 0) {
$ret[4] = "M0006,,"; // 總經理 $ret[4] = "M0006,,"; // 總經理
@ -123,7 +123,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
} }
} else { } else {
$ret[2] = "M0107,,<##>M0175,,"; // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人) // $ret[2] = "M0107,,<##>M0175,,"; // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
$ret[3] = "M0060,,"; // 業務協理 $ret[3] = "M0060,,"; // 業務協理
if ($rate < 80 || $special_fee > 0) { if ($rate < 80 || $special_fee > 0) {
$ret[4] = "M0006,,"; // 總經理 $ret[4] = "M0006,,"; // 總經理

6
wms/mkt/assets/js/alpine.js
View File

@ -84,7 +84,7 @@ const priceOptionIndex = () => {
if (item.spec == null) item.spec = '' if (item.spec == null) item.spec = ''
if (item.memo == null) item.memo = '' if (item.memo == null) item.memo = ''
if (item.price == null) item.price = 0 if (item.price == null) item.price = 0
return (item.group_name.toLowerCase().includes(text.toLowerCase()) || item.spec.toLowerCase().includes(text.toLowerCase()) || item.memo.toLowerCase().includes(text.toLowerCase()) || String(item.price).includes(text.toLowerCase())); return (item.id.includes(text.toLowerCase()) ||item.group_name.toLowerCase().includes(text.toLowerCase()) || item.spec.toLowerCase().includes(text.toLowerCase()) || item.memo.toLowerCase().includes(text.toLowerCase()) || String(item.price).includes(text.toLowerCase()));
} }
}).slice((Number(this.currentpage) - 1) * Number(this.pageLength), (Number(this.currentpage) - 1) * Number(this.pageLength) + Number(this.pageLength)) }).slice((Number(this.currentpage) - 1) * Number(this.pageLength), (Number(this.currentpage) - 1) * Number(this.pageLength) + Number(this.pageLength))
this.dataLangth = this.options.length this.dataLangth = this.options.length
@ -165,7 +165,7 @@ const priceOptionSelect = () => {
if (item.spec == null) item.spec = '' if (item.spec == null) item.spec = ''
if (item.memo == null) item.memo = '' if (item.memo == null) item.memo = ''
if (item.price == null) item.price = 0 if (item.price == null) item.price = 0
return (item.group_name.toLowerCase().includes(text.toLowerCase()) || item.spec.toLowerCase().includes(text.toLowerCase()) || item.memo.toLowerCase().includes(text.toLowerCase()) || String(item.price).includes(text.toLowerCase())); return (item.id.includes(text.toLowerCase()) || item.group_name.toLowerCase().includes(text.toLowerCase()) || item.spec.toLowerCase().includes(text.toLowerCase()) || item.memo.toLowerCase().includes(text.toLowerCase()) || String(item.price).includes(text.toLowerCase()));
}).slice((Number(this.currentpage) - 1) * Number(this.pageLength), (Number(this.currentpage) - 1) * Number(this.pageLength) + Number(this.pageLength)) }).slice((Number(this.currentpage) - 1) * Number(this.pageLength), (Number(this.currentpage) - 1) * Number(this.pageLength) + Number(this.pageLength))
this.dataLangth = this.options.length this.dataLangth = this.options.length
} else { } else {
@ -304,7 +304,7 @@ const pricereviewOptionSelect = () => {
if(option.memo == null) option.memo = '' if(option.memo == null) option.memo = ''
if(option.price == null) option.price = 0 if(option.price == null) option.price = 0
if(option.unit == null) option.unit = '' if(option.unit == null) option.unit = ''
if(option.group_name.includes(val) || option.memo.toLowerCase().includes(val) || option.spec.toLowerCase().includes(val) || option.unit.includes(val) || String(option.price).includes(val)){ if(option.id.includes(val) || option.group_name.includes(val) || option.memo.toLowerCase().includes(val) || option.spec.toLowerCase().includes(val) || option.unit.includes(val) || String(option.price).includes(val)){
option.status = "Y" option.status = "Y"
}else{ }else{
option.status = "N" option.status = "N"

4
wms/mkt/price_option-index.php
View File

@ -74,7 +74,7 @@ $optional_arr = [1 => '標', 2 => '選'];
<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>
<?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225") : ?> <?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225" || $user_id =="M0060" || $user_id =="M0061") : ?>
<th scope="col" nowrap>MI</th> <th scope="col" nowrap>MI</th>
<?php endif; ?> <?php endif; ?>
</tr> </tr>
@ -96,7 +96,7 @@ $optional_arr = [1 => '標', 2 => '選'];
<td x-text="options_arr[option.optional]"></td> <td x-text="options_arr[option.optional]"></td>
<td x-text="option.unit"></td> <td x-text="option.unit"></td>
<td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : '$0'"></td> <td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : '$0'"></td>
<?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225") : ?> <?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225" || $user_id =="M0060" || $user_id =="M0061") : ?>
<td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : ''"></td> <td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : ''"></td>
<?php endif; ?> <?php endif; ?>
</tr> </tr>

4
wms/mkt/price_option-select.php
View File

@ -58,7 +58,7 @@ $optional_arr = [1 => '標配', 2 => '選配',3=>'加價'];
<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>
<?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225") : ?> <?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225" || $user_id =="M0061" || $user_id == "M0060") : ?>
<th scope="col" nowrap>MI</th> <th scope="col" nowrap>MI</th>
<?php endif; ?> <?php endif; ?>
</tr> </tr>
@ -80,7 +80,7 @@ $optional_arr = [1 => '標配', 2 => '選配',3=>'加價'];
<td x-text="options_arr[option.optional]"></td> <td x-text="options_arr[option.optional]"></td>
<td x-text="option.unit"></td> <td x-text="option.unit"></td>
<td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : '$0'"></td> <td x-html="option.price!=null ? '$'+Number(option.price).toLocaleString() : '$0'"></td>
<?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225") : ?> <?php if ($user_id == 'M0174' || $user_id == 'M0107' || $user_id == "M0225" || $user_id =="M0060" || $user_id =="M0061") : ?>
<td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : '$0'"></td> <td x-html="option.mi!=null ? '$'+Number(option.mi).toLocaleString() : '$0'"></td>
<?php endif; ?> <?php endif; ?>
</tr> </tr>

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

@ -662,7 +662,7 @@ foreach ($res as $data) {
?> ?>
<tr> <tr>
<td><?php echo $idx; ?></td> <td><?php echo $idx; ?></td>
<td><input type="text" name="option_seat" class="form-control" size="30" value="<?= $val['item_spec']; ?>"></td> <td><input type="text" name="option_seat" class="form-control" size="30" value="<?= str_replace("()", "", str_replace("&amp;", "", str_replace("&lt;br&gt;", "", str_replace("&amp;lt;br&amp;gt;", "", $val['item_spec'])))); ?>"></td>
<td><input type="text" name="option_unit_price" class="form-control dollar-right" size="8" value="<?= number_format($val["item_unit_price"]); ?>"></td> <td><input type="text" name="option_unit_price" class="form-control dollar-right" size="8" value="<?= number_format($val["item_unit_price"]); ?>"></td>
<td><input type="text" name="option_qty" class="form-control" size="2" value="<?= number_format($val["item_qty"]); ?>"></td> <td><input type="text" name="option_qty" class="form-control" size="2" value="<?= number_format($val["item_qty"]); ?>"></td>
<td><input type="text" name="option_price_bp" class="form-control dollar-right" size="8" value="<?= number_format($val["item_price_bp"]); ?>"></td> <td><input type="text" name="option_price_bp" class="form-control dollar-right" size="8" value="<?= number_format($val["item_price_bp"]); ?>"></td>

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

@ -2556,12 +2556,13 @@ include "../footer.php";
// console.log(pobj.find('input[name=optionID]').val()); // console.log(pobj.find('input[name=optionID]').val());
// console.log(jobj.html(pobj.find('td').eq(0).html() + ' ' + pobj.find('td').eq(1).html())); // console.log(jobj.html(pobj.find('td').eq(0).html() + ' ' + pobj.find('td').eq(1).html()));
console.log(pobj.find('td').eq(0).html()); console.log(pobj.find('td').eq(0).html());
jobj.html(pobj.find('td').eq(1).html() + " " + pobj.find('td').eq(2).html() + '<br />(' + pobj.find('td').eq(3).html() + ')'); let sepc = pobj.find('td').eq(2).html() + '<br />(' + pobj.find('td').eq(3).html() + ')';
sepc = sepc.replace("()", "")
jobj.html(pobj.find('td').eq(1).html() + " " );
jobj.closest('td').parent().find('input[name=option_unit_price]').val(pobj.find('td').eq(6).html()); jobj.closest('td').parent().find('input[name=option_unit_price]').val(pobj.find('td').eq(6).html());
jobj.closest('td').parent().find('input[name=option_price_bp]').val(commafy(pobj.find('td').eq(6).html().replace(/[,]+/g, "") * jobj.closest('td').parent().find('input[name=option_qty]').val().replace(/[,]+/g, ""))); jobj.closest('td').parent().find('input[name=option_price_bp]').val(commafy(pobj.find('td').eq(6).html().replace(/[,]+/g, "") * jobj.closest('td').parent().find('input[name=option_qty]').val().replace(/[,]+/g, "")));
jobj.closest('td').parent().find('input[name=op_id]').val(pobj.find('td').eq(0).html()); jobj.closest('td').parent().find('input[name=op_id]').val(pobj.find('td').eq(0).html());
$("#optionModal").modal('hide'); $("#optionModal").modal('hide');
} }
function checkSubmit(){ function checkSubmit(){
const price_total = document.getElementById('price_total') const price_total = document.getElementById('price_total')

Write Preview
Loading…
Cancel
Save