From 6f8663cc171cc431595505006abadcc93ff78d73 Mon Sep 17 00:00:00 2001 From: Cheng Date: Tue, 16 Jan 2024 18:42:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=91=E7=B4=84=E5=83=B9=E5=AF=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/flow/cont/con01.json | 72 +++++++++++++++++++++++++++++++++- wms/cont/apply_form.php | 7 ++-- wms/crm/crmm02-index.php | 2 +- wms/crm/crmm06-edit.php | 2 +- wms/mkt/pricereview-check.php | 74 +++++++++++++++++++---------------- 5 files changed, 117 insertions(+), 40 deletions(-) diff --git a/static/flow/cont/con01.json b/static/flow/cont/con01.json index 4b435a3d..ab807286 100644 --- a/static/flow/cont/con01.json +++ b/static/flow/cont/con01.json @@ -1 +1,71 @@ -{"flowName":"保养合约价格审核","systemId":"con","flowId":"con01","version":"","selectedNode":"start_node_1684033305000","saveUrl":"https://www.masada.com.tw/fds/index.php/DesignFlow/acceptJsonToSave/","publishUrl":"","drawID":"draw","flowList":{"start_node_1684033305000":{"nodeName":"申请","nodeId":"start_node_1684033305000","creator":"P0044","desc":"申请单位签核","nodeType":"start_node","targetId":["end_node_1684033370000"],"sourceId":[],"targetAnchor":[],"connector":[],"blockTop":"218.8625030517578px","blockLeft":"718.6625366210938px","endPoints":["RightMiddle"],"flowCode":"A","assignClass":"X","assignClassMethod":"function test($flow_context, $form)\n{\n\n $discount = empty($form['discount']) ? '' : $form['discount'];\n\n if ($discount >= '90') return 'C';\n if ($discount >= 80 and $discount < 90) return 'C';\n if ($discount >= 60 and $discount < 80) return 'D';\n if ($discount < 60) return 'F';\n return 'C';\n}","assigner":"","htmlDiv":"
\n \"\"\n

开始

\n
","allowAssign":"true","allowPassTo":"true","backOption":"B1"},"end_node_1684033370000":{"nodeName":"结案节点","nodeId":"end_node_1684033370000","creator":" ","desc":"结案节点","nodeType":"end_node","targetId":[],"sourceId":["start_node_1684033305000"],"targetAnchor":[],"connector":[],"blockTop":"409.26251220703125px","blockLeft":"903.6625366210938px","endPoints":["TopCenter"],"flowCode":"Z","assignClass":"A","assigner":"F4-结案:|","htmlDiv":"
\n \"\"\n

结案

\n
"}},"flowConnector":[{"ConnectionId":"con_5","PageSourceId":"start_node_1684033305000","PageTargetId":"end_node_1684033370000","SourceText":"","TargetText":"","SourceAnchor":"RightMiddle","TargetAnchor":"TopCenter"}]} \ No newline at end of file +{ + "flowName": "保养合约价格审核", + "systemId": "con", + "flowId": "con01", + "version": "", + "selectedNode": "start_node_1684033305000", + "saveUrl": "https://www.masada.com.tw/fds/index.php/DesignFlow/acceptJsonToSave/", + "publishUrl": "", + "drawID": "draw", + "flowList": { + "start_node_1684033305000": { + "nodeName": "申请", + "nodeId": "start_node_1684033305000", + "creator": "P0044", + "desc": "申请单位签核", + "nodeType": "start_node", + "targetId": [ + "end_node_1684033370000" + ], + "sourceId": [], + "targetAnchor": [], + "connector": [], + "blockTop": "218.8625030517578px", + "blockLeft": "718.6625366210938px", + "endPoints": [ + "RightMiddle" + ], + "flowCode": "A", + "assignClass": "X", + "assignClassMethod": "function test($flow_context, $form)\n{\n\n $discount = empty($form['discount']) ? '' : $form['discount'];\n\n if ($discount >= '90') return 'C';\n if ($discount >= 80 and $discount < 90) return 'C';\n if ($discount >= 60 and $discount < 80) return 'D';\n if ($discount < 60) return 'F';\n return 'C';\n}", + "assigner": "", + "htmlDiv": "
\n \"\"\n

开始

\n
", + "allowAssign": "true", + "allowPassTo": "true", + "backOption": "B1" + }, + "end_node_1684033370000": { + "nodeName": "结案节点", + "nodeId": "end_node_1684033370000", + "creator": " ", + "desc": "结案节点", + "nodeType": "end_node", + "targetId": [], + "sourceId": [ + "start_node_1684033305000" + ], + "targetAnchor": [], + "connector": [], + "blockTop": "409.26251220703125px", + "blockLeft": "903.6625366210938px", + "endPoints": [ + "TopCenter" + ], + "flowCode": "Z", + "assignClass": "A", + "assigner": "F4-结案:|", + "htmlDiv": "
\n \"\"\n

结案

\n
" + } + }, + "flowConnector": [ + { + "ConnectionId": "con_5", + "PageSourceId": "start_node_1684033305000", + "PageTargetId": "end_node_1684033370000", + "SourceText": "", + "TargetText": "", + "SourceAnchor": "RightMiddle", + "TargetAnchor": "TopCenter" + } + ] +} \ No newline at end of file diff --git a/wms/cont/apply_form.php b/wms/cont/apply_form.php index 161797ad..a7f4c7db 100644 --- a/wms/cont/apply_form.php +++ b/wms/cont/apply_form.php @@ -68,9 +68,7 @@ $wf->setFormData(['discount' => 100]); $flowName = $wf->getFlowName(); $assigner = $wf->getAssignerList(); $assign_status = $wf->getAssignStatus($assigner); -// echo '
';
-// print_r($assign_status);
-// echo '
'; + $if_show_assign = true; //加載流程圖 //$fc = WorkFLowItems::get_records($flow->getSystemID(), $flow->getFlowID()); @@ -254,6 +252,9 @@ if ($result['department_id'] == '511') { } else if ($result['department_id'] == '514') { $managerid = 'M0033'; $managername = '吳育宗'; +} else if ($user_id == 'TEST01') { + $managerid = 'TEST04'; + $managername = '區經理'; } if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' || $result['department_id'] == 'M0033') { diff --git a/wms/crm/crmm02-index.php b/wms/crm/crmm02-index.php index 297445e7..17e14a51 100644 --- a/wms/crm/crmm02-index.php +++ b/wms/crm/crmm02-index.php @@ -170,7 +170,7 @@ if ($data) : - + 轉價審 diff --git a/wms/crm/crmm06-edit.php b/wms/crm/crmm06-edit.php index fbf21dfd..a8cdb8e1 100644 --- a/wms/crm/crmm06-edit.php +++ b/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'"; $elevator_kind_opt = DB::result($sql); #4.營業員 -$sql = "select employee_no value ,name label from employee where depart_no in ('511','512','513','514','515')"; +$sql = "select employee_no value ,name label from employee where depart_no in ('511','512','513','514','515','314')"; $salesman_opt = DB::result($sql); #5.有望客戶狀態 $sql = "select code_name value ,content label from code where field_name='hope_customer_status'"; diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php index ffcef2d6..f5667028 100644 --- a/wms/mkt/pricereview-check.php +++ b/wms/mkt/pricereview-check.php @@ -302,8 +302,7 @@ foreach ($res as $data) { } } } - - } + } // getMI($id); ?> @@ -317,28 +316,40 @@ foreach ($res as $data) { return num; } let total_mi = 0; + function getMI(id) { var formdata = new FormData(); formdata.append('pa', id); + // formdata.append('user_id', ); var xhr = new XMLHttpRequest(); xhr.onreadystatechange = function() { if (this.readyState == 4 && this.status == 200) { data = JSON.parse(this.responseText); + console.log('123'); + //console.log(data);return false; if (data.st == 'err') { + console.log('123'); + //alert(data.err); return false; } + // console.log(data.content); Object.keys(data.content).forEach(function(k) { console.log('k=>', k); + // console.log(data.content); //console.log(data.content[k][0]); // 有值表示先前已寫入MI if ($("#tb1").find("input[name=mi_fix]").eq(k).val() == "") { - // console.log($("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(data.content[k][0]))); + + // $("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(data.content[k][0])); let a = data.content[k][0] + data.content[k][19][1]; $("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(a)); } - $("#tb1").find("input[name=mi_fix]").eq(k).keyup(); + console.log('123'); + + let a = data.content[k][0] + data.content[k][19][1]; + $("#tb1").find("input[name=mi_fix]").eq(k).val(commafy(a)); var mihtml = ""; total_mi = 0; mihtml += "
電梯設備
"; @@ -353,40 +364,39 @@ foreach ($res as $data) { mihtml += "以上合計：" + commafy(data.content[k][12]) + "/台"; mihtml += "
"; mihtml += "
OPTION
"; - total_mi = total_mi + data.content[k][12]; + total_mi = total_mi + data.content[k][12]; console.log(data.content[k][12]); Object.keys(data.content[k][14]).forEach(function(m) { if (data.content[k][14][m][0] != '') { - mihtml += "
  • " + data.content[k][14][m][0]+ "：" + commafy(data.content[k][14][m][1]) + "
    • "; + mihtml += "
  • " + data.content[k][14][m][0] + "：" + commafy(data.content[k][14][m][1]) + "
    • "; } }); Object.keys(data.content[k][16]).forEach(function(m) { if (data.content[k][16][m][0] != '') { - mihtml += "
  • " + data.content[k][16][m][0]+ "：" + commafy(data.content[k][16][m][1]) + "
    • "; + mihtml += "
  • " + data.content[k][16][m][0] + "：" + commafy(data.content[k][16][m][1]) + "
    • "; } }); Object.keys(data.content[k][18]).forEach(function(m) { - mihtml += "
  • " + data.content[k][18][m][0]+ "：" + commafy(data.content[k][18][m][1]) + "
    • "; + mihtml += "
  • " + data.content[k][18][m][0] + "：" + commafy(data.content[k][18][m][1]) + "
    • "; }); mihtml += "
  • " + data.content[k][19][0] + "：" + commafy(data.content[k][19][1]) + "
    • "; - mihtml += "以上合計：" + commafy(data.content[k][13]) + "
    "; - total_mi = total_mi + data.content[k][13]; - console.log(data.content[k][13]); + mihtml += "以上合計：" + commafy(data.content[k][13]) + + "
    "; $("#tb1").find("tr[name=facil_templ2]").eq(k).find('td').eq(1).html(mihtml); //$("#tb1").find("input[name=mi_fix]").eq(k).closest('td').append(mihtml); - document.getElementsByClassName('total_mi_fix')[k].value =commafy(total_mi) + document.getElementsByClassName('total_mi_fix')[k].value = commafy(total_mi) // document.getElementsByClassName('item_price_ct')[k].value =commafy(total_mi) - document.getElementsByClassName('gross_profit')[k].value =commafy(Number(document.getElementsByClassName('item_price_ct')[k].value.replace(/[,]+/g, "")) - total_mi) - document.getElementsByClassName('gross_profit_rate')[k].value =Math.round((Number(document.getElementsByClassName('gross_profit')[k].value.replace(/[,]+/g, ""))/Number(document.getElementsByClassName('item_price_ct')[k].value.replace(/[,]+/g, ""))*100)*10)/10 + document.getElementsByClassName('gross_profit')[k].value = commafy(Number(document.getElementsByClassName('item_price_ct')[k].value.replace(/[,]+/g, "")) - total_mi) + document.getElementsByClassName('gross_profit_rate')[k].value = Math.round((Number(document.getElementsByClassName('gross_profit')[k].value.replace(/[,]+/g, "")) / Number(document.getElementsByClassName('item_price_ct')[k].value.replace(/[,]+/g, "")) * 100) * 10) / 10 }); } - + } xhr.open('POST', 'pricereview_mi-api.php', true); xhr.send(formdata); } - + $(function() { getMI(''); @@ -423,22 +433,19 @@ foreach ($res as $data) { $("#specModal .modal-body").html(plink); $("#specModal").modal('show'); }); - + }); $('#tb1').on('keyup', 'input[name=mi_fix]', function() { + // console.log($(this).val); $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); // var mf = $(this).val().replace(/[,]+/g, ""); var mf = $(this).closest('td').parent().find('input[name=mi_fix]').val().replace(/[,]+/g, ""); var ct = $(this).closest('td').parent().find('input[name=item_price_ct]').val().replace(/[,]+/g, ""); - console.log(mf); - console.log(ct); - console.log(ct - mf); - $(this).closest('td').parent().find('input[name=gross_profit]').val(commafy(ct - mf)); if (ct == 0) $(this).closest('td').parent().find('input[name=gross_profit_rate]').val(0.0); else $(this).closest('td').parent().find('input[name=gross_profit_rate]').val((((ct - mf) / ct) * 100).toFixed(1)); }); - + $('button[name=status]').click(function() { var itemNoArr = []; @@ -488,9 +495,8 @@ foreach ($res as $data) { $('#tb5').on('keyup', 'input[name=final_price_total]', function() { $(this).val(commafy($(this).val())); }); - - }); + });