From b820452c06f537b7bcac312ef64c0c240e0d7d17 Mon Sep 17 00:00:00 2001 From: Cheng Date: Tue, 9 Jan 2024 14:51:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B0=BD=E6=A0=B8=E6=B5=81=E7=A8=8B=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/cont/sign_list.php | 370 +++++++++++-------------- wms/frame/pending.php | 10 +- wms/mkt/pricereview-index.php | 64 ++++- wms/mkt/pricereview_renovate-index.php | 58 +++- wms/sign/list.php | 13 +- 5 files changed, 293 insertions(+), 222 deletions(-) diff --git a/wms/cont/sign_list.php b/wms/cont/sign_list.php index db39721b..d31780b3 100644 --- a/wms/cont/sign_list.php +++ b/wms/cont/sign_list.php @@ -3,34 +3,77 @@ require_once "../header.php"; // 載入db.php來連結資料庫 $table = 'con_maintance_examine_apply'; -$para = "function_name=pricereview&" . $token_link; +// 待我簽核進入 +if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) { + $system_id = $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['system_id'] : @$_POST['system_id']; + $where_system_id = " and a.system_id like '" . $system_id . "%'"; + + $flow_id = $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] : @$_POST['flow_id']; + $where_flow_id = " and b.flow_id like '" . $flow_id . "%'"; + + $sql_get = "SELECT d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner, + concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name , + flow_name,c.update_date ,c.create_date,b.path,d.flow_code FROM system_main a,flow_main b ,subflow + c,flow d + WHERE a.system_id=b.system_id + AND b.flow_id=d.flow_id + AND c.current_assigner='$user_id' + AND d.flow_id=b.flow_id + AND c.form_key=d.form_key + $where_system_id + $where_flow_id + "; + // echo '
';
+    // print_r($sql_get);
+    // echo '
'; + + $result = mysqli_query($link, $sql_get); + if ($result == false) { + die(mysqli_error($link)); + } + $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC); -$status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"]; -#可編輯的列 -// $editableColumn = [ -// 'apply_key' => [ -// 'label' => "評審單號", "value" => "", "tag" => 'text', -// 'attr' => [ -// 'readonly=true ', -// 'class' => 'form-control form-control-sm' -// ] -// ], -// 'vol_no' => ['label' => "卷號", "value" => "", "tag" => 'text', 'attr' => ['readonly=true ', 'class' => 'form-control form-control-sm']], -// 'address' => ['label' => "現場地址", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], -// 'case_name' => ['label' => "現場名稱", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], -// 'brand' => ['label' => "電梯品牌", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm']], -// 'num' => ['label' => "電梯臺數", "value" => "", "tag" => 'number', 'attr' => ['required', 'class' => 'form-control form-control-sm']], -// 'salesman' => ['label' => "營業員", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], -// 'maintain_kind' => ['label' => "保養方式", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']], -// 'contract_begin_date' => ['label' => "契約期限開始", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']], -// 'contract_end_date' => ['label' => "契約期限結束", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']], -// 'contract_kind' => ['label' => "契約性質", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']], -// 'platform_company' => ['label' => "加盟公司名稱", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']], -// 'platforom_company_tel' => ['label' => "加盟公司電話", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']], -// //'payment_kind' => ['label' => "付款方式", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm'], 'options' => $payment_kind_opt], + foreach ($res_get as $key => $data) { + // 結案隱藏 + if ($data['flow_code'] !== 'Z') { + $test = $data['form_key']; + // $sql = "SELECT mid FROM pricereview_sign WHERE id = $test"; + // $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC); + // echo '
';
+            // print_r($result);
+            // echo '
'; + $id[] = $test; + } + } + $inClause = implode(',', $id); +} + -// ]; +#可編輯的列 +$editableColumn = [ + 'apply_key' => [ + 'label' => "評審單號", "value" => "", "tag" => 'text', + 'attr' => [ + 'readonly=true ', + 'class' => 'form-control form-control-sm' + ] + ], + 'vol_no' => ['label' => "卷號", "value" => "", "tag" => 'text', 'attr' => ['readonly=true ', 'class' => 'form-control form-control-sm']], + 'address' => ['label' => "現場地址", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], + 'case_name' => ['label' => "現場名稱", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], + 'brand' => ['label' => "電梯品牌", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm']], + 'num' => ['label' => "電梯臺數", "value" => "", "tag" => 'number', 'attr' => ['required', 'class' => 'form-control form-control-sm']], + 'salesman' => ['label' => "營業員", "value" => "", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], + 'maintain_kind' => ['label' => "保養方式", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']], + 'contract_begin_date' => ['label' => "契約期限開始", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']], + 'contract_end_date' => ['label' => "契約期限結束", "value" => "", "tag" => 'date', 'attr' => ['required', 'class' => 'date form-control form-control-sm']], + 'contract_kind' => ['label' => "契約性質", "value" => "", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm']], + 'platform_company' => ['label' => "加盟公司名稱", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']], + 'platforom_company_tel' => ['label' => "加盟公司電話", "value" => "", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']], + //'payment_kind' => ['label' => "付款方式", "value" => "", "tag" => 'select', 'attr' => ['required', 'class' => 'form-control form-control-sm'], 'options' => $payment_kind_opt], + +]; // 設置一個空陣列來放資料 $data = array(); @@ -45,7 +88,7 @@ $res = mysqli_query($link, $sql); $row = mysqli_fetch_row($res); $user_department_id = $row[0]; mysqli_free_result($res); -if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "M0225") $where = ""; +if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") $where = ""; // 電梯廠牌 $elevator_brand_arr = []; @@ -55,32 +98,49 @@ while ($row = mysqli_fetch_row($res)) { $elevator_brand_arr[$row[0]] = $row[1]; } mysqli_free_result($res); - -$sql = "SELECT - apply_key, - vol_no, - address, -case_name, -brand , -num , -salesman as salesman_id, -f_return_name(salesman) salesman, -f_return_content('maintain_kind',maintain_kind ) maintain_kind, -date_format(contract_begin_date,'%Y/%m/%d') contract_begin_date, -date_format(contract_end_date,'%Y/%m/%d') contract_end_date , -f_return_content('contract_kind',contract_kind ) contract_kind, -platform_company, -platforom_company_tel, -form_key, -status, -f_return_content('payment_kind',payment_kind ) payment_kind FROM $table - where 1=1 $where ORDER BY vol_no"; +if (!empty($res_get)) { + $sql = "SELECT + apply_key, + vol_no, + address, + case_name, + brand , + num , + f_return_name(salesman) salesman, + f_return_content('maintain_kind',maintain_kind ) maintain_kind, + date_format(contract_begin_date,'%Y/%m/%d') contract_begin_date, + date_format(contract_end_date,'%Y/%m/%d') contract_end_date , + f_return_content('contract_kind',contract_kind ) contract_kind, + platform_company, + platforom_company_tel, + form_key, + + f_return_content('payment_kind',payment_kind ) payment_kind FROM $table WHERE form_key IN ($inClause) "; +} else { + $sql = "SELECT + apply_key, + vol_no, + address, + case_name, + brand , + num , + f_return_name(salesman) salesman, + f_return_content('maintain_kind',maintain_kind ) maintain_kind, + date_format(contract_begin_date,'%Y/%m/%d') contract_begin_date, + date_format(contract_end_date,'%Y/%m/%d') contract_end_date , + f_return_content('contract_kind',contract_kind ) contract_kind, + platform_company, + platforom_company_tel, + form_key, + + f_return_content('payment_kind',payment_kind ) payment_kind FROM $table + where 1=1 $where ORDER BY vol_no"; +} +// echo $sql; $data = mysqli_query($link, $sql); // echo '
';
-// print_r($sql);
+// print_r($data);
 // echo '
'; - - ?> - - - - + echo "" . (empty($signer) ? "結案" : "N") . ""; -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ?> - - - - - - -
評審單號卷號現場地址現場名稱電梯品牌電梯台數營業員保養方式契約期限開始契約期限結束契約性質加盟公司名稱加盟公司電話是否結案合約下載
- - - - - 待簽核
- - - -- - - - 下載 - -
+ + + +
'; for (i = 1; i <= Object.keys(obj.content).length; i++) { - myhtml += '
  • ' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')
    • '; + if (obj.content[i].fname == '新梯價審流程') { + myhtml += '
  • ' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')
    • '; + } else if (obj.content[i].fname == '汰改價審流程') { + myhtml += '
  • ' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')
    • '; + } else if (obj.content[i].fname == '契约價審流程') { + myhtml += '
  • ' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')
    • '; + } else { + myhtml += '
  • ' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')
    • '; + } } if (Object.keys(obj.content).length == 6) { myhtml += '
  • .... 顯示更多
    • '; diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php index b827938c..cd04c150 100644 --- a/wms/mkt/pricereview-index.php +++ b/wms/mkt/pricereview-index.php @@ -7,6 +7,59 @@ $accountname_arr = accountid2name(); $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"]; $pricereviewID = $_GET['id']; // 設置一個空陣列來放資料 + +// 從待我簽核進來 +if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) { + $system_id = $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['system_id'] : @$_POST['system_id']; + $where_system_id = " and a.system_id like '" . $system_id . "%'"; + + $flow_id = $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] : @$_POST['flow_id']; + $where_flow_id = " and b.flow_id like '" . $flow_id . "%'"; + + $sql_get = "SELECT d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner, + concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name , + flow_name,c.update_date ,c.create_date,b.path,d.flow_code FROM system_main a,flow_main b ,subflow + c,flow d + WHERE a.system_id=b.system_id + AND b.flow_id=d.flow_id + AND c.current_assigner='$user_id' + AND d.flow_id=b.flow_id + AND c.form_key=d.form_key + $where_system_id + $where_flow_id + "; + echo '
    ';
