From c49500f90630b990eaf5b460824cb4920655689a Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Thu, 23 Nov 2023 09:55:49 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B1=B0=E6=94=B9=E7=B0=BD=E6=A0=B8bug=20f?=
 =?UTF-8?q?ix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/fun_global.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wms/fun_global.php b/wms/fun_global.php
index b00c9d19..e995e449 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -124,11 +124,11 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag) {
     mysqli_free_result($res);
 
     if ($renovate_flag == "REN") {
-        if ($rate < 80 && $rate >= 60) $ret[3] = "M0008";  // 詹總
+        if ($rate < 80) $ret[3] = "M0008";  // 詹總
         if ($rate < 60) $ret[4] = "M0006";  // 總經理
     } else {
         // 全汰改
-        if ($rate < 80 && $rate >= 75) $ret[3] = "M0008";  // 詹總
+        if ($rate < 80) $ret[3] = "M0008";  // 詹總
         if ($rate < 75) $ret[4] = "M0006";  // 總經理
     }
 

From 9dc6ea134529ef018a282c91225855aa8a41c6b8 Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Thu, 23 Nov 2023 11:50:11 +0800
Subject: [PATCH 2/6] =?UTF-8?q?option=E5=88=AA=E9=99=A4=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/crm/async_req.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wms/crm/async_req.php b/wms/crm/async_req.php
index af5a0d5a..9c04bf7f 100644
--- a/wms/crm/async_req.php
+++ b/wms/crm/async_req.php
@@ -19,5 +19,5 @@ function rm_option($req)
 {
     $vol_no = $req['vol_no'];
     $model_no = $req['model_no'];
-    DB::query("delete from hope_elevator_option_price  where vol_no='$vol_no' and model_no='$model_no'");
+    DB::query("delete from hope_elevator_option_price  where vol_no='$vol_no' and id='$model_no'");
 }

From aa7a680e156480631a772137e4e397b02688ee55 Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Thu, 23 Nov 2023 13:39:59 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8A=A0=E4=B8=8Aoption=E9=A0=85=E7=9B=AE?=
 =?UTF-8?q?=E7=8B=80=E6=85=8B=E5=88=A4=E6=96=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/crm/crmm03-edit.php | 2 +-
 wms/crm/crmm04-edit.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wms/crm/crmm03-edit.php b/wms/crm/crmm03-edit.php
index 0e27348d..a08b40db 100644
--- a/wms/crm/crmm03-edit.php
+++ b/wms/crm/crmm03-edit.php
@@ -131,7 +131,7 @@ $hpeoRow .= "<td><button onClick='delHpeoRow(this)' type='button' class='btn btn
 
 
 //linkman,
-$sql = " SELECT id,spec,memo,case when optional then  '1-選配' when 2 then '2-標配' end optional ,unit,price  FROM option_price    ";
+$sql = " SELECT id,spec,memo,case when optional then  '1-選配' when 2 then '2-標配' end optional ,unit,price  FROM option_price where status='Y'";
 $option_price = DB::result($sql);
 
 
diff --git a/wms/crm/crmm04-edit.php b/wms/crm/crmm04-edit.php
index b5f4bbc0..188bce36 100644
--- a/wms/crm/crmm04-edit.php
+++ b/wms/crm/crmm04-edit.php
@@ -143,7 +143,7 @@ $option_price_column = [
 ];
 $sql = " SELECT  * FROM $table_option_price  where 1=1 $where  ";
 $hope_project_elevator_option = DB::result($sql);
-$sql = " SELECT id,spec,memo,case when optional then  '1-選配' when 2 then '2-標配' end optional ,unit,price  FROM option_price    ";
+$sql = " SELECT id,spec,memo,case when optional then  '1-選配' when 2 then '2-標配' end optional ,unit,price  FROM option_price where status='Y'";
 $option_price = DB::result($sql);
 
 $hpeoRow = "  <tr>";

From 8f80993f79d89b156ffebebc033aeb93ade7f1e2 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Thu, 23 Nov 2023 18:11:57 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BC=E7=A5=A8?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=A4=E6=96=B7=E8=88=87=E4=BE=9D=E6=93=9A?=
 =?UTF-8?q?=E5=B9=A3=E5=88=A5=E4=BD=9C=E6=95=B4=E6=95=B8=E6=88=96=E5=8F=96?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B8=E9=BB=9E=E5=BE=8C=E5=85=A9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/WriteOff.xlsx    | Bin 8783 -> 8785 bytes
 wms/rib02-create.php |  32 ++++++++++------------
 wms/rib02-edit.php   |  23 +++++++++-------
 wms/rib03-submit.php |  62 +++++++++++++++++++++----------------------
 4 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/wms/WriteOff.xlsx b/wms/WriteOff.xlsx
index 2cb167432c169e95a6f5cccbc69aaf8e68358f0b..f0bd5f01e16abde4427b97f06faf3b72163ce1c2 100644
GIT binary patch
delta 2732
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
bR@#k>?fS`G-#6GUQsP09Du=|Nza#$voE$S-

delta 2732
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
X<=DlJ{mfv;NXKyqtI%;mPa^*U0eB6}

diff --git a/wms/rib02-create.php b/wms/rib02-create.php
index 7cc5dd20..ee2dbad2 100644
--- a/wms/rib02-create.php
+++ b/wms/rib02-create.php
@@ -636,28 +636,24 @@ $materials = $conn->query($sql_Material);
                 $("#FeeDate").val('');
             } else {
                 let year = $("#FeeDate").val().substr(0, 4);
-                let month = $("#FeeDate").val().substr(4, 2);
+                let month = parseInt($("#FeeDate").val().substr(4, 2)) - 1;
                 let day = $("#FeeDate").val().substr(6, 2);
                 let feedate = new Date(year, month, day);
-                feedate.setMonth(feedate.getMonth() - 1);
                 let now = new Date();
-                if (feedate > now) {
-                    alert("費用日期不可大於今天");
-                    $("#FeeDate").val('');
+                if (feedate.getMonth() != month) {
+                    alert("請輸入正確格式的日期");
                 } else {
-                    now.setMonth(now.getMonth() - 2);
-                    now.setDate(1);
-                    now.setDate(now.getDate() - 1);
-                    console.log(now.getFullYear());
-                        console.log(now.getMonth());
-                        console.log(now.getDate());
-                        console.log(feedate.getFullYear());
-                        console.log(feedate.getMonth());
-                        console.log(feedate.getDate());
-                    if (feedate <= now) {
-
-                        alert("超過兩個月的費用無法進行報銷");
+                    if (feedate > now) {
+                        alert("費用日期不可大於今天");
                         $("#FeeDate").val('');
+                    } else {
+                        now.setMonth(now.getMonth() - 2);
+                        now.setDate(1);
+                        now.setDate(now.getDate() - 1);
+                        if (feedate <= now) {
+                            alert("超過兩個月的費用無法進行報銷");
+                            $("#FeeDate").val('');
+                        }
                     }
                 }
             }
@@ -685,7 +681,7 @@ $materials = $conn->query($sql_Material);
     };
 
     function senddata() {
-        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "") {
+        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "" || $("#WriteOffId").val() == "") {
             alert("請確認紅字部分皆有填寫");
         } else if ($("#OAmount").val() <= 0) {
             alert("金額必須大於零");
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index a78cde97..f1ea8ccc 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -550,21 +550,24 @@ $materials = $conn->query($sql_Material);
                 $("#FeeDate").val('');
             } else {
                 let year = $("#FeeDate").val().substr(0, 4);
-                let month = $("#FeeDate").val().substr(4, 2);
+                let month = parseInt($("#FeeDate").val().substr(4, 2)) - 1;
                 let day = $("#FeeDate").val().substr(6, 2);
                 let feedate = new Date(year, month, day);
-                feedate.setMonth(feedate.getMonth() - 1);
                 let now = new Date();
-                if (feedate > now) {
-                    alert("費用日期不可大於今天");
-                    $("#FeeDate").val('');
+                if (feedate.getMonth() != month) {
+                    alert("請輸入正確格式的日期");
                 } else {
-                    now.setMonth(now.getMonth() - 2);
-                    now.setDate(1);
-                    now.setDate(now.getDate() - 1)
-                    if (feedate < now) {
-                        alert("超過兩個月的費用無法進行報銷");
+                    if (feedate > now) {
+                        alert("費用日期不可大於今天");
                         $("#FeeDate").val('');
+                    } else {
+                        now.setMonth(now.getMonth() - 2);
+                        now.setDate(1);
+                        now.setDate(now.getDate() - 1);
+                        if (feedate <= now) {
+                            alert("超過兩個月的費用無法進行報銷");
+                            $("#FeeDate").val('');
+                        }
                     }
                 }
             }
diff --git a/wms/rib03-submit.php b/wms/rib03-submit.php
index 336be643..bbc05b82 100644
--- a/wms/rib03-submit.php
+++ b/wms/rib03-submit.php
@@ -224,13 +224,13 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
     $WriteOffDescribe = empty($rib['WriteOffDescribe']) ? null : $rib['WriteOffDescribe'];
     $DeptId = $rib['DeptId'];
     $CostCenterId = empty($rib['CostCenterId']) ? Null : $rib['CostCenterId'];
-    $HadPayOAmount = $rib['HadPayOAmount'];
-    $HadPayLAmount = $rib['HadPayLAmount'];
-    $UnPayOAmount = $rib['UnPayOAmount'];
-    $UnPayLAmount = $rib['UnPayLAmount'];
+    $HadPayOAmount = $CurrId=="TWD"? round($rib['HadPayOAmount']):round($rib['HadPayOAmount'],2);
+    $HadPayLAmount = $CurrId=="TWD"? round($rib['HadPayLAmount']):round($rib['HadPayLAmount'],2);
+    $UnPayOAmount = $CurrId=="TWD"? round($rib['UnPayOAmount']):round($rib['UnPayOAmount'],2);
+    $UnPayLAmount = $CurrId=="TWD"? round($rib['UnPayLAmount']):round($rib['UnPayLAmount'],2);
     $PaymentState = $rib['PaymentState'];
-    $Balance = $rib['Balance'];
-    $LBalance = $rib['LBalance'];
+    $Balance = $CurrId=="TWD"? round($rib['Balance']):round($rib['Balance'],2);
+    $LBalance = $CurrId=="TWD"? round($rib['LBalance']):round($rib['LBalance'],2);
     $GatheringPersonId = $rib['GatheringPersonId'];
     $GatheringPersonDescribe = empty($rib['GatheringPersonDescribe']) ? Null : $rib['GatheringPersonDescribe'];
     $BankId = empty($rib['BankId']) ? Null : $rib['BankId'];
@@ -241,19 +241,20 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
     $BankAccount = empty($rib['BankAccount']) ? Null : $rib['BankAccount'];
     $BankAccountName = empty($rib['BankAccountName']) ? Null : $rib['BankAccountName'];
     $IsTaxBill = $rib['IsTaxBill'];
-    $OAmount = $rib['OAmount'];
-    $LAmount = $rib['LAmount'];
-    $OTax = $rib['OTax'];
-    $LTax = $rib['LTax'];
-    $LAmountWithTax = $rib['LAmountWithTax'];
-    $OAmountWithTax = $rib['OAmountWithTax'];
+    $OAmount = $CurrId=="TWD"? round($rib['OAmount']):round($rib['OAmount'],2);
+    $LAmount = $CurrId=="TWD"? round($rib['LAmount']):round($rib['LAmount'],2);
+    $OTax = $CurrId=="TWD"? round($rib['OTax']):round($rib['OTax'],2);
+    $LTax = $CurrId=="TWD"? round($rib['LTax']):round($rib['LTax'],2);
+    $LAmountWithTax = $CurrId=="TWD"? round($rib['LAmountWithTax']):round($rib['LAmountWithTax'],2);
+    $OAmountWithTax = $CurrId=="TWD"? round($rib['OAmountWithTax']):round($rib['OAmountWithTax'],2);
     $IsContainTax = $rib['IsContainTax'];
-    $AdvanceOAmount = $rib['AdvanceOAmount'];
-    $AdvanceLAmount = $rib['AdvanceLAmount'];
+    $AdvanceOAmount = $CurrId=="TWD"? round($rib['AdvanceOAmount']):round($rib['AdvanceOAmount'],2);
+    $AdvanceLAmount = $CurrId=="TWD"? round($rib['AdvanceLAmount']):round($rib['AdvanceLAmount'],2);
     $PrePayWriteOffAmount = $rib['PrePayWriteOffAmount'];
-    $WriteOffAmount = $rib['WriteOffAmount'];
+    $WriteOffAmount = $CurrId=="TWD"? round($rib['WriteOffAmount']):round($rib['WriteOffAmount'],2);
     $TelNo = empty($rib['TelNo']) ? Null : $rib['TelNo'];
-    $UnPaymentLAmt = empty($rib['UnPaymentLAmt']) ? null : $rib['UnPaymentLAmt'];
+    $UnPaymentLAmt = empty($rib['UnPaymentLAmt']) ? null : ($CurrId=="TWD"? round($rib['UnPaymentLAmt']):round($rib['UnPaymentLAmt'],2));
+    $CreatorId = $rib['CreatorId'];
 
 
     $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -262,14 +263,14 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
             HadPayOAmount,HadPayLAmount,UnPayOAmount,UnPayLAmount,PaymentState,Balance,LBalance,
             FillUp,GatheringBizOrgId, GatheringPersonId, IsTaxBill, OAmount,LAmount,OTax,LTax,LAmountWithTax,OAmountWithTax,
             IsContainTax,AdvanceOAmount,AdvanceLAmount,PrePayWriteOffAmount,WriteOffAmount,
-            CompId,UnPaymentOAmt,UnPaymentLAmt,IsPayment, CurrentState,PermitState";
+            CompId,UnPaymentOAmt,UnPaymentLAmt,IsPayment, CurrentState,PermitState,CreatorId";
 
     $sql2 = ") VALUES ('$BillNo',$BillDate,'1000','1000','$TypeId','1000',
             '$CurrId','$TransactId',$WriteOffType,'1000','$WriteOffId','$DeptId',
             $HadPayOAmount,$HadPayLAmount,$UnPayOAmount,$UnPayLAmount,$PaymentState,$Balance,$LBalance,
             0,'1000','$GatheringPersonId',$IsTaxBill,$OAmount,$LAmount,$OTax,$LTax,$LAmountWithTax,$OAmountWithTax,
             $IsContainTax,$AdvanceOAmount,$AdvanceLAmount,$PrePayWriteOffAmount,$WriteOffAmount,
-            '1001',$WriteOffAmount,$UnPaymentLAmt,0,2,0";
+            '1001',$WriteOffAmount,$UnPaymentLAmt,0,2,0,'$CreatorId'";
 
     $sql .= empty($CostCenterId) ? "" : ",CostCenterId";
     $sql2 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
@@ -309,18 +310,18 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
         $CostCenterId = empty($ribsub['CostCenterId']) ? Null : $ribsub['CostCenterId'];
         $UnitId = $ribsub['UnitId'];
         $Quantity = $ribsub['Quantity'];
-        $Price = $ribsub['Price'];
-        $CurrOAmount = $ribsub['CurrOAmount'];
-        $CurrLAmount = $ribsub['CurrentLAmount'];
+        $Price = $CurrId=="TWD"? round($ribsub['Price']) : round($ribsub['Price'],2);
+        $CurrOAmount = $CurrId=="TWD"? round($ribsub['CurrOAmount']) : round($ribsub['CurrOAmount'],2);
+        $CurrLAmount = $CurrId=="TWD"? round($ribsub['CurrentLAmount']): round($ribsub['CurrentLAmount'],2);
         $TaxId = $ribsub['TaxId'];
         $TaxRate = $ribsub['TaxRate'];
-        $OTax = $ribsub['OTax'];
-        $LTax = $ribsub['LTax'];
-        $LAmountUnWithTax = $ribsub['LAmountUnWithTax'];
-        $OAmountUnWithTax = $ribsub['OAmountUnWithTax'];
-        $OAmount = $ribsub['OAmount'];
-        $LAmount = $ribsub['LAmount'];
-        $FeeBalance = $ribsub['FeeBalance'];
+        $OTax = $CurrId=="TWD"? round($ribsub['OTax']): round($ribsub['OTax'],2);
+        $LTax = $CurrId=="TWD"? round($ribsub['LTax']): round($ribsub['LTax'],2);
+        $LAmountUnWithTax = $CurrId=="TWD"? round($ribsub['LAmountUnWithTax']): round($ribsub['LAmountUnWithTax'],2);
+        $OAmountUnWithTax = $CurrId=="TWD"? round($ribsub['OAmountUnWithTax']): round($ribsub['OAmountUnWithTax'],2);
+        $OAmount = $CurrId=="TWD"? round($ribsub['OAmount']): round($ribsub['OAmount'],2);
+        $LAmount = $CurrId=="TWD"? round($ribsub['LAmount']): round($ribsub['LAmount'],2);
+        $FeeBalance = $CurrId=="TWD"? round($ribsub['FeeBalance']): round($ribsub['FeeBalance'],2);
         $VoucherCount = $ribsub['VoucherCount'];
 
         $FeeNoteShow = empty($ribsub['FeeNoteShow']) ? Null : $ribsub['FeeNoteShow'];
@@ -341,13 +342,13 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
         $sqlsub = "INSERT INTO glFeeWriteOffSub (BillNo, RowCode,RowNo,FeeDate,FeeTypeId, WriteOffType,
             BizOrgId, WriteOffId, FeeOrgId, FeeDeptId, FeeCompanyId, UnitId ,
              Quantity, Price, CurrOAmount,CurrLAmount,TaxId,TaxRate,OTax,LTax,LAmountUnWithTax
-             ,OAmountUnWithTax,OAmount,LAmount,FeeBalance,VoucherCount,CurrId,WriteOffAmount,SupplyOrgId,IsCounteract,IsKeyByFeeInfo,CreatorId
+             ,OAmountUnWithTax,OAmount,LAmount,FeeBalance,VoucherCount,CurrId,WriteOffAmount,SupplyOrgId,IsCounteract,IsKeyByFeeInfo
              ";
 
         $sqlsub2 = ") VALUES ('$BillNo',$RowCode, $RowNo,$FeeDate,'$FeeTypeId',$WriteOffType,
             '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',
             $Quantity, $Price, $CurrOAmount, $CurrLAmount,'$TaxId',$TaxRate,$OTax,$LTax,$LAmountUnWithTax
-            ,$OAmountUnWithTax,$OAmount,$LAmount,$FeeBalance,$VoucherCount,'$CurrId',$WriteOffAmount,'1000',$IsCounteract,0,$CreatorId
+            ,$OAmountUnWithTax,$OAmount,$LAmount,$FeeBalance,$VoucherCount,'$CurrId',$WriteOffAmount,'1000',$IsCounteract,0
             ";
 
         $sqlsub .= empty($WriteOffDescribe) ? "" : ",WriteOffDescribe";
@@ -374,7 +375,6 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
 
         $sqlsub .= $sqlsub2;
         $sqlsub .= ")";
-
         $result2 = $conn->query($sqlsub);
     }
 

From 1221f77c720788ecab0de7931a2214d350b067af Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Fri, 24 Nov 2023 15:18:25 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1.=E7=B5=B1=E7=B7=A8=E6=94=B9=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=202.=E4=BF=AE=E6=94=B9=E7=80=8F=E8=A6=BD?=
 =?UTF-8?q?=E6=AC=8A=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/mkt/pricereview_repair-check.php  |  5 ++++-
 wms/mkt/pricereview_repair-create.php | 29 +++++++++++++++------------
 wms/mkt/pricereview_repair-index.php  | 16 ++++-----------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/wms/mkt/pricereview_repair-check.php b/wms/mkt/pricereview_repair-check.php
index 011a6869..56caeff1 100644
--- a/wms/mkt/pricereview_repair-check.php
+++ b/wms/mkt/pricereview_repair-check.php
@@ -91,6 +91,9 @@ input[type=submit], input[type=button] {
 .dollar-right {
     text-align: right;
 }
+.star {
+    color: red;
+}
 </style>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 <script>
@@ -230,7 +233,7 @@ $(function(){
             <table class="table table-bordered">
                 <thead>
                     <tr>
-                        <th colspan="10">簽核操作</th>
+                        <th colspan="10">簽核操作<span class="star">*</span></th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/wms/mkt/pricereview_repair-create.php b/wms/mkt/pricereview_repair-create.php
index b8fd4938..285d561f 100644
--- a/wms/mkt/pricereview_repair-create.php
+++ b/wms/mkt/pricereview_repair-create.php
@@ -116,6 +116,9 @@ input[type=submit], input[type=button] {
 .dollar-right {
     text-align: right;
 }
+.star {
+    color: red;
+}
 </style>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 <script>
@@ -342,7 +345,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
 ?>
     <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
         <div>
-            <label for="contractno">客戶合約號</label>
+            <label for="contractno">客戶合約號<span class="star">*</span></label>
             <input type="text" name="contractno" id="contractno" required>
         </div>
         <div>
@@ -351,16 +354,16 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
         </div>
         <div class="nextline"></div>
         <div>
-            <label for="repair_no">報價單編號</label>
+            <label for="repair_no">報價單編號<span class="star">*</span></label>
             <input type="text" name="repair_no" id="repair_no" value="<?php echo $repair_no; ?>" readonly>
         </div>
         <div class="nextline"></div>
         <div>
-            <label for="sign_date">簽訂日期</label><br>
+            <label for="sign_date">簽訂日期<span class="star">*</span></label><br>
             <input type="date" name="sign_date" id="sign_date" value="<?php echo date('Y-m-d'); ?>" required>
         </div>
         <div>
-            <label for="company">公司地址</label>
+            <label for="company">公司地址<span class="star">*</span></label>
             <select name="masada_addr" id="masada_addr" required>
                 <option value=""></option>
                 <?php
@@ -371,11 +374,11 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
             </select>
         </div>
         <div>
-            <label for="company">客戶名稱</label>
+            <label for="company">客戶名稱<span class="star">*</span></label>
             <input type="text" name="company" id="company" size="30" required>
         </div>
         <div>
-            <label for="facilityno">電梯編號</label>
+            <label for="facilityno">電梯編號<span class="star">*</span></label>
             <input type="text" name="facilityno" required>
             <select name="facilityno" required>
                 <option value=""></option>
@@ -383,19 +386,19 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
         </div>
         <div class="nextline"></div>
         <div>
-            <label for="address">工程地址</label>
+            <label for="address">工程地址<span class="star">*</span></label>
             <input type="text" name="address" id="address" size="50" required>
         </div>
         <div>
-            <label for="taxid">客戶統一編號</label>
-            <input type="text" name="taxid" id="taxid" maxlength="8" required>
+            <label for="taxid">客戶統一編號<span></span></label>
+            <input type="text" name="taxid" id="taxid" maxlength="8">
         </div>
         <div>
-            <label for="invoice">客戶發票抬頭</label>
+            <label for="invoice">客戶發票抬頭<span class="star">*</span></label>
             <input type="text" name="invoice" id="invoice" size="30" required>
         </div>
         <div>
-            <label for="repairerid">申請人</label>
+            <label for="repairerid">申請人<span class="star">*</span></label>
             <select name="repairerid" id="repairerid" required>
                 <option value=""></option>
                 <?php
@@ -418,7 +421,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
             <table id="tb1" class="table table-bordered">
                 <thead>
                     <tr>
-                        <th colspan="10"><a href="javascript:void(0);" id="btnadd" class="btn btn-primary btn-sm">新增</a></th>
+                        <th colspan="10"><a href="javascript:void(0);" id="btnadd" class="btn btn-primary btn-sm">新增備品</a> <span class="star">*</span></th>
                     </tr>
                     <tr>
                         <th nowrap>名稱</th>
@@ -476,7 +479,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
             <table class="table table-bordered">
                 <thead>
                     <tr>
-                        <th colspan="10">簽核操作</th>
+                        <th colspan="10">簽核操作<span class="star">*</span></th>
                     </tr>
                 </thead>
                 <tbody>
diff --git a/wms/mkt/pricereview_repair-index.php b/wms/mkt/pricereview_repair-index.php
index a910c023..d8f49604 100644
--- a/wms/mkt/pricereview_repair-index.php
+++ b/wms/mkt/pricereview_repair-index.php
@@ -9,24 +9,16 @@ $psta_arr = ["A" => "簽核中", "B1" => "已同意", "B2" => "已完工", "X" =
 // 設置一個空陣列來放資料
 $data = array();
 // sql語法存在變數中
-$sql_cmd = sql_myself($user_id, "repairerid");
+$sql_cmd = "where (repairerid = '$user_id' or checker = '$user_id')";
 $is_manager = 0;
 // 宜：M0054-陳志文
-$repman_arr[0] = ["M0177"];
 // 北：M0137-劉永德
-$repman_arr[1] = ["M0059","M0083","M0084","M0090","M0064","M0106","M0092","M0120","M0147","M0139","M0194","M0210"];
 // 桃：M0026-張莉凱
-$repman_arr[2] = ["M0018", "M0045","M0089","M0104","M0111"];
 // 中：M0086-李烘銘
-$repman_arr[3] = ["M0148","M0114","M0161"];
 // 南：M0033-吳育宗
-$repman_arr[4] = ["M0196","M0195","M0190","M0094","M0123","M0124"];
-if ($user_id == "M0054") { $is_manager = 1; $sql_cmd = "where repairerid in ('".implode("','", $repman_arr[0])."')"; }
-elseif ($user_id == "M0137") { $is_manager = 1; $sql_cmd = "where repairerid in ('".implode("','", $repman_arr[1])."')"; }
-elseif ($user_id == "M0026") { $is_manager = 1; $sql_cmd = "where repairerid in ('".implode("','", $repman_arr[2])."')"; }
-elseif ($user_id == "M0086") { $is_manager = 1; $sql_cmd = "where repairerid in ('".implode("','", $repman_arr[3])."')"; }
-elseif ($user_id == "M0033") { $is_manager = 1; $sql_cmd = "where repairerid in ('".implode("','", $repman_arr[4])."')"; }
-elseif ($user_id == "M0012") $sql_cmd = "";
+$manager_arr = ["M0054", "M0137", "M0026", "M0086", "M0033"];
+if (in_array($user_id, $manager_arr)) $is_manager = 1;
+if ($user_id == "M0012") $sql_cmd = "";
 $sql = "select * from pricereview_repair_main $sql_cmd order by id";
 $data = mysqli_query($link,$sql);
 $para = "function_name=pricereview_repair&".$token_link;

From d2abcf120e2a3358b99c5859237cc4c669150fba Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Fri, 24 Nov 2023 16:09:27 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=96=8B=E6=94=BE=E6=9D=8E=E7=9B=88?=
 =?UTF-8?q?=E7=91=A9=E7=80=8F=E8=A6=BD=E6=AC=8A=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/mkt/pricereview_renovate-index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wms/mkt/pricereview_renovate-index.php b/wms/mkt/pricereview_renovate-index.php
index b5f5e520..9ad5e544 100644
--- a/wms/mkt/pricereview_renovate-index.php
+++ b/wms/mkt/pricereview_renovate-index.php
@@ -10,8 +10,8 @@ $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "Y
 $data = array();
 // sql語法存在變數中
 $sql_cmd = sql_myself($user_id);
-// M0024許伃廷,M0107許紓晴權限全開
-if ($user_id == "M0024" || $user_id == "M0107") {
+// M0024許伃廷,M0107許紓晴,M0012李盈瑩權限全開
+if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012") {
     $sql_cmd = "where create_at >= '2023-01-01 00:00:00'";
 }
 if ($user_id == "M0008") {