From eb0e0ad4a3fcd03ebb6cf144bbfd67d28c9cc9bc Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 12 Oct 2020 09:10:14 +0800 Subject: [PATCH] * Fix a bug about task#8073. --- module/project/js/common.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/module/project/js/common.js b/module/project/js/common.js index eec18f98ad..a4b9f19c5e 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -240,24 +240,27 @@ $(function() }); /*Assign value to the manage products by the different request type.*/ - var url = window.location.href; - if(window.config.requestType == 'GET') + if(window.config.currentMethod === 'create') { - var paramStr = url.split('?')[1]; - var paramArr = paramString.split('&'); - var productID = paramArr[2].split('=')[1]; + var url = window.location.href; + if(window.config.requestType == 'GET') + { + var paramStr = url.split('?')[1]; + var paramArr = paramString.split('&'); + var productID = paramArr[2] ? paramArr[2].split('=')[1] : 0; + } + else + { + var urlArr = url.split('/'); + var paramStr = urlArr[urlArr.length-1]; + var paramArr = paramStr.split('-'); + var productID = paramArr[2] ? paramArr[2].split('.')[0] : 0; + } + var product = $('#productsBox .input-group:last select:first'); + $(product).val(productID); + $(product).trigger("chosen:updated"); + loadBranches($(product)); } - else - { - var urlArr = url.split('/'); - var paramStr = urlArr[urlArr.length-1]; - var paramArr = paramStr.split('-'); - var productID = paramArr[2].split('.')[0]; - } - var product = $('#productsBox .input-group:last select:first'); - $(product).val(productID); - $(product).trigger("chosen:updated"); - loadBranches($(product)); adjustProductBoxMargin(); adjustPlanBoxMargin();