diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php index ab74027c..856f0896 100644 --- a/wms/contract/contract-new-apply.php +++ b/wms/contract/contract-new-apply.php @@ -1,4 +1,3 @@ - bindParam(':id',$id); $stmt->execute(); $contract = $stmt->fetch(PDO::FETCH_ASSOC); + print_r($contract); $accounttype = "M"; $sql_str = "SELECT * FROM account WHERE accounttype = :accounttype"; $stmt = $conn->prepare($sql_str); @@ -45,6 +45,7 @@ if(empty($contract_new_apply)){ $stmt->bindParam(':mid', $mid); $stmt->execute(); $pays = $stmt->fetchAll(PDO::FETCH_ASSOC); + print_r($pays); $price_a = 0; $price_b = 0; foreach($pays as $pay){ diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js index a92a5396..a28c011b 100644 --- a/wms/contract/js/alpine.js +++ b/wms/contract/js/alpine.js @@ -813,6 +813,7 @@ const contractNewInput =()=> { address:'', salesman:'', qc:'', + qc:'', files:[], }, step:1, diff --git a/wms/contract/styles/style.css b/wms/contract/styles/style.css index 3abd4c88..8868e264 100644 --- a/wms/contract/styles/style.css +++ b/wms/contract/styles/style.css @@ -541,14 +541,14 @@ main table td, main table th { transform: rotate(360deg); } } -.contract-input-component .form, .contract-management .form, .contract-new-apply-component .form { +.contract-input-component .contract-input-component .form, .contract-input-component .contract-management .form, .contract-input-component .contract-new-apply-component .form, .contract-management .contract-input-component .form, .contract-management .contract-management .form, .contract-management .contract-new-apply-component .form, .contract-new-apply-component .contract-input-component .form, .contract-new-apply-component .contract-management .form, .contract-new-apply-component .contract-new-apply-component .form { margin: 0 auto; } -.contract-input-component .form .dropdown, .contract-management .form .dropdown, .contract-new-apply-component .form .dropdown { +.contract-input-component .contract-input-component .form .dropdown, .contract-input-component .contract-management .form .dropdown, .contract-input-component .contract-new-apply-component .form .dropdown, .contract-management .contract-input-component .form .dropdown, .contract-management .contract-management .form .dropdown, .contract-management .contract-new-apply-component .form .dropdown, .contract-new-apply-component .contract-input-component .form .dropdown, .contract-new-apply-component .contract-management .form .dropdown, .contract-new-apply-component .contract-new-apply-component .form .dropdown { width: 100%; margin-top: 7px; } -.contract-input-component .form .savebtn, .contract-management .form .savebtn, .contract-new-apply-component .form .savebtn { +.contract-input-component .contract-input-component .form .savebtn, .contract-input-component .contract-management .form .savebtn, .contract-input-component .contract-new-apply-component .form .savebtn, .contract-management .contract-input-component .form .savebtn, .contract-management .contract-management .form .savebtn, .contract-management .contract-new-apply-component .form .savebtn, .contract-new-apply-component .contract-input-component .form .savebtn, .contract-new-apply-component .contract-management .form .savebtn, .contract-new-apply-component .contract-new-apply-component .form .savebtn { margin-right: 13px; display: flex; justify-content: center; @@ -557,11 +557,11 @@ main table td, main table th { height: 45px; font-size: 15px; } -.contract-input-component .form table .fixed, .contract-management .form table .fixed, .contract-new-apply-component .form table .fixed { +.contract-input-component .contract-input-component .form table .fixed, .contract-input-component .contract-management .form table .fixed, .contract-input-component .contract-new-apply-component .form table .fixed, .contract-management .contract-input-component .form table .fixed, .contract-management .contract-management .form table .fixed, .contract-management .contract-new-apply-component .form table .fixed, .contract-new-apply-component .contract-input-component .form table .fixed, .contract-new-apply-component .contract-management .form table .fixed, .contract-new-apply-component .contract-new-apply-component .form table .fixed { padding: 8px 0; cursor: not-allowed; } -.contract-input-component .form table .alerttext, .contract-management .form table .alerttext, .contract-new-apply-component .form table .alerttext { +.contract-input-component .contract-input-component .form table .alerttext, .contract-input-component .contract-management .form table .alerttext, .contract-input-component .contract-new-apply-component .form table .alerttext, .contract-management .contract-input-component .form table .alerttext, .contract-management .contract-management .form table .alerttext, .contract-management .contract-new-apply-component .form table .alerttext, .contract-new-apply-component .contract-input-component .form table .alerttext, .contract-new-apply-component .contract-management .form table .alerttext, .contract-new-apply-component .contract-new-apply-component .form table .alerttext { font-size: 13px; color: #a00; font-weight: 500; @@ -569,86 +569,92 @@ main table td, main table th { font-weight: 900; padding: 0; } -.contract-input-component .form input[type=file], .contract-management .form input[type=file], .contract-new-apply-component .form input[type=file] { +.contract-input-component .contract-input-component .form input[type=file], .contract-input-component .contract-management .form input[type=file], .contract-input-component .contract-new-apply-component .form input[type=file], .contract-management .contract-input-component .form input[type=file], .contract-management .contract-management .form input[type=file], .contract-management .contract-new-apply-component .form input[type=file], .contract-new-apply-component .contract-input-component .form input[type=file], .contract-new-apply-component .contract-management .form input[type=file], .contract-new-apply-component .contract-new-apply-component .form input[type=file] { padding: 12px 20px; margin: 8px 0; } -.contract-input-component .form span, .contract-management .form span, .contract-new-apply-component .form span { +.contract-input-component .contract-input-component .form span, .contract-input-component .contract-management .form span, .contract-input-component .contract-new-apply-component .form span, .contract-management .contract-input-component .form span, .contract-management .contract-management .form span, .contract-management .contract-new-apply-component .form span, .contract-new-apply-component .contract-input-component .form span, .contract-new-apply-component .contract-management .form span, .contract-new-apply-component .contract-new-apply-component .form span { font-weight: 900; } -.contract-input-component .form span.successtext, .contract-management .form span.successtext, .contract-new-apply-component .form span.successtext { +.contract-input-component .contract-input-component .form span.successtext, .contract-input-component .contract-management .form span.successtext, .contract-input-component .contract-new-apply-component .form span.successtext, .contract-management .contract-input-component .form span.successtext, .contract-management .contract-management .form span.successtext, .contract-management .contract-new-apply-component .form span.successtext, .contract-new-apply-component .contract-input-component .form span.successtext, .contract-new-apply-component .contract-management .form span.successtext, .contract-new-apply-component .contract-new-apply-component .form span.successtext { color: #0a0; } -.contract-input-component .form span.failtext, .contract-management .form span.failtext, .contract-new-apply-component .form span.failtext { +.contract-input-component .contract-input-component .form span.failtext, .contract-input-component .contract-management .form span.failtext, .contract-input-component .contract-new-apply-component .form span.failtext, .contract-management .contract-input-component .form span.failtext, .contract-management .contract-management .form span.failtext, .contract-management .contract-new-apply-component .form span.failtext, .contract-new-apply-component .contract-input-component .form span.failtext, .contract-new-apply-component .contract-management .form span.failtext, .contract-new-apply-component .contract-new-apply-component .form span.failtext { color: #a00; } -.contract-input-component .form span.readtext, .contract-management .form span.readtext, .contract-new-apply-component .form span.readtext { +.contract-input-component .contract-input-component .form span.readtext, .contract-input-component .contract-management .form span.readtext, .contract-input-component .contract-new-apply-component .form span.readtext, .contract-management .contract-input-component .form span.readtext, .contract-management .contract-management .form span.readtext, .contract-management .contract-new-apply-component .form span.readtext, .contract-new-apply-component .contract-input-component .form span.readtext, .contract-new-apply-component .contract-management .form span.readtext, .contract-new-apply-component .contract-new-apply-component .form span.readtext { color: #aa0; } -.contract-input-component .form input[type=number]::-webkit-outer-spin-button, -.contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .form input[type=number]::-webkit-outer-spin-button, -.contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button, -.contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button { +.contract-input-component .contract-input-component .form input[type=number]::-webkit-outer-spin-button, +.contract-input-component .contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-input-component .contract-management .form input[type=number]::-webkit-outer-spin-button, +.contract-input-component .contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-input-component .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button, +.contract-input-component .contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .contract-input-component .form input[type=number]::-webkit-outer-spin-button, +.contract-management .contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .contract-management .form input[type=number]::-webkit-outer-spin-button, +.contract-management .contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-management .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button, +.contract-management .contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .contract-input-component .form input[type=number]::-webkit-outer-spin-button, +.contract-new-apply-component .contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .contract-management .form input[type=number]::-webkit-outer-spin-button, +.contract-new-apply-component .contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button, +.contract-new-apply-component .contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; margin: 0; } -.contract-input-component .form input[type=number], .contract-management .form input[type=number], .contract-new-apply-component .form input[type=number] { +.contract-input-component .contract-input-component .form input[type=number], .contract-input-component .contract-management .form input[type=number], .contract-input-component .contract-new-apply-component .form input[type=number], .contract-management .contract-input-component .form input[type=number], .contract-management .contract-management .form input[type=number], .contract-management .contract-new-apply-component .form input[type=number], .contract-new-apply-component .contract-input-component .form input[type=number], .contract-new-apply-component .contract-management .form input[type=number], .contract-new-apply-component .contract-new-apply-component .form input[type=number] { -moz-appearance: textfield; } -.contract-input-component .error, .contract-management .error, .contract-new-apply-component .error { +.contract-input-component .contract-input-component .error, .contract-input-component .contract-management .error, .contract-input-component .contract-new-apply-component .error, .contract-management .contract-input-component .error, .contract-management .contract-management .error, .contract-management .contract-new-apply-component .error, .contract-new-apply-component .contract-input-component .error, .contract-new-apply-component .contract-management .error, .contract-new-apply-component .contract-new-apply-component .error { display: flex; flex-direction: column; margin: 15px; } -.contract-input-component .error .errortext, .contract-management .error .errortext, .contract-new-apply-component .error .errortext { +.contract-input-component .contract-input-component .error .errortext, .contract-input-component .contract-management .error .errortext, .contract-input-component .contract-new-apply-component .error .errortext, .contract-management .contract-input-component .error .errortext, .contract-management .contract-management .error .errortext, .contract-management .contract-new-apply-component .error .errortext, .contract-new-apply-component .contract-input-component .error .errortext, .contract-new-apply-component .contract-management .error .errortext, .contract-new-apply-component .contract-new-apply-component .error .errortext { font-size: 16px; font-weight: 500; color: #a00; } -.contract-input-component .input-group-btn, .contract-management .input-group-btn, .contract-new-apply-component .input-group-btn { +.contract-input-component .contract-input-component .input-group-btn, .contract-input-component .contract-management .input-group-btn, .contract-input-component .contract-new-apply-component .input-group-btn, .contract-management .contract-input-component .input-group-btn, .contract-management .contract-management .input-group-btn, .contract-management .contract-new-apply-component .input-group-btn, .contract-new-apply-component .contract-input-component .input-group-btn, .contract-new-apply-component .contract-management .input-group-btn, .contract-new-apply-component .contract-new-apply-component .input-group-btn { font-size: 16px; } @media screen and (max-width: 600px) { - .contract-input-component table, .contract-management table, .contract-new-apply-component table { + .contract-input-component .contract-input-component table, .contract-input-component .contract-management table, .contract-input-component .contract-new-apply-component table, .contract-management .contract-input-component table, .contract-management .contract-management table, .contract-management .contract-new-apply-component table, .contract-new-apply-component .contract-input-component table, .contract-new-apply-component .contract-management table, .contract-new-apply-component .contract-new-apply-component table { border: 0; } - .contract-input-component table thead, .contract-management table thead, .contract-new-apply-component table thead { + .contract-input-component .contract-input-component table thead, .contract-input-component .contract-management table thead, .contract-input-component .contract-new-apply-component table thead, .contract-management .contract-input-component table thead, .contract-management .contract-management table thead, .contract-management .contract-new-apply-component table thead, .contract-new-apply-component .contract-input-component table thead, .contract-new-apply-component .contract-management table thead, .contract-new-apply-component .contract-new-apply-component table thead { display: none; } - .contract-input-component table tr, .contract-management table tr, .contract-new-apply-component table tr { + .contract-input-component .contract-input-component table tr, .contract-input-component .contract-management table tr, .contract-input-component .contract-new-apply-component table tr, .contract-management .contract-input-component table tr, .contract-management .contract-management table tr, .contract-management .contract-new-apply-component table tr, .contract-new-apply-component .contract-input-component table tr, .contract-new-apply-component .contract-management table tr, .contract-new-apply-component .contract-new-apply-component table tr { margin-bottom: 10px; display: block; border-bottom: 2px solid #ddd; } - .contract-input-component table td, .contract-management table td, .contract-new-apply-component table td { + .contract-input-component .contract-input-component table td, .contract-input-component .contract-management table td, .contract-input-component .contract-new-apply-component table td, .contract-management .contract-input-component table td, .contract-management .contract-management table td, .contract-management .contract-new-apply-component table td, .contract-new-apply-component .contract-input-component table td, .contract-new-apply-component .contract-management table td, .contract-new-apply-component .contract-new-apply-component table td { display: block; text-align: left; font-size: 14px; border-bottom: 1px dotted #ccc; } - .contract-input-component table td:last-child, .contract-management table td:last-child, .contract-new-apply-component table td:last-child { + .contract-input-component .contract-input-component table td:last-child, .contract-input-component .contract-management table td:last-child, .contract-input-component .contract-new-apply-component table td:last-child, .contract-management .contract-input-component table td:last-child, .contract-management .contract-management table td:last-child, .contract-management .contract-new-apply-component table td:last-child, .contract-new-apply-component .contract-input-component table td:last-child, .contract-new-apply-component .contract-management table td:last-child, .contract-new-apply-component .contract-new-apply-component table td:last-child { border-bottom: 0; } - .contract-input-component table td:before, .contract-management table td:before, .contract-new-apply-component table td:before { + .contract-input-component .contract-input-component table td:before, .contract-input-component .contract-management table td:before, .contract-input-component .contract-new-apply-component table td:before, .contract-management .contract-input-component table td:before, .contract-management .contract-management table td:before, .contract-management .contract-new-apply-component table td:before, .contract-new-apply-component .contract-input-component table td:before, .contract-new-apply-component .contract-management table td:before, .contract-new-apply-component .contract-new-apply-component table td:before { content: attr(data-label); float: left; text-transform: uppercase; font-weight: bold; } } -.contract-input-component .images, .contract-management .images, .contract-new-apply-component .images { +.contract-input-component .contract-input-component .images, .contract-input-component .contract-management .images, .contract-input-component .contract-new-apply-component .images, .contract-management .contract-input-component .images, .contract-management .contract-management .images, .contract-management .contract-new-apply-component .images, .contract-new-apply-component .contract-input-component .images, .contract-new-apply-component .contract-management .images, .contract-new-apply-component .contract-new-apply-component .images { display: flex; flex-wrap: wrap; padding: 20px; } -.contract-input-component .images > .image, .contract-management .images > .image, .contract-new-apply-component .images > .image { +.contract-input-component .contract-input-component .images > .image, .contract-input-component .contract-management .images > .image, .contract-input-component .contract-new-apply-component .images > .image, .contract-management .contract-input-component .images > .image, .contract-management .contract-management .images > .image, .contract-management .contract-new-apply-component .images > .image, .contract-new-apply-component .contract-input-component .images > .image, .contract-new-apply-component .contract-management .images > .image, .contract-new-apply-component .contract-new-apply-component .images > .image { position: relative; margin: 10px; } -.contract-input-component .images > .image:hover > i, .contract-management .images > .image:hover > i, .contract-new-apply-component .images > .image:hover > i { +.contract-input-component .contract-input-component .images > .image:hover > i, .contract-input-component .contract-management .images > .image:hover > i, .contract-input-component .contract-new-apply-component .images > .image:hover > i, .contract-management .contract-input-component .images > .image:hover > i, .contract-management .contract-management .images > .image:hover > i, .contract-management .contract-new-apply-component .images > .image:hover > i, .contract-new-apply-component .contract-input-component .images > .image:hover > i, .contract-new-apply-component .contract-management .images > .image:hover > i, .contract-new-apply-component .contract-new-apply-component .images > .image:hover > i { opacity: 1; } -.contract-input-component .images > .image > i, .contract-management .images > .image > i, .contract-new-apply-component .images > .image > i { +.contract-input-component .contract-input-component .images > .image > i, .contract-input-component .contract-management .images > .image > i, .contract-input-component .contract-new-apply-component .images > .image > i, .contract-management .contract-input-component .images > .image > i, .contract-management .contract-management .images > .image > i, .contract-management .contract-new-apply-component .images > .image > i, .contract-new-apply-component .contract-input-component .images > .image > i, .contract-new-apply-component .contract-management .images > .image > i, .contract-new-apply-component .contract-new-apply-component .images > .image > i { position: absolute; top: -12px; right: -12px; @@ -657,37 +663,29 @@ main table td, main table th { opacity: 0; transition: 0.3s; } - -table { +.contract-input-component table, .contract-management table, .contract-new-apply-component table { table-layout: fixed; width: 100%; } - -td { +.contract-input-component td, .contract-management td, .contract-new-apply-component td { word-wrap: break-word; } - -img { +.contract-input-component img, .contract-management img, .contract-new-apply-component img { width: 125px; } - -.width_style_1 { +.contract-input-component .width_style_1, .contract-management .width_style_1, .contract-new-apply-component .width_style_1 { width: 125px; } - -table { +.contract-input-component table, .contract-management table, .contract-new-apply-component table { width: 100%; } - -#table_index_filter { +.contract-input-component #table_index_filter, .contract-management #table_index_filter, .contract-new-apply-component #table_index_filter { float: right; } - -#table_index_paginate { +.contract-input-component #table_index_paginate, .contract-management #table_index_paginate, .contract-new-apply-component #table_index_paginate { float: right; } - -label { +.contract-input-component label, .contract-management label, .contract-new-apply-component label { display: inline-flex; margin-bottom: 0.5rem; margin-top: 0.5rem; diff --git a/wms/contract/styles/style.css.map b/wms/contract/styles/style.css.map index 695e9607..bfb5f800 100644 --- a/wms/contract/styles/style.css.map +++ b/wms/contract/styles/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/wms/contract/styles/style.scss b/wms/contract/styles/style.scss index d19c1c9b..76899a30 100644 --- a/wms/contract/styles/style.scss +++ b/wms/contract/styles/style.scss @@ -562,6 +562,7 @@ main{ 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } } +.contract-input-component, .contract-management, .contract-new-apply-component{ .contract-input-component, .contract-management, .contract-new-apply-component{ .form{ margin:0 auto; @@ -717,5 +718,5 @@ label { display: inline-flex; margin-bottom: .5rem; margin-top: .5rem; - +} } diff --git a/wms/fun_global.php b/wms/fun_global.php index e995e449..aa1f8e69 100644 --- a/wms/fun_global.php +++ b/wms/fun_global.php @@ -146,7 +146,7 @@ function check_user_permission($user_id, $token) { global $link; // 不檢查清單 - $ignore_url_arr = ['/wms/index.php', '/wms/notice-index.php', '/wms/notice-edit.php', '/wms/change-password.php', '/wms/wipwhole-change-contractdate.php', '/wms/wipwhole-change-planning-customer-name.php','/wms/test.php']; + $ignore_url_arr = ['/wms/index.php', '/wms/notice-index.php', '/wms/notice-edit.php', '/wms/change-password.php', '/wms/wipwhole-change-contractdate.php', '/wms/wipwhole-change-planning-customer-name.php','/wms/test.php', '/wms/mkt/pricereview_mi-api.php']; if (in_array($_SERVER["SCRIPT_NAME"], $ignore_url_arr)) return; $do = ""; @@ -169,6 +169,8 @@ function check_user_permission($user_id, $token) { mysqli_free_result($res); if (!$do) { + echo "無權限操作，請洽管理員。"; + exit; echo ""; } else return $do; } @@ -562,4 +564,11 @@ function sign_status($arr) { $ret["sign_nt"] = ""; } return $ret; +} + +function getAccounttype($link,$user_id){ + $sql = "SELECT * FROM account where accountid = '$user_id'"; + $data = mysqli_query($link, $sql); + $row = mysqli_fetch_array($data, MYSQLI_ASSOC); + return $row['accounttype']; } \ No newline at end of file diff --git a/wms/header.php b/wms/header.php index 4cee8dd0..2e1f8a8d 100644 --- a/wms/header.php +++ b/wms/header.php @@ -7,6 +7,18 @@ // $maintenancePage = new MaintenancePage($maintenancePeriod); // $maintenancePage->displayPage(); +function CreateToken($user_id, $user_name) { + date_default_timezone_set("Asia/Taipei"); + $start_time = date("Y-m-d H:i:s"); + $end_time = date('Y-m-d H:i:s',strtotime('+24 hour')); #设定24小时 + $info = $user_id . '.' . base64_encode(urlencode($user_name)) . '.' . $start_time . '.' . $end_time; //设置token过期时间为一天 + $encryption_code = "MASADA!^***"; + //根据以上信息信息生成签名（密钥为 SIGNATURE 自定义全局常量) + $signature = hash_hmac('md5', $info, $encryption_code); + //最后将这两部分拼接起来，得到最终的Token字符串 + return $token = $info . '.' . $signature; +} + require_once dirname(__FILE__) . "/../mkt/database.php"; include "fun_global.php"; @@ -21,9 +33,9 @@ if (isset($_REQUEST["function_name"])) { * 連線T8 MSSQL */ try { - $conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8TEST", "masada", "@m222222"); + $conn = new PDO("sqlsrv:Server=10.10.145.2;Database=T8MASADA", "masada", "@m222222"); if ($conn) { - $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); } } catch (PDOException $e) { //echo "fail"; @@ -42,10 +54,38 @@ try { * $user_auth 使用權限:1,2,3 *****************************/ $token = $_REQUEST["token"]; -$token_link = "token=" . $_REQUEST["token"]; -list($user_id, $enc_user_name, $login_dt) = explode(".", $token); -$user_name = urldecode(base64_decode($enc_user_name)); +if (count(explode(".", $token)) > 1) { + $token_link = "token=" . $_REQUEST["token"]; + list($user_id, $enc_user_name, $login_dt) = explode(".", $token); + $user_name = urldecode(base64_decode($enc_user_name)); +} else { + $user_id = !empty($_GET["employee_no"]) ? $_GET["employee_no"] : $user_id; + $login_dt = !empty($_GET["timestamp"]) ? substr($_GET["timestamp"], 0, 10) : $login_dt; + $login_dt = date('Y-m-d H:i:s', $login_dt); + $user_name = accountid2name()[$user_id]; + $token = CreateToken($user_id,$user_name); + $token_link = "token=" . $token; +} + + +include 'IncludeCommon.php'; +$includecommon = new IncludeCommon(); +$accounttype = getAccounttype($link, $user_id); +$login_json = null; +if (strlen($accounttype) != 0) { + $jsonres['menu'] = $includecommon->menu_v3($user_id, $accounttype); + $login_json = json_encode($jsonres, JSON_UNESCAPED_UNICODE); +} +?> + + diff --git a/wms/mkt/price_option-index.php b/wms/mkt/price_option-index.php index e8334a85..dd29327d 100644 --- a/wms/mkt/price_option-index.php +++ b/wms/mkt/price_option-index.php @@ -106,6 +106,5 @@ $optional_arr = [1=>'標', 2=>'選']; \ No newline at end of file diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php index 23dad8e4..b1cb75e3 100644 --- a/wms/mkt/pricereview-check.php +++ b/wms/mkt/pricereview-check.php @@ -310,6 +310,7 @@ $(function () { $("#checker").prop("disabled", false); $("#status_n").prop("disabled", false); $("#status_y").prop("disabled", false); + $("#status_yy").prop("disabled", false); $("#id").prop("disabled", false); $("#st").prop("disabled", false); $('#btn_close').prop("disabled", false); @@ -974,8 +975,11 @@ hr { - - + + + + + diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php index 44e06e1f..6e9a631c 100644 --- a/wms/mkt/pricereview-index.php +++ b/wms/mkt/pricereview-index.php @@ -14,7 +14,7 @@ $sql_cmd = sql_myself($user_id); if ($user_id == "M0024" || $user_id == "M0107") { $sql_cmd = "where create_at >= '2023-01-01 00:00:00'"; } -if ($user_id == "M0060") { +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"; @@ -357,7 +357,7 @@ if ($user_id=="M0023") { $str = $uperson = $ustatus = $udtte = ""; if (!empty($sign3)) list($uperson, $ustatus, $udtte) = explode(",", $sign3); if ($ustatus) { - if ($ustatus == "Y") $str = ""; + if ($ustatus == "Y" || $ustatus == "YY") $str = ""; elseif ($ustatus == "N") $str = ""; $str .= "
".$accountname_arr[$uperson]."
".$udtte; } else { diff --git a/wms/mkt/pricereview-record-check.php b/wms/mkt/pricereview-record-check.php index b8bf6b48..340f3b8d 100644 --- a/wms/mkt/pricereview-record-check.php +++ b/wms/mkt/pricereview-record-check.php @@ -59,7 +59,11 @@ if (isset($_POST['status'])) { $sql2 .= "status = 'YY'"; } $end_flow = 1; - } else { + }elseif($status == 'YY'){ + $sql2 .= "status = 'YY'"; + $end_flow = 1; + } + else { $do_assign = 1; } if ($item_no_all) { @@ -82,7 +86,7 @@ if (isset($_POST['status'])) { mysqli_query($link, $db_query); } } - + echo $status; if ($sql) { $db_query = "update pricereview_sign set $sql where mid = '$id'"; mysqli_query($link, $db_query); @@ -128,6 +132,6 @@ if (isset($_POST['status'])) { } mysqli_close($link); echo ""; } diff --git a/wms/mkt/pricereview_renovate-check.php b/wms/mkt/pricereview_renovate-check.php index 79e51e12..0fde252d 100644 --- a/wms/mkt/pricereview_renovate-check.php +++ b/wms/mkt/pricereview_renovate-check.php @@ -1018,7 +1018,22 @@ hr { - 業務部協理 + + prepare($sql_str); + $stmt->bindParam(':name',$accountname_arr[$person3]); + $stmt->execute(); + $user = $stmt->fetch(PDO::FETCH_ASSOC); + echo $user['role']; + }else{ + echo "業務部協理"; + } + + ?> + diff --git a/wms/mkt/specsurvey-edit.zip b/wms/mkt/specsurvey-edit.zip new file mode 100644 index 00000000..b6fb52d4 Binary files /dev/null and b/wms/mkt/specsurvey-edit.zip differ diff --git a/wms/mkt/specsurvey-index.php b/wms/mkt/specsurvey-index.php index 2a806f21..87e8b723 100644 --- a/wms/mkt/specsurvey-index.php +++ b/wms/mkt/specsurvey-index.php @@ -5,7 +5,7 @@ include "../header.php"; $data = array(); // sql語法存在變數中 $sql_cmd = sql_myself($user_id, "s.creater"); -if ($user_id == "M0060") $sql_cmd = ""; +if ($user_id == "M0060" || $user_id == "M0023") $sql_cmd = ""; $sql2 = (empty($sql_cmd)) ? "where" : "and"; $sql2 .= " s.mid = p.id and p.ekind = '新梯' "; $sql2 .= "and (s.mid, s.pr_item_id, s.sub_item_id, s.version) in (select s.mid, s.pr_item_id, s.sub_item_id, max(s.version) from specsurvey_main s, pricereview_main p where s.mid = p.id group by s.mid, s.pr_item_id, s.sub_item_id)"; diff --git a/wms/mkt/specsurvey_renovate-index.php b/wms/mkt/specsurvey_renovate-index.php index 1478118c..55b79cf3 100644 --- a/wms/mkt/specsurvey_renovate-index.php +++ b/wms/mkt/specsurvey_renovate-index.php @@ -5,7 +5,7 @@ include "../header.php"; $data = array(); // sql語法存在變數中 $sql_cmd = sql_myself($user_id, "s.creater"); -if ($user_id == "M0060") $sql_cmd = ""; +if ($user_id == "M0060" || $user_id == "M0023") $sql_cmd = ""; $sql2 = (empty($sql_cmd)) ? "where" : "and"; $sql2 .= " s.mid = p.id and p.ekind = '汰改' "; $sql2 .= "and (s.mid, s.pr_item_id, s.sub_item_id, s.version) in (select s.mid, s.pr_item_id, s.sub_item_id, max(s.version) from specsurvey_main s, pricereview_main p where s.mid = p.id group by s.mid, s.pr_item_id, s.sub_item_id)";