Browse Source

20240111

main
Cheng 1 year ago
parent
commit
76c868d107
  1. 13
      wms/cont/apply_form.php
  2. 140
      wms/contract/api/testT8API.php
  3. 2
      wms/contract/contract-download.php
  4. 189
      wms/contract/contract-new-apply.php
  5. 27
      wms/crm/crmm03-edit.php
  6. 2
      wms/crm/crmm06-edit.php
  7. 6
      wms/fun_global.php
  8. 4
      wms/mkt/pricereview-index.php

13
wms/cont/apply_form.php

@ -67,11 +67,10 @@ $subflow_assign_opinions = SubflowManager::getCounterSignComments($form_key);
$wf->setFormData(['discount' => 100]); $wf->setFormData(['discount' => 100]);
$flowName = $wf->getFlowName(); $flowName = $wf->getFlowName();
$assigner = $wf->getAssignerList(); $assigner = $wf->getAssignerList();
$assign_status = $wf->getAssignStatus($assigner); $assign_status = $wf->getAssignStatus($assigner);
echo '<pre>'; // echo '<pre>';
print_r($assigner); // print_r($assign_status);
echo '</pre>'; // echo '</pre>';
$if_show_assign = true; $if_show_assign = true;
//加載流程圖 //加載流程圖
//$fc = WorkFLowItems::get_records($flow->getSystemID(), $flow->getFlowID()); //$fc = WorkFLowItems::get_records($flow->getSystemID(), $flow->getFlowID());
@ -247,8 +246,8 @@ if ($result['department_id'] == '511') {
$managerid = 'M0137'; $managerid = 'M0137';
$managername = '劉永德'; $managername = '劉永德';
} else if ($result['department_id'] == '512') { } else if ($result['department_id'] == '512') {
$managerid = 'M0137'; $managerid = 'M0054';
$managername = '劉永德'; $managername = '陳志文';
} else if ($result['department_id'] == '513') { } else if ($result['department_id'] == '513') {
$managerid = 'M0086'; $managerid = 'M0086';
$managername = '李烘銘'; $managername = '李烘銘';
@ -662,7 +661,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan='18' ;><button onClick='addRow()' type="button" style='float:right' class="btn btn-link btn-md">+新增</button></td> <td colspan='18'><button onClick='addRow()' type="button" style='float:right' class="btn btn-link btn-md">+新增</button></td>
</tr> </tr>
<!-- <tr style='margin-top:0px;text-align:center'> --> <!-- <tr style='margin-top:0px;text-align:center'> -->
<?php <?php

140
wms/contract/api/testT8API.php

@ -1,86 +1,66 @@
<?php <?php
require_once('../../T8_Authorization_from_bpm.php'); require_once('../../T8_Authorization_from_bpm.php');
require_once('../connt8.php'); require_once('../connt8.php');
$sql = "SELECT * FROM salIncomeApplyMaster WHERE BillNo = '3TX10701' ";
$stmt = $connT8->prepare($sql);
$stmt->execute();
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
echo '<pre>';
print_r($result);
echo '</pre>';
// $date = date("Y-m-d");
// $date1 = str_replace('-', '', $date);
// $arr = [ $validation = get_Auth();
// "date" => $date1 $data = [
// ]; [
"name" => "OtherStockOutMtable",
"rows" => [
[
"BillNo" => "00850110", // 單據編號 varchar(20)
"BillDate" => 20210427, // 單據日期 int
"OrgId" => "1000", //組織 varchar(20)
"FOrgId" => "1000", //核算組織 varchar(20)
"TypeId" => "OS", //單據類型 varchar(10)
"BizPartnerId" => "", //往來對象(供應商) 可為空
"PersonId" => "C0003", // 經辦人員 varchar(20)
"DeptId" => "250", // 經辦部門 varchar(20)
"CompId" => "1001" // 公司 varchar(20)
]
]
], [
"name" => "OtherStockOutDetail",
"rows" => [
[
"BillNo" => "00850110", //單據編號 varchar(20)
"RowCode" => 1, // 序號 int(10)
"MaterialId" => "MX00021003", // 產品代碼 -> 產品集成 varchar(40)
"SupplyOrgId" => "1000", // 供貨組織代碼 varchar(20)
"SQuantity" => 1, // 交易數量 numeric(19)
"WarehouseId" => "100" // 倉庫代碼 varchar(20)
]
]
]
];
$api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKOTHERSTOCKOUT/PostERPData';
$header = [
"CHI_Authorization :" . $validation
];
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
// echo '<pre>'; $response = curl_exec($ch);
// print_r($arr); if ($response === false) {
// echo '</pre>'; echo 'Curl error: ' . curl_error($ch);
// $validation = get_Auth(); } else {
// $data = [ $result = json_decode($response, true);
// [ if ($result['Status'] == 'Error') {
// "name" => "OtherStockOutMtable", echo '<pre>';
// "rows" => [ print_r($result);
// [ echo '</pre>';
// "BillNo" => "00850110", // 單據編號 varchar(20) echo 'API 傳入錯誤,' . $result['ErrorMsg'];
// "BillDate" => 20210427, // 單據日期 int } else {
// "OrgId" => "1000", //組織 varchar(20) echo '<pre>';
// "FOrgId" => "1000", //核算組織 varchar(20) print_r($result['Status']);
// "TypeId" => "OS", //單據類型 varchar(10) echo '</pre>';
// "BizPartnerId" => "", //往來對象(供應商) 可為空 return $result;
// "PersonId" => "C0003", // 經辦人員 varchar(20) }
// "DeptId" => "250", // 經辦部門 varchar(20) }
// "CompId" => "1001" // 公司 varchar(20)
// ]
// ]
// ], [
// "name" => "OtherStockOutDetail",
// "rows" => [
// [
// "BillNo" => "00850110", //單據編號 varchar(20)
// "RowCode" => 1, // 序號 int(10)
// "MaterialId" => "MX00021003", // 產品代碼 -> 產品集成 varchar(40)
// "SupplyOrgId" => "1000", // 供貨組織代碼 varchar(20)
// "SQuantity" => 1, // 交易數量 numeric(19)
// "WarehouseId" => "100" // 倉庫代碼 varchar(20)
// ]
// ]
// ]
// ];
// $data = file_get_contents('test.json');
// echo '<pre>';
// print_r($data);
// echo '</pre>';
// $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKOTHERSTOCKOUT/PostERPData';
// $header = [
// "CHI_Authorization :" . $validation
// ];
// $ch = curl_init();
// curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
// curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
// curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
// curl_setopt($ch, CURLOPT_POST, 1);
// curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
// $response = curl_exec($ch); curl_close($ch);
// if ($response === false) {
// echo 'Curl error: ' . curl_error($ch);
// } else {
// $result = json_decode($response, true);
// if ($result['Status'] == 'Error') {
// echo '<pre>';
// print_r($result);
// echo '</pre>';
// echo 'API 傳入錯誤,' . $result['ErrorMsg'];
// } else {
// echo '<pre>';
// print_r($result['Status']);
// echo '</pre>';
// return $result;
// }
// }
// curl_close($ch);

