测评

app/admin/controller/Officer.php

@@ -80,22 +80,12 @@ class Officer extends AdminBaseController
         $xlsCell = [
             ['name', '姓名'],
             ['mobile', '手机号'],
-            ['sex', '性别'],
-            ['age', '年龄'],
-            ['marry', '婚姻状况'],
-            ['education', '学历'],
-            ['major', '专业'],
-            ['seniority', '工龄'],
-            ['leader', '担任领导的累计年限'],
-            ['industry', '所在行业'],
-            ['company', '所在单位'],
-            ['job', '职位'],
         ];
 
         $res = [];
         foreach ($list as $ak => $answer) {
-            $item              = [];
-            $item['name']      = $answer['name'];
+            $item         = [];
+            $item['name'] = $answer['name'];
             $item['mobile']    = $answer['mobile'];
             $item['sex']       = $answer['sex'];
             $item['age']       = $answer['age'];
@@ -105,6 +95,7 @@ class Officer extends AdminBaseController
             $item['seniority'] = $answer['seniority'];
             $item['leader']    = $answer['leader'];
             $item['industry']  = $answer['industry'];
+
             if (empty($answer['company_text'])) {
                 $item['company'] = $answer['company'];
             } else {
@@ -116,7 +107,7 @@ class Officer extends AdminBaseController
                 $item['job'] = $answer['job'] . "（{$answer['job_text']}）";
             }
             foreach ($answer['detail'] as $k => $v) {
-                $index = 'part_' . $v['no'];
+                $index = 'item_' . $v['no'];
                 if ($ak == 0) {
                     $xlsCell[] = [$index, $index];
                 }
@@ -125,6 +116,19 @@ class Officer extends AdminBaseController
             $res[] = $item;
         }
 
+        $xlsCell = array_merge($xlsCell, [
+            ['sex', '性别'],
+            ['age', '年龄'],
+            ['marry', '婚姻状况'],
+            ['education', '学历'],
+            ['major', '专业'],
+            ['seniority', '工龄'],
+            ['leader', '担任领导的累计年限'],
+            ['industry', '所在行业'],
+            ['company', '所在单位'],
+            ['job', '职位'],]);
+
+
         export_exl("考试明细", $xlsCell, $res);
     }
 

app/home/view/officer/answer_base.html

@@ -236,25 +236,25 @@
             for (let item of required_field) {
                 if (base.answer.value[item.field] === undefined || base.answer.value[item.field] === '') {
                     ElementPlus.ElMessage.error(item.tip);
-                    base.baseLoading.value = true;
+                    base.baseLoading.value = false;
                     return false;
                 }
             }
             if (base.answer.value.company == '党政机关') {
                 if (base.answer.value.company_text === undefined || base.answer.value.company_text === '') {
                     ElementPlus.ElMessage.error('请输入具体部门');
-                    base.baseLoading.value = true;
+                    base.baseLoading.value = false;
                     return false;
                 }
                 if (base.answer.value.job === undefined || base.answer.value.job === '') {
                     ElementPlus.ElMessage.error('请选择职位');
-                    base.baseLoading.value = true;
+                    base.baseLoading.value = false;
                     return false;
                 } else {
                     if (base.answer.value.job == '其他') {
                         if (base.answer.value.job_text === undefined || base.answer.value.job_text === '') {
                             ElementPlus.ElMessage.error('请输入具体职位');
-                            base.baseLoading.value = true;
+                            base.baseLoading.value = false;
                             return false;
                         }
                     }
@@ -263,18 +263,18 @@
             if (base.answer.value.company == '事业单位') {
                 if (base.answer.value.company_text === undefined || base.answer.value.company_text === '') {
                     ElementPlus.ElMessage.error('请输入具体领域');
-                    base.baseLoading.value = true;
+                    base.baseLoading.value = false;
                     return false;
                 }
                 if (base.answer.value.job === undefined || base.answer.value.job === '') {
                     ElementPlus.ElMessage.error('请选择职位');
-                    base.baseLoading.value = true;
+                    base.baseLoading.value = false;
                     return false;
                 } else {
                     if (base.answer.value.job == '其他') {
                         if (base.answer.value.job_text === undefined || base.answer.value.job_text === '') {
                             ElementPlus.ElMessage.error('请输入具体职位');
-                            base.baseLoading.value = true;
+                            base.baseLoading.value = false;
                             return false;
                         }
                     }
@@ -283,7 +283,7 @@
             if (base.answer.value.company == '其他') {
                 if (base.answer.value.company_text === undefined || base.answer.value.company_text === '') {
                     ElementPlus.ElMessage.error('请输入单位补充');
-                    base.baseLoading.value = true;
+                    base.baseLoading.value = false;
                     return false;
                 }
             }