diff --git a/db/zentao.sql b/db/zentao.sql
index 7887d5a9d3..526a878625 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1050,6 +1050,7 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` (
   `name` char(90) NOT NULL,
   `execution` mediumint(8) unsigned NOT NULL default '0',
   `build` char(30) NOT NULL,
+  `type` varchar(255) NOT NULL,
   `owner` varchar(30) NOT NULL,
   `pri` tinyint(3) unsigned NOT NULL default '0',
   `begin` date NOT NULL,
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 2d3cd8e457..d12016a28d 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -59,6 +59,7 @@ $lang->testtask->common         = 'Testaufgabe';
 $lang->testtask->product        = $lang->productCommon;
 $lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Typ';
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Besitzer';
 $lang->testtask->executor       = 'Executor';
@@ -193,3 +194,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index afb1798101..057257218e 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -62,6 +62,7 @@ $lang->testtask->common         = 'Request';
 $lang->testtask->product        = $lang->productCommon;
 $lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Type';
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->executor       = 'Executor';
@@ -196,3 +197,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index fa45220580..1169714119 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -59,6 +59,7 @@ $lang->testtask->common         = 'Recette';
 $lang->testtask->product        = $lang->productCommon;
 $lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Type';
 $lang->testtask->build          = 'Build';
 $lang->testtask->owner          = 'Owner';
 $lang->testtask->executor       = 'Executeur';
@@ -193,3 +194,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 5f2ed5aeae..95907cb5f6 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -59,6 +59,7 @@ $lang->testtask->common         = 'Yêu cầu';
 $lang->testtask->product        = $lang->productCommon;
 $lang->testtask->project        = 'Project';
 $lang->testtask->execution      = $lang->execution->common;
+$lang->testtask->type           = 'Kiểu';
 $lang->testtask->build          = 'Bản dựng';
 $lang->testtask->owner          = 'Sở hữu';
 $lang->testtask->executor       = 'Executor';
@@ -193,3 +194,9 @@ $lang->testtask->unitTag['thisWeek']  = 'This week';
 $lang->testtask->unitTag['lastWeek']  = 'Last week';
 $lang->testtask->unitTag['thisMonth'] = 'This month';
 $lang->testtask->unitTag['lastMonth'] = 'Last month';
+
+$lang->testtask->typeList['integrate']   = 'Integrate';
+$lang->testtask->typeList['system']      = 'System';
+$lang->testtask->typeList['acceptance']  = 'Acceptance';
+$lang->testtask->typeList['performance'] = 'Performance';
+$lang->testtask->typeList['safety']      = 'Safety';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 99fd6a3e23..13e956d258 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -62,6 +62,7 @@ $lang->testtask->common         = '测试单';
 $lang->testtask->product        = '所属' . $lang->productCommon;
 $lang->testtask->project        = '所属项目';
 $lang->testtask->execution      = '所属' . $lang->execution->common;
+$lang->testtask->type           = '测试类型';
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '负责人';
 $lang->testtask->executor       = '执行人';
@@ -196,3 +197,9 @@ $lang->testtask->unitTag['thisWeek']  = '本周';
 $lang->testtask->unitTag['lastWeek']  = '上周';
 $lang->testtask->unitTag['thisMonth'] = '本月';
 $lang->testtask->unitTag['lastMonth'] = '上月';
+
+$lang->testtask->typeList['integrate']   = '集成测试';
+$lang->testtask->typeList['system']      = '系统测试';
+$lang->testtask->typeList['acceptance']  = '验收测试';
+$lang->testtask->typeList['performance'] = '性能测试';
+$lang->testtask->typeList['safety']      = '安全测试';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index f60b4faf3f..80c4df932b 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -62,6 +62,7 @@ $lang->testtask->common         = '測試單';
 $lang->testtask->product        = '所屬' . $lang->productCommon;
 $lang->testtask->project        = '所屬項目';
 $lang->testtask->execution      = '所屬' . $lang->executionCommon;
+$lang->testtask->type           = '測試類型';
 $lang->testtask->build          = '版本';
 $lang->testtask->owner          = '負責人';
 $lang->testtask->executor       = '執行人';
@@ -196,3 +197,9 @@ $lang->testtask->unitTag['thisWeek']  = '本週';
 $lang->testtask->unitTag['lastWeek']  = '上周';
 $lang->testtask->unitTag['thisMonth'] = '本月';
 $lang->testtask->unitTag['lastMonth'] = '上月';
+
+$lang->testtask->typeList['integrate']   = '集成測試';
+$lang->testtask->typeList['system']      = '系統測試';
+$lang->testtask->typeList['acceptance']  = '接受度測試';
+$lang->testtask->typeList['performance'] = '性能測試';
+$lang->testtask->typeList['safety']      = '安全測試';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 02109736cc..9564cc7079 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -33,6 +33,7 @@ class testtaskModel extends model
             ->setIF($this->config->systemMode == 'new', 'project', $projectID)
             ->stripTags($this->config->testtask->editor->create['id'], $this->config->allowedTags)
             ->join('mailto', ',')
+            ->join('type', ',')
             ->remove('uid,contactListMenu')
             ->get();
 
@@ -730,7 +731,7 @@ class testtaskModel extends model
     public function update($taskID)
     {
         $oldTask = $this->dao->select("*")->from(TABLE_TESTTASK)->where('id')->eq((int)$taskID)->fetch();
-        $task = fixer::input('post')->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)->join('mailto', ',')->remove('uid,comment,contactListMenu')->get();
+        $task = fixer::input('post')->stripTags($this->config->testtask->editor->edit['id'], $this->config->allowedTags)->join('mailto', ',')->join('type', ',')->remove('uid,comment,contactListMenu')->get();
         $task = $this->loadModel('file')->processImgURL($task, $this->config->testtask->editor->edit['id'], $this->post->uid);
         $this->dao->update(TABLE_TESTTASK)->data($task)
             ->autoCheck()
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index c63321b09b..a2beb118cd 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -107,7 +107,7 @@ $status = $this->session->testTaskVersionStatus;
         common::printIcon('testtask',   'linkCase', "taskID=$task->id&type=all&param=myQueryID", $task, 'list', 'link');
         common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
         echo '</div>';
-        common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt','','iframe',true);
+        common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, "data-width='90%'");
         common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list');
         if(common::hasPriv('testtask', 'delete', $task))
         {
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index fd35e0498b..c33e286a64 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -50,6 +50,10 @@
           </td>
           <td></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->testtask->type;?></th>
+          <td><?php echo html::select('type[]', $lang->testtask->typeList, '', "class='form-control chosen' multiple");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->owner;?></th>
           <td>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 05ad141a09..a537b5e30a 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -39,6 +39,10 @@
           <td class='w-p35-f'><span id='buildBox'><?php echo html::select('build', $builds, $task->build, "class='form-control chosen'");?></span></td>
           <td></td>
         </tr>
+        <tr>
+          <th><?php echo $lang->testtask->type;?></th>
+          <td><?php echo html::select('type[]', $lang->testtask->typeList, $task->type, "class='form-control chosen' multiple");?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->testtask->owner;?></th>
           <td>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 20c0914883..f2385b3fb5 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -97,6 +97,12 @@
                 ?>
               </td>
             </tr>
+            <tr>
+              <th><?php echo $lang->testtask->type;?></th>
+              <?php $testType = '';?>
+              <?php foreach(explode(',', $task->type) as $type) $testType .= zget($lang->testtask->typeList, $type) . ' ';?>
+              <td><?php echo $testType;?></td>
+            </tr>
             <tr>
               <th><?php echo $lang->testtask->owner;?></th>
               <td><?php echo zget($users, $task->owner);?></td>