From fc58365ce958f2bc5ce6967e8029cbe340c1a199 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 19 Jul 2022 13:31:16 +0800 Subject: [PATCH] * Finish task #61179. --- module/product/config.php | 2 +- module/product/view/create.html.php | 2 ++ module/product/view/edit.html.php | 2 ++ module/product/view/view.html.php | 22 +++++++++++++++++++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/module/product/config.php b/module/product/config.php index 789f16d593..967c5f8df0 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -93,7 +93,7 @@ $app->loadLang('product'); $config->product->all = new stdclass(); $config->product->all->search['module'] = 'product'; $config->product->all->search['fields']['name'] = $lang->product->name; -$config->product->all->search['fields']['code'] = $lang->product->code; +if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code; $config->product->all->search['fields']['id'] = $lang->product->id; if($config->systemMode == 'new') $config->product->all->search['fields']['program'] = $lang->product->program; $config->product->all->search['fields']['line'] = $lang->product->line; diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index b1b22554a0..e02e822238 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -56,10 +56,12 @@ product->name;?> + setCode) or $config->setCode == 1):?> product->code;?> + product->PO;?> app->user->account, "class='form-control chosen'");?> diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index c577fa0f96..1e7d95c235 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -51,10 +51,12 @@ product->name;?> name, "class='form-control' required");?> + setCode) or $config->setCode == 1):?> product->code;?> code, "class='form-control' required");?> + product->PO;?> PO, "class='form-control chosen'");?> diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index 2263f04f35..5e666130d8 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -19,7 +19,8 @@
-

id;?> code;?> name;?>

+ setCode) and $config->setCode == 0) ? 'hidden' : '';?> +

id;?> code;?> name;?>

desc;?>

@@ -72,6 +73,7 @@
+ @@ -90,6 +92,24 @@ + + + + + + + + + + + + + + + + + + acl == 'custom'):?>
product->code;?> code;?>product->acl;?> code) ? "colspan='4'" : "colspan='2'";?>>product->aclList[$product->acl];?>
product->type;?>product->typeList, $product->type);?>story->openedBy?>createdBy);?>
productCommon . $lang->product->status;?>product->statusList, $product->status);?>story->openedDate?>createdDate, DT_DATE1);?>
product->acl;?>product->aclList[$product->acl];?>
product->whitelist;?>