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

commit

gary
IA2301\IA_2301 1 year ago
parent
0bfcbca425
commit
b5b1cca104
13 changed files with 146 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      wms/facility-index.php
  2. 2
      wms/fnh/faultreview-index.php
  3. 2
      wms/schedule-index.php
  4. 40
      wms/wipwhole-index-export-excel.php
  5. 6
      wms/wipwhole-index-function.php
  6. 5
      wms/wipwhole-index.php
  7. 32
      wms/wipwhole-rec-invoice-edit.php
  8. 43
      wms/wipwhole-renovate-index-export-excel.php
  9. 4
      wms/wipwhole-renovate-index-function.php
  10. 5
      wms/wipwhole-renovate-index.php
  11. 32
      wms/wipwhole-renovate-rec-invoice-edit.php
  12. 52
      wms/wipwholeinstall-index-table-html.php
  13. 71
      wms/wipwholeinstall-renovate-index-table-html.php

2
wms/facility-index.php
View File

@ -12,7 +12,7 @@ mysqli_free_result($res);
$data = array();
// sql語法存在變數中
$sql_cmd = sql_myself($user_id);
if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
if ($user_department_id == "501" || $user_id == "M0105"|| $user_id == "PT007"|| $user_id == "M0149") $sql_cmd = "";
$sql = "SELECT * FROM facility $sql_cmd ORDER BY id";
// 用mysqli_query方法執行(sql語法)將結果存在變數中

2
wms/fnh/faultreview-index.php
View File