+    print_r($sql_get);
+    echo '
    '; + + $result = mysqli_query($link, $sql_get); + if ($result == false) { + die(mysqli_error($link)); + } + $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC); + + + foreach ($res_get as $key => $data) { + // 結案隱藏 + if ($data['flow_code'] !== 'Z') { + $test = $data['form_id']; + // $sql = "SELECT mid FROM pricereview_sign WHERE id = $test"; + // $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC); + // echo '
    ';
+            // print_r($result);
+            // echo '
    '; + $id[] = $test; + } + } + + + $inClause = implode(',', $id); + // echo '
    ';
+    // print_r($inClause);
+    // echo '
    '; +} + + $data = array(); // sql語法存在變數中 $sql_cmd = sql_myself($user_id, "pricereview_main .creater"); @@ -23,12 +76,13 @@ if ($user_id == "M0060") { if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id"; else $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id"; -if (!empty($_GET)) { - $sql = "SELECT pricereview_main.*, flow.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main +if (!empty($res_get)) { + $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress + from pricereview_main left join contract_new_apply on contract_new_apply.mid = pricereview_main.id - LEFT JOIN flow ON pricereview_main.id = flow.flow_id - $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($pricereviewID) and flow.flow_code = 'A' and flow.system_id = 'prm' AND pricereview_main.ekind = '新梯' order by pricereview_main.id"; - echo $sql; + + $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($inClause) AND pricereview_main.ekind = '新梯' order by pricereview_main.id"; + // echo $sql; } $data = mysqli_query($link, $sql); diff --git a/wms/mkt/pricereview_renovate-index.php b/wms/mkt/pricereview_renovate-index.php index 611c6e70..2a91a83c 100644 --- a/wms/mkt/pricereview_renovate-index.php +++ b/wms/mkt/pricereview_renovate-index.php @@ -6,6 +6,56 @@ $accountname_arr = accountid2name(); $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"]; +// 待我簽核跳 +if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) { + $system_id = $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['system_id'] : @$_POST['system_id']; + $where_system_id = " and a.system_id like '" . $system_id . "%'"; + + $flow_id = $_SERVER['REQUEST_METHOD'] == 'GET' ? @$_GET['flow_id'] : @$_POST['flow_id']; + $where_flow_id = " and b.flow_id like '" . $flow_id . "%'"; + + $sql_get = "SELECT d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c.current_assigner, + concat(c.current_assigner ,'-',f_return_name(c.current_assigner)) current_assigner_name , + flow_name,c.update_date ,c.create_date,b.path,d.flow_code FROM system_main a,flow_main b ,subflow + c,flow d + WHERE a.system_id=b.system_id + AND b.flow_id=d.flow_id + AND c.current_assigner='$user_id' + AND d.flow_id=b.flow_id + AND c.form_key=d.form_key + $where_system_id + $where_flow_id + "; + + + $result = mysqli_query($link, $sql_get); + if ($result == false) { + die(mysqli_error($link)); + } + $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC); + // echo '
    ';
