Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs

wms/account-receivable-index.php

@@ -108,7 +108,6 @@ if ((in_array($user_id, array('M0060', 'M0175'))) || (in_array(accountidToDepart
     $sql_opening .= " OR person_id = '$user_id'";
     $sql .= " WHERE salesid = '$user_id'";
     $sql_contract_budget .= " AND (PersonId = '$user_id'";
-    $sql_contract_budget .= " AND (PersonId = '$user_id'";
     if (count($follower) > 0) {
         $column_str = "('$user_id'" . ",'";
         $column_str .= implode("','", $follower);
@@ -124,7 +123,6 @@ if ((in_array($user_id, array('M0060', 'M0175'))) || (in_array(accountidToDepart
         $sql_opening .= ")";
         $sql .= " ORDER BY contractno";
         $sql_contract_budget .= ")";
-        $sql_contract_budget .= ")";
     };
 }
 
@@ -219,7 +217,6 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['facilities'] = "";
         $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['sign_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
         $arrayData[$BillNo]['total_list'] = $arrayData[$BillNo]['sign_list'] = $arrayData[$BillNo]['second_list'] = $arrayData[$BillNo]['arrive_list'] = $arrayData[$BillNo]['install_list'] = $arrayData[$BillNo]['tryrun_list'] = $arrayData[$BillNo]['check_list'] = $arrayData[$BillNo]['delivery_list'] = $arrayData[$BillNo]['final_list'] = [];
-        $arrayData[$BillNo]['total_list'] = $arrayData[$BillNo]['sign_list'] = $arrayData[$BillNo]['second_list'] = $arrayData[$BillNo]['arrive_list'] = $arrayData[$BillNo]['install_list'] = $arrayData[$BillNo]['tryrun_list'] = $arrayData[$BillNo]['check_list'] = $arrayData[$BillNo]['delivery_list'] = $arrayData[$BillNo]['final_list'] = [];
     }
     if (stristr($PayStage, '二次款') || (stristr($PayStage, '出貨前') && $PayStage != "寶佳出貨前30天") || stristr($PayStage, '簽約後') || stristr($PayStage, '訂金支付後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60') || stristr($PayStage, '寶佳出貨後10天')) {
         $arrayData[$BillNo]['second'][0] = $PayStage;
@@ -410,7 +407,6 @@ foreach ($wipwhole_array as $wip) {
         if ($arrayData[$wip['contractno']]['sign'][0] == "寶佳出貨前30天") {
             $facility_status = "";
             array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
-            array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
             $today = strtotime(date('Ymd'));
             $contractday = strtotime($arrayData[$wip['contractno']]['sign'][2]);
             $month = collect_month($contractday);
@@ -419,7 +415,6 @@ foreach ($wipwhole_array as $wip) {
             if ($today > $contractday) {
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 $facility_status = $wip['facilityno'] . " (出貨前30天" . $arrayData[$wip['contractno']]['sign'][2] . "已過)  <br>";
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
                 //二次款
@@ -430,7 +425,6 @@ foreach ($wipwhole_array as $wip) {
                 if ($today > $contractday) {
                     $arrayData[$wip['contractno']]['second_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
-                    array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                     $facility_status = $wip['facilityno'] . " (出貨後10天" . $arrayData[$wip['contractno']]['second'][2] . "已過)  <br>";
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
                     //貨抵工地款
@@ -443,7 +437,6 @@ foreach ($wipwhole_array as $wip) {
                         if ($today > $contractday) {
                             $arrayData[$wip['contractno']]['arrive_num'] += 1;
                             array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
-                            array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                             $arrayData[$wip['contractno']]['arrive'][2] = strval(date('Y-m-d', $contractday));
                             $facility_status = $wip['facilityno'] . " (貨抵工地後90天" . $arrayData[$wip['contractno']]['arrive'][2] . "已過)  <br>";
                             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -457,7 +450,6 @@ foreach ($wipwhole_array as $wip) {
                                 if ($today > $contractday) {
                                     $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                                     array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
-                                    array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                                     $arrayData[$wip['contractno']]['tryrun'][2] = strval(date('Y-m-d', $contractday));
                                     $facility_status = $wip['facilityno'] . " (試車後90天" . $arrayData[$wip['contractno']]['tryrun'][2] . "已過)  <br>";
                                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -472,8 +464,6 @@ foreach ($wipwhole_array as $wip) {
                                             $arrayData[$wip['contractno']]['delivery_num'] += 1;
                                             array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                                             array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
-                                            array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
-                                            array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                                             $arrayData[$wip['contractno']]['delivery'][2] = strval(date('Y-m-d', $contractday));
                                             $facility_status = $wip['facilityno'] . " (交車後270天" . $arrayData[$wip['contractno']]['delivery'][2] . "已過)  <br>";
                                             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $facility_status;
@@ -492,7 +482,6 @@ foreach ($wipwhole_array as $wip) {
         } else {
             $signtime = strtotime($arrayData[$wip['contractno']]['sign'][2]);
             array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
-            array_push($arrayData[$wip['contractno']]['total_list'], $wip['facilityno']);
             $month = collect_month($signtime);
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['sign'][6] = $month;
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['sign'][2] = strval(date('Ymd', $signtime));
@@ -507,19 +496,14 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
 
                 if ($arrayData[$wip['contractno']]['delivery'][0] == "交車後270天") {
                     $estimate_delivery_time = strtotime($wip['delivery_date']);
@@ -529,8 +513,6 @@ foreach ($wipwhole_array as $wip) {
                         $arrayData[$wip['contractno']]['delivery_num'] += 1;
                         array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                         array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
-                        array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
-                        array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                     }
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['delivery'][6] = $month;
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['delivery'][2] = strval(date('Ymd', $arrivetime));
@@ -542,11 +524,8 @@ foreach ($wipwhole_array as $wip) {
                     $arrayData[$wip['contractno']]['delivery_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
                     array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
-                    array_push($arrayData[$wip['contractno']]['delivery_list'], $wip['facilityno']);
-                    array_push($arrayData[$wip['contractno']]['final_list'], $wip['facilityno']);
                     $arrayData[$wip['contractno']]['check_num'] += 1;
                     array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
-                    array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
                     $arrayData[$wip['contractno']]['delivery'][2] = strval($wip['delivery_date']);
                     $deliverytime = strtotime($wip['delivery_date']);
                     $month = collect_month($deliverytime);
@@ -618,22 +597,16 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
                 $arrayData[$wip['contractno']]['check_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['check_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['tryrun_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['tryrun_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
                     array_push($arrayData[$wip['contractno']]['check']['min'], strtotime(strval($wip['official_check_date'])));
                     array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
@@ -774,16 +747,12 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
                 $arrayData[$wip['contractno']]['install_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['install_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
                     $installtime = strtotime($wip['install_end_date']);
                     $month = collect_month($installtime);
@@ -831,13 +800,10 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
                 $arrayData[$wip['contractno']]['arrive_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['arrive_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
 
                 if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
                     $estimate_delivery_time = strtotime($wip['real_arrival_date']);
@@ -867,14 +833,11 @@ foreach ($wipwhole_array as $wip) {
                 $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (已達二次款收款條件)  <br>";
                 $arrayData[$wip['contractno']]['second_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['second_list'], $wip['facilityno']);
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
             } else {
                 $arrayData[$wip['contractno']]['sign_num'] += 1;
                 array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
-                array_push($arrayData[$wip['contractno']]['sign_list'], $wip['facilityno']);
                 if ($wip['real_contract_arrival_date'] != NULL) {
                     $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
                     $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
@@ -913,30 +876,6 @@ foreach ($wipwhole_array as $wip) {
 //     }
 // }
 
-// foreach ($arrayData as $key => $value) {
-//     echo $key."<br>";
-//     print_r($value['total_list']);
-//     echo "   /  總   ";
-//     print_r($value['sign_list']);
-//     echo "    / 訂金  <br>";
-//     print_r($value['arrive_list']);
-//     echo "    / 貨抵  ";
-//     print_r($value['install_list']);
-//     echo "    / 安裝  <br>";
-//     print_r($value['tryrun_list']);
-//     echo "    / 試車  ";
-//     print_r($value['check_list']);
-//     echo "    / 官檢  <br>";
-//     print_r($value['delivery_list']);
-//     echo "    / 移交  ";
-//     print_r($value['final_list']);
-//     echo "   /  結案        <br>";
-//     echo "---------------------------<br>";
-//     foreach($value['sign_list'] as $fac){
-//         echo $fac."=========";
-//     }
-// }
-
 
 // 計算每個合約的應收款、作番總數
 $today_date = new DateTime(date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m-d')))));
@@ -961,25 +900,6 @@ foreach ($arrayData as &$value) {
         $value['final'][3] = $value['final'][1] * $final_ratio;
         $value['receivable_budget'] = $value['sign'][3] + $value['second'][3] + $value['arrive'][3] + $value['install'][3] + $value['tryrun'][3] + $value['check'][3] + $value['delivery'][3] + $value['final'][3];
     }
-    //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
-        $sign_ratio = get_ratio($value['sign_list'], $value[10], $contract_budget);
-        $value['sign'][3] = $value['sign'][1] * $sign_ratio;
-        $second_ratio = get_ratio($value['second_list'], $value[10], $contract_budget);
-        $value['second'][3] = $value['second'][1] * $second_ratio;
-        $arrive_ratio = get_ratio($value['arrive_list'], $value[10], $contract_budget);
-        $value['arrive'][3] = $value['arrive'][1] * $arrive_ratio;
-        $install_ratio = get_ratio($value['install_list'], $value[10], $contract_budget);
-        $value['install'][3] = $value['install'][1] * $install_ratio;
-        $tryrun_ratio = get_ratio($value['tryrun_list'], $value[10], $contract_budget);
-        $value['tryrun'][3] = $value['tryrun'][1] * $tryrun_ratio;
-        $check_ratio = get_ratio($value['check_list'], $value[10], $contract_budget);
-        $value['check'][3] = $value['check'][1] * $check_ratio;
-        $delivery_ratio = get_ratio($value['delivery_list'], $value[10], $contract_budget);
-        $value['delivery'][3] = $value['delivery'][1] * $delivery_ratio;
-        $final_ratio = get_ratio($value['final_list'], $value[10], $contract_budget);
-        $value['final'][3] = $value['final'][1] * $final_ratio;
-        $value['receivable_budget'] = $value['sign'][3] + $value['second'][3] + $value['arrive'][3] + $value['install'][3] + $value['tryrun'][3] + $value['check'][3] + $value['delivery'][3] + $value['final'][3];
-    }
     //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     // 計算每台作番金額與各階段應收金額
     if (isset($value['facility'])) {
@@ -1847,6 +1767,7 @@ foreach ($arrayData as $key => &$data) {
     }
 }
 
+
 //產生excel的array
 $excel_aray = array();
 $boga_array = array();
@@ -1919,7 +1840,6 @@ foreach ($arrayData as $key => $value) {
         number_format(round($value['A40001'])), number_format(round($value['A40008'])), number_format(round($value['total_budget'])), number_format(round($value['receivable_budget'])), number_format(round($value['invoice_budget'])), number_format(round($value['received_budget'])), $value['total_facility_num'], str_replace('<br>', ';     ', $value['facilities'])
     ];
 
-
     //['sign'] 0 款項名稱   1 簽約金額   2 簽約日期 3 應收金額  min 最早應收月份   max 最晚應收月份 
     //[合約號]['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     if (isset($value['facility'])) {
@@ -1979,7 +1899,6 @@ $average_A40001 = round($sum_A40001 / $sum_facility, 2);
 $average_A40008 = round($sum_A40008 / $sum_facility, 2);
 $average_budget = round($sum_total_budget / $sum_facility, 2);
 
-$total_data = json_encode($excel_aray);
 $total_data = json_encode($excel_aray);
 $boga_data = json_encode($boga_array);
 $exclude_boga_data = json_encode($exclude_boga_array);
@@ -2024,9 +1943,6 @@ $facility_exclude_boga_data = json_encode($facility_exclude_boga_array);
         margin-top: .5rem;
 
     }
-    .hiddenTable {
-        display: none;
-    }
 </style>
 
 <div style="width: 98%;margin: 1%;">
@@ -2042,7 +1958,6 @@ $facility_exclude_boga_data = json_encode($facility_exclude_boga_array);
         <button type="button" style="width: 12%;" onclick="downloadFacilityData('ExcludeData')" class="btn btn-info btn-md">不含寶佳作番收款明細<span class="glyphicon glyphicon-download-alt"></span></button>
         <button type="button" style="width: 12%;" onclick="downloadFacilityData('BogaData')" class="btn btn-warning btn-md">寶佳作番收款明細<span class="glyphicon glyphicon-download-alt"></span></button>
 
-
     </div>
 </div>
 
@@ -2237,13 +2152,11 @@ include "./footer.php";
         }
         xhr.send(JSON.stringify({
             Bill: <?= $total_data ?>
-            Bill: <?= $total_data ?>
         }));
 
     }
 
     function bogaData() {
-        console.log(<?= $boga_data ?>);
         var xhr = new XMLHttpRequest();
         var url = window.location.origin + "/wms/account-receivable-excel.php?type=boga&<?= $token_link ?>";
         xhr.open('POST', url, true);
@@ -2272,11 +2185,9 @@ include "./footer.php";
         if (content == 'AllData') {
             var BillData = <?= $facility_data ?>;
             var filename = "作番應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";
-        } else if (content == 'ExcludeData') {
         } else if (content == 'ExcludeData') {
             var BillData = <?= $facility_exclude_boga_data ?>;
             var filename = "不含寶佳作番應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";
-        } else if (content == 'BogaData') {
         } else if (content == 'BogaData') {
             var BillData = <?= $facility_boga_data ?>;
             var filename = "寶佳作番應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";

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");
@@ -276,7 +277,6 @@ foreach ($res as $data) {
                     $speed = str_replace("CO", "",  $openfn);
                     $openname = "CO";
                 } else {
-
                 }
 
                 // specarr[] = [trim(explode("-", $item['item_spec'])[0]), explode("*", explode("-", $item['item_spec'])[1])[1]];
@@ -320,7 +320,6 @@ foreach ($res as $data) {
         function getMI(id) {
             var formdata = new FormData();
             formdata.append('pa', id);
-            // formdata.append('user_id', <?= $user_id ?>);
             var xhr = new XMLHttpRequest();
             xhr.onreadystatechange = function() {
                 if (this.readyState == 4 && this.status == 200) {
@@ -330,13 +329,14 @@ foreach ($res as $data) {
                         //alert(data.err);
                         return false;
                     }
-                    console.log(data.content);
                     Object.keys(data.content).forEach(function(k) {
-                        console.log(k);
+                        console.log(data.content);
                         //console.log(data.content[k][0]);
                         // 有值表示先前已寫入MI
                         if ($("#tb1").find("input[name=mi_fix]").eq(k).val() == "") {
-                            $("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(data.content[k][0]));
+                            // console.log($("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(data.content[k][0])));
+                            let a = data.content[k][0] + data.content[k][19][1];
+                            $("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(a));
                         }
                         $("#tb1").find("input[name=mi_fix]").eq(k).keyup();
                         var mihtml = "";
@@ -367,8 +367,7 @@ foreach ($res as $data) {
                             mihtml += "<li>" + data.content[k][18][m][0]+ "：" + commafy(data.content[k][18][m][1]) + "</li>";
                         });
                         mihtml += "<li>" + data.content[k][19][0] + "：" + commafy(data.content[k][19][1]) + "</li>";
-                        mihtml += "以上合計：" + commafy(data.content[k][13]) + "<br />" ;
+                        mihtml += "以上合計：" + commafy(data.content[k][13]) + "<br>";
-                        mihtml = mihtml.replace("<br>", "").replace("&lt;br&gt;", "")
                         $("#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);
                     });
@@ -420,6 +419,8 @@ foreach ($res as $data) {
                 $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ","));
                 var mf = $(this).val().replace(/[,]+/g, "");
                 var ct = $(this).closest('td').parent().find('input[name=item_price_ct]').val().replace(/[,]+/g, "");
+                console.log(ct - mf);
+
                 $(this).closest('td').parent().find('input[name=gross_profit]').val(commafy(ct - mf));
                 if (ct == 0) $(this).closest('td').parent().find('input[name=gross_profit_rate]').val(0.0);
                 else $(this).closest('td').parent().find('input[name=gross_profit_rate]').val((((ct - mf) / ct) * 100).toFixed(1));
@@ -553,6 +554,7 @@ foreach ($res as $data) {
                         <?php
                         $item_amt_A_all = 0;
                         $idx = 1;
+                        print_r($item_arr);
                         foreach ($item_arr as $item_no => $val) {
                             echo $val["item_price_ct"];
                             echo "------";

wms/mkt/pricereview-create.php

@@ -1974,6 +1974,9 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
                         <?php
                         }
                     } else {
+                        echo '<pre>';
+                        print_r($v["option_price"]);
+                        echo '</pre>';
                         ?>
                         <tr name="option_templ">
                             <td name="option_seat">

wms/mkt/pricereview-index.php

@@ -330,7 +330,7 @@ if ($data) :
                                 }
                             }
                             ?>
-                            <a href="pricereview-check.php?id=<?php echo $data['id'] . "&" . $para; ?>" class="btn btn-warning btn-sm">檢視</a>
+                            <a href="pricereview-check.php?id=<?php echo $data['id'] . "&" . $para; ?>" target="_blank" class="btn btn-warning btn-sm">檢視</a>
                             <?php
                             if ($user_id == "M0023") {
                             ?>
@@ -352,7 +352,7 @@ if ($data) :
                                 if ($ss_arr["sign_st"] == 1 && in_array($user_id, $ss_arr["sign_nt"]) && $data["status"] == "YS" || $user_id == 'TEST04') {
                                     $str = "<span class=\"glyphicon glyphicon-user\"></span>";
                                     $str = "待簽核";
-                                    $str = "<a href=\"pricereview-check.php?st=1&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
+                                    $str = "<a href=\"pricereview-check.php?st=1&id=" . $data["id"] . "&" . $para . "\" target=\"_blank\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
                                 } else $str = "--";
                             }
                             echo $str;
@@ -409,7 +409,7 @@ if ($data) :
                                 if (($data["status"] == "YS") && ($ss_arr["sign_st"] == 2) && (in_array($user_id, $ss_arr["sign_nt"])) || $user_id == 'TEST02') {
                                     $str = "<span class=\"glyphicon glyphicon-user\"></span>";
                                     $str = "待簽核";
-                                    $str = "<a href=\"pricereview-check.php?st=2&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
+                                    $str = "<a href=\"pricereview-check.php?st=2&id=" . $data["id"] . "&" . $para . "\" target=\"_blank\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
                                 } else $str = "--";
                             }
                             echo $str;
@@ -544,7 +544,7 @@ if ($data) :
                                 <?php if (($user_id === "M0107" || $user_id === "M0060") && $data['applystatus'] < 3) : ?>
                                     <span style="font-size:13px;font-weight:600">待申請</span>
                                 <?php elseif ($data['applystatus'] < 3) : ?>
-                                    <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
+                                    <a class="applybtn" target="_blank" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
                                         <?php if ($data['applystatus'] < 1) {
                                             echo "申請";
                                         } else {