2
wms/contract/contract-download.php

@ -26,7 +26,7 @@ if (isset($_GET['id']) && $_GET['id'] != "") {
$contracts = $stmt->fetchAll(PDO::FETCH_ASSOC); $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
$contract = $contracts[0]; $contract = $contracts[0];
$contract_apply_id = $contract['id']; $contract_apply_id = $contract['id'];
if (($contract['status'] !== "YY" && $user_id != 'M0107') && $user_id != 'M0174' && $user_id != 'M0225') { if (($contract['status'] !== "YY" && $user_id != 'M0107' && $user_id != "TEST02" && $user_id == "TEST01") && $user_id != 'M0174' && $user_id != 'M0225') {
echo '<script type="text/javascript"> echo '<script type="text/javascript">
alert("非法訪問。"); alert("非法訪問。");
window.history.back(); window.history.back();

189
wms/contract/contract-new-apply.php

@ -1,8 +1,8 @@
<?php <?php
include_once("../header.php"); include_once("../header.php");
require_once("./conn.php"); require_once("./conn.php");
if(!(isset($_GET['id']) && !empty($_GET['id']))){ if (!(isset($_GET['id']) && !empty($_GET['id']))) {
$para = "function_name=pricereview&".$token_link; $para = "function_name=pricereview&" . $token_link;
echo "<script>alert('非法訪問!!!');</script>"; echo "<script>alert('非法訪問!!!');</script>";
echo "<script>window.history.go(-1);</script>"; echo "<script>window.history.go(-1);</script>";
exit; exit;
@ -15,25 +15,25 @@ LEFT JOIN account AS person_account ON contract_new_apply.review_person_id = per
LEFT JOIN account AS person_final_account ON contract_new_apply.review_final_person_id = person_final_account.accountid LEFT JOIN account AS person_final_account ON contract_new_apply.review_final_person_id = person_final_account.accountid
WHERE contract_new_apply.mid = :mid"; WHERE contract_new_apply.mid = :mid";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':mid',$id); $stmt->bindParam(':mid', $id);
$stmt->execute(); $stmt->execute();
$contract_new_apply = $stmt->fetch(PDO::FETCH_ASSOC); $contract_new_apply = $stmt->fetch(PDO::FETCH_ASSOC);
$contract = $contract_new_apply; $contract = $contract_new_apply;
$isFirst = empty($contract_new_apply) ? 1 : 0; $isFirst = empty($contract_new_apply) ? 1 : 0;
if(empty($contract_new_apply)){ if (empty($contract_new_apply)) {
$sql_str = "SELECT pricereview_main.contractno, pricereview_main.ekind, pricereview_main.person, pricereview_main.company, pricereview_main.case_name, pricereview_main.address, pricereview_main.price_lowest, pricereview_main.price_total, pricereview_main.price_rate, pricereview_main.status as priceview_status, pricereview_main.id as mainid, account.name as accountname $sql_str = "SELECT pricereview_main.contractno, pricereview_main.ekind, pricereview_main.person, pricereview_main.company, pricereview_main.case_name, pricereview_main.address, pricereview_main.price_lowest, pricereview_main.price_total, pricereview_main.price_rate, pricereview_main.status as priceview_status, pricereview_main.id as mainid, account.name as accountname
FROM pricereview_main FROM pricereview_main
JOIN account ON pricereview_main.person = account.accountid JOIN account ON pricereview_main.person = account.accountid
WHERE pricereview_main.id = :id"; WHERE pricereview_main.id = :id";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':id',$id); $stmt->bindParam(':id', $id);
$stmt->execute(); $stmt->execute();
$contract = $stmt->fetch(PDO::FETCH_ASSOC); $contract = $stmt->fetch(PDO::FETCH_ASSOC);
// print_r($contract); // print_r($contract);
$accounttype = "M"; $accounttype = "M";
$sql_str = "SELECT * FROM account WHERE accounttype = :accounttype"; $sql_str = "SELECT * FROM account WHERE accounttype = :accounttype";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
$stmt->bindParam(':accounttype',$accounttype); $stmt->bindParam(':accounttype', $accounttype);
$stmt->execute(); $stmt->execute();
$persons = $stmt->fetchAll(PDO::FETCH_ASSOC); $persons = $stmt->fetchAll(PDO::FETCH_ASSOC);
$sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC"; $sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC";
@ -50,7 +50,7 @@ if(empty($contract_new_apply)){
$stmt->execute(); $stmt->execute();
$items = $stmt->fetchAll(PDO::FETCH_ASSOC); $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
$total_items = 0; $total_items = 0;
foreach($items as $item){ foreach ($items as $item) {
$total_items += $item['item_qty']; $total_items += $item['item_qty'];
} }
$sql_str = "SELECT * FROM pricereview_pay WHERE mid = :mid ORDER BY pay_kind ASC"; $sql_str = "SELECT * FROM pricereview_pay WHERE mid = :mid ORDER BY pay_kind ASC";
@ -60,15 +60,14 @@ if(empty($contract_new_apply)){
$pays = $stmt->fetchAll(PDO::FETCH_ASSOC); $pays = $stmt->fetchAll(PDO::FETCH_ASSOC);
$price_a = 0; $price_a = 0;
$price_b = 0; $price_b = 0;
foreach($pays as $pay){ foreach ($pays as $pay) {
if($pay['pay_kind'] <= 4){ if ($pay['pay_kind'] <= 4) {
$price_a = $price_a + $pay['pay_amount']; $price_a = $price_a + $pay['pay_amount'];
}else{ } else {
$price_b = $price_b + $pay['pay_amount']; $price_b = $price_b + $pay['pay_amount'];
} }
} }
} else {
}else{
$mid = $contract['mid']; $mid = $contract['mid'];
$contract_new_apply_id = $contract_new_apply['id']; $contract_new_apply_id = $contract_new_apply['id'];
$sql_str = "SELECT * FROM contract_new_apply_pays WHERE mid = :mid ORDER BY pay_kind ASC"; $sql_str = "SELECT * FROM contract_new_apply_pays WHERE mid = :mid ORDER BY pay_kind ASC";
@ -84,10 +83,10 @@ if(empty($contract_new_apply)){
$items = $stmt->fetchAll(PDO::FETCH_ASSOC); $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
$price_a = 0; $price_a = 0;
$price_b = 0; $price_b = 0;
foreach($pays as $pay){ foreach ($pays as $pay) {
if($pay['pay_kind'] <= 4){ if ($pay['pay_kind'] <= 4) {
$price_a = $price_a + $pay['pay_amount']; $price_a = $price_a + $pay['pay_amount'];
}else{ } else {
$price_b = $price_b + $pay['pay_amount']; $price_b = $price_b + $pay['pay_amount'];
} }
} }
@ -112,7 +111,7 @@ $person = $contract['person'];
<script defer src="./js/alpinejs/cdn.min.js"></script> <script defer src="./js/alpinejs/cdn.min.js"></script>
<script src="./js/axios/axios.min.js"></script> <script src="./js/axios/axios.min.js"></script>
<div class="contract-new-apply-component" x-data="contractNewApply"> <div class="contract-new-apply-component" x-data="contractNewApply">
<div class="form" method="post" id="form" enctype="multipart/form-data" > <div class="form" method="post" id="form" enctype="multipart/form-data">
<input type="hidden" name='form_name' value="main_form" /> <input type="hidden" name='form_name' value="main_form" />
<div> <div>
<table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%"> <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@ -142,7 +141,7 @@ $person = $contract['person'];
</td> </td>
<td style="vertical-align: middle">統一編號/身分證字號</td> <td style="vertical-align: middle">統一編號/身分證字號</td>
<td> <td>
<input class="form-control disabled_select" type="text" x-model="data.vat" disabled > <input class="form-control disabled_select" type="text" x-model="data.vat" disabled>
<p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">合約書申請日期</td> <td style="vertical-align: middle">合約書申請日期</td>
@ -161,7 +160,7 @@ $person = $contract['person'];
<tr> <tr>
<td style="vertical-align: middle">案件名稱</td> <td style="vertical-align: middle">案件名稱</td>
<td style="vertical-align: middle" colspan="3"> <td style="vertical-align: middle" colspan="3">
<input class="form-control disabled_select" type="text" x-model="data.case_name" disabled > <input class="form-control disabled_select" type="text" x-model="data.case_name" disabled>
<p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">立約人</td> <td style="vertical-align: middle">立約人</td>
@ -171,24 +170,24 @@ $person = $contract['person'];
</td> </td>
<td style="vertical-align: middle">負責人</td> <td style="vertical-align: middle">負責人</td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<input class="form-control disabled_select" type="text" x-model="data.manager" disabled > <input class="form-control disabled_select" type="text" x-model="data.manager" disabled>
<p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">含稅給約總價</td> <td style="vertical-align: middle">含稅給約總價</td>
<td colspan="3" style="vertical-align: middle"> <td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select lock" type="number" x-model="data.total_price" > <input class="form-control disabled_select lock" type="number" x-model="data.total_price">
<p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">含稅貸款(A)</td> <td style="vertical-align: middle">含稅貸款(A)</td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<input class="form-control disabled_select lock" type="number" x-model="data.price_a" > <input class="form-control disabled_select lock" type="number" x-model="data.price_a">
<p class="alerttext" x-show="data.price_a==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.price_a==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">含稅安裝款(A)</td> <td style="vertical-align: middle">含稅安裝款(A)</td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<input class="form-control disabled_select lock" type="number" x-model="data.price_b" > <input class="form-control disabled_select lock" type="number" x-model="data.price_b">
<p class="alerttext" x-show="data.price_b==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.price_b==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
@ -244,7 +243,7 @@ $person = $contract['person'];
<tr> <tr>
<td style="vertical-align: middle">交貨地點</td> <td style="vertical-align: middle">交貨地點</td>
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
<input class="form-control disabled_select" type="text" x-model="data.tradeaddress" > <input class="form-control disabled_select" type="text" x-model="data.tradeaddress">
<p class="alerttext" x-show="data.tradeaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.tradeaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">交貨期限</td> <td style="vertical-align: middle">交貨期限</td>
@ -283,16 +282,18 @@ $person = $contract['person'];
<tbody style="font-weight: bolder;margin-bottom: 20px"> <tbody style="font-weight: bolder;margin-bottom: 20px">
<template x-for="(item, idx) in data.items"> <template x-for="(item, idx) in data.items">
<tr> <tr>
<td style="vertical-align: middle"><p x-text="idx+1"></p></td> <td style="vertical-align: middle">
<p x-text="idx+1"></p>
</td>
<td colspan="3" style="vertical-align: middle"> <td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select lock" type="text" x-model="item.item_spec" > <input class="form-control disabled_select lock" type="text" x-model="item.item_spec">
<p class="alerttext" x-show="data.item_spec==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.item_spec==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<span x-text="item.item_qty + '台'" style="padding:0 20px"></span> <span x-text="item.item_qty + '台'" style="padding:0 20px"></span>
</td> </td>
<td colspan="3" style="vertical-align: middle"> <td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select lock" type="number" x-model="item.item_price_ct" > <input class="form-control disabled_select lock" type="number" x-model="item.item_price_ct">
<p class="alerttext" x-show="data.item_price_ct==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.item_price_ct==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
@ -334,70 +335,70 @@ $person = $contract['person'];
</td> </td>
</tr> </tr>
</thead> </thead>
<tbody style="font-weight: bolder;margin-bottom: 20px" > <tbody style="font-weight: bolder;margin-bottom: 20px">
<?php <?php
$day = 0; $day = 0;
$styles = [ $styles = [
1=> "訂金", 1 => "訂金",
2=> "二次款", 2 => "二次款",
3=>"貨到款", 3 => "貨到款",
4=>"", 4 => "",
5=>"安裝款", 5 => "安裝款",
6=>"尾款", 6 => "尾款",
7=>"", 7 => "",
]; ];
$paydate = [ $paydate = [
1=>"合約日", 1 => "合約日",
2=>"合約日", 2 => "合約日",
3=>"出貨日", 3 => "出貨日",
4=>"", 4 => "",
5=>"竣檢日", 5 => "竣檢日",
6=>"交車日", 6 => "交車日",
7=>"" 7 => ""
]; ];
?> ?>
<?php foreach($pays as $pay): <?php foreach ($pays as $pay) :
if($pay['pay_scale'] == 0) continue; if ($pay['pay_scale'] == 0) continue;
?> ?>
<tr> <tr>
<td> <td>
<p style='text-align:center'><?php echo ($pay['pay_kind'] <=4) ? "銷售" : "按裝"; ?></p> <p style='text-align:center'><?php echo ($pay['pay_kind'] <= 4) ? "銷售" : "按裝"; ?></p>
</td> </td>
<td> <td>
<p style='text-align:center'><?php echo $styles[$pay['pay_kind']]; ?></p> <p style='text-align:center'><?php echo $styles[$pay['pay_kind']]; ?></p>
</td> </td>
<td> <td>
<?php if($pay['pay_kind'] == 1){ ?> <?php if ($pay['pay_kind'] == 1) { ?>
<template x-if="pays[1] > 0"> <template x-if="pays[1] > 0">
<p style='text-align:center'>簽約後<span x-text="pays[1]"></span>天付訂金</p> <p style='text-align:center'>簽約後<span x-text="pays[1]"></span>天付訂金</p>
</template> </template>
<template x-if="pays[1] <= 0"> <template x-if="pays[1] <= 0">
<p style='text-align:center'>簽約後付訂金</p> <p style='text-align:center'>簽約後付訂金</p>
</template> </template>
<?php } elseif($pay['pay_kind'] == 2){ ?> <?php } elseif ($pay['pay_kind'] == 2) { ?>
<template x-if="pays[2] > 0"> <template x-if="pays[2] > 0">
<p style='text-align:center'>簽約後<span x-text="pays[2]"></span>天付二次款</p> <p style='text-align:center'>簽約後<span x-text="pays[2]"></span>天付二次款</p>
</template> </template>
<template x-if="pays[2] <= 0"> <template x-if="pays[2] <= 0">
<p style='text-align:center'>簽約後付二次款</p> <p style='text-align:center'>簽約後付二次款</p>
</template> </template>
<?php } elseif($pay['pay_kind'] == 3){ ?> <?php } elseif ($pay['pay_kind'] == 3) { ?>
<p style='text-align:center'>貨抵工地付貨到款</p> <p style='text-align:center'>貨抵工地付貨到款</p>
<?php } elseif($pay['pay_kind'] == 5){ ?> <?php } elseif ($pay['pay_kind'] == 5) { ?>
<template x-if="pays[5] > 0"> <template x-if="pays[5] > 0">
<p style='text-align:center'>安裝完成後<span x-text="pays[5]"></span>天收款</p> <p style='text-align:center'>安裝完成後<span x-text="pays[5]"></span>天收款</p>
</template> </template>
<template x-if="pays[5] <= 0"> <template x-if="pays[5] <= 0">
<p style='text-align:center'>安裝完成後收款</p> <p style='text-align:center'>安裝完成後收款</p>
</template> </template>
<?php } elseif($pay['pay_kind'] == 6){ ?> <?php } elseif ($pay['pay_kind'] == 6) { ?>
<template x-if="pays[6] > 0"> <template x-if="pays[6] > 0">
<p style='text-align:center'>交車後<span x-text="pays[6]"></span>天付尾款</p> <p style='text-align:center'>交車後<span x-text="pays[6]"></span>天付尾款</p>
</template> </template>
<template x-if="pays[6] <= 0"> <template x-if="pays[6] <= 0">
<p style='text-align:center'>交車後付尾款</p> <p style='text-align:center'>交車後付尾款</p>
</template> </template>
<?php } else{ ?> <?php } else { ?>
<p style='text-align:center'>-</p> <p style='text-align:center'>-</p>
<?php } ?> <?php } ?>
</td> </td>
@ -406,7 +407,7 @@ $person = $contract['person'];
</td> </td>
<td> <td>
<div class="ui labeled input"> <div class="ui labeled input">
<input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind'];?>].condition_date" disabled > <input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind']; ?>].condition_date" disabled>
<div class="ui label"> <div class="ui label">
</div> </div>
@ -414,17 +415,17 @@ $person = $contract['person'];
</td> </td>
<td> <td>
<div class="ui labeled input"> <div class="ui labeled input">
<input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind'];?>].pay_period" disabled > <input type="number" placeholder="90" style="width:65px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind']; ?>].pay_period" disabled>
<div class="ui label"> <div class="ui label">
</div> </div>
</div> </div>
</td> </td>
<td> <td>
<p style='text-align:center' x-text="pays[<?php echo $pay['pay_kind'];?>].scale + '%'"><?php echo $pay['pay_scale'] ?>%</p> <p style='text-align:center' x-text="pays[<?php echo $pay['pay_kind']; ?>].scale + '%'"><?php echo $pay['pay_scale'] ?>%</p>
</td> </td>
<td> <td>
<p style='text-align:center' x-text="localnumber(data.total_price * pays[<?php echo $pay['pay_kind'];?>].scale/100)"></p> <p style='text-align:center' x-text="localnumber(data.total_price * pays[<?php echo $pay['pay_kind']; ?>].scale/100)"></p>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
@ -459,14 +460,14 @@ $person = $contract['person'];
</td> </td>
<td colspan="1">附件上傳</td> <td colspan="1">附件上傳</td>
<td colspan="4"> <td colspan="4">
<?php if($status < 1): ?> <?php if ($status < 1) : ?>
<input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" /> <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
<?php endif; ?> <?php endif; ?>
<template x-for="file in data.originfiles"> <template x-for="file in data.originfiles">
<template x-if="file"> <template x-if="file">
<div> <div>
<a :href="'./images/contracts_new_files/' + file.file_name" download x-text="file.file_name" ></a> <a :href="'./images/contracts_new_files/' + file.file_name" download x-text="file.file_name"></a>
<?php if($status <= 0): ?> <?php if ($status <= 0) : ?>
<span @click="removeFile(file.id)" style="margin-left:10px;cursor:pointer;color:#f019">X</span> <span @click="removeFile(file.id)" style="margin-left:10px;cursor:pointer;color:#f019">X</span>
<?php endif; ?> <?php endif; ?>
</div> </div>
@ -492,42 +493,42 @@ $person = $contract['person'];
<td>結果</td> <td>結果</td>
<td colspan=2>意見</td> <td colspan=2>意見</td>
<td>時間</td> <td>時間</td>
<td colspan=2><?php if(($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060") && $status == 1): ?>審核意見<?php endif; ?></td> <td colspan=2><?php if (($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060" || $user_id == "TEST02" || $user_id == "TEST03") && $status == 1) : ?>審核意見<?php endif; ?></td>
</tr> </tr>
<tr> <tr>
<td>營業員</td> <td>營業員</td>
<td><span x-text="data.salesmanname + '(' + data.salesman + ')'"></span></td> <td><span x-text="data.salesmanname + '(' + data.salesman + ')'"></span></td>
<td> <td>
<?php if($status >= 1): ?><span class="successtext">已送審</span><?php endif; ?> <?php if ($status >= 1) : ?><span class="successtext">已送審</span><?php endif; ?>
<?php if($status == 0): ?><span class="readtext">暫存</span><?php endif; ?> <?php if ($status == 0) : ?><span class="readtext">暫存</span><?php endif; ?>
<?php if($status == -1): ?><span class="">未提交</span><?php endif; ?> <?php if ($status == -1) : ?><span class="">未提交</span><?php endif; ?>
</td> </td>
<td colspan=2>---</td> <td colspan=2>---</td>
<td><?php echo ($contract['submit_date']) ?? "---"; ?> </td> <td><?php echo ($contract['submit_date']) ?? "---"; ?> </td>
<td colspan=2 rowspan="3"> <td colspan=2 rowspan="3">
<?php if(($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060") && $status == 1): ?> <?php if (($user_id === "M0174" || $user_id === "M0107" || $user_id === "M0060" || $user_id == "TEST02" || $user_id == "TEST03") && $status == 1) : ?>
<textarea class="form-control opinion" x-model="data.review_comment"></textarea> <textarea class="form-control opinion" x-model="data.review_comment"></textarea>
<?php endif; ?> <?php endif; ?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>業務承辦人</td> <td>業務承辦人</td>
<td><span><?php echo (!isset($contract['review_person_name']) || empty($contract['review_person_name'])) ? "---" : $contract['review_person_name'] ."(".$contract['review_person_id'].")"; ?></span></td> <td><span><?php echo (!isset($contract['review_person_name']) || empty($contract['review_person_name'])) ? "---" : $contract['review_person_name'] . "(" . $contract['review_person_id'] . ")"; ?></span></td>
<td> <td>
<?php if(($status == 1 || $status == 3) && $progress >= 2): ?><span class="successtext">已同意</span><?php endif; ?> <?php if (($status == 1 || $status == 3) && $progress >= 2) : ?><span class="successtext">已同意</span><?php endif; ?>
<?php if($status == 2): ?><span class="failtext">結案不同意</span><?php endif; ?> <?php if ($status == 2) : ?><span class="failtext">結案不同意</span><?php endif; ?>
<?php if($status < 2 && $progress < 2): ?><span>---</span><?php endif; ?> <?php if ($status < 2 && $progress < 2) : ?><span>---</span><?php endif; ?>
</td> </td>
<td colspan=2><?php echo $contract['review_comment'] ?? "---"; ?></td> <td colspan=2><?php echo $contract['review_comment'] ?? "---"; ?></td>
<td><?php echo $contract['review_date'] ?? "---"; ?></td> <td><?php echo $contract['review_date'] ?? "---"; ?></td>
</tr> </tr>
<tr> <tr>
<td>業務部協理</td> <td>業務部協理</td>
<td><span><?php echo (!isset($contract['review_final_person_name']) || empty($contract['review_final_person_name'])) ? "---" : $contract['review_final_person_name'] ."(".$contract['review_final_person_id'].")"; ?></span></td> <td><span><?php echo (!isset($contract['review_final_person_name']) || empty($contract['review_final_person_name'])) ? "---" : $contract['review_final_person_name'] . "(" . $contract['review_final_person_id'] . ")"; ?></span></td>
<td> <td>
<?php if($status == 3): ?><span class="successtext">結案同意</span><?php endif; ?> <?php if ($status == 3) : ?><span class="successtext">結案同意</span><?php endif; ?>
<?php if($status == 2): ?><span class="failtext">結案不同意</span><?php endif; ?> <?php if ($status == 2) : ?><span class="failtext">結案不同意</span><?php endif; ?>
<?php if($status < 2): ?><span>---</span><?php endif; ?> <?php if ($status < 2) : ?><span>---</span><?php endif; ?>
</td> </td>
<td colspan=2><?php echo $contract['review_final_comment'] ?? "---"; ?></td> <td colspan=2><?php echo $contract['review_final_comment'] ?? "---"; ?></td>
<td><?php echo $contract['review_final_date'] ?? "---"; ?></td> <td><?php echo $contract['review_final_date'] ?? "---"; ?></td>
@ -538,7 +539,7 @@ $person = $contract['person'];
<template x-if="false"> <template x-if="false">
<span class="failtext">已退件</span> <span class="failtext">已退件</span>
</template> </template>
<?php if($status == 1): ?> <?php if ($status == 1) : ?>
<span class="readtext">審核中...</span> <span class="readtext">審核中...</span>
<?php endif; ?> <?php endif; ?>
<template x-if="false"> <template x-if="false">
@ -550,8 +551,8 @@ $person = $contract['person'];
</tr> --> </tr> -->
</tbody> </tbody>
</table> </table>
<button @click="window.history.go(-1)" type="button" class="btn btn-primary btn-lg pull-right savebtn" >回前頁</button> <button @click="window.history.go(-1)" type="button" class="btn btn-primary btn-lg pull-right savebtn">回前頁</button>
<?php if(($isFirst == 1 && ($person == $user_id || $user_id == "M0174")) || ($isFirst==0 && $status == 0 && ($person == $user_id || $user_id == "M0174"))): ?> <?php if (($isFirst == 1 && ($person == $user_id || $user_id == "M0174")) || ($isFirst == 0 && $status == 0 && ($person == $user_id || $user_id == "M0174"))) : ?>
<button x-show="true" x-on:click="submit()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn"> <button x-show="true" x-on:click="submit()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
<template x-if="!isLoading"> <template x-if="!isLoading">
<span>送審</span> <span>送審</span>
@ -569,14 +570,14 @@ $person = $contract['person'];
</template> </template>
</button> </button>
<?php endif; ?> <?php endif; ?>
<?php if($status == 1 && (($user_id == "M0107" && $contract['progress'] <= 1 ) || ($user_id == "M0060" && $contract['progress'] == 2 ) || $user_id == "M0174")): ?> <?php if ($status == 1 && ((($user_id == "M0107" || $user_id == "TEST02") && $contract['progress'] <= 1) || (($user_id == "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) || $user_id == "M0174")) : ?>
<button x-show="true" x-on:click="agree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn"> <button x-show="true" x-on:click="agree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
<template x-if="!isLoading"> <template x-if="!isLoading">
<span> <span>
<?php <?php
if($user_id === "M0107" && $contract['progress'] <= 1 ){ if (($user_id === "M0107" || $user_id == "TEST02") && $contract['progress'] <= 1) {
echo "同意(上呈)"; echo "同意(上呈)";
}elseif($user_id === "M0060" && $contract['progress'] == 2){ } elseif (($user_id === "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) {
echo "同意(結案)"; echo "同意(結案)";
} }
?> ?>
@ -600,18 +601,18 @@ $person = $contract['person'];
</div> </div>
<script src="./js/jquery/jquery-3.1.1.min.js"></script> <script src="./js/jquery/jquery-3.1.1.min.js"></script>
<script src="semantic/dist/semantic.min.js" ></script> <script src="semantic/dist/semantic.min.js"></script>
<script src="./js/alpine.js"></script> <script src="./js/alpine.js"></script>
<script> <script>
window.onload = ()=>{ window.onload = () => {
const lock = document.getElementsByClassName('lock'); const lock = document.getElementsByClassName('lock');
for(let i=0;i<lock.length;i++){ for (let i = 0; i < lock.length; i++) {
lock[i].disabled = true lock[i].disabled = true
} }
} }
</script> </script>
<?php if(empty($contract_new_apply)): ?> <?php if (empty($contract_new_apply)) : ?>
<script> <script>
const contractno = '<?php echo $contract['contractno'] ?? ''; ?>'; const contractno = '<?php echo $contract['contractno'] ?? ''; ?>';
const salesman = '<?php echo $contract['person'] ?? ''; ?>'; const salesman = '<?php echo $contract['person'] ?? ''; ?>';
const salesmanname = '<?php echo $contract['accountname'] ?? ''; ?>'; const salesmanname = '<?php echo $contract['accountname'] ?? ''; ?>';
@ -624,7 +625,7 @@ $person = $contract['person'];
const address = '<?php echo $contract['address'] ?? ''; ?>'; const address = '<?php echo $contract['address'] ?? ''; ?>';
const price_a = <?php echo $price_a ?? ''; ?>; const price_a = <?php echo $price_a ?? ''; ?>;
const price_b = <?php echo $price_b ?? ''; ?>; const price_b = <?php echo $price_b ?? ''; ?>;
const items = [...<?php echo json_encode($items) ?? [];?>]; const items = [...<?php echo json_encode($items) ?? []; ?>];
const user_id = '<?php echo $user_id ?>'; const user_id = '<?php echo $user_id ?>';
const mid = '<?php echo $_GET['id']; ?>'; const mid = '<?php echo $_GET['id']; ?>';
const pays = [...<?php echo json_encode($pays) ?? []; ?>]; const pays = [...<?php echo json_encode($pays) ?? []; ?>];
@ -642,9 +643,9 @@ $person = $contract['person'];
const description = ''; const description = '';
const contractstatus = null; const contractstatus = null;
const progress = 0; const progress = 0;
</script> </script>
<?php else: ?> <?php else : ?>
<script> <script>
const contractno = '<?php echo $contract['contractno'] ?? ''; ?>'; const contractno = '<?php echo $contract['contractno'] ?? ''; ?>';
const salesman = '<?php echo $contract['person'] ?? ''; ?>'; const salesman = '<?php echo $contract['person'] ?? ''; ?>';
const salesmanname = '<?php echo $contract['personname'] ?? ''; ?>'; const salesmanname = '<?php echo $contract['personname'] ?? ''; ?>';
@ -676,29 +677,29 @@ $person = $contract['person'];
const description = '<?php echo $contract['description']; ?>'; const description = '<?php echo $contract['description']; ?>';
const contractstatus = <?php echo $contract['status']; ?>; const contractstatus = <?php echo $contract['status']; ?>;
const progress = <?php echo $contract['progress']; ?>; const progress = <?php echo $contract['progress']; ?>;
</script> </script>
<?php endif; ?> <?php endif; ?>
<?php if($status > 0 ||( $person != $user_id && $user_id != "M0174")): ?> <?php if ($status > 0 || ($person != $user_id && $user_id != "M0174")) : ?>
<script> <script>
window.onload = ()=>{ window.onload = () => {
const input = document.querySelectorAll('input'); const input = document.querySelectorAll('input');
const alerttext = document.querySelectorAll('p.alerttext'); const alerttext = document.querySelectorAll('p.alerttext');
const select = document.querySelectorAll('select'); const select = document.querySelectorAll('select');
const textarea = document.querySelectorAll('textarea'); const textarea = document.querySelectorAll('textarea');
for(let i=0;i<input.length;i++){ for (let i = 0; i < input.length; i++) {
input[i].disabled = true input[i].disabled = true
} }
for(let i=0;i<select.length;i++){ for (let i = 0; i < select.length; i++) {
select[i].disabled = true select[i].disabled = true
} }
for(let i=0;i<textarea.length;i++){ for (let i = 0; i < textarea.length; i++) {
textarea[i].disabled = true textarea[i].disabled = true
} }
for(let i=0;i<alerttext.length;i++){ for (let i = 0; i < alerttext.length; i++) {
alerttext[i].style.display = "none" alerttext[i].style.display = "none"
} }
} }
</script> </script>
<?php endif; ?> <?php endif; ?>

27
wms/crm/crmm03-edit.php

@ -18,14 +18,14 @@ $customer_source_opt = DB::result($sql);
$sql = "select code_name value ,content label from code where field_name='elevator_kind'"; $sql = "select code_name value ,content label from code where field_name='elevator_kind'";
$elevator_kind_opt = DB::result($sql); $elevator_kind_opt = DB::result($sql);
#4.營業員 #4.營業員
$sql = "select employee_no value ,name label from employee where depart_no in ('320','311','312','313','314','511','512','513','514')"; $sql = "select employee_no value ,name label from employee where depart_no in ('320','311','312','313','314','511','512','513','514','322','515')";
$salesman_opt = DB::result($sql); $salesman_opt = DB::result($sql);
#5.有望客戶狀態 #5.有望客戶狀態
$sql = "select code_name value ,content label from code where field_name='hope_customer_status'"; $sql = "select code_name value ,content label from code where field_name='hope_customer_status'";
$hope_customer_status_opt = DB::result($sql); $hope_customer_status_opt = DB::result($sql);
#6.是否汰改 #6.是否汰改
$is_renovation_opt = ["N"=>"新梯(M)", "Y"=>"汰改(T)"]; $is_renovation_opt = ["N" => "新梯(M)", "Y" => "汰改(T)"];
/* /*
['label' => '是', 'value' => 'Y'], ['label' => '是', 'value' => 'Y'],
['label' => '否', 'value' => 'N'], ['label' => '否', 'value' => 'N'],
@ -59,7 +59,7 @@ $hope_elevator_customer_column = [
'case_name' => ['label' => "案件名稱", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']], 'case_name' => ['label' => "案件名稱", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
//統編/身份證字號 //統編/身份證字號
'uscc' => ['label' => "統編/身份證", "tag" => 'text', 'attr' => [ 'class' => 'form-control form-control-sm']], 'uscc' => ['label' => "統編/身份證", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
'linkman' => ['label' => "業主方聯係人", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']], 'linkman' => ['label' => "業主方聯係人", "tag" => 'text', 'attr' => ['class' => 'form-control form-control-sm']],
'lm_tel' => ['label' => "市話/手機", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']], 'lm_tel' => ['label' => "市話/手機", "tag" => 'text', 'attr' => ['required', 'class' => 'form-control form-control-sm']],
@ -82,11 +82,11 @@ $data = [
$table_hope_project_elevator_spec = 'hope_project_elevator_spec'; $table_hope_project_elevator_spec = 'hope_project_elevator_spec';
$hope_project_elevator_spec_columm = [ $hope_project_elevator_spec_columm = [
'specifications' => ['label' => "規格", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'specifications[]', 'class' => 'form-control form-control-sm'], 'options' => $fp_kind_opt], 'specifications' => ['label' => "規格", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'specifications[]', 'class' => 'form-control form-control-sm'], 'options' => $fp_kind_opt],
'person' => ['label' => "人乘/載重", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'person[]', 'class' => 'form-control form-control-sm'],'options' => $person_opt], 'person' => ['label' => "人乘/載重", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'person[]', 'class' => 'form-control form-control-sm'], 'options' => $person_opt],
//'weight' => ['label' => "載重(KG)", "tag" => 'number', 'attr' => ['name' => 'weight[]', 'gt=0', 'min=0', 'class' => 'form-control form-control-sm']], //'weight' => ['label' => "載重(KG)", "tag" => 'number', 'attr' => ['name' => 'weight[]', 'gt=0', 'min=0', 'class' => 'form-control form-control-sm']],
'stop' => ['label' => "停數", "tag" => 'number', 'attr' => ['name' => 'stop[]', 'min=1', 'class' => 'form-control form-control-sm']], 'stop' => ['label' => "停數", "tag" => 'number', 'attr' => ['name' => 'stop[]', 'min=1', 'class' => 'form-control form-control-sm']],
'open' => ['label' => "開門方式", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'open[]', 'class' => 'form-control form-control-sm'], 'options' => $open_kind_opt], 'open' => ['label' => "開門方式", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'open[]', 'class' => 'form-control form-control-sm'], 'options' => $open_kind_opt],
'speed' => ['label' => "速度(m/min)", "tag" => 'select', 'attr' => ['name' => 'speed[]', 'class' => 'form-control form-control-sm'],'options' => $speed_opt], 'speed' => ['label' => "速度(m/min)", "tag" => 'select', 'attr' => ['name' => 'speed[]', 'class' => 'form-control form-control-sm'], 'options' => $speed_opt],
'spec_num' => ['label' => "數量", "tag" => 'digits', 'attr' => ['name' => 'spec_num[]', 'min=1', 'class' => 'form-control form-control-sm']], 'spec_num' => ['label' => "數量", "tag" => 'digits', 'attr' => ['name' => 'spec_num[]', 'min=1', 'class' => 'form-control form-control-sm']],
'spec_price' => ['label' => "單價", "tag" => 'number', 'attr' => ['name' => 'spec_price[]', 'min=0', 'class' => 'form-control form-control-sm']], 'spec_price' => ['label' => "單價", "tag" => 'number', 'attr' => ['name' => 'spec_price[]', 'min=0', 'class' => 'form-control form-control-sm']],
@ -185,12 +185,12 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<link rel="stylesheet" type="text/css" href="<?php echo base_url('css/form.css?') . rand(10, 100);; ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/form.css?') . rand(10, 100);; ?>" />
<style> <style>
label { label {
margin-right:10px; margin-right: 10px;
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("input[name=is_renovation]").click(function(){ $("input[name=is_renovation]").click(function() {
if ($(this).val() == "Y") { if ($(this).val() == "Y") {
var volNo = "<?php echo get_sequnece_no('rt_vol_no', date('ym')); ?>"; var volNo = "<?php echo get_sequnece_no('rt_vol_no', date('ym')); ?>";
} else if ($(this).val() == "N") { } else if ($(this).val() == "N") {
@ -215,8 +215,8 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
return value > param; return value > param;
}, $.validator.format("輸入值必須大於0")); }, $.validator.format("輸入值必須大於0"));
$('#cmecTbody').on('click', 'input[name^=spec_num]', function(){ $('#cmecTbody').on('click', 'input[name^=spec_num]', function() {
$(this).unbind().keyup(function(){ $(this).unbind().keyup(function() {
$(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ","));
sumNum(); sumNum();
}); });
@ -226,8 +226,8 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
}); });
sumNum = function() { sumNum = function() {
var numAll = 0; var numAll = 0;
$("input[name^=spec_num]").each(function(){ $("input[name^=spec_num]").each(function() {
numAll += Number($(this).val().replace(/[,]+/g,"")); numAll += Number($(this).val().replace(/[,]+/g, ""));
}); });
$('#num').val(numAll); $('#num').val(numAll);
} }
@ -312,7 +312,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
if ($val['tag'] == 'select') { if ($val['tag'] == 'select') {
$_input = FormHelper::select("$key", $val['options'], $fieldVal, $val['attr']); $_input = FormHelper::select("$key", $val['options'], $fieldVal, $val['attr']);
} elseif ($val['tag'] == 'radio') { } elseif ($val['tag'] == 'radio') {
$_input = FormHelper::collectionRadios("$key", $val['options'],""); $_input = FormHelper::collectionRadios("$key", $val['options'], "");
} else { } else {
$_input = FormHelper::text("$key", $fieldVal, $val['attr'], $val['tag']); $_input = FormHelper::text("$key", $fieldVal, $val['attr'], $val['tag']);
} }
@ -345,8 +345,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
</div> </div>
<div class="col-12 " style="padding:0"> <div class="col-12 " style="padding:0">
<textarea class='form-control textarea' id="progress_status" name="progress_status" <textarea class='form-control textarea' id="progress_status" name="progress_status" value='' rows='6'></textarea>
value='' rows='6'></textarea>
</div> </div>
</div> </div>
<div id="elevator_list_area" class="row "> <div id="elevator_list_area" class="row ">

2
wms/crm/crmm06-edit.php

@ -19,7 +19,7 @@ $customer_source_opt = DB::result($sql);
$sql = "select code_name value ,content label from code where field_name='elevator_kind'"; $sql = "select code_name value ,content label from code where field_name='elevator_kind'";
$elevator_kind_opt = DB::result($sql); $elevator_kind_opt = DB::result($sql);
#4.營業員 #4.營業員
$sql = "select employee_no value ,name label from employee where depart_no in ('511','512','513','514')"; $sql = "select employee_no value ,name label from employee where depart_no in ('511','512','513','514','515')";
$salesman_opt = DB::result($sql); $salesman_opt = DB::result($sql);
#5.有望客戶狀態 #5.有望客戶狀態
$sql = "select code_name value ,content label from code where field_name='hope_customer_status'"; $sql = "select code_name value ,content label from code where field_name='hope_customer_status'";

6
wms/fun_global.php

@ -97,6 +97,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee)
$ret[3] = "test03,,"; $ret[3] = "test03,,";
$ret[4] = "test05,,"; $ret[4] = "test05,,";
return $ret; return $ret;
exit;
} else { } else {
if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") { if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
$ret[1] = $row["manager"] . ",,"; $ret[1] = $row["manager"] . ",,";
@ -130,12 +131,13 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
$res = mysqli_query($link, $sql); $res = mysqli_query($link, $sql);
if ($row = mysqli_fetch_assoc($res)) { if ($row = mysqli_fetch_assoc($res)) {
if ($row["manager"] == "M0001") return; // 董事長略過 if ($row["manager"] == "M0001") return; // 董事長略過
if ($row["manager"] == "TEST04" || $user_id = 'TEST01') { if ($row["manager"] == "TEST04" || $user_id == 'TEST01') {
$ret[1] = "test04,,"; $ret[1] = "test04,,";
$ret[2] = "test02,,"; $ret[2] = "test02,,";
$ret[3] = "test03,,"; $ret[3] = "test03,,";
$ret[4] = "test05,,"; $ret[4] = "test05,,";
return $ret; return $ret;
exit();
} else { } else {
if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") { if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
$ret[1] = $row["manager"]; $ret[1] = $row["manager"];
@ -144,7 +146,7 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
} }
} }
} }
$ret[1] = "M0029"; // $ret[1] = "M0029";
mysqli_free_result($res); mysqli_free_result($res);
$ret[2] = 'M0012'; $ret[2] = 'M0012';
if ($renovate_flag == "REN") { if ($renovate_flag == "REN") {

4
wms/mkt/pricereview-index.php

@ -550,14 +550,14 @@ if ($data) :
<?php endif; ?> <?php endif; ?>
<?php if ($data['status'] == 'YY' && (($user_id == "M0060" && $data['applyprogress'] == 2) || (($user_id == "M0107" || $user_id == "M0175") && $data['applyprogress'] <= 1) || $user_id == "M0174" || $user_id == 'M0225') && $data['applystatus'] == 1) : ?> <?php if ($data['status'] == 'YY' && ((($user_id == "M0060" || $user_id === "TEST03") && $data['applyprogress'] == 2) || (($user_id == "M0107" || $user_id == "M0175" || $user_id == "TEST02") && $data['applyprogress'] <= 1) || $user_id == "M0174" || $user_id == 'M0225') && $data['applystatus'] == 1) : ?>
<a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">待簽核</a><br> <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">待簽核</a><br>
<?php endif; ?> <?php endif; ?>
<?php if ($data['status'] != 'YY') : ?> <?php if ($data['status'] != 'YY') : ?>
<span style="font-size:13px;font-weight:600">--</span> <span style="font-size:13px;font-weight:600">--</span>
<?php endif; ?> <?php endif; ?>
<!-- 工號M0107、M0174有所有權限 --> <!-- 工號M0107、M0174有所有權限 -->
<?php if (($data['status'] === 'YY' && $data['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060" || $user_id == "M0175")) || $user_id == "M0174" || $user_id == 'M0225') : ?> <?php if (($data['status'] === 'YY' && $data['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060" || $user_id == "M0175" || $user_id === "TEST02")) || $user_id == "M0174" || $user_id == 'M0225') : ?>
<a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para ?>">下載</a> <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para ?>">下載</a>
<?php endif; ?> <?php endif; ?>
</td> </td>

Loading…
Cancel
Save