diff --git a/wms/mkt/api/postNewElevatorPricereview.php b/wms/mkt/api/postNewElevatorPricereview.php
index 0337ae81..841f53d6 100644
--- a/wms/mkt/api/postNewElevatorPricereview.php
+++ b/wms/mkt/api/postNewElevatorPricereview.php
@@ -684,6 +684,10 @@ try{
$manager = "M0137";
}
$sign1 = "$manager,,"; //區處長
+ //新梯區處長自己填價審 ,審核直接通過
+ if($creater == "M0033" || $creater == "M0054" || $creater == "M0086" || $creater == "M0137" ){
+ $sign1 = $creater . ",Y,".date('Y-m-d H:i:s');
+ }
$sign2 =$ekind == '汰改'? "M0012,," : NULL; // 業務承辦人
$sign3 = $ekind == '汰改' ? "M0008,," : "M0060,,"; //業務部協理
$signArr = [
@@ -692,8 +696,8 @@ try{
$sign3,
];
$sign_total = count(array_filter($signArr, fn($item)=> $item != NULL));
- //是否呈核至總經理(M0006)
- if($price_rate < 80 || $special_fee > 0){
+ //是否呈核至總經理(M0006) ,暫時不送至總經理,所以加入false
+ if((false && $price_rate < 80 || $special_fee > 0)){
$sign4 = "M0006,,";
$sign_total += 1;
}else{
diff --git a/wms/mkt/api/postPricereviewSign.php b/wms/mkt/api/postPricereviewSign.php
index 01bbd928..dfe15b01 100644
--- a/wms/mkt/api/postPricereviewSign.php
+++ b/wms/mkt/api/postPricereviewSign.php
@@ -97,7 +97,7 @@ try{
//待簽通知
if($form_key == null){
- $sql_str = "SELECT form_key FROM flow WHERE form_id = :form_id";
+ $sql_str = "SELECT form_key FROM flow WHERE form_id = :form_id AND system_id = 'prm' AND (flow_id='prm01' OR flow_id='prm02')";
$stmt = $conn->prepare($sql_str);
$stmt->bindParam(':form_id', $mid);
$stmt->execute();
diff --git a/wms/mkt/api/updateSign.php b/wms/mkt/api/updateSign.php
new file mode 100644
index 00000000..3d57e5b2
--- /dev/null
+++ b/wms/mkt/api/updateSign.php
@@ -0,0 +1,51 @@
+prepare($sql_str);
+$stmt->execute();
+$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+foreach($result as $sign){
+ $endSign = false;
+ if(explode(",", $sign['sign3'])[1] == "Y"){
+ $newSign3 = str_replace("Y", "YY", $sign['sign3']);
+ $sign4_is_null = $sign['sign4'] == null ? true : false;
+ $sql_str = $sign4_is_null ? "UPDATE pricereview_sign SET sign3 = :sign3 WHERE id = :id" : "UPDATE pricereview_sign SET sign3 = :sign3, sign4 = NULL, sign_total = sign_total - 1 WHERE id = :id";
+ $stmt = $conn->prepare($sql_str);
+ $stmt->bindParam(':sign3', $newSign3);
+ $stmt->bindParam(':id', $sign['id']);
+ $stmt->execute();
+
+ $sql_str = "UPDATE pricereview_main SET status = 'YY' WHERE id = :id AND status = 'YS' ";
+
+ $stmt = $conn->prepare($sql_str);
+ $stmt->bindParam(':id', $sign['mid']);
+ $stmt->execute();
+
+ $sql_str = "UPDATE flow SET flow_code = 'Z' WHERE form_id = :id AND system_id = 'prm' AND (flow_id = 'prm01' OR flow_id = 'prm02')";
+ $stmt = $conn->prepare($sql_str);
+ $stmt->bindParam(':id', $sign['mid']);
+ $stmt->execute();
+
+ echo $sign['mid'];
+ echo "
";
+ }else{
+ if($sign['sign4'] != NULL){
+ $sql_str = "UPDATE pricereview_sign SET sign4 = NULL, sign_total = sign_total + 1 WHERE id = :id AND sign4 IS NOT NULL";
+ $stmt = $conn->prepare($sql_str);
+ $stmt->bindParam(':id', $sign['id']);
+ $stmt->execute();
+
+ echo $sign['mid'];
+ echo "
";
+ }
+
+ }
+}
+
diff --git a/wms/mkt/assets/js/pricereviewAlpine.js b/wms/mkt/assets/js/pricereviewAlpine.js
index bd1d74a9..227b2f4c 100644
--- a/wms/mkt/assets/js/pricereviewAlpine.js
+++ b/wms/mkt/assets/js/pricereviewAlpine.js
@@ -1182,13 +1182,13 @@ const pricereviewCheck = ()=>{
totalStandardPrice(){
return this.totalElevatorsPrice() + this.otherOptionsTotalPrice() + this.optionsTotalPrice() + this.maintainOptionsTotalPrice() + this.demolishOptionsTotalPrice();
},
- check(sign, status){
+ check(sign, status, user_id = this.user_id ){
console.log(sign);
const form = new FormData();
form.append('sign', sign);
form.append('mid', this.mid);
form.append('result', status);
- form.append('user_id', this.user_id);
+ form.append('user_id', user_id);
form.append('reviewcomment', this.reviewcomment);
form.append('currentSignId', currentSignId);
form.append('token', token);
diff --git a/wms/mkt/exportTable.php b/wms/mkt/exportTable.php
new file mode 100644
index 00000000..9f4a2187
--- /dev/null
+++ b/wms/mkt/exportTable.php
@@ -0,0 +1,76 @@
+ 'D'
+AND pricereview_main.create_at >= '2024-01-01'
+AND pricereview_main.create_at <= '2024-01-31'
+AND ekind = '汰改'";
+$stmt = $conn->prepare($sql_str);
+// $stmt->bindParam(':vol_no', $vol_no);
+$stmt->execute();
+$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+
+
+
+?>
+
+
+
ID | +卷號 | +營業員 | +客戶名稱 | +案件名稱 | +牌價總額 | +售價總額 | +價率 | +預定成交日 | +預定交期 | +建檔人 | +建檔時間 | +狀態 | +
---|---|---|---|---|---|---|---|---|---|---|---|---|
+ | + | + | + | + | + | + | + | + | + | + | + | + + | + +
ID | +卷號 | +營業員 | +客戶名稱 | +案件名稱 | +標準價 | +售價總額 | +契約成交價 | +保養月數 | +建檔人 | +建檔時間 | +狀態 | +
---|---|---|---|---|---|---|---|---|---|---|---|
+ | + | + | + | + | + | + | + | + | + | + | + 簽核中 + | + +