diff --git a/extension/or/common/ext/lang/zh-cn/ipd.php b/extension/or/common/ext/lang/zh-cn/ipd.php index 8f0f26d89b..bd015914d9 100644 --- a/extension/or/common/ext/lang/zh-cn/ipd.php +++ b/extension/or/common/ext/lang/zh-cn/ipd.php @@ -143,5 +143,5 @@ $lang->market->homeMenu->market = array('link' => "市场|market|browse|browse $lang->market->menu = new stdclass(); $lang->market->menu->report = array('link' => "报告|marketreport|browse|marketID=%s", 'subModule' => 'marketreport'); -$lang->market->menu->research = array('link' => "调研|marketresearch|browse|marketID=%s"); +$lang->market->menu->research = array('link' => "调研|marketresearch|browse|marketID=%s", 'subModule' => 'marketresearch'); $lang->market->menu->view = array('link' => "概况|market|view|marketID=%s", 'alias' => 'edit'); diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index 398ebac249..bf2904c65e 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -47,6 +47,7 @@ programplan->PM;?> PM, "class='form-control picker-select'");?> + model != 'research'):?> setPercent) and $config->setPercent == 1):?> programplan->percent;?> @@ -61,7 +62,7 @@ programplan->attribute;?> - model == 'ipd') { echo zget($lang->stage->ipdTypeList, $plan->attribute); @@ -95,6 +96,7 @@ grade == 2 ? "disabled='disabled'" : '';?> execution->aclList, $plan->acl, "class='form-control' $class");?> + programplan->planDateRange;?>