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

價審(修改)

main
Cheng 2 years ago
parent
3cf6007657
commit
00cc9c7ef6
7 changed files with 264 additions and 271 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 284
      wms/cont/apply_form.php
  2. 193
      wms/cont/apply_form1.php
  3. 16
      wms/contract-repair/api/getContractData.php
  4. 8
      wms/contract-repair/contract-repair-input.php
  5. 8
      wms/contract-repair/js/alpine.js
  6. 6
      wms/crm/crmm02-index.php
  7. 20
      wms/mkt/pricereview_repair-create.php

284
wms/cont/apply_form.php
View File

@ -25,27 +25,19 @@ $flow_id = 'con01';
$form_id = ""; $form_id = "";
#價審單狀態 #價審單狀態
$apply_st = ""; $apply_st = "";
list($apply_key, $form_key, $salesman) = DB::fields("SELECT apply_key, form_key,salesman FROM con_maintance_examine_apply WHERE vol_no='$vol_no' ORDER BY apply_key desc limit 0, 1"); list($apply_key, $form_key) = DB::fields("SELECT apply_key, form_key from con_maintance_examine_apply where vol_no='$vol_no' order by apply_key desc limit 0, 1");
// echo '<pre>';
// print_r($apply_key);
// echo '</pre>';
// exit;
// if ($salesman != $user_id) {
// echo '<script>alert("您並不是該單營業員，無法訪問。");history.go(-1);</script>';
// exit;
// }
if (empty($apply_key)) $apply_st = 1; // 準備新增 if (empty($apply_key)) $apply_st = 1; // 準備新增
else { else {
//list($flow_code)=DB::fields("select flow_code from flow where form_key = '$form_key' and system_id = '$system_id' and flow_id = '$flow_id'"); //list($flow_code)=DB::fields("select flow_code from flow where form_key = '$form_key' and system_id = '$system_id' and flow_id = '$flow_id'");
list($current_assigner) = DB::fields("SELECT current_assigner FROM subflow WHERE form_key = '$form_key' ORDER BY seq desc limit 0, 1"); list($current_assigner) = DB::fields("select current_assigner from subflow where form_key = '$form_key' order by seq desc limit 0, 1");
if ($current_assigner == $user_id) $apply_st = 2; // 修改中，還未提交 if ($current_assigner == $user_id) $apply_st = 2; // 修改中，還未提交
else $apply_st = 9; // 已到下一關，無法䖺改 else $apply_st = 9; // 已到下一關，無法䖺改
} }
// if ($apply_st > 2) { if ($apply_st > 2) {
// echo "<script>alert('卷號" . $vol_no . "已生成價審單,請勿重複生成!');history.go(-1);</script>"; echo "<script>alert('卷號" . $vol_no . "已生成價審單,請勿重複生成!');history.go(-1);</script>";
// exit; exit;
// } }
if ($apply_st == 1) { if ($apply_st == 1) {
$wf = new WorkFlow($system_id, $flow_id, $form_id); $wf = new WorkFlow($system_id, $flow_id, $form_id);
@ -66,6 +58,7 @@ $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);
$if_show_assign = true; $if_show_assign = true;
//加載流程圖 //加載流程圖
//$fc = WorkFLowItems::get_records($flow->getSystemID(), $flow->getFlowID()); //$fc = WorkFLowItems::get_records($flow->getSystemID(), $flow->getFlowID());
@ -79,19 +72,19 @@ $isSplitable = $wf->isSplitable();
//表單數據 //表單數據
#客戶表 #客戶表
#1.電梯品牌選項 #1.電梯品牌選項
$sql = "select code_name value ,content label from code where field_name='elevator_brand' order by code_name asc "; $sql = "SELECT code_name value ,content label FROM code WHERE field_name='elevator_brand' order by code_name asc ";
$elevator_brand_opt = DB::result($sql); $elevator_brand_opt = DB::result($sql);
#2.保養方式 #2.保養方式
$sql = "select code_name value ,content label from code where field_name='maintain_kind'"; $sql = "SELECT code_name value ,content label FROM code WHERE field_name='maintain_kind'";
$maintain_kind_opt = DB::result($sql); $maintain_kind_opt = DB::result($sql);
#3.電梯類型 #3.電梯類型
$sql = "select code_name value ,content label from code where field_name='maintain_elevator_kind'"; $sql = "SELECT code_name value ,content label FROM code WHERE field_name='maintain_elevator_kind'";
$elevator_kind_opt = DB::result($sql); $elevator_kind_opt = DB::result($sql);
#4.付款方式 #4.付款方式
$sql = "select code_name value ,content label from code where field_name='payment_kind' order by code_name+ 0 asc"; $sql = "SELECT code_name value ,content label FROM code WHERE field_name='payment_kind' order by code_name+ 0 asc";
$payment_kind_opt = DB::result($sql); $payment_kind_opt = DB::result($sql);
#5.契約性質 #5.契約性質
$sql = "select code_name value ,content label from code where field_name='contract_kind'"; $sql = "SELECT code_name value ,content label FROM code WHERE field_name='contract_kind'";
$contract_kind_opt = DB::result($sql); $contract_kind_opt = DB::result($sql);
#6.是否贈送M1 #6.是否贈送M1
$is_m1_bundle_opt = [ $is_m1_bundle_opt = [
@ -100,13 +93,15 @@ $is_m1_bundle_opt = [
]; ];
#7.機種 #7.機種
$sql = "select code_name value ,content label from code where field_name='fp_kind'"; $sql = "SELECT code_name value ,content label FROM code WHERE field_name='fp_kind'";
$fp_kind_opt = DB::result($sql); $fp_kind_opt = DB::result($sql);
#抓取有望客戶資料 #抓取有望客戶資料
$vol_no = $_GET['vol_no']; $vol_no = $_GET['vol_no'];
$where = " and vol_no='$vol_no'"; $where = " and vol_no='$vol_no'";
$sql = "SELECT * FROM hope_contract_customer where 1=1 $where ORDER BY vol_no"; $sql = "SELECT * FROM hope_contract_customer where 1=1 $where ORDER BY vol_no";
// print_r($sql);
$hope_contract = DB::result($sql); $hope_contract = DB::result($sql);
$hope_contract = empty($hope_contract) ? [] : $hope_contract[0]; $hope_contract = empty($hope_contract) ? [] : $hope_contract[0];
#寫入 con_maintance_examine_apply #寫入 con_maintance_examine_apply
@ -132,32 +127,7 @@ if ($apply_st == 1) {
//var_dump($insert_data); //var_dump($insert_data);
DB::insert_table('con_maintance_examine_apply', $insert_data); DB::insert_table('con_maintance_examine_apply', $insert_data);
} }
#抓使用者主管
$sql = "SELECT * FROM account WHERE accountid = '$user_id' ";
list($result) = DB::result($sql);
if ($result['department_id'] == '511') {
$managerid = 'M0137';
$managername = '劉永德';
} else if ($result['department_id'] == '512') {
$managerid = 'M0137';
$managername = '劉永德';
} else if ($result['department_id'] == '513') {
$managerid = 'M0086';
$managername = '李烘銘';
} else if ($result['department_id'] == '514') {
$managerid = 'M0033';
$managername = '吳育宗';
}
if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' || $result['department_id'] == 'M0033') {
$managerid = 'M0008';
$managername = '詹益彰';
}
if ($result['department_id'] == 'M0008') {
$managerid = 'M0008';
$managername = '詹益彰';
}
$table = 'con_maintance_examine_apply'; $table = 'con_maintance_examine_apply';
#可編輯的列 #可編輯的列
$editableColumn = [ $editableColumn = [
@ -217,11 +187,12 @@ $con_maintance_examine_clear_columm = [
'is_m1_bundle' => ['label' => "贈送M1", "value" => "", "tag" => 'select', 'attr' => ['name' => 'is_m1_bundle[]', 'required', 'class' => 'form-control form-control-sm'], 'option' => 'disable', 'options' => $is_m1_bundle_opt], 'is_m1_bundle' => ['label' => "贈送M1", "value" => "", "tag" => 'select', 'attr' => ['name' => 'is_m1_bundle[]', 'required', 'class' => 'form-control form-control-sm'], 'option' => 'disable', 'options' => $is_m1_bundle_opt],
'stand_price' => ['label' => "標準價格(元/月)", "value" => "", "tag" => 'text', 'attr' => ['required', "readonly", 'colspan' => 2, 'name' => 'stand_price[]', 'class' => 'form-control form-control-sm']], 'stand_price' => ['label' => "標準價格(元/月)", "value" => "", "tag" => 'text', 'attr' => ['required', "readonly", 'colspan' => 2, 'name' => 'stand_price[]', 'class' => 'form-control form-control-sm']],
'contract_price' => ['label' => "契約報價(元/月)", "value" => "", "tag" => 'number', 'attr' => ['required', 'colspan' => 2, "placeholder" => "契約報價", 'name' => 'contract_price[]', 'class' => 'form-control form-control-sm']], 'contract_price' => ['label' => "契約報價(元/月)", "value" => "", "tag" => 'number', 'attr' => ['required', 'colspan' => 2, "placeholder" => "契約報價", 'name' => 'contract_price[]', 'class' => 'form-control form-control-sm']],
'sold_price' => ['label' => "契約成交價(元/月)", "value" => "", "tag" => 'number', 'attr' => ['required', 'colspan' => 2, 'name' => 'sold_price[]', 'class' => 'form-control form-control-sm']], 'sold_price' => ['label' => "契約成交價(元/月)", "value" => "", "tag" => 'number', 'attr' => ['required', 'colspan' => 2, 'name' => 'sold_price[]', 'placeholder' => '契約成交價', 'class' => 'form-control form-control-sm']],
]; ];
$con_maintance_examine_clear = DB::result("SELECT " . implode(',', array_keys($con_maintance_examine_clear_columm)) . $con_maintance_examine_clear = DB::result("SELECT " . implode(',', array_keys($con_maintance_examine_clear_columm)) .
" FROM con_maintance_examine_clear where 1=1 and apply_key='$apply_key' and cmstatus='Y' "); " FROM con_maintance_examine_clear where 1=1 and apply_key='$apply_key' and cmstatus='Y' ");
$j = 0; $j = 0;
$col_count = 12; $col_count = 12;
$cmecRow = " <tr>"; $cmecRow = " <tr>";
@ -237,8 +208,6 @@ foreach ($con_maintance_examine_clear_columm as $key => $val) {
$cmecRow .= "</tr><tr>"; $cmecRow .= "</tr><tr>";
} }
} }
$cmecRow .= "</tr>"; $cmecRow .= "</tr>";
function base_url($url) function base_url($url)
{ {
@ -259,7 +228,26 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
return $seq_no; return $seq_no;
} }
$sql = "SELECT * FROM account WHERE accountid = '$user_id' ";
list($result) = DB::result($sql);
if ($result['department_id'] == '511') {
$managerid = 'M0137';
$managername = '劉永德';
} else if ($result['department_id'] == '512') {
$managerid = 'M0137';
$managername = '劉永德';
} else if ($result['department_id'] == '513') {
$managerid = 'M0086';
$managername = '李烘銘';
} else if ($result['department_id'] == '514') {
$managerid = 'M0033';
$managername = '吳育宗';
}
if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' || $result['department_id'] == 'M0033') {
$managerid = 'M0008';
$managername = '詹益彰';
}
?> ?>
<link rel="stylesheet" type="text/css" href="<?php echo base_url('css/jquery.cleditor.css'); ?>" /> <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/jquery.cleditor.css'); ?>" />
@ -366,8 +354,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
// } // }
// } // }
// } // }
_option_tmp += '<option value=' + '<?php echo $managerid ?>' + '>' + '<?php echo $managername ?>' + '</option>'; _option_tmp = '<option value=' + '<?php echo $managerid ?>' + '>' + '<?php echo $managername ?>' + '</option>';
// console.log(_option_tmp);
$("#next_users").append(_option_tmp); $("#next_users").append(_option_tmp);
}); });
$('#maintain_kind').change(function() { $('#maintain_kind').change(function() {
@ -388,9 +375,8 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
$('#maintain_kind').eq(0).focus(); $('#maintain_kind').eq(0).focus();
return false; return false;
} }
var cmecRow = $('#elevator_list').html(); var cmecRow = "<?= $cmecRow ?>";
// console.log(cmecRow); $('#cmecTbody').append(cmecRow);
$('#elevator_list').append(cmecRow);
$("select[name^='elevator_kind'],select[name^='is_m1_bundle']").on('change', function(obj) { $("select[name^='elevator_kind'],select[name^='is_m1_bundle']").on('change', function(obj) {
//console.log('#'+$(this).attr('name')+'#'); //console.log('#'+$(this).attr('name')+'#');
var elen = 1; var elen = 1;
@ -406,7 +392,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
var element = elementObj; var element = elementObj;
if ('elevator_kind[]' == $(this).attr('name')) { if ('elevator_kind[]' == $(this).attr('name')) {
var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle'] option: selected").val(""); var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle'] option:selected").val();
} else if ('is_m1_bundle[]' == $(this).attr('name')) { } else if ('is_m1_bundle[]' == $(this).attr('name')) {
var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle']").val(); var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle']").val();
} }
@ -438,6 +424,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
//console.info(param1); //console.info(param1);
}); });
$("input[name^='floors']" + $("input[name^='floors']" +
",input[name^='speed']" + ",input[name^='speed']" +
",input[name^='persons']" + ",input[name^='persons']" +
@ -478,18 +465,16 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
}); });
} }
delRow = function(btn) { delRow = function(btn) {
console.log($(btn).parent().parent().parent().parent().parent().remove());
if ($(btn).attr('name') == 'btn1') { if ($(btn).attr('name') == 'btn1') {
// console.log($(btn).parent().parent().prev('tr').find('input[id=register_code]').val()); //console.log($(btn).parent().parent().prev('tr').find('input[id=register_code]').val());
regDelStr += $(btn).parent().parent().parent().find('input[id=register_code]').val() + ","; regDelStr += $(btn).parent().parent().find('input[id=register_code]').val() + ",";
$(btn).parent().parent().next('tr').remove(); $(btn).parent().parent().next('tr').remove();
console.log(regDelStr)
} else { } else {
// console.log($(btn).parent().parent().find('input[id=register_code]').val()); //console.log($(btn).parent().parent().find('input[id=register_code]').val());
$(btn).parent().parent().next('tr').remove(); $(btn).parent().parent().next('tr').remove();
$(btn).parent().parent().remove(); $(btn).parent().parent().remove();
} }
$(btn).parent().parent().parent().parent().parent().remove(); $(btn).parent().parent().remove();
} }
setStandPrice = function(p, obj) { setStandPrice = function(p, obj) {
$.ajax({ $.ajax({
@ -499,7 +484,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
dataType: 'json', dataType: 'json',
//success: function(data) {}, //success: function(data) {},
success: function(data) { success: function(data) {
console.info(data); // console.info(data);
if (data.status == 'ok') { if (data.status == 'ok') {
$(obj).val(data.price); $(obj).val(data.price);
} else { } else {
@ -523,11 +508,11 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
console.info(data); // console.info(data);
$("#brand").append("<option value='" + data.seq + "'>" + new_brand + "</option>"); $("#brand").append("<option value='" + data.seq + "'>" + new_brand + "</option>");
}, },
error: function(data) { error: function(data) {
console.info(data); // console.info(data);
} }
}); });
@ -619,7 +604,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<div class="col-12 form_row_header "> <div class="col-12 form_row_header ">
<b>電梯詳細資料</b> <b>電梯詳細資料</b>
</div> </div>
<table style='margin-top:0px;text-align:center' class=' table-condensed' id='elevator_list1'> <table style='margin-top:0px;text-align:center' class=' table-condensed' id='elevator_list'>
<thead> <thead>
<tr> <tr>
@ -636,138 +621,53 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<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>
</thead> <!-- <tr style='margin-top:0px;text-align:center'> -->
</table> <?php
<table class=' table-condensed' id='elevator_list'> $j = 0;
<thead> echo "<tr style='margin-top:0px;text-align:center'>";
<tr style=' margin-top:0px;text-align:center'>
<th colspan="2">電梯許可代碼</th> $i = 0;
<th colspan="2">品牌</th> $cmecRow = '<tr>';
<th colspan="2">電梯類型</th> foreach ($con_maintance_examine_clear_columm as $col => $col_def) {
<th colspan="2">規格型號</th> echo FormHelper::tag("th", ['colspan' => empty($col_def['attr']['colspan']) ? 1 : $col_def['attr']['colspan']], $col_def['label']);
<th>載重(KG)</th>
<th colspan="2">速度(m/min)</th> if ((++$j % $col_count) == 0) {
<th>停數</th> if ($j == $col_count) echo "<th>操作</th>";
<th>層數</th> echo "</tr><tr style='margin-top:0px;text-align:center'>";
<th>人乘</th> }
<th colspan="2">保養次數</th> }
<th>保養月數</th> echo '</tr>';
<th>保養周期</th>
<th>贈送M1</th>
</tr>
</thead>
<tbody id='cmecTbody'>
<tr>
<td colspan="2">
<div class=' col-12'><input id="register_code" name="register_code[]" type="text" value placeholder="無證號請輸入A、B..." repuired class="form-control form=control-sm"></div>
</td>
<td colspan="2">
<div class=' col-12'>
<select name="elevator_brand[]" id="" class="form-control form-control-sm">
<option value=""></option>
<?php foreach ($elevator_brand_opt as $data) : ?>
<option value="<?php echo $data['value']; ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
<td colspan="2">
<div class=' col-12'>
<select name="elevator_kind[]" id="" class="form-control form-control-sm">
<option value=""></option>
<?php foreach ($elevator_kind_opt as $data) : ?>
<option value="<?php echo $data['value'] ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
<td colspan="2">
<div class=' col-12'>
<select name="spec[]" id="" class="form-control form-control-sm">
<option value=""></option>
<?php foreach ($fp_kind_opt as $data) : ?>
<option value="<?php echo $data['value'] ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
<!-- <td><section name='spec'></section></td> -->
<td>
<div class=' col-12'><input type="digits" id="weight" name="weight[]" value gt="0" min="0" required class="form-control form-control-sm"></div>
</td>
<td colspan="2">
<div class=' col-12'><input type="number" id="speed" name="speed[]" valaue gt="0" min="0" require class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="number" id="stop" name="stop[]" class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="floors" name="floors[]" value min="1" required class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="persons" name="persons[]" value min='1' required class="form-control form-contorl-sm"></div>
</td>
<td colspan="2">
<div class=' col-12'><input type="digits" id="maintain_times" name="maintain_times[]" value='1' min='1' required class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="maintain_months" name="maintain_months[]" value="12" min='12' required class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="maintain_period" name="maintain_period[]" value="1" min='1' require class="form-control form-control-sm"></div>
</td>
<td>
<div class='col-12'>
<select name="is_m1_bundle[]" id required class="form-control form-control-sm" id="">
<option value=""></option>
<?php foreach ($is_m1_bundle_opt as $data) : ?>
<option value="<?php $data['value'] ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
</tr>
</tbody>
<thead>
<tr style='margin-top:0px;text-align:center'>
<th colspan="2">竣工檢查年度</th>
<th colspan="2">上次年檢日期</th>
<th colspan="2">年檢費用(元)</th>
<th colspan="2">標準價格(元/月)</th>
<th colspan="2">契約報價(元/月)</th>
<th colspan="2">契約成交價(元/月)</th>
<th>刪除</th>
<th colspan="6"></th> ?>
</tr>
</thead> </thead>
<tbody id='cmecTbody2'> <tbody id='cmecTbody'>
<tr> <tr>
<td colspan="2"> <?php
<div class="col-12"><input type="text" id="useful_years" name="useful_years[]" type="digits" value colspan='2' required gt='0' min='0' class="form-control form-control-sm"></div> foreach ($con_maintance_examine_clear as $key => $val) {
</td> $j = 0;
<td colspan="2"> $cmecRow = "<tr>";
<div class="col-12"><input type="number" id="last_check_date" name="last_check_date[]" value required colspan="2" class="form-control form-control-sn"></div> foreach ($con_maintance_examine_clear_columm as $col => $col_def) {
</td>
<td colspan="2"> $fieldVal = empty($val) ? "" : $val[$col];
<div class="col-12"><input type="text" id="annual_survey_expense" name="annual_survey_exoense[]" type="number" value required colspan='2' class="form-control form-control-sm"></div> $_input = $col_def['tag'] == 'select' ?
</td> FormHelper::select($col, $col_def['options'], $fieldVal, $col_def['attr'])
<td colspan="2"> : FormHelper::text($col, $fieldVal, $col_def['attr'], $col_def['tag']);
<div class="col-12"><input type="text" id='stand_price' name="stand_price[]" value required readonly colspan='2' class="form-control form-control-sm"></div> $cmecRow .= "<td colspan='" . (empty($col_def['attr']['colspan']) ? '' :
</td> $col_def['attr']['colspan']) . "' ><div class=' col-12'>
<td colspan="2"> $_input</td>";
<div class="col-12"><input type="number" id="contract_price" name="contract_price[]" required colsapn="2" class="form-control form-control-sm"></div> if ((++$j % $col_count) == 0) {
</td> $cmecRow .= "<td><button name='btn1' onClick='delRow(this)' type='button' class='btn btn-link btn-md '>刪除</button></td>";
<td colspan="2"> $cmecRow .= "</tr><tr>";
<div class="col-12"><input type="number" id="sold_price" name="sold_price[]" colspan='2' class="form-control form-control-sm"></div> }
</td> }
<td>
<div class=' col-12'><button onclick="delRow(this)" type="button" class="btn btn-link btn md">刪除</button></div>
</td> echo $cmecRow . "</tr>";
<td colspan="6"></td> }
?>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -796,7 +696,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<b>下位簽核者</b> <b>下位簽核者</b>
</div> </div>
<div class="col-2 form_field_content"> <div class="col-2 form_field_content">
<select lect name="next_users" id="next_users" class='form-control form-control-sm '></select> <select name="next_users" id="next_users" class='form-control form-control-sm '></select>
</div> </div>
<div class="col-3 form_field_title "> <div class="col-3 form_field_title ">

193
wms/cont/apply_form3.php → wms/cont/apply_form1.php
View File

@ -225,6 +225,7 @@ $con_maintance_examine_clear = DB::result("SELECT " . implode(',', array_keys($
$j = 0; $j = 0;
$col_count = 12; $col_count = 12;
$cmecRow = " <tr>"; $cmecRow = " <tr>";
foreach ($con_maintance_examine_clear_columm as $key => $val) { foreach ($con_maintance_examine_clear_columm as $key => $val) {
$fieldVal = ""; $fieldVal = "";
$_input = $val['tag'] == 'select' ? $_input = $val['tag'] == 'select' ?
@ -388,8 +389,9 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
$('#maintain_kind').eq(0).focus(); $('#maintain_kind').eq(0).focus();
return false; return false;
} }
var cmecRow = "<?= $cmecRow ?>"; const cmecRow = $('#elevator_list').html();
$('#cmecTbody').append(cmecRow); console.log(cmecRow);
$('#elevator_list').append(cmecRow);
$("select[name^='elevator_kind'],select[name^='is_m1_bundle']").on('change', function(obj) { $("select[name^='elevator_kind'],select[name^='is_m1_bundle']").on('change', function(obj) {
//console.log('#'+$(this).attr('name')+'#'); //console.log('#'+$(this).attr('name')+'#');
var elen = 1; var elen = 1;
@ -478,15 +480,16 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
} }
delRow = function(btn) { delRow = function(btn) {
if ($(btn).attr('name') == 'btn1') { if ($(btn).attr('name') == 'btn1') {
//console.log($(btn).parent().parent().prev('tr').find('input[id=register_code]').val()); // console.log($(btn).parent().parent().prev('tr').find('input[id=register_code]').val());
regDelStr += $(btn).parent().parent().find('input[id=register_code]').val() + ","; regDelStr += $(btn).parent().parent().parent().find('input[id=register_code]').val() + ",";
$(btn).parent().parent().next('tr').remove(); $(btn).parent().parent().next('tr').remove();
console.log(regDelStr)
} else { } else {
//console.log($(btn).parent().parent().find('input[id=register_code]').val()); // console.log($(btn).parent().parent().find('input[id=register_code]').val());
$(btn).parent().parent().next('tr').remove(); $(btn).parent().parent().next('tr').remove();
$(btn).parent().parent().remove(); $(btn).parent().parent().remove();
} }
$(btn).parent().parent().remove(); $(btn).parent().parent().parent().parent().remove();
} }
setStandPrice = function(p, obj) { setStandPrice = function(p, obj) {
$.ajax({ $.ajax({
@ -616,7 +619,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<div class="col-12 form_row_header "> <div class="col-12 form_row_header ">
<b>電梯詳細資料</b> <b>電梯詳細資料</b>
</div> </div>
<table style='margin-top:0px;text-align:center' class=' table-condensed' id='elevator_list'> <table style='margin-top:0px;text-align:center' class=' table-condensed' id='elevator_list1'>
<thead> <thead>
<tr> <tr>
@ -633,53 +636,139 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
<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'> </thead>
<?php </table>
$j = 0; <table class=' table-condensed' id='elevator_list'>
foreach ($con_maintance_examine_clear_columm as $val) { <thead>
<tr style=' margin-top:0px;text-align:center'>
echo FormHelper::tag("th", ['colspan' => empty($val['attr']['colspan']) ? 1 : $val['attr']['colspan']], $val['label']); <th colspan="2">電梯許可代碼</th>
//echo "<th>" . $val['label'] . "</th>"; <th colspan="2">品牌</th>
if ((++$j % $col_count) == 0) { <th colspan="2">電梯類型</th>
if ($j == $col_count) echo "<th>操作</th>"; <th colspan="2">規格型號</th>
<th>載重(KG)</th>
<th colspan="2">速度(m/min)</th>
echo "</tr><tr style='margin-top:0px;text-align:center'>"; <th>停數</th>
} <th>層數</th>
} <th>人乘</th>
<th colspan="2">保養次數</th>
<th>保養月數</th>
<th>保養周期</th>
<th>贈送M1</th>
</tr>
</thead>
<tbody id='cmecTbody'>
<tr>
<td colspan="2">
<div class=' col-12'><input id="register_code" name="register_code[]" type="text" value placeholder="無證號請輸入A、B..." repuired class="form-control form=control-sm"></div>
</td>
<td colspan="2">
<div class=' col-12'>
<select name="elevator_brand[]" id="" class="form-control form-control-sm">
<option value=""></option>
<?php foreach ($elevator_brand_opt as $data) : ?>
<option value="<?php echo $data['value']; ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
<td colspan="2">
<div class=' col-12'>
<select name="elevator_kind[]" id="" class="form-control form-control-sm">
<option value=""></option>
<?php foreach ($elevator_kind_opt as $data) : ?>
<option value="<?php echo $data['value'] ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
<td colspan="2">
<div class=' col-12'>
<select name="spec[]" id="" class="form-control form-control-sm">
<option value=""></option>
<?php foreach ($fp_kind_opt as $data) : ?>
<option value="<?php echo $data['value'] ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
<!-- <td><section name='spec'></section></td> -->
<td>
<div class=' col-12'><input type="digits" id="weight" name="weight[]" value gt="0" min="0" required class="form-control form-control-sm"></div>
</td>
<td colspan="2">
<div class=' col-12'><input type="number" id="speed" name="speed[]" valaue gt="0" min="0" require class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="number" id="stop" name="stop[]" class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="floors" name="floors[]" value min="1" required class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="persons" name="persons[]" value min='1' required class="form-control form-contorl-sm"></div>
</td>
<td colspan="2">
<div class=' col-12'><input type="digits" id="maintain_times" name="maintain_times[]" value='1' min='1' required class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="maintain_months" name="maintain_months[]" value="12" min='12' required class="form-control form-control-sm"></div>
</td>
<td>
<div class=' col-12'><input type="digits" id="maintain_period" name="maintain_period[]" value="1" min='1' require class="form-control form-control-sm"></div>
</td>
<td>
<div class='col-12'>
<select name="is_m1_bundle[]" id required class="form-control form-control-sm" id="">
<option value=""></option>
<?php foreach ($is_m1_bundle_opt as $data) : ?>
<option value="<?php $data['value'] ?>"><?php echo $data['label'] ?></option>
<?php endforeach ?>
</select>
</div>
</td>
</tr>
</tbody>
<thead>
<tr style='margin-top:0px;text-align:center'>
<th colspan="2">竣工檢查年度</th>
<th colspan="2">上次年檢日期</th>
<th colspan="2">年檢費用(元)</th>
<th colspan="2">標準價格(元/月)</th>
<th colspan="2">契約報價(元/月)</th>
<th colspan="2">契約成交價(元/月)</th>
<th>刪除</th>
?> <th colspan="6"></th>
</tr> </tr>
</thead> </thead>
<tbody id='cmecTbody'> <tbody id='cmecTbody2'>
<?php <tr>
<td colspan="2">
foreach ($con_maintance_examine_clear as $key => $val) { <div class="col-12"><input type="text" id="useful_years" name="useful_years[]" type="digits" value colspan='2' required gt='0' min='0' class="form-control form-control-sm"></div>
$j = 0; </td>
$cmecRow = " <td>"; <td colspan="2">
foreach ($con_maintance_examine_clear_columm as $col => $col_def) { <div class="col-12"><input type="number" id="last_check_date" name="last_check_date[]" value required colspan="2" class="form-control form-control-sn"></div>
</td>
$fieldVal = empty($val) ? "" : $val[$col]; <td colspan="2">
$_input = $col_def['tag'] == 'select' ? <div class="col-12"><input type="text" id="annual_survey_expense" name="annual_survey_exoense[]" type="number" value required colspan='2' class="form-control form-control-sm"></div>
FormHelper::select($col, $col_def['options'], $fieldVal, $col_def['attr']) </td>
: FormHelper::text($col, $fieldVal, $col_def['attr'], $col_def['tag']); <td colspan="2">
$cmecRow .= "<td colspan='" . (empty($col_def['attr']['colspan']) ? '' : <div class="col-12"><input type="text" id='stand_price' name="stand_price[]" value required readonly colspan='2' class="form-control form-control-sm"></div>
$col_def['attr']['colspan']) . "' ><div class=' col-12'> </td>
$_input</td>"; <td colspan="2">
if ((++$j % $col_count) == 0) { <div class="col-12"><input type="number" id="contract_price" name="contract_price[]" required colsapn="2" class="form-control form-control-sm"></div>
$cmecRow .= "<td><button name='btn1' onClick='delRow(this)' type='button' class='btn btn-link btn-md '>刪除</button></td>"; </td>
$cmecRow .= "</td><td>"; <td colspan="2">
} <div class="col-12"><input type="number" id="sold_price" name="sold_price[]" colspan='2' class="form-control form-control-sm"></div>
} </td>
<td>
<div class=' col-12'><button onclick="delRow(this)" name='btn1' type="button" class="btn btn-link btn md">刪除</button></div>
echo $cmecRow . "</td>"; </td>
} <td colspan="6"></td>
?>
</tr>
</tbody> </tbody>
</table> </table>
@ -727,12 +816,6 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
</div> </div>
<div class="tab-content col-12"> <div class="tab-content col-12">
<div role="tabpanel" class="tab-pane active" id="main_flow_assign"> <div role="tabpanel" class="tab-pane active" id="main_flow_assign">
<?php
$assign_departs = array();
foreach ($assign_opinions as $as) {
$assign_departs[$as['assign_depart']] = $as['assign_depart_name'];
}
?>
<div class="comment_items "> <div class="comment_items ">
<?php $cnt = 1; <?php $cnt = 1;

16
wms/contract-repair/api/getContractData.php
View File

@ -64,15 +64,15 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
//// 製作人：梓誠 //// 製作人：梓誠
/// 時間 ： /// 時間 ：
////////////////////////////// //////////////////////////////
if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'r') { if (isset($_GET['repair_no']) && $_GET['repair_no'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'r') {
try { try {
$contractno = $_GET['contractno']; $repair_no = $_GET['repair_no'];
$fail_arr = []; $fail_arr = [];
$d_status = '1'; $d_status = '1';
// 判斷單號是否在合約簽核已建立 // 判斷單號是否在合約簽核已建立
$sql = "SELECT COUNT(*) AS num FROM contract_r_signed_back WHERE contractno = :contractno AND delete_status = :d_status "; $sql = "SELECT COUNT(*) AS num FROM contract_r_signed_back WHERE repair_no = :repair_no AND delete_status = :d_status ";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->bindParam(":contractno", $contractno); $stmt->bindParam(":repair_no", $repair_no);
$stmt->bindParam(":d_status", $d_status); $stmt->bindParam(":d_status", $d_status);
$stmt->execute(); $stmt->execute();
$result = $stmt->fetch(PDO::FETCH_ASSOC); $result = $stmt->fetch(PDO::FETCH_ASSOC);
@ -84,9 +84,9 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
exit(); exit();
} }
// 判斷單號是否在價格審查中以建立。 // 判斷單號是否在價格審查中以建立。
$sql = "SELECT COUNT(*) AS num FROM pricereview_repair_main WHERE contractno = :contractno"; $sql = "SELECT COUNT(*) AS num FROM pricereview_repair_main WHERE repair_no = :repair_no";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->bindParam(":contractno", $contractno); $stmt->bindParam(":repair_no", $repair_no);
$stmt->execute(); $stmt->execute();
$result2 = $stmt->fetch(PDO::FETCH_ASSOC); $result2 = $stmt->fetch(PDO::FETCH_ASSOC);
$count2 = $result2['num']; $count2 = $result2['num'];
@ -103,10 +103,10 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
FROM pricereview_repair_main AS a FROM pricereview_repair_main AS a
LEFT JOIN account AS b LEFT JOIN account AS b
ON a.repairerid = b.accountid ON a.repairerid = b.accountid
WHERE a.contractno = :contractno "; WHERE a.repair_no = :repair_no ";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->bindParam(':contractno', $contractno); $stmt->bindParam(':repair_no', $repair_no);
$stmt->execute(); $stmt->execute();
$contract = $stmt->fetch(PDO::FETCH_ASSOC); $contract = $stmt->fetch(PDO::FETCH_ASSOC);
$contractResponse = json_encode($contract); $contractResponse = json_encode($contract);

8
wms/contract-repair/contract-repair-input.php
View File

@ -45,9 +45,9 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修
<template x-if="step==1"> <template x-if="step==1">
<tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==1"> <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==1">
<tr> <tr>
<td style="vertical-align: middle">合約號</td> <td style="vertical-align: middle">報價單編號</td>
<td colspan="5"> <td colspan="5">
<input class="form-control" @keyup="nextStepKeyupFn($event)" type="text" name="contractno" x-model="data.contractno"> <input class="form-control" @keyup="nextStepKeyupFn($event)" type="text" name="repair_no" x-model="data.repair_no">
</td> </td>
<td colspan="2" style="vertical-align: middle"> <td colspan="2" style="vertical-align: middle">
@ -80,8 +80,8 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修
</td> </td>
<td style="vertical-align: middle">維保人員</td> <td style="vertical-align: middle">維保人員</td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<select class="repaireid" id="repaireid" x-model="data.repaireid"> <select class="repaireid" id="repaireid" x-model="data.repairerid">
<option value="<?php echo $contract['repaireid'] ?>"><?php echo $contract['repaireid'] . '-' . $contract['name'] ?></option> <option value="<?php echo $contract['repaireid'] ?>"><?php echo $contract['repairerid'] . '-' . $contract['name'] ?></option>
<?php foreach ($persons as $person) : ?> <?php foreach ($persons as $person) : ?>
<option value="<?php echo $person['value']; ?>"><?php echo $person['view']; ?></option> <option value="<?php echo $person['value']; ?>"><?php echo $person['view']; ?></option>
<?php endforeach ?> <?php endforeach ?>

8
wms/contract-repair/js/alpine.js
View File

@ -975,7 +975,7 @@ const contractRepair = () => {
}, },
// 抓資料 // 抓資料
getContractDate() { getContractDate() {
axios.get('./api/getContractData.php?contracttype=r&contractno=' + this.data.contractno).then(res => { axios.get('./api/getContractData.php?contracttype=r&repair_no=' + this.data.repair_no).then(res => {
if (!res.data) { if (!res.data) {
this.step = 2; this.step = 2;
this.isLoading = false; this.isLoading = false;
@ -993,7 +993,7 @@ const contractRepair = () => {
this.data.address = res.data.address; this.data.address = res.data.address;
this.data.repair_no = res.data.repair_no; this.data.repair_no = res.data.repair_no;
this.data.total_price = res.data.total_price; this.data.total_price = res.data.total_price;
this.data.repaireid = res.data.accountid; this.data.repaireid = res.data.repairerid;
this.data.sign_date = res.data.sign_date; this.data.sign_date = res.data.sign_date;
this.data.contract_status = res.data.contract_status; this.data.contract_status = res.data.contract_status;
} }
@ -1135,7 +1135,7 @@ const contractInput = () => {
fail_arr: [], fail_arr: [],
nextStepFn() { nextStepFn() {
if (this.step == 1) { if (this.step == 1) {
if (this.data.contractno == '') return alert('請輸入合約號'); if (this.data.repair_no == '') return alert('請輸入合約號');
this.isLoading = true this.isLoading = true
this.getContractDate(); this.getContractDate();
} else if (this.step == 2) { } else if (this.step == 2) {
@ -1149,7 +1149,7 @@ const contractInput = () => {
nextStepKeyupFn(e) { nextStepKeyupFn(e) {
if (e.keyCode !== 13) return if (e.keyCode !== 13) return
if (this.step == 1) { if (this.step == 1) {
if (this.data.contractno == '') return alert('請輸入合約號'); if (this.data.repair_no == '') return alert('請輸入合約號');
this.isLoading = true this.isLoading = true
this.getContractDate(); this.getContractDate();

6
wms/crm/crmm02-index.php
View File

@ -52,9 +52,9 @@ linkman,lm_tel,f_return_name(salesman) salesman,num ,date_format(pre_order_date,
$data = mysqli_query($link, $sql); $data = mysqli_query($link, $sql);
echo '<pre>'; // echo '<pre>';
print_r($data); // print_r($sql);
echo '</pre>'; // echo '</pre>';
?> ?>
<style> <style>
#table_index2 { #table_index2 {

20
wms/mkt/pricereview_repair-create.php
View File

@ -210,7 +210,7 @@ $assign_status = '<option value="FH">指派</option>'
} }
function cacl(o) { function cacl(o) {
console.log(o.parent().parent()); // console.log(o.parent().parent());
var fp = o.parent().parent(); var fp = o.parent().parent();
fp.find('input[name=item_price_bp]').val(commafy(fp.find('input[name=item_unit_price]').val().replace(/[,]+/g, "") * o.val().replace(/[,]+/g, ""))); fp.find('input[name=item_price_bp]').val(commafy(fp.find('input[name=item_unit_price]').val().replace(/[,]+/g, "") * o.val().replace(/[,]+/g, "")));
dataFormat(); dataFormat();
@ -270,6 +270,14 @@ $assign_status = '<option value="FH">指派</option>'
$('#tb1 tr:last').prev().prev().prev().after($("tr[name='main_templ']").last().clone().find('input').val('').end()); $('#tb1 tr:last').prev().prev().prev().after($("tr[name='main_templ']").last().clone().find('input').val('').end());
$('#tb1 tr:last').prev().prev().prev().find('td a[name=item_href]').html('點選'); $('#tb1 tr:last').prev().prev().prev().find('td a[name=item_href]').html('點選');
}); });
// 點擊服務費會出現 or 消失 input 框
$('#btnadd-sc').click(function() {
$('#service_charge_tr').toggle();
// 若消失清空 input 的值
$('#service_charge').val('');
// 並且重新計算總價(total)
dataFormat();
});
$('#tb1').on('click', 'a[name=btndel]', function() { $('#tb1').on('click', 'a[name=btndel]', function() {
if ($('tr[name=main_templ]').length > 1) { if ($('tr[name=main_templ]').length > 1) {
$(this).closest('tr').remove(); $(this).closest('tr').remove();
@ -462,7 +470,8 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<table id="tb1" class="table table-bordered"> <table id="tb1" class="table table-bordered">
<thead> <thead>
<tr> <tr>
<th colspan="10"><a href="javascript:void(0);" id="btnadd" class="btn btn-primary btn-sm">新增備品</a> <span class="star">*</span></th> <th colspan="5"><a href="javascript:void(0);" id="btnadd" class="btn btn-primary btn-sm">新增備品</a> <span class="star">*</span></th>
<th colspan="5"><a href="javascript:void(0);" id="btnadd-sc" class="btn btn-primary btn-sm">服務費</a></th>
</tr> </tr>
<tr> <tr>
<th nowrap>名稱</th> <th nowrap>名稱</th>
@ -496,14 +505,15 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
<a href="javascript:void(0);" name="btndel" class="btn btn-danger btn-sm">X</a> <a href="javascript:void(0);" name="btndel" class="btn btn-danger btn-sm">X</a>
</td> </td>
</tr> </tr>
<tr> <tr id='service_charge_tr' style="display: none;">
<td colspan="3"> <td colspan="3">
<h5>服務費</h5> <h5>服務費</h5>
</td> </td>
<td> <td>
<input type="text" name="service_charge" id="service_charge" class="dollar-right" size="8"> <input type="text" name="service_charge" id="service_charge" class="dollar-right" size="8" ">
</td>
<td colspan=" 2">
</td> </td>
<td colspan="2"></td>
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">

Write Preview
Loading…
Cancel
Save