diff --git a/module/custom/model.php b/module/custom/model.php
index ea8843e979..68ae13050b 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -692,11 +692,12 @@ class customModel extends model
                     continue;
                 }
 
-                $fields = join(',', $data->requiredFields[$method]);
-                foreach(explode(',', $systemField) as $field)
+                $fields       = join(',', $data->requiredFields[$method]);
+                $systemFields = array_reverse(explode(',', $systemField));
+                foreach($systemFields as $field)
                 {
                     $field = trim($field);
-                    if(strpos(",$fields,", ",$field,") === false) $fields .= ",$field";
+                    if(strpos(",$fields,", ",$field,") === false) $fields = "$field,$fields";
                 }
 
                 $requiredFields[$method]['requiredFields'] = $fields;
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 280b08c452..957efc4372 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1436,7 +1436,15 @@ class testcaseModel extends model
             $cases[$key] = $caseData;
             $line++;
         }
-        if(!empty($fieldNames)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $fieldNames));
+        if(!empty($fieldNames))
+        {
+            $tipContent = '';
+            foreach($requiredFields as $field)
+            {
+                if(isset($fieldNames[$field])) $tipContent .= ",{$fieldNames[$field]}";
+            }
+            dao::$errors = sprintf($this->lang->testcase->noRequireTip, trim($tipContent, ','));
+        }
 
         if(dao::isError()) return false;
 
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 44d00ea281..839315cd10 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -26,7 +26,7 @@ $(function()
   <div class="main-header clearfix">
     <h2><?php echo $lang->testcase->import;?></h2>
   </div>
-  <form target='hiddenwin' method='post'>
+  <form class='main-form' target='hiddenwin' method='post'>
     <div class="table-responsive">
       <table class='table table-form' id='showData'>
         <thead>
@@ -163,7 +163,7 @@ $(function()
         </tbody>
         <tfoot>
           <tr>
-            <td colspan='10' class='text-center form-actions'>
+            <td colspan='11' class='text-center form-actions'>
               <?php
               $submitText = $isEndPage ? $this->lang->save : $this->lang->file->saveAndNext;
               if(!$insert and $dataInsert === '')