M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

汰改價審上傳

main
10994015 1 year ago
parent
ead52f9b44
commit
ec671b0382
4 changed files with 78 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      wms/mkt/api/postNewElevatorPricereview.php
  2. 42
      wms/mkt/assets/js/pricereviewAlpine.js
  3. 16
      wms/mkt/pricereviewCheck.php
  4. 7
      wms/mkt/pricereview_renovate-index.php

43
wms/mkt/api/postNewElevatorPricereview.php
View File

@ -186,7 +186,8 @@ if($main){
$price_id = $elevator['facility_id'];
$item_no = $elevator['id'];
$item_group = "A";
$item_spec = $elevator['specifications'] . "-" . $elevator['person'] . "*" . $elevator['stop'] . "-" . $elevator['open_converted'] . $elevator['speed'];
// $item_spec = $elevator['specifications'] . "-" . $elevator['person'] . "*" . $elevator['stop'] . "-" . $elevator['open_converted'] . $elevator['speed'];
$item_spec = getSpec($elevator['specifications'], $elevator['person'], $elevator['stop'], $elevator['open_converted'], $elevator['speed']);
$item_weight = $elevator['weight'];
$item_op = $elevator['open_converted'];
@ -216,7 +217,8 @@ if($main){
$price_id = $elevator['facility_id'];
$item_no = $elevator['id'];
$item_group = "A";
$item_spec = $elevator['specifications'] . "-" . $elevator['person'] . "*" . $elevator['stop'] . "-" . $elevator['open_converted'] . $elevator['speed'];
// $item_spec = $elevator['specifications'] . "-" . $elevator['person'] . "*" . $elevator['stop'] . "-" . $elevator['open_converted'] . $elevator['speed'];
$item_spec = getSpec($elevator['specifications'], $elevator['person'], $elevator['stop'], $elevator['open_converted'], $elevator['speed']);
$item_weight = $elevator['weight'];
$item_op = $elevator['open_converted'];
@ -563,10 +565,10 @@ if($main){
$price_id = $elevator['facility_id'];
$item_no = $elevator['id'];
$item_group = "A";
$item_spec = $elevator['specifications'] . "-" . $elevator['person'] . "*" . $elevator['stop'] . "-" . $elevator['open_converted'] . $elevator['speed'];
// $item_spec = $elevator['specifications'] . "-" . $elevator['person'] . "*" . $elevator['stop'] . "-" . $elevator['open_converted'] . $elevator['speed'];
$item_op = $elevator['open_converted'];
$item_weight = $elevator['weight'];
$item_spec = getSpec($elevator['specifications'], $elevator['person'], $elevator['stop'], $elevator['open_converted'], $elevator['speed']);
$item_unit_price = $elevator['price'];
$item_qty = (int)$elevator['spec_num'];
$item_price_bp = (int)$elevator['price'] * (int)$elevator['spec_num'];
@ -719,10 +721,12 @@ if($main){
$stmt->execute();
$account = $stmt->fetch(PDO::FETCH_ASSOC);
$manager = $account['manager'];
if($manager == "M0029" && $ekind == "新梯"){
$manager = "M0137";
}
$sign1 = "$manager,,"; //區處長
$sign2 = NULL; // 業務承辦人
$sign3 = "M0060,,"; //業務部協理
$sign2 =$ekind == '汰改'? "M0012,," : NULL; // 業務承辦人
$sign3 = $ekind == '汰改' ? "M0008,," : "M0060,,"; //業務部協理
//是否呈核至總經理(M0006)
if($price_rate < 80 || $special_fee > 0){
@ -732,6 +736,9 @@ if($main){
$sign4 = NULL;
$sign_total = 3;
}
if($ekind == "N"){
$sign_total = $sign_total - 1;
}
$sql_str = "INSERT INTO pricereview_sign (mid, sign1, sign2, sign3, sign4, sign_total)
VALUES (:mid, :sign1, :sign2, :sign3, :sign4, :sign_total)";
$stmt = $conn->prepare($sql_str);
@ -756,6 +763,26 @@ if($main){
function calcWeight($kind, $person){
function getSpec($spec, $person, $stop, $open, $speed){
$weightArr = array(
6 => 450,
8 => 550,
9 => 600,
10 => 700,
11 => 750,
12 => 800,
13 => 900,
15 => 1000,
17 => 1150,
20 => 1350,
24 => 1600,
);
if($spec == 'M1' || $spec=='M1+M4(1:1)' || $spec == 'M1+M4(2:1)'){
$model = "P" . $person . "-" . $weightArr[$person] . "-" . $open . "-" . $speed . "-" . $stop;
}else{
$model = $spec . "-" . $person . "*" . $stop . "-" . $open . $speed;
}
return $model;
}

42
wms/mkt/assets/js/pricereviewAlpine.js
View File

@ -816,6 +816,7 @@ const pricereviewCreate = ()=>{
return this.error.length > 0 ? false : true
},
submit(){
console.log(this.is_renovation);
const validation = this.validation();
if(!validation) return
const form = new FormData();
@ -854,6 +855,10 @@ const pricereviewCreate = ()=>{
console.log(res.data);
if(res.data == "success"){
alert("送審成功!");
if(this.is_renovation == 'Y'){
window.location.href = './pricereview_renovate-index.php?' + token_link;
return;
}
window.location.href = './pricereview-index.php?' + token_link;
}
}).catch(err=>{
@ -994,18 +999,33 @@ const pricereviewCheck = ()=>{
this.elevators_total_price += Number(elevator.item_qty) * Number(elevator.price);
//MAE100-15*24-CO105
const model = elevator.item_spec;
let spec = model.split('-')[0];
let person = model.split('-')[1].split('*')[0];
let stop = model.split('-')[1].split('*')[1].split('-')[0];
let open = model.split('-')[2];
console.log(elevator.item_spec);
let spec = '';
let person = '';
let stop = '';
let open = '';
let speed = '';
for(let i=0;i<this.openFn.length;i++){
if(open.includes(this.openFn[i])){
speed = open.replace(this.openFn[i], '')
open = this.openFn[i];
break;
if(elevator.item_spec[0] == "P"){
spec = elevator.note.split(',')[0]
person = elevator.note.split(',')[1]
stop = elevator.note.split(',')[2]
speed = elevator.note.split(',')[3]
open = elevator.item_op
}else{
spec = model.split('-')[0];
person = model.split('-')[1].split('*')[0];
stop = model.split('-')[1].split('*')[1].split('-')[0];
open = model.split('-')[2];
for(let i=0;i<this.openFn.length;i++){
if(open.includes(this.openFn[i])){
speed = open.replace(this.openFn[i], '')
open = this.openFn[i];
break;
}
}
}
this.getElevatorMi(idx, spec, person, stop, open, speed, elevator.item_weight)
});
@ -1050,8 +1070,6 @@ const pricereviewCheck = ()=>{
'add_price':0,
}
}
console.log(this.elevators[idx]);
}catch (error) {
@ -1074,7 +1092,7 @@ const pricereviewCheck = ()=>{
this.$refs.historySign.style.display = "block";
body.style.overflow = 'hidden'
},
is_renovate: false,
is_renovate: is_renovate,
elevators_total_price: 0,
contractno: contractno,
person_name: person_name,

16
wms/mkt/pricereviewCheck.php
View File

@ -233,7 +233,7 @@ if($sign){
$permissions = false;
//開啟業務部權限
if($user_id == "M0174" || $user_id == "M0175" || $user_id == "M0060"){
if($user_id == "M0174" || $user_id == "M0175" || $user_id == "M0060" || $user_id == "M0008" || $user_id == "M0012"){
$permissions = true;
}
function getSignerName($signer){
@ -284,14 +284,14 @@ function getSignerName($signer){
<td><?php echo $history['sign1_date']; ?></td>
</tr>
<tr>
<td>業務承辦人</td>
<td x-text="is_renovate=='汰改' ? '服務助理' : '業務承辦人'"></td>
<td><?php echo $history['signer2']; ?></td>
<td><?php echo $history['sign2_result']; ?></td>
<td><?php echo $history['sign2_note']; ?></td>
<td><?php echo $history['sign2_date']; ?></td>
</tr>
<tr>
<td>業務部協理</td>
<td x-text="is_renovate=='汰改' ? '服務副總' :'業務部協理'"></td>
<td><?php echo $history['signer3']; ?></td>
<td><?php echo $history['sign3_result']; ?></td>
<td><?php echo $history['sign3_note']; ?></td>
@ -368,7 +368,7 @@ function getSignerName($signer){
<td><input type="text" class="form-control" x-model="Number(elevator.price * elevator.item_qty).toLocaleString()" disabled /></td>
<?php if($permissions): ?>
<td>
<input x-show="isNotfoundMi" type="text" class="form-control" value="公司無此規格">
<input x-show="isNotfoundMi" type="text" class="form-control" value="找不到此規格">
<input x-show="!isNotfoundMi" type="text" class="form-control" x-model="Math.round(Number(elevator.optionsTotalPrice) + Number(elevator.otherOptionsTotalPrice) + Number(elevator.maintainOptionsTotalPrice) + Number(elevator.totalMi * elevator.item_qty)).toLocaleString() " disabled />
</td>
<td><input type="text" class="form-control" x-model="Number(elevator.item_price_ct).toLocaleString()" disabled /></td>
@ -838,7 +838,7 @@ function getSignerName($signer){
<td><?php echo isset($sign['sign1']) ? explode(',', $sign['sign1'])[2] : "---" ?></td>
</tr>
<tr>
<td>業務承辦人</td>
<td x-text="is_renovate=='汰改' ? '服務助理' : '業務承辦人'"></td>
<td x-text="sign2"></td>
<td>
<?php
@ -857,7 +857,7 @@ function getSignerName($signer){
<td><?php echo (isset($sign['sign2']) && $sign['sign2']!=NULL) ? explode(',', $sign['sign2'])[2] : '---' ?></td>
</tr>
<tr>
<td>業務部協理</td>
<td x-text="is_renovate=='汰改' ? '服務副總' : '業務部協理'"></td>
<td x-text="sign3"></td>
<td>
<?php
@ -929,10 +929,12 @@ function getSignerName($signer){
<?php if($contract['status'] == "YS"){ ?>
<?php if($currentSigner == $user_id): ?>
<button class="btn btn-primary" @click="check(<?php echo $currentSign; ?>, 'YN')">不同意(退回)</button>
<?php if($sign4 =='W' && $sign3 == 'W'): ?>
<?php if($sign1=='W' || ($sign1=='Y' && $sign2 =='W') || ($sign1 == 'Y' && $sign2 == 'Y' && $sign3 == 'W' && $sign4 == 'W')): ?>
<button class="btn btn-primary" @click="check(<?php echo $currentSign; ?>, 'YS')">同意(上呈)</button>
<?php endif ; ?>
<?php if(($sign3 == 'W' && $sign2 == 'Y') || ($sign3 == 'Y' && $sign4 == 'W') ): ?>
<button class="btn btn-primary" @click="check(<?php echo $currentSign; ?>, 'YY')">同意(結案)</button>
<?php endif ; ?>
<?php endif; ?>
<?php } ?>
<?php if($contract['attatch1']!=null): ?>

7
wms/mkt/pricereview_renovate-index.php
View File

@ -61,11 +61,11 @@ $data = array();
// sql語法存在變數中
$sql_cmd = sql_myself($user_id);
// M0024許伃廷,M0107許紓晴,M0012李盈瑩權限全開
if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012" || $user_id == "M0060" || $user_id == "M0189" || $user_id == "M0061" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04" || $user_id == "M0029") {
if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0012" || $user_id == "M0008" || $user_id == "M0060" || $user_id == "M0189" || $user_id == "M0061" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04" || $user_id == "M0029") {
$sql_cmd = "where create_at >= '2023-01-01 00:00:00'";
}
if ($user_id == "M0008") {
$sql_cmd = "where creater in (select accountid from account where department_id like '5%')";
// $sql_cmd = "where creater in (select accountid from account where department_id like '5%')";
}
if (!empty($res_get)) {
@ -224,7 +224,7 @@ if ($data) :
$sign1 = $sign2 = $sign3 = $sign4 = "";
$oneself = ($data["creater"] == $user_id) ? 1 : 0; // 是否為營業員本人
// 簽核狀況
$db_query = "select sign1, sign2, sign3, sign4 from pricereview_sign where mid = '" . $data["id"] . "'";
$db_query = "select sign1, sign2, sign3, sign4 from pricereview_sign where mid = '" . $data["id"] . "' order by id desc";
$res_s = mysqli_query($link, $db_query);
if ($row_s = mysqli_fetch_row($res_s)) {
list($sign1, $sign2, $sign3, $sign4) = $row_s;
@ -353,6 +353,7 @@ if ($data) :
$str .= "<br>" . $accountname_arr[$uperson] . "<br>" . $udtte;
} else {
if ($sign_st == 2 && $sign_nt == $user_id && $data["status"] == "YS") {
$str = "<span class=\"glyphicon glyphicon-user\"></span>";
$str = "待簽核";
$str = "<a href=\"pricereviewCheck.php?st=2&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";

Write Preview
Loading…
Cancel
Save