diff --git a/wms/contract-repair/prviewPdf.php b/wms/contract-repair/prviewPdf.php index 91adc475..82d476b0 100644 --- a/wms/contract-repair/prviewPdf.php +++ b/wms/contract-repair/prviewPdf.php @@ -509,7 +509,7 @@ if ($_POST['list']) { -  臺北市中山區敬業一路128巷39號3樓之1 +  桃園市觀音區崙坪村8鄰140號

 

diff --git a/wms/contract/prviewPdf.php b/wms/contract/prviewPdf.php index 1d311b0a..3ee604cb 100644 --- a/wms/contract/prviewPdf.php +++ b/wms/contract/prviewPdf.php @@ -495,7 +495,7 @@ if($_POST['list']){ -  臺北市中山區敬業一路128巷39號3樓之1 +  桃園市觀音區崙坪村8鄰140號

 

diff --git a/wms/fun_global.php b/wms/fun_global.php index cd4271b2..d9f9e98d 100644 --- a/wms/fun_global.php +++ b/wms/fun_global.php @@ -102,7 +102,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0) // 若為第一層且使用者ID為區經理,直接訂好接下來的簽核人員並跳出。 if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) { $ret[1] = $user_id . ",,"; - $ret[2] = "M0107,,<##>M0175,,"; // 業務部專員:M0175陳君敏、M0107許紓晴(第2關有多位審核人) + // $ret[2] = "M0107,,<##>M0175,,"; // 業務部專員:M0175陳君敏、M0107許紓晴(第2關有多位審核人) $ret[3] = "M0060,,"; // 業務協理 if ($rate < 80 || $special_fee > 0) { $ret[4] = "M0006,,"; // 總經理 @@ -123,7 +123,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0) } } else { - $ret[2] = "M0107,,<##>M0175,,"; // 業務部專員:M0175陳君敏、M0107許紓晴(第2關有多位審核人) + // $ret[2] = "M0107,,<##>M0175,,"; // 業務部專員:M0175陳君敏、M0107許紓晴(第2關有多位審核人) $ret[3] = "M0060,,"; // 業務協理 if ($rate < 80 || $special_fee > 0) { $ret[4] = "M0006,,"; // 總經理 diff --git a/wms/mkt/assets/js/alpine.js b/wms/mkt/assets/js/alpine.js index 85f3c5a4..05a190ee 100644 --- a/wms/mkt/assets/js/alpine.js +++ b/wms/mkt/assets/js/alpine.js @@ -84,7 +84,7 @@ const priceOptionIndex = () => { if (item.spec == null) item.spec = '' if (item.memo == null) item.memo = '' 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)) this.dataLangth = this.options.length @@ -165,7 +165,7 @@ const priceOptionSelect = () => { if (item.spec == null) item.spec = '' if (item.memo == null) item.memo = '' 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)) this.dataLangth = this.options.length } else { @@ -304,7 +304,7 @@ const pricereviewOptionSelect = () => { if(option.memo == null) option.memo = '' if(option.price == null) option.price = 0 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" }else{ option.status = "N" diff --git a/wms/mkt/price_option-index.php b/wms/mkt/price_option-index.php index ecf0afa6..e133f221 100644 --- a/wms/mkt/price_option-index.php +++ b/wms/mkt/price_option-index.php @@ -74,7 +74,7 @@ $optional_arr = [1 => '標', 2 => '選']; 配置 單位 定價 - + MI @@ -96,7 +96,7 @@ $optional_arr = [1 => '標', 2 => '選']; - + diff --git a/wms/mkt/price_option-select.php b/wms/mkt/price_option-select.php index a352c5ea..ed48efb2 100644 --- a/wms/mkt/price_option-select.php +++ b/wms/mkt/price_option-select.php @@ -58,7 +58,7 @@ $optional_arr = [1 => '標配', 2 => '選配',3=>'加價']; 配置 單位 定價 - + MI @@ -80,7 +80,7 @@ $optional_arr = [1 => '標配', 2 => '選配',3=>'加價']; - + diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php index 64db1e44..18aa89e3 100644 --- a/wms/mkt/pricereview-check.php +++ b/wms/mkt/pricereview-check.php @@ -662,7 +662,7 @@ foreach ($res as $data) { ?> - + "> "> "> "> diff --git a/wms/mkt/pricereview-create.php b/wms/mkt/pricereview-create.php index ae64948b..cc95eadf 100644 --- a/wms/mkt/pricereview-create.php +++ b/wms/mkt/pricereview-create.php @@ -2556,12 +2556,13 @@ include "../footer.php"; // 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(pobj.find('td').eq(0).html()); - jobj.html(pobj.find('td').eq(1).html() + " " + pobj.find('td').eq(2).html() + '
(' + pobj.find('td').eq(3).html() + ')'); + let sepc = pobj.find('td').eq(2).html() + '
(' + 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_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()); $("#optionModal").modal('hide'); - } function checkSubmit(){ const price_total = document.getElementById('price_total')