Browse Source

Merge branch 'main' into gary

gary
gary_chen\gary_chen 1 year ago
parent
commit
dc86fcc585
  1. 2
      wms/cont/sign_form.php
  2. 4
      wms/crm/crmm01-index.php
  3. 2
      wms/crm/crmm02-index.php

2
wms/cont/sign_form.php

@ -475,7 +475,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
</div> </div>
<div class="col-3 form_field_title "> <div class="col-3 form_field_title ">
<button type="submit" class="btn btn-primary btn-sm" style='float:left'>提交</button> <button type="submit" name="btn_save" class="btn btn-primary btn-sm" value="tosign" style='float:left'>提交</button>
</div> </div>
</div> </div>

4
wms/crm/crmm01-index.php

@ -41,8 +41,8 @@ $salesman = empty($_GET['salesman']) ? "%" : $_GET['salesman'];
$where .= " and salesman_name like '$salesman'"; $where .= " and salesman_name like '$salesman'";
$sql_cmd = sql_myself($user_id, "salesman"); $sql_cmd = sql_myself($user_id, "salesman");
// max,許紓晴,林慧珊 // max,許紓晴,林慧珊,鄭伊岑
if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0107" || $user_id == "M0193") $sql_cmd = ""; if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0107" || $user_id == "M0193" || $user_id == "M0149") $sql_cmd = "";
if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd); if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd);
/* /*
$checkAll = ['p0044', 'M0007']; $checkAll = ['p0044', 'M0007'];

2
wms/crm/crmm02-index.php

@ -42,7 +42,7 @@ $where .= " and salesman like '$salesman'";
$lm_name = empty($_GET['linkman']) ? "%" : $_GET['linkman']; $lm_name = empty($_GET['linkman']) ? "%" : $_GET['linkman'];
$where .= " and linkman like '$lm_name'"; $where .= " and linkman like '$lm_name'";
$sql_cmd = sql_myself($user_id, "salesman"); $sql_cmd = sql_myself($user_id, "salesman");
if (in_array($user_department_id, $depart_arr) || $user_id == "M0060") $sql_cmd = ""; // M0060:Max if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0149") $sql_cmd = ""; // M0060:Max,鄭伊岑
if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd); if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd);
$sql = "SELECT vol_no,customer,manager,f_return_content('customer_source',source ) source, $sql = "SELECT vol_no,customer,manager,f_return_content('customer_source',source ) source,

Loading…
Cancel
Save