xiugai

test_client/src/views/exam/issue.vue

@@ -53,12 +53,14 @@
       <el-table-column label="单位">
         <template slot-scope="scope">{{ scope.row.company_name }}</template>
       </el-table-column>
+      <!--
       <el-table-column label="有效期始">
         <template slot-scope="scope">{{ scope.row.start_date }}</template>
       </el-table-column>
       <el-table-column label="有效期止">
         <template slot-scope="scope">{{ scope.row.end_date }}</template>
       </el-table-column>
+      -->
       <el-table-column label="手动创建">
         <template slot-scope="scope">
           <span v-if="scope.row.is_manual">是</span>
@@ -118,28 +120,27 @@
       >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="报告单号" prop="number">
+            <el-form-item label="证书编号" prop="number">
-              <el-input v-model="candidate.number" placeholder="报告单号" />
+              <el-input v-model="candidate.number" placeholder="证书编号" />
             </el-form-item>
             <el-form-item label="姓名" prop="consumer_name">
               <el-input v-model="candidate.consumer_name" placeholder="姓名" />
             </el-form-item>
             <el-form-item label="性别" prop="gender">
-              <el-input v-model="candidate.gender" placeholder="性别" />
+              <el-select v-model="candidate.gender" placeholder="性别" style="width:80%">
+            <el-option
+              v-for="item in genderOption"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+
             </el-form-item>
             <el-form-item label="身份证号" prop="ID_number">
               <el-input v-model="candidate.ID_number" placeholder="身份证号" />
             </el-form-item>
-            <el-form-item label="工作类别" prop="workscope_name">
-              <el-input
-                v-model="candidate.workscope_name"
-                placeholder="工作类别"
-              />
-            </el-form-item>
 
-            <el-form-item label="单位" prop="company_name">
-              <el-input v-model="candidate.company_name" placeholder="单位" />
-            </el-form-item>
 
           </el-col>
           <el-col :span="12">
@@ -151,6 +152,7 @@
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
+            <!--
             <el-form-item label="有效期始" prop="start_date">
               <el-date-picker
                 v-model="candidate.start_date"
@@ -167,6 +169,7 @@
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
+
             <el-form-item label="考试时间" prop="examtest_date">
               <el-date-picker
                 v-model="candidate.examtest_date"
@@ -174,7 +177,7 @@
                 placeholder="选择日期"
                 value-format="yyyy-MM-dd"
               />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="职业等级" prop="opllevel">
               <el-select v-model="candidate.opllevel" placeholder="职业等级" style="width:80%">
             <el-option
@@ -185,9 +188,25 @@
             />
           </el-select>
             </el-form-item>
+            <el-form-item label="工作类别" prop="workscope_name">
+              <el-select v-model="candidate.workscope_name" placeholder="工作类别" style="width:80%">
+            <el-option
+              v-for="item in worksOption"
+              :key="item.key"
+            :label="item.label"
+            :value="item.value"
+            />
+          </el-select>
+            </el-form-item>
+
+            <el-form-item label="单位" prop="company_name">
+              <el-input v-model="candidate.company_name" placeholder="单位" />
+            </el-form-item>
+            <!---
             <el-form-item label="部门" prop="deptname">
               <el-input v-model="candidate.deptname" placeholder="部门" />
             </el-form-item>
+            -->
           </el-col>
         </el-row>
       </el-form>
@@ -251,8 +270,11 @@ import {
   createCandidate,
   updateCandidate
 } from '@/api/candidate'
-import { deepClone } from '@/utils'
+import {
+  getWorkScopeAll,
+} from "@/api/examtest";
 import { upUrl, upHeaders } from '@/api/file'
+import { genTree, deepClone } from '@/utils'
 import checkPermission from '@/utils/permission'
 import Pagination from '@/components/Pagination'
 
@@ -287,6 +309,10 @@ export default {
         { name: '技师', value: '技师'},
         { name: '高级技师', value: '高级技师' }
       ],
+      worksOption:[],
+      genderOption:[
+        { name: '男', value: '男' },
+        { name: '女', value: '女'}]
 
     }
   },
@@ -306,6 +332,12 @@ export default {
       }
       return isLt2M
     },
+    //工作类别选择
+    getWorkScopeAll() {
+      getWorkScopeAll().then((response) => {
+        this.worksOption = genTree(response.data)
+      })
+    },
     getList() {
       this.listLoading = true
       getCandidateList(this.listQuery).then((response) => {
@@ -346,6 +378,7 @@ export default {
     },
     handleAdd() {
       this.dialogVisible = true
+      this.getWorkScopeAll();
       this.dialogType = 'create'
       this.$nextTick(() => {
         this.$refs['candidateForm'].clearValidate()

test_client/src/views/system/banner.vue

@@ -12,7 +12,7 @@
           row-key="id"
           default-expand-all
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-          
+
         >
           <el-table-column type="index" width="50"></el-table-column>
           <el-table-column label="图片名称">
@@ -138,7 +138,7 @@ export default {
         this.banner.path = res.data.path
     },
     beforeImgUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 0.6;
+      const isLt2M = file.size / 1024 / 1024 < 1;
       if (!isLt2M) {
         this.$message.error("上传图片大小不能超过 600KB!");
       }