From 27b73d7dcd62c9562f3ca7d759f702315990d101 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Mon, 12 Dec 2022 16:16:51 +0800
Subject: [PATCH] * Code for function review.

---
 module/execution/lang/zh-cn.php               | 4 ++--
 module/productplan/view/browsebylist.html.php | 2 +-
 module/project/view/build.html.php            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index decdee30da..48db681691 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -351,8 +351,8 @@ $lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.net/goto.p
 $lang->execution->whyNoStories         = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->projectNoStories     = "看起来没有{$lang->SRCommon}可以关联。请检查下项目中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
 $lang->execution->productStories       = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
-$lang->execution->haveBranchDraft      = "有%s条非激活状态或不是{$lang->executionCommon}关联分支的{$lang->SRCommon}无法导入";
-$lang->execution->haveDraft            = "有%s条非激活状态的{$lang->SRCommon}无法导入";
+$lang->execution->haveBranchDraft      = "导入完成！有%s条非激活状态或不是{$lang->executionCommon}关联分支的{$lang->SRCommon}无法导入";
+$lang->execution->haveDraft            = "导入完成！有%s条非激活状态的{$lang->SRCommon}无法导入";
 $lang->execution->doneExecutions       = '已结束';
 $lang->execution->selectDept           = '选择部门';
 $lang->execution->selectDeptTitle      = '选择一个部门的成员';
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 7eabe9d192..c46b8cd66c 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -84,7 +84,7 @@
         <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->productplan->status);?></th>
         <?php endif;?>
         <?php if($this->session->currentProductType != 'normal'):?>
-        <th class='c-branch'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->productplan->branch);?></th>
+        <th class='c-branch'><?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branchName[$product->type]);?></th>
         <?php endif;?>
         <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
         <th class='c-date'><?php common::printOrderLink('end',   $orderBy, $vars, $lang->productplan->end);?></th>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index c1f1db4e25..222988fe91 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -50,9 +50,9 @@
           <th class="c-id-sm"><?php echo $lang->build->id;?></th>
           <th class="c-name text-left"><?php echo $lang->build->name;?></th>
           <?php if($project->hasProduct):?>
-          <th class="c-name w-150px text-left"><?php echo $lang->build->product;?></th>
+          <th class="c-name w-200px text-left"><?php echo $lang->build->product;?></th>
           <?php if($showBranch):?>
-          <th class="c-name w-200px text-left"><?php echo $lang->build->branch;?></th>
+          <th class="c-name w-150px text-left"><?php echo $lang->build->branch;?></th>
           <?php endif;?>
           <?php endif;?>
           <?php if($project->multiple):?>