@ -20,7 +20,7 @@ if (getAccounttype($link, $user_id) == "B") {
$facilitynos = getAllFacilitynos($link, $user_id);
} else if (in_array(accountidToDepartId($user_id), ['912', '220'])) {
$facilitynos = '';
} else if (in_array($user_id, ['M0061', 'M0112', 'C0004', 'M0154'])) {
} else if (in_array($user_id, ['M0061', 'M0112', 'C0004', 'M0154', 'M0149', 'PT007'])) {
$facilitynos = '';
} else {
$facilitynos = "'NA'";

2
wms/schedule-index.php
View File

@ -25,7 +25,7 @@ $data = array();
$page_close = 0;
$sql_cmd2 = "";
$sql_cmd = sql_myself($user_id, "repairerid");
if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105") $sql_cmd = "";
if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105"|| $user_id == "PT007"|| $user_id == "M0149") $sql_cmd = "";
if (in_array($user_department_id . $user_role_id, $dr_arr)) $sql_cmd = "";
//if (empty($sql_cmd)) $sql_cmd = "where ";
if (!empty($_GET["contractno"])) $sql_cmd2 .= "and contractno = '" . $_GET["contractno"] . "' ";

40
wms/wipwhole-index-export-excel.php
View File

@ -18,7 +18,7 @@ use PhpOffice\PhpSpreadsheet\Style\Fill;
function getArea($address)
{
$address = mb_substr($address, 0, 2);
if (in_array($address, ['宜蘭', '花蓮', '台東']))
if (in_array($address, ['宜蘭', '花蓮']))
return '宜花東';
if (in_array($address, ['臺北', '台北', '基隆', '新北']))
return '北區';
@ -26,7 +26,7 @@ function getArea($address)
return '桃竹';
if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
return '中區';
if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄', '台東']))
return '南區';
}
if ($_SERVER["REQUEST_METHOD"] == "POST") {
@ -106,10 +106,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
'設計主管確認',
'設計主管確認日期',
'工務確認',
'樓高通報',
'樓高通報日期',
'工勘確認',
'工勘確認日期',
// '樓高通報',
// '樓高通報日期',
'工地進度',
'工地進度確認日期',
'生管確認',
'是否齊備',
'是否齊備日期',
@ -158,8 +158,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// $caiwuok = 0;
// 工務統計已確認
if ($row['building_heigh_verify'] == 0)
$gongwuok += 1;
// if ($row['building_heigh_verify'] == 0)
// $gongwuok += 1;
// if ($row['site_survey_contact_verify'] == 0)
if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
$gongwuok += 1;
@ -281,10 +281,18 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// 設計 設計主管確認
$desin_leader_verify_status = !empty($status_arr[$row['desin_leader_verify']]) ? $status_arr[$row['desin_leader_verify']] : "";
// 工務 樓高通報確認
$dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
// 工務 工勘確認
// // 工務 樓高通報確認
// $dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
// // 工務 工勘確認
$site_survey_contact_verify_status = !empty($site_survey_status[$row['site_survey_contact_verify']]) ? $site_survey_status[$row['site_survey_contact_verify']] : "";
$site_survey_contact_verify_status = "";
if (!empty($site_survey_status[$row['site_survey_contact_verify']])) {
if ($site_survey_status[$row['site_survey_contact_verify']] !== $row['site_survey_contact_verify']) {
$site_survey_contact_verify_status = $row['site_survey_contact_verify'] . ":" . $site_survey_status[$row['site_survey_contact_verify']];
} else {
$site_survey_contact_verify_status = $row['site_survey_contact_verify'];
}
}
// 生管 是否齊備確認
$shengguanok_status = !empty($status_arr[$row['shengguanok_status']]) ? $status_arr[$row['shengguanok_status']] : "";
@ -332,9 +340,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
$desin_leader_verify_status,
substr($row['desin_leader_verify_at'], 0, 10),
// getGunwuName($row['address']) . $gongwuok . "/2",
accountidToName($row['warehouseid']) . $gongwuok . "/2",
$dbuilding_heigh_verify_status,
substr($row['building_heigh_verify_at'], 0, 10),
accountidToName($row['warehouseid']) . $gongwuok . "/1",
// $dbuilding_heigh_verify_status,
// substr($row['building_heigh_verify_at'], 0, 10),
$site_survey_contact_verify_status,
substr($row['site_survey_contact_verify_at'], 0, 10),
'許伃廷 ' . $shengguanok . "/7",
@ -385,13 +393,13 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
->getStartColor()->setRGB('FFBB66');
// 背景顏色為綠色
$styleA1toC1 = $sheet->getStyle('AJ1:AN1');
$styleA1toC1 = $sheet->getStyle('AJ1:AL1');
$fillA1toC1 = $styleA1toC1->getFill();
$fillA1toC1->setFillType(Fill::FILL_SOLID)
->getStartColor()->setRGB('DDFF77');
// 背景顏色為橘色
$styleA1toC1 = $sheet->getStyle('AO1:BC1');
$styleA1toC1 = $sheet->getStyle('AM1:BA1');
$fillA1toC1 = $styleA1toC1->getFill();
$fillA1toC1->setFillType(Fill::FILL_SOLID)
->getStartColor()->setRGB('FFCCCC');

6
wms/wipwhole-index-function.php
View File

@ -32,11 +32,11 @@ function getWipwholeSearchSql()
{
$area = [
'Y' => " '宜蘭','花蓮','台東' ",
'Y' => " '宜蘭','花蓮' ",
'N' => " '臺北', '台北', '基隆', '新北' ",
'T' => " '桃園', '新竹' ",
'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
'K' => " '台南', '臺南', '嘉義', '屏東', '高雄','台東' "
];
$contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
@ -982,7 +982,7 @@ function getYewuStatus($link, $user_department_id, $role_id)
// 取得工務的欄位權限
function getWarehouseStatus($link, $user_department_id, $role_id, $status)
{
if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912,220])) {
if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912, 220])) {
// if (getSaveEstimateInstallData($user_department_id, $role_id)) {
if ($status == 1) {
return checkNowFormGStatus($link) == 'G' ? "" : "disabled";

5
wms/wipwhole-index.php
View File

@ -175,10 +175,11 @@ $data = mysqli_query($link, $sql);
<?php
echo "<option value=''>全部</option>";
foreach ($site_survey_status as $key => $val) {
$key_tmp = $key == $val ? '' : $key . ":";
if ((string)$site_survey_contact_verify == (string)$key) {
echo "<option value='$key' selected>$val</option>";
echo "<option value='$key' selected >$key_tmp" . "$val</option>";
} else {
echo "<option value='$key'>$val</option>";
echo "<option value='$key' >$key_tmp" . "$val</option>";
}
}
?>

32
wms/wipwhole-rec-invoice-edit.php
View File

@ -542,7 +542,7 @@ if (!empty($row['official_check_file']))
</tr>
<tr class="official_check_tr">
<td colspan="8" style="vertical-align: middle">官檢資料上傳
<a href="./pdf/【範本】營業提供官檢資料.pdf" style='color:#00F;' download>範例下載</a>
<a href="./pdf/【範本】營業提供官檢資料.pdf" style='color:#00F;' download>範例下載</a>
</td>
</tr>
<tr class="official_check_tr">
@ -1054,12 +1054,13 @@ if (!empty($row['official_check_file']))
<input type="hidden" name="old_warehouseid" id="old_warehouseid" value="<?= $row["warehouseid"]; ?>">
<?php
// 北區
if (in_array($row['warehouseid'], ['M0041', 'M0150'])) {
if (in_array($row['warehouseid'], ['M0041', 'M0150', 'M0277'])) {
?>
<select name="warehouseid" id="warehouseid" <?= $warehouse; ?>>
<option value="">請選擇</option>
<option value="M0041" <?php if ($row["warehouseid"] == "M0041") echo " selected"; ?>>張潘榮</option>
<option value="M0150" <?php if ($row["warehouseid"] == "M0150") echo " selected"; ?>>羅盛騰</option>
<option value="M0277" <?php if ($row["warehouseid"] == "M0277") echo " selected"; ?>>陳彥翔</option>
</select>
<?php
}
@ -1078,13 +1079,14 @@ if (!empty($row['official_check_file']))
?>
<?php
// 南區
if (in_array($row['warehouseid'], ['M0078', 'M0102', 'M0187'])) {
if (in_array($row['warehouseid'], ['M0078', 'M0102', 'M0187', 'M0265'])) {
?>
<select name="warehouseid" id="warehouseid" <?= $warehouse; ?>>
<option value="">請選擇</option>
<option value="M0078" <?php if ($row["warehouseid"] == "M0078") echo " selected"; ?>>許益連</option>
<option value="M0102" <?php if ($row["warehouseid"] == "M0102") echo " selected"; ?>>鄭存邑</option>
<option value="M0187" <?php if ($row["warehouseid"] == "M0187") echo " selected"; ?>>田祖豪</option>
<option value="M0265" <?php if ($row["warehouseid"] == "M0265") echo " selected"; ?>>林耀宗</option>
</select>
<?php
}
@ -1102,16 +1104,18 @@ if (!empty($row['official_check_file']))
?>
<?php
// 南區
if (!in_array($row['warehouseid'], ['M0041', 'M0150', 'M0078', 'M0102', 'M0187', 'M0198', 'M0087', 'M0158'])) {
if (!in_array($row['warehouseid'], ['M0041', 'M0150', 'M0078', 'M0102', 'M0187', 'M0198', 'M0087', 'M0158', 'M0277', 'M0265'])) {
?>
<select name="warehouseid" id="warehouseid" <?= $warehouse; ?>>
<option value="">請選擇</option>
<option value="M0041" <?php if ($row["warehouseid"] == "M0041") echo " selected"; ?>>張潘榮</option>
<option value="M0150" <?php if ($row["warehouseid"] == "M0150") echo " selected"; ?>>羅盛騰</option>
<option value="M0277" <?php if ($row["warehouseid"] == "M0277") echo " selected"; ?>>陳彥翔</option>
<option value="M0078" <?php if ($row["warehouseid"] == "M0078") echo " selected"; ?>>許益連</option>
<option value="M0102" <?php if ($row["warehouseid"] == "M0102") echo " selected"; ?>>鄭存邑</option>
<option value="M0198" <?php if ($row["warehouseid"] == "M0198") echo " selected"; ?>>廖堉勝</option>
<option value="M0187" <?php if ($row["warehouseid"] == "M0187") echo " selected"; ?>>田祖豪</option>
<option value="M0265" <?php if ($row["warehouseid"] == "M0265") echo " selected"; ?>>林耀宗</option>
<option value="M0087" <?php if ($row["warehouseid"] == "M0087") echo " selected"; ?>>高培軒</option>
<option value="M0158" <?php if ($row["warehouseid"] == "M0158") echo " selected"; ?>>劉子睿</option>
</select>
@ -1120,7 +1124,7 @@ if (!empty($row['official_check_file']))
?>
</td>
</tr>
<tr>
<!-- <tr>
<td style="vertical-align: middle">樓高通報</td>
<td>
<select class="disabled_select" name="building_heigh_verify" id="building_heigh_verify" <?= $warehouse2; ?>>
@ -1146,9 +1150,9 @@ if (!empty($row['official_check_file']))
<?php echo getSelectOptionHtml($all_users_options, $row['building_heigh_verify_owner']); ?>
</select>
</td>
</tr>
</tr> -->
<tr>
<td style="vertical-align: middle">工勘確認</td>
<td style="vertical-align: middle">工地進度</td>
<td>
<?php
$site_survey_status = array(
@ -1183,10 +1187,12 @@ if (!empty($row['official_check_file']))
<select class="disabled_select" name="site_survey_contact_verify" id="site_survey_contact_verify" <?= $warehouse2; ?>>
<?php
foreach ($site_survey_status as $key => $val) {
$thisDisabled = $key == '0' ? 'disabled' : '';
$key_tmp = $key == $val ? '' : $key . ":";
if ($row["site_survey_contact_verify"] == $key) {
echo "<option value='$key' selected>$val</option>";
echo "<option value='$key' selected $thisDisabled>$key_tmp" . "$val</option>";
} else {
echo "<option value='$key'>$val</option>";
echo "<option value='$key' $thisDisabled>$key_tmp" . "$val</option>";
}
}
?>
@ -1812,7 +1818,7 @@ if (!empty($row['official_check_file']))
<?php
if ($user_id == 'M0193') {
?>
<tr>
<!-- <tr>
<td style="vertical-align: middle">QC及官檢類型</td>
<td>
<input type='radio' id="qc_official_type_Q2" name='qc_official_type2' value='Q' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'Q' ? "checked" : ""; ?> />
@ -1822,7 +1828,7 @@ if (!empty($row['official_check_file']))
<input type='radio' id="qc_official_type_QO2" name='qc_official_type2' value='QO' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'QO' ? "checked" : ""; ?> />
<label for='qc_official_type_QO2'>QC+官檢</label>
</td>
</tr>
</tr> -->
<tr>
<td style="vertical-align: middle">內部QC日</td>
<td style="vertical-align: middle">
@ -2166,7 +2172,7 @@ if (!empty($row['official_check_file']))
</td>
</tr>
<tr>
<td style="vertical-align: middle;">完工驗收單附件</td>
<td style="vertical-align: middle;">安裝完工驗收單</td>
<td colspan="5" style="vertical-align: middle;">
<input style="width:70%;display:inline;" type="file" name="completion_acceptance_file" <?= $warehouse2; ?>>
<?php
@ -2175,7 +2181,7 @@ if (!empty($row['official_check_file']))
</td>
</tr>
<tr>
<td style="vertical-align: middle;">移交日附件(核准函)</td>
<td style="vertical-align: middle;">移交日附件</td>
<td colspan='3' style="vertical-align: middle;">
<input type="hidden" name="old_delivery_date_file" value="<?php echo $row['delivery_date_file']; ?>">
<input style="width:70%;display:inline;" type="file" id="delivery_date_file2" name="delivery_date_file2" <?= $warehouse2; ?>>

43
wms/wipwhole-renovate-index-export-excel.php
View File

@ -17,7 +17,7 @@ use PhpOffice\PhpSpreadsheet\Style\Fill;
function getArea($address)
{
$address = mb_substr($address, 0, 2);
if (in_array($address, ['宜蘭', '花蓮', '台東']))
if (in_array($address, ['宜蘭', '花蓮']))
return '宜花東';
if (in_array($address, ['臺北', '台北', '基隆', '新北']))
return '北區';
@ -25,7 +25,7 @@ function getArea($address)
return '桃竹';
if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
return '中區';
if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄', '台東']))
return '南區';
}
if ($_SERVER["REQUEST_METHOD"] == "POST") {
@ -83,10 +83,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
'實際到廠日(觀音廠)',
'預計出貨日(到工地)',
'工務確認',
'樓高通報',
'樓高通報日期',
'工勘確認',
'工勘確認日期',
// '樓高通報',
// '樓高通報日期',
'工地進度',
'工地進度確認日期',
'營業/契約確認',
'營業/契約規格',
'營業/契約規格日期',
@ -157,8 +157,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// $caiwuok = 0;
// 工務統計已確認
if ($row['building_heigh_verify'] == 0)
$gongwuok += 1;
// if ($row['building_heigh_verify'] == 0)
// $gongwuok += 1;
if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
$gongwuok += 1;
@ -278,11 +278,18 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// 設計 設計主管確認
$desin_leader_verify_status = !empty($status_arr[$row['desin_leader_verify']]) ? $status_arr[$row['desin_leader_verify']] : "";
// 工務 樓高通報確認
$dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
// // 工務 樓高通報確認
// $dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
// 工務 工勘確認
$site_survey_contact_verify_status = !empty($site_survey_status[$row['site_survey_contact_verify']]) ? $site_survey_status[$row['site_survey_contact_verify']] : "";
$site_survey_contact_verify_status = "";
if(!empty($site_survey_status[$row['site_survey_contact_verify']])){
if($site_survey_status[$row['site_survey_contact_verify']] !== $row['site_survey_contact_verify']){
$site_survey_contact_verify_status = $row['site_survey_contact_verify'] . ":" . $site_survey_status[$row['site_survey_contact_verify']];
}else{
$site_survey_contact_verify_status = $row['site_survey_contact_verify'];
}
}
// 生管 是否齊備確認
$shengguanok_status = !empty($status_arr[$row['shengguanok_status']]) ? $status_arr[$row['shengguanok_status']] : "";
@ -309,9 +316,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
substr($row['actual_tofactory_date'], 0, 10),
substr($row['real_contract_arrival_date'], 0, 10),
// getGunwuName($row['address']) . $gongwuok . "/2",
accountidToName($row['warehouseid']) . $gongwuok . "/2",
$dbuilding_heigh_verify_status,
substr($row['building_heigh_verify_at'], 0, 10),
accountidToName($row['warehouseid']) . $gongwuok . "/1",
// $dbuilding_heigh_verify_status,
// substr($row['building_heigh_verify_at'], 0, 10),
$site_survey_contact_verify_status,
substr($row['site_survey_contact_verify_at'], 0, 10),
accountidToName($row['salesid']) . " " . $yingyeok . "/5",
@ -371,25 +378,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
->getStartColor()->setRGB('8EA9DB');
// 背景顏色為橘色
$styleA1toC1 = $sheet->getStyle('O1:S1');
$styleA1toC1 = $sheet->getStyle('O1:Q1');
$fillA1toC1 = $styleA1toC1->getFill();
$fillA1toC1->setFillType(Fill::FILL_SOLID)
->getStartColor()->setRGB('FFBB66');
// 背景顏色為綠色
$styleA1toC1 = $sheet->getStyle('T1:AD1');
$styleA1toC1 = $sheet->getStyle('R1:AB1');
$fillA1toC1 = $styleA1toC1->getFill();
$fillA1toC1->setFillType(Fill::FILL_SOLID)
->getStartColor()->setRGB('DDFF77');
// 背景顏色為藍色
$styleA1toC1 = $sheet->getStyle('AE1:AO1');
$styleA1toC1 = $sheet->getStyle('AC1:AM1');
$fillA1toC1 = $styleA1toC1->getFill();
$fillA1toC1->setFillType(Fill::FILL_SOLID)
->getStartColor()->setRGB('BBFFEE');
// 背景顏色為橘色
$styleA1toC1 = $sheet->getStyle('AP1:BE1');
$styleA1toC1 = $sheet->getStyle('AN1:BB1');
$fillA1toC1 = $styleA1toC1->getFill();
$fillA1toC1->setFillType(Fill::FILL_SOLID)
->getStartColor()->setRGB('FFCCCC');

4
wms/wipwhole-renovate-index-function.php
View File

@ -282,11 +282,11 @@ function getWipwholeSearchSql()
{
$area = [
'Y' => " '宜蘭','花蓮','台東' ",
'Y' => " '宜蘭','花蓮' ",
'N' => " '臺北', '台北', '基隆', '新北' ",
'T' => " '桃園', '新竹' ",
'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
'K' => " '台南', '臺南', '嘉義', '屏東', '高雄','台東' "
];
$contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);

5
wms/wipwhole-renovate-index.php
View File

@ -172,10 +172,11 @@ $data = mysqli_query($link, $sql);
<?php
echo "<option value=''>全部</option>";
foreach ($site_survey_status as $key => $val) {
$key_tmp = $key == $val ? '' : $key . ":";
if ((string)$site_survey_contact_verify == (string)$key) {
echo "<option value='$key' selected>$val</option>";
echo "<option value='$key' selected >$key_tmp" . "$val</option>";
} else {
echo "<option value='$key'>$val</option>";
echo "<option value='$key' >$key_tmp" . "$val</option>";
}
}
?>

32
wms/wipwhole-renovate-rec-invoice-edit.php
View File

@ -332,13 +332,14 @@ if (!empty($row['official_check_file']))
<input type="hidden" name="old_warehouseid" id="old_warehouseid" value="<?= $row["warehouseid"]; ?>">
<?php
// 北區
if (in_array($row['warehouseid'], ['M0040', 'M0041', 'M0150'])) {
if (in_array($row['warehouseid'], ['M0040', 'M0041', 'M0150', 'M0277'])) {
?>
<select name="warehouseid" id="warehouseid" <?= $warehouse; ?>>
<option value="">請選擇</option>
<option value="M0040" <?php if ($row["warehouseid"] == "M0040") echo " selected"; ?>>吳宗紘</option>
<option value="M0041" <?php if ($row["warehouseid"] == "M0041") echo " selected"; ?>>張潘榮</option>
<option value="M0150" <?php if ($row["warehouseid"] == "M0150") echo " selected"; ?>>羅盛騰</option>
<option value="M0277" <?php if ($row["warehouseid"] == "M0277") echo " selected"; ?>>陳彥翔</option>
</select>
<?php
}
@ -357,13 +358,14 @@ if (!empty($row['official_check_file']))
?>
<?php
// 南區
if (in_array($row['warehouseid'], ['M0078', 'M0102', 'M0187'])) {
if (in_array($row['warehouseid'], ['M0078', 'M0102', 'M0187', 'M0265'])) {
?>
<select name="warehouseid" id="warehouseid" <?= $warehouse; ?>>
<option value="">請選擇</option>
<option value="M0078" <?php if ($row["warehouseid"] == "M0078") echo " selected"; ?>>許益連</option>
<option value="M0102" <?php if ($row["warehouseid"] == "M0102") echo " selected"; ?>>鄭存邑</option>
<option value="M0187" <?php if ($row["warehouseid"] == "M0187") echo " selected"; ?>>田祖豪</option>
<option value="M0265" <?php if ($row["warehouseid"] == "M0265") echo " selected"; ?>>林耀宗</option>
</select>
<?php
}
@ -380,18 +382,20 @@ if (!empty($row['official_check_file']))
}
?>
<?php
// 南區
if (!in_array($row['warehouseid'], ['M0040','M0041', 'M0150', 'M0078', 'M0102', 'M0187', 'M0198', 'M0087', 'M0158'])) {
// 全區
if (!in_array($row['warehouseid'], ['M0040', 'M0041', 'M0150', 'M0078', 'M0102', 'M0187', 'M0198', 'M0087', 'M0158', 'M0277', 'M0265'])) {
?>
<select name="warehouseid" id="warehouseid" <?= $warehouse; ?>>
<option value="">請選擇</option>
<option value="M0040" <?php if ($row["warehouseid"] == "M0040") echo " selected"; ?>>吳宗紘</option>
<option value="M0041" <?php if ($row["warehouseid"] == "M0041") echo " selected"; ?>>張潘榮</option>
<option value="M0150" <?php if ($row["warehouseid"] == "M0150") echo " selected"; ?>>羅盛騰</option>
<option value="M0277" <?php if ($row["warehouseid"] == "M0277") echo " selected"; ?>>陳彥翔</option>
<option value="M0078" <?php if ($row["warehouseid"] == "M0078") echo " selected"; ?>>許益連</option>
<option value="M0102" <?php if ($row["warehouseid"] == "M0102") echo " selected"; ?>>鄭存邑</option>
<option value="M0198" <?php if ($row["warehouseid"] == "M0198") echo " selected"; ?>>廖堉勝</option>
<option value="M0187" <?php if ($row["warehouseid"] == "M0187") echo " selected"; ?>>田祖豪</option>
<option value="M0265" <?php if ($row["warehouseid"] == "M0265") echo " selected"; ?>>林耀宗</option>
<option value="M0087" <?php if ($row["warehouseid"] == "M0087") echo " selected"; ?>>高培軒</option>
<option value="M0158" <?php if ($row["warehouseid"] == "M0158") echo " selected"; ?>>劉子睿</option>
</select>
@ -400,7 +404,7 @@ if (!empty($row['official_check_file']))
?>
</td>
</tr>
<tr>
<!-- <tr>
<td style="vertical-align: middle">樓高通報</td>
<td>
<select class="disabled_select" name="building_heigh_verify" id="building_heigh_verify" <?= $warehouse; ?>>
@ -426,9 +430,9 @@ if (!empty($row['official_check_file']))
<?php echo getSelectOptionHtml($all_users_options, $row['building_heigh_verify_owner']); ?>
</select>
</td>
</tr>
</tr> -->
<tr>
<td style="vertical-align: middle">工勘確認</td>
<td style="vertical-align: middle">工地進度</td>
<td>
<?php
$site_survey_status = array(
@ -463,10 +467,12 @@ if (!empty($row['official_check_file']))
<select class="disabled_select" name="site_survey_contact_verify" id="site_survey_contact_verify" <?= $warehouse; ?>>
<?php
foreach ($site_survey_status as $key => $val) {
$thisDisabled = $key == '0' ? 'disabled' : '';
$key_tmp = $key == $val ? '' : $key . ":";
if ($row["site_survey_contact_verify"] == $key) {
echo "<option value='$key' selected>$val</option>";
echo "<option value='$key' selected $thisDisabled>$key_tmp" . "$val</option>";
} else {
echo "<option value='$key'>$val</option>";
echo "<option value='$key' $thisDisabled>$key_tmp" . "$val</option>";
}
}
?>
@ -1815,7 +1821,7 @@ if (!empty($row['official_check_file']))
<?php
if ($user_id == 'M0193') {
?>
<tr>
<!-- <tr>
<td style="vertical-align: middle">QC及官檢類型</td>
<td>
<input type='radio' id="qc_official_type_Q2" name='qc_official_type2' value='Q' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'Q' ? "checked" : ""; ?> />
@ -1825,7 +1831,7 @@ if (!empty($row['official_check_file']))
<input type='radio' id="qc_official_type_QO2" name='qc_official_type2' value='QO' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'QO' ? "checked" : ""; ?> />
<label for='qc_official_type_QO2'>QC+官檢</label>
</td>
</tr>
</tr> -->
<tr>
<td style="vertical-align: middle">內部QC日</td>
<td style="vertical-align: middle">
@ -2169,7 +2175,7 @@ if (!empty($row['official_check_file']))
</td>
</tr>
<tr>
<td style="vertical-align: middle;">完工驗收單附件</td>
<td style="vertical-align: middle;">安裝完工驗收單</td>
<td colspan="5" style="vertical-align: middle;">
<input style="width:70%;display:inline;" type="file" name="completion_acceptance_file" <?= $warehouse2; ?>>
<?php
@ -2178,7 +2184,7 @@ if (!empty($row['official_check_file']))
</td>
</tr>
<tr>
<td style="vertical-align: middle;">移交日附件(核准函)</td>
<td style="vertical-align: middle;">移交日附件</td>
<td colspan='3' style="vertical-align: middle;">
<input type="hidden" name="old_delivery_date_file" value="<?php echo $row['delivery_date_file']; ?>">
<input style="width:70%;display:inline;" type="file" id="delivery_date_file2" name="delivery_date_file2" <?= $warehouse2; ?>>

52
wms/wipwholeinstall-index-table-html.php
View File

@ -1,6 +1,7 @@
<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
<thead>
<tr>
<th style="vertical-align: middle;text-align:center;width:80px;">編輯</th>
<th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
<th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
<th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
@ -10,16 +11,16 @@
<th style="text-align:center;width:100px;">預計出貨日(到工地)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
<!-- <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th> -->
<th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
<!-- <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th> -->
<th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
<th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
<th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
<th style="vertical-align: middle;text-align:center;width:120px;">工勘人員</th>
</tr>
</thead>
<tbody>
@ -52,6 +53,19 @@
}
?>
</td> -->
<?php
if ($edit_flag & 4 && ($user_auth & 2)) {
?>
<td>
<p>
<a target='_blank' href="wipwhole-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</p>
</td>
<?php
}
?>
<td><?php echo $data['facilityno']; ?></td>
<td><?php echo $data['custom']; ?></td>
<td><?php echo $data['address']; ?></td>
@ -69,17 +83,6 @@
echo date("Y/m/d", strtotime(substr($data['real_contract_arrival_date'], 0, 10)));
?>
</td>
<?php
// foreach ($site_survey_status as $key => $val) {
// if ((string)$data['site_survey_contact_verify'] == (string)$key) {
// if (in_array($data['site_survey_contact_verify'], ['1', 'A'])) {
// echo "<td style='color:#F00;'>$val</td>";
// } else {
// echo "<td>$val</td>";
// }
// }
// }
?>
<td>
<?php
if (!empty($data['install_outsourcer']) && !empty($data['tryrun_outsourcer'])) {
@ -106,7 +109,7 @@
}
?>
</td>
<td>
<!-- <td>
<?php
if (!empty($data['estimate_install_start_date']) && !empty($data['estimate_tryrun_start_date'])) {
echo date("Y/m/d", strtotime($data['estimate_install_start_date']));
@ -118,7 +121,7 @@
echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
}
?>
</td>
</td> -->
<td>
<?php
if (!empty($data['install_start_date']) && !empty($data['tryrun_start_date'])) {
@ -132,7 +135,7 @@
}
?>
</td>
<td>
<!-- <td>
<?php
if (!empty($data['estimate_install_end_date']) && !empty($data['estimate_tryrun_end_date'])) {
echo date("Y/m/d", strtotime($data['estimate_install_end_date']));
@ -144,7 +147,7 @@
echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
}
?>
</td>
</td> -->
<td>
<?php
if (!empty($data['install_end_date']) && !empty($data['tryrun_end_date'])) {
@ -194,19 +197,8 @@
</td>
<td>
<?php
if ($edit_flag & 4 && ($user_auth & 2)) {
?>
<p>
<a target='_blank' href="wipwhole-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
<?php
echo accountidToName($data['warehouseid']);
?>
</a>
</p>
<?php
} else {
if (!empty($data['warehouseid']))
echo accountidToName($data['warehouseid']);
}
?>
</td>
</tr>

71
wms/wipwholeinstall-renovate-index-table-html.php
View File

@ -1,6 +1,7 @@
<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
<thead>
<tr>
<th style="vertical-align: middle;text-align:center;width:80px;">編輯</th>
<th style="vertical-align: middle;text-align:center;width:70px;"><span id="th_1">汰改<br />種類</span></th>
<th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
<th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
@ -11,24 +12,36 @@
<th style="text-align:center;width:100px;">預計出貨日(到工地)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
<!-- <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th> -->
<th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
<!-- <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th> -->
<th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
<th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
<th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
<th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
<th style="vertical-align: middle;text-align:center;width:120px;">工勘人員</th>
</tr>
</thead>
<tbody>
<?php
foreach ($dataDetailsArr as $key => $data) :
?>
<tr>
<?php
if ($edit_flag & 4 && ($user_auth & 2)) {
?>
<td>
<p>
<a target='_blank' href="wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</p>
</td>
<?php
}
?>
<td>
<?php
// 汰改 json 轉字串組合 ex M1+M2
@ -89,7 +102,7 @@
}
?>
</td>
<td>
<!-- <td>
<?php
if (!empty($data['estimate_install_start_date']) && !empty($data['estimate_tryrun_start_date'])) {
echo date("Y/m/d", strtotime($data['estimate_install_start_date']));
@ -101,7 +114,7 @@
echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
}
?>
</td>
</td> -->
<td>
<?php
if (!empty($data['install_start_date']) && !empty($data['tryrun_start_date'])) {
@ -115,7 +128,7 @@
}
?>
</td>
<td>
<!-- <td>
<?php
if (!empty($data['estimate_install_end_date']) && !empty($data['estimate_tryrun_end_date'])) {
echo date("Y/m/d", strtotime($data['estimate_install_end_date']));
@ -127,7 +140,7 @@
echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
}
?>
</td>
</td> -->
<td>
<?php
if (!empty($data['install_end_date']) && !empty($data['tryrun_end_date'])) {
@ -177,19 +190,8 @@
</td>
<td>
<?php
if ($edit_flag & 4 && ($user_auth & 2)) {
?>
<p>
<a target='_blank' href="wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
<?php
echo accountidToName($data['warehouseid']);
?>
</a>
</p>
<?php
} else {
if (!empty($data['warehouseid']))
echo accountidToName($data['warehouseid']);
}
?>
</td>
</tr>
@ -226,31 +228,4 @@
}, function() {
$("#subContentInsideDiv").hide();
});
</script>
<!-- <style>
#subContentDiv {
position: relative;
top: 0;
left: 0;
}
#subContentInsideDiv {
position: absolute;
top: 0;
left: 0;
width: 200px;
height: 100px;
border: 1px solid blue;
display: none;
z-index: 999;
background-color: #FFFFFF;
border: 5px solid #000;
border-radius: 15px;
}
</style> -->
<!-- <div id="subContentDiv">
<div id="subContentInsideDiv">
</div>
</div> -->
</script>
Write Preview
Loading…
Cancel
Save