+    // print_r($sql_get);
+    // echo '
    '; + foreach ($res_get as $key => $data) { + // 結案隱藏 + if ($data['flow_code'] !== 'Z') { + $test = $data['form_id']; + // $sql = "SELECT mid FROM pricereview_sign WHERE id = $test"; + // $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC); + // echo '
    ';
+            // print_r($result);
+            // echo '
    '; + $id[] = $test; + } + } + + + $inClause = implode(',', $id); +} + + + + // 設置一個空陣列來放資料 $data = array(); // sql語法存在變數中 @@ -17,12 +67,18 @@ if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012" || $user_i if ($user_id == "M0008") { $sql_cmd = "where creater in (select accountid from account where department_id like '5%')"; } + +if (!empty($res_get)) { + $sql_cmd = "where id IN ($inClause)"; +} // if ($user_id == "M0060") { // $sql_cmd = "where creater in (select accountid from account where (department_id like '3%' or department_id like '5%'))"; // } if (empty($sql_cmd)) $sql = "select * from pricereview_main where status like 'Y%' and ekind = '汰改' order by id"; else $sql = "select * from pricereview_main $sql_cmd and status like 'Y%' and ekind = '汰改' order by id"; - +// echo '
    ';
+// print_r($sql);
+// echo '
    '; $data = mysqli_query($link, $sql); diff --git a/wms/sign/list.php b/wms/sign/list.php index 126a4627..e750d3c4 100644 --- a/wms/sign/list.php +++ b/wms/sign/list.php @@ -31,7 +31,7 @@ $sql_get = "SELECT d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c AND c.form_key=d.form_key $where_system_id $where_flow_id -"; + "; // echo '
    ';
 // print_r($sql_get);
 // echo '
    '; @@ -159,13 +159,22 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR)); foreach ($res_get as $key => $data) { if ($data['flow_code'] !== 'Z') { $test = $data['form_id']; - $id[] = $test; + $sql = "SELECT mid FROM pricereview_sign WHERE id = $test"; + $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC); + // echo '
    ';
+                        // print_r($result);
+                        // echo '
    '; + $id[] = $result[0]['mid']; } } + + $inClause = implode(',', $id); echo '
    ';
                 print_r($inClause);
                 echo '
    '; + + $rowspan = 1; $path = "localhost:3000/wms/sign/list.php"; foreach ($res_get as $key => $data) :