diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php index 214f8984..ebffa59f 100644 --- a/wms/mkt/pricereview-check.php +++ b/wms/mkt/pricereview-check.php @@ -246,7 +246,8 @@ foreach ($res as $data) { mysqli_free_result($res_p); - function getMI($id){ + function getMI($id) + { $specarr = []; $elno = []; require_once("./conn.php"); @@ -255,34 +256,33 @@ foreach ($res as $data) { $stmt->bindParam(':id', $id); $stmt->execute(); $price_items = $stmt->fetchAll(PDO::FETCH_ASSOC); - foreach($price_items as $item){ - if($item['item_group'] == "A"){ + foreach ($price_items as $item) { + if ($item['item_group'] == "A") { $openfn = trim(explode("-", $item['item_spec'])[2]); $openname = ""; $speed = ""; - if(str_contains($openfn, "2U")){ + if (str_contains($openfn, "2U")) { $speed = str_replace("2U", "", $openfn); $openname = "2U"; - }elseif(str_contains($openfn, "4PCO")){ - $speed = str_replace("4PCO","", $openfn); + } elseif (str_contains($openfn, "4PCO")) { + $speed = str_replace("4PCO", "", $openfn); $openname = "4PCO"; - }elseif(str_contains($openfn, "6PCO")){ - $speed = str_replace("6PCO","", $openfn); + } elseif (str_contains($openfn, "6PCO")) { + $speed = str_replace("6PCO", "", $openfn); $openname = "6PCO"; - }elseif(str_contains($openfn, "2S")){ - $speed = str_replace("2S","", $openfn); + } elseif (str_contains($openfn, "2S")) { + $speed = str_replace("2S", "", $openfn); $openname = "2S"; - }elseif(str_contains($openfn, "CO")){ - $speed = str_replace("CO","", $openfn); + } elseif (str_contains($openfn, "CO")) { + $speed = str_replace("CO", "", $openfn); $openname = "CO"; - }else{ - + } else { } - + // specarr[] = [trim(explode("-", $item['item_spec'])[0]), explode("*", explode("-", $item['item_spec'])[1])[1]]; $specarr[] = [trim(explode("-", $item['item_spec'])[0]), explode("*", trim(explode("-", $item['item_spec'])[1]))[0], explode("*", trim(explode("-", $item['item_spec'])[1]))[1], $openname, $speed, $item['item_weight']]; - - $elno[] = trim("'".explode("-", $item['item_spec'])[0]. "'"); + + $elno[] = trim("'" . explode("-", $item['item_spec'])[0] . "'"); } } $quotation_no = "Q2401002"; @@ -295,15 +295,14 @@ foreach ($res as $data) { $el_options = []; - foreach($output_el_options as $el){ - foreach($specarr as $spec){ - if($el['min_weight'] == $spec['5'] && $el['min_speed'] == $spec['4']){ + foreach ($output_el_options as $el) { + foreach ($specarr as $spec) { + if ($el['min_weight'] == $spec['5'] && $el['min_speed'] == $spec['4']) { $el_options[] = $el; } } } - - } + } getMI($id); ?> @@ -367,7 +366,11 @@ foreach ($res as $data) { mihtml += "
  • " + data.content[k][18][m][0] + ":" + commafy(data.content[k][18][m][1]) + "
  • "; }); mihtml += "
  • " + data.content[k][19][0] + ":" + commafy(data.content[k][19][1]) + "
  • "; - mihtml += "以上合計:" + commafy(data.content[k][13]) + "
    "; + // 總價 + 服務費 + let total = data.content[k][13] + data.content[k][19][1]; + mihtml += "以上合計:" + commafy(total) + + "
    "; + // console.log(data.content[k][13] + data.content[k][19][1]) $("#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); }); diff --git a/wms/mkt/pricereview-create.php b/wms/mkt/pricereview-create.php index 79fdffdd..9ba49511 100644 --- a/wms/mkt/pricereview-create.php +++ b/wms/mkt/pricereview-create.php @@ -756,10 +756,10 @@ $option_str .= ""; var pobj = $(this).closest('td').parent(); // 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()); + console.log(pobj.find('td').eq(6).html()); jobj.html(pobj.find('td').eq(0).html() + ' ' + pobj.find('td').eq(1).html() + '
    (' + pobj.find('td').eq(2).html() + ')'); - jobj.closest('td').parent().find('input[name=option_unit_price]').val(pobj.find('td').eq(5).html()); - jobj.closest('td').parent().find('input[name=option_price_bp]').val(commafy(pobj.find('td').eq(5).html().replace(/[,]+/g, "") * jobj.closest('td').parent().find('input[name=option_qty]').val().replace(/[,]+/g, ""))); + 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'); @@ -1974,6 +1974,9 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){ '; + print_r($v["option_price"]); + echo ''; ?>