From 1f8513ffa98f48475264c4f2cc6dd849fa6da799 Mon Sep 17 00:00:00 2001 From: 10994015 Date: Thu, 29 Feb 2024 15:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=83=B9=E5=AF=A9=E5=BE=85=E7=B0=BD=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/mkt/api/postFlow.php | 56 ++++++++++++++ wms/mkt/api/postNewElevatorPricereview.php | 6 +- wms/mkt/api/postPricereviewSign.php | 21 +++++- wms/mkt/assets/js/pricereviewAlpine.js | 12 ++- wms/mkt/css/pricereview.css | 2 +- wms/mkt/css/pricereview.css.map | 2 +- wms/mkt/css/pricereview.scss | 2 +- wms/mkt/pricereviewCheck.php | 86 +++++----------------- wms/mkt/pricereviewCreate.php | 23 ++++-- wms/mkt/window-modal/historySignModal.php | 62 ++++++++++++++++ 10 files changed, 192 insertions(+), 80 deletions(-) create mode 100644 wms/mkt/api/postFlow.php create mode 100644 wms/mkt/window-modal/historySignModal.php diff --git a/wms/mkt/api/postFlow.php b/wms/mkt/api/postFlow.php new file mode 100644 index 00000000..44d5b4a5 --- /dev/null +++ b/wms/mkt/api/postFlow.php @@ -0,0 +1,56 @@ +prepare($sql_str); + $stmt->execute(); + $result = $stmt->fetch(PDO::FETCH_ASSOC); + $form_key = $result['form_key']; + $seq = 0; + + $sql_str = "INSERT INTO flow (system_id, flow_id, form_id, form_key, flow_code) + VALUES (:system_id, :flow_id, :form_id, :form_key, :flow_code)"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':system_id', $system_id); + $stmt->bindParam(':flow_id', $flow_id); + $stmt->bindParam(':form_id', $form_id); + $stmt->bindParam(':form_key', $form_key); + $stmt->bindParam(':flow_code', $flow_code); + $stmt->execute(); + }else{ + $sql_str = "UPDATE flow SET flow_code = :flow_code WHERE form_key = :form_key"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':form_key', $form_key); + $stmt->bindParam(':flow_code', $flow_code); + $stmt->execute(); + + $sql_str = "SELECT MAX(seq) AS max_seq FROM subflow WHERE form_key = :form_key"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':form_key', $form_key); + $stmt->execute(); + $result = $stmt->fetch(PDO::FETCH_ASSOC); + $seq = $result['max_seq']; + $seq ++; + } + + $created_at = date("Y-m-d H:i:s"); + $sql_str = "INSERT INTO subflow (form_key, seq, current_assigner, update_date,create_date) + VALUES (:form_key, :seq, :current_assigner, :update_date,:create_date)"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':form_key', $form_key); + $stmt->bindParam(':seq', $seq); + $stmt->bindParam(':current_assigner', $current_assigner); + $stmt->bindParam(':update_date', $created_at); + $stmt->bindParam(':create_date', $created_at); + $stmt->execute(); + +} \ No newline at end of file diff --git a/wms/mkt/api/postNewElevatorPricereview.php b/wms/mkt/api/postNewElevatorPricereview.php index 8f4b9b6d..148e8001 100644 --- a/wms/mkt/api/postNewElevatorPricereview.php +++ b/wms/mkt/api/postNewElevatorPricereview.php @@ -28,6 +28,7 @@ $create_at = date("Y-m-d H:i:s"); $attatch1_src = null; $attatch2_src = null; $token = $_POST['token']; +$form_key = $_POST['form_key']; $elevators = json_decode($_POST['elevators'], true); $options = json_decode($_POST['options'], true); @@ -709,7 +710,10 @@ try{ $stmt->bindParam(':sign_total', $sign_total); $stmt->execute(); - + //發送待簽通知 + include_once "./postFlow.php"; + $createFlow = createFlow($mid, $manager, "A", $ekind, $form_key); + echo $createFlow; //發送系統通知 include_once "./postSystemNotice.php"; $sql_str = "SELECT * FROM pricereview_main WHERE id = :id ORDER BY id DESC LIMIT 1"; diff --git a/wms/mkt/api/postPricereviewSign.php b/wms/mkt/api/postPricereviewSign.php index b013ab50..01bbd928 100644 --- a/wms/mkt/api/postPricereviewSign.php +++ b/wms/mkt/api/postPricereviewSign.php @@ -9,6 +9,7 @@ $result = $_POST['result']; $reviewcomment = $_POST['reviewcomment']; $sign_id = $_POST['currentSignId']; $token = $_POST['token']; +$form_key = $_POST['form_key']; $signOff = ''; if($result == 'YY' ){ $signOff = 'YY'; @@ -61,6 +62,7 @@ try{ $permissions[] = $contract['person']; $title = $ekind . "價審結案通知(".$contract['contractno']."," .$contract['company']. ")"; $content = "狀態:結案同意
"; + $current_assigner = "00000"; }elseif($signOff == "Y"){ if($sign == 1 || $sign == 2 || $sign == 3){ $signer = $currentsign['sign'.($sign+1)]; @@ -68,6 +70,7 @@ try{ $signer = $currentsign['sign'.($sign+2)]; } $permissions[] = explode(",", $signer)[0]; + $current_assigner = explode(",", $signer)[0]; $title = $ekind . "價審待簽通知(".$contract['contractno']."," .$contract['company']. ")"; $content = "狀態:待簽核
"; } @@ -77,9 +80,9 @@ try{ $title = $ekind . "價審退回通知(".$contract['contractno']."," .$contract['company']. ")"; $content = "狀態:退回
"; $url = "mkt/pricereviewCreate.php?id=" . $mid; + $current_assigner = "00000"; } - $kind = 1; $related_id = $mid; $content .= "合約號:".$contract['contractno'] . "
"; @@ -92,6 +95,22 @@ try{ $create_at = date("Y-m-d H:i:s"); sendSystemNotice($kind, $related_id, $title, $content, $havaread, $permissions, $creater, $create_at, $url); + //待簽通知 + if($form_key == null){ + $sql_str = "SELECT form_key FROM flow WHERE form_id = :form_id"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':form_id', $mid); + $stmt->execute(); + $form_key = $stmt->fetch(PDO::FETCH_ASSOC)['form_key']; + } + include_once "./postFlow.php"; + if($signOff == "YY") $flow_code = "Z"; + if($signOff == "Y") $flow_code = "B"; + if($signOff == "N") $flow_code = "A"; + if($form_key == null){ + throw new PDOException("form_key 不存在!"); + } + createFlow($mid, $current_assigner, $flow_code, $ekind, $form_key); echo 1; }catch(PDOException $e){ echo $e->getMessage(); diff --git a/wms/mkt/assets/js/pricereviewAlpine.js b/wms/mkt/assets/js/pricereviewAlpine.js index 637b3bf6..bd1d74a9 100644 --- a/wms/mkt/assets/js/pricereviewAlpine.js +++ b/wms/mkt/assets/js/pricereviewAlpine.js @@ -875,6 +875,7 @@ const pricereviewCreate = ()=>{ form.append('demolishOptions', JSON.stringify(this.demolishOptions)); form.append('paymentRatio', JSON.stringify(this.paymentRatio)); + form.append('form_key', form_key); axios.post('./api/postNewElevatorPricereview.php', form).then(res=>{ console.log(res.data); @@ -915,7 +916,7 @@ const pricereviewCreate = ()=>{ form.append('attatch1', this.attatch1); form.append('attatch2', this.attatch2); form.append('user_id', user_id); - + form.append('token', token); form.append('elevators', JSON.stringify(this.elevators)); form.append('options', JSON.stringify(this.selectedOptions)); @@ -1105,16 +1106,20 @@ const pricereviewCheck = ()=>{ openFn:[ 'CO', '2S', '2U', '4PCO', '6PCO' ], + form_key: form_key, sign1:'', sign2:'', sign3:'', sign4:'', + historySignShow:false, hideHistorySignModal(){ - this.$refs.historySign.style.display = "none"; + this.historySignShow = false + // this.$refs.historySign.style.display = "none"; body.style.overflow = 'auto' }, openHishtorySignModal(){ - this.$refs.historySign.style.display = "block"; + this.historySignShow = true; + // this.$refs.historySign.style.display = "block"; body.style.overflow = 'hidden' }, is_renovate: is_renovate, @@ -1187,6 +1192,7 @@ const pricereviewCheck = ()=>{ form.append('reviewcomment', this.reviewcomment); form.append('currentSignId', currentSignId); form.append('token', token); + form.append('form_key', form_key); axios.post('./api/postPricereviewSign.php', form).then(res=>{ console.log(res.data); if(res.data == 1){ diff --git a/wms/mkt/css/pricereview.css b/wms/mkt/css/pricereview.css index 425107d3..afeeb875 100644 --- a/wms/mkt/css/pricereview.css +++ b/wms/mkt/css/pricereview.css @@ -178,7 +178,7 @@ [x-cloak][data-type=window-modal], [x-cloak][data-type=errortext] { - display: none; + display: none !important; } .errortext { diff --git a/wms/mkt/css/pricereview.css.map b/wms/mkt/css/pricereview.css.map index 975c5705..4acaa24e 100644 --- a/wms/mkt/css/pricereview.css.map +++ b/wms/mkt/css/pricereview.css.map @@ -1 +1 @@ -{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"} \ No newline at end of file +{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"} \ No newline at end of file diff --git a/wms/mkt/css/pricereview.scss b/wms/mkt/css/pricereview.scss index bba827b2..07a63973 100644 --- a/wms/mkt/css/pricereview.scss +++ b/wms/mkt/css/pricereview.scss @@ -190,7 +190,7 @@ [x-cloak][data-type="window-modal"], [x-cloak][data-type="errortext"] { - display: none; + display: none !important; } .errortext{ font-size:12px !important; diff --git a/wms/mkt/pricereviewCheck.php b/wms/mkt/pricereviewCheck.php index 27e17c01..84309ff2 100644 --- a/wms/mkt/pricereviewCheck.php +++ b/wms/mkt/pricereviewCheck.php @@ -1,11 +1,25 @@ prepare($sql_str); + $stmt->bindParam(':system_id', $system_id); + $stmt->bindParam(':form_key', $form_key); + $stmt->execute(); + $flow = $stmt->fetch(PDO::FETCH_ASSOC); + $id = $flow['form_id']; + }else{ + echo "找不到此紀錄!"; + exit; + } +}else{ + $id = $_GET['id']; } -$id = $_GET['id']; $sql_str = "SELECT pricereview_main.*, account.name as person_name FROM pricereview_main LEFT JOIN account ON pricereview_main.person = account.accountid WHERE pricereview_main.id = :id AND pricereview_main.status <> 'D'"; $stmt = $conn->prepare($sql_str); @@ -253,68 +267,7 @@ function getSignerName($signer){
-
-
-
-

歷史簽核紀錄

- -
-
-
- - - - - - - - - - - - $history): ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
審核審核人結果意見時間
區經理
總經理
-
-
-
- -
-
-
-
+
@@ -371,7 +324,7 @@ function getSignerName($signer){ - + @@ -989,4 +942,5 @@ function getSignerName($signer){ const currentSignId = ''; const token = ''; + const form_key = ''; \ No newline at end of file diff --git a/wms/mkt/pricereviewCreate.php b/wms/mkt/pricereviewCreate.php index 12054319..921de714 100644 --- a/wms/mkt/pricereviewCreate.php +++ b/wms/mkt/pricereviewCreate.php @@ -35,8 +35,8 @@ if(isset($_GET['id'])){ $vol_no = $main['contractno']; } if($main && $main['status'] == 'YS'){ - // echo ""; - // exit; + echo ""; + exit; } $hope_status = [ 'A'=>'有望簽約(已報價)', @@ -56,8 +56,8 @@ $stmt->execute(); $hope_customer = $stmt->fetch(PDO::FETCH_ASSOC); if($user_id !== $hope_customer['salesman'] && $user_id !== "M0174"){ - // echo ""; - // exit; + echo ""; + exit; } if($hope_customer['vol_no']=="" || $hope_customer['customer']=="" || @@ -73,8 +73,8 @@ $hope_customer['status']=="" || $hope_customer['address']=="" || $hope_customer['case_name']=="" ){ - // echo ""; - // exit; + echo ""; + exit; } $hope_elevators = []; $total_spec = 0; @@ -84,6 +84,8 @@ $otherOptions = []; $otherOptionKey = 0; $demolishOptions = []; $demolishOptionKey = 0; + +$form_key = null; if($main){ $mid = $main["id"]; $sql_str = "SELECT @@ -267,6 +269,13 @@ if($main){ ]; } + //獲取form_key + $sql_str = "SELECT form_key FROM flow WHERE form_id = :form_id AND system_id = 'prm' LIMIT 1"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':form_id', $id); + $stmt->execute(); + $flow = $stmt->fetch(PDO::FETCH_ASSOC); + $form_key = $flow['form_key']; }else{ //獲取有望客戶電梯規格 $sql_str = "SELECT @@ -1085,4 +1094,6 @@ function convertDateTimeFormat($dateTimeStr) { const warranty_rate = ''; const paymentRatio = [...]; const user_id = ''; + const form_key = ''; + console.log(form_key); \ No newline at end of file diff --git a/wms/mkt/window-modal/historySignModal.php b/wms/mkt/window-modal/historySignModal.php new file mode 100644 index 00000000..ede4d6e6 --- /dev/null +++ b/wms/mkt/window-modal/historySignModal.php @@ -0,0 +1,62 @@ +
+
+
+

歷史簽核紀錄

+ +
+
+
+
+ + + + + + + + + + + $history): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
審核審核人結果意見時間
區經理
總經理
+
+
+
+ +
+ +
+ \ No newline at end of file