From 1d7dfda3a3176e9c1e4cba49be3c79cdce9128a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 11 Jul 2022 22:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/router/index.js             |   6 +-
 test_client/src/views/exam/issue.vue        | 217 +++++++++++---------
 test_client/src/views/question/question.vue |   8 +-
 test_server/crm/views.py                    |   4 +-
 test_server/rbac/models.py                  |   2 +-
 5 files changed, 128 insertions(+), 109 deletions(-)

diff --git a/test_client/src/router/index.js b/test_client/src/router/index.js
index 9d422d3..78dec53 100644
--- a/test_client/src/router/index.js
+++ b/test_client/src/router/index.js
@@ -157,7 +157,7 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/Qmanage/question',
     name: 'Qmanage',
-    meta: { title: '题库管理', icon: 'table', perms: []},
+    meta: { title: '题库管理', icon: 'table'},
     children: [
       {
         path: 'subject',
@@ -175,7 +175,7 @@ export const asyncRoutes = [
         path: 'question',
         name: 'question',
         component: () => import('@/views/question/question.vue'),
-        meta: { title: '题目列表', icon: '', perms: ['question_manage'] }
+        meta: { title: '题目列表', icon: '', perms: ['question_view'] }
       },
       {
         path: 'question/create',
@@ -279,7 +279,7 @@ export const asyncRoutes = [
         path: 'issue',
         name: 'issue',
         component: () => import('@/views/exam/issue.vue'),
-        meta: { title: '出证记录',  perms: ['candidate_view'] }
+        meta: { title: '出证记录',  perms: ['certificate_view'] }
       },
     ]
   },
diff --git a/test_client/src/views/exam/issue.vue b/test_client/src/views/exam/issue.vue
index 2ab89b0..60190b9 100644
--- a/test_client/src/views/exam/issue.vue
+++ b/test_client/src/views/exam/issue.vue
@@ -18,7 +18,7 @@
       <el-button
         type="primary"
         @click="handleAdd"
-        v-if="checkPermission(['candidate_create'])"
+        v-if="checkPermission(['certificate_create'])"
         >手动创建</el-button
       >
     </div>
@@ -68,17 +68,21 @@
       </el-table-column>
       <el-table-column align="center" label="操作" fixed="right">
         <template slot-scope="scope">
-          <el-button type="primary" size="small" @click="handleView(scope)" icon="el-icon-more" plain=true
-            ></el-button
-          >
           <el-button
-              type="primary"
-              size="small"
-              plain=true
-              @click="handleEdit(scope)"
-              icon="el-icon-edit"
-              v-if="checkPermission(['candidate_update'])"
-            ></el-button>
+            type="primary"
+            size="small"
+            @click="handleView(scope)"
+            icon="el-icon-more"
+            plain="true"
+          ></el-button>
+          <el-button
+            type="primary"
+            size="small"
+            plain="true"
+            @click="handleEdit(scope)"
+            icon="el-icon-edit"
+            v-if="checkPermission(['certificate_update'])"
+          ></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -89,7 +93,10 @@
       :limit.sync="listQuery.limit"
       @pagination="getList"
     />
-    <el-dialog :visible.sync="dialogVisible" :title="dialogType === 'update' ? '编辑' : '新增'">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dialogType === 'update' ? '编辑' : '新增'"
+    >
       <el-form
         :model="candidate"
         label-width="80px"
@@ -97,78 +104,87 @@
         :rules="candidateRule"
         ref="candidateForm"
       >
-      <el-row>
-        <el-col :span="12">
-<el-form-item label="报告单号" prop="number">
-          <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="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-form-item label="部门" prop="deptname">
-          <el-input v-model="candidate.deptname" placeholder="部门" />
-        </el-form-item>
-        </el-col>
-        <el-col :span="12">
-<el-form-item label="发证日期" prop="issue_date">
-          <el-date-picker
-      v-model="candidate.issue_date"
-      type="date"
-      placeholder="选择日期"
-      value-format="yyyy-MM-dd">
-    </el-date-picker>
-        </el-form-item>
-        <el-form-item label="有效期始" prop="start_date">
-         <el-date-picker
-      v-model="candidate.start_date"
-      type="date"
-      placeholder="选择日期"
-      value-format="yyyy-MM-dd">
-    </el-date-picker>
-        </el-form-item>
-        <el-form-item label="有效期止" prop="end_date">
-          <el-date-picker
-      v-model="candidate.end_date"
-      type="date"
-      placeholder="选择日期"
-      value-format="yyyy-MM-dd">
-    </el-date-picker>
-        </el-form-item>
-        <el-form-item label="考试时间" prop="examtest_date">
-          <el-date-picker
-      v-model="candidate.examtest_date"
-      type="date"
-      placeholder="选择日期"
-      value-format="yyyy-MM-dd">
-    </el-date-picker>
-        </el-form-item>
-        <el-form-item label="照片" prop="photo">
-          <el-upload
-            class="avatar-uploader"
-            :action="upUrl"
-            accept="image/jpeg, image/gif, image/png, image/bmp"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload"
-            :headers="upHeaders"
-          >
-            <img v-if="candidate.photo" :src="candidate.photo" class="avatar" />
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-        </el-form-item>
-        </el-col>
-      </el-row>
-        
-        
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="报告单号" prop="number">
+              <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="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-form-item label="部门" prop="deptname">
+              <el-input v-model="candidate.deptname" placeholder="部门" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发证日期" prop="issue_date">
+              <el-date-picker
+                v-model="candidate.issue_date"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="有效期始" prop="start_date">
+              <el-date-picker
+                v-model="candidate.start_date"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="有效期止" prop="end_date">
+              <el-date-picker
+                v-model="candidate.end_date"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="考试时间" prop="examtest_date">
+              <el-date-picker
+                v-model="candidate.examtest_date"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="照片" prop="photo">
+              <el-upload
+                class="avatar-uploader"
+                :action="upUrl"
+                accept="image/jpeg, image/gif, image/png, image/bmp"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess"
+                :before-upload="beforeAvatarUpload"
+                :headers="upHeaders"
+              >
+                <img
+                  v-if="candidate.photo"
+                  :src="candidate.photo"
+                  class="avatar"
+                />
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -205,9 +221,13 @@
 }
 </style>
 <script>
-import { getCandidateList, createCandidate, updateCandidate } from "@/api/candidate";
+import {
+  getCandidateList,
+  createCandidate,
+  updateCandidate,
+} from "@/api/candidate";
 import { deepClone } from "@/utils";
-import { upUrl, upHeaders } from "@/api/file"
+import { upUrl, upHeaders } from "@/api/file";
 import checkPermission from "@/utils/permission";
 import Pagination from "@/components/Pagination";
 
@@ -227,7 +247,7 @@ export default {
       listLoading: true,
       dialogVisible: false,
       dialogType: "create",
-      candidate: {photo:''},
+      candidate: { photo: "" },
       candidateRule: {
         number: [{ required: true, message: "请输入编号", trigger: "blur" }],
       },
@@ -240,7 +260,7 @@ export default {
   methods: {
     checkPermission,
     handleAvatarSuccess(res, file) {
-        this.candidate.photo = res.data.path
+      this.candidate.photo = res.data.path;
     },
     beforeAvatarUpload(file) {
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -281,8 +301,8 @@ export default {
         this.$refs["candidateForm"].clearValidate();
       });
     },
-    handleEdit(scope){
-      this.candidate = scope.row
+    handleEdit(scope) {
+      this.candidate = scope.row;
       this.dialogType = "update";
       this.dialogVisible = true;
       this.$nextTick(() => {
@@ -293,20 +313,19 @@ export default {
       this.$refs[form].validate((valid) => {
         if (valid) {
           const isEdit = this.dialogType === "update";
-          if(isEdit){
-updateCandidate(this.candidate.id, this.candidate).then(() => {
+          if (isEdit) {
+            updateCandidate(this.candidate.id, this.candidate).then(() => {
+              this.getList();
+              this.dialogVisible = false;
+              this.$message.success("成功");
+            });
+          } else {
+            createCandidate(this.candidate).then((res) => {
               this.getList();
               this.dialogVisible = false;
               this.$message.success("成功");
             });
-          }else{
-createCandidate(this.candidate).then((res) => {
-            this.getList();
-            this.dialogVisible = false;
-            this.$message.success("成功");
-          });
           }
-          
         } else {
           return false;
         }
diff --git a/test_client/src/views/question/question.vue b/test_client/src/views/question/question.vue
index 1c5c27f..9ef0958 100644
--- a/test_client/src/views/question/question.vue
+++ b/test_client/src/views/question/question.vue
@@ -43,14 +43,14 @@
             @click="resetFilter"
           >刷新重置</el-button>
           <div style="margin-top:10px">
-            <el-button type="primary" slot="reference" @click="handleAdd()">新增</el-button>
+            <el-button type="primary" slot="reference" @click="handleAdd()" v-if="checkPermission(['question_create'])">新增</el-button>
             <el-button
         @click="handleEnabled"
       >启用</el-button>
     <el-popover
   placement="top"
   width="160"
-  v-if="checkPermission(['consumer_import'])"
+  v-if="checkPermission(['question_import'])"
   v-model="popovervisible"
   >
   <p>导入题目前,请下载模板并按格式录入.</p>
@@ -69,7 +69,7 @@
   
   <el-button slot="reference">Excel导入</el-button>
 </el-popover>
-<el-button type="primary" icon="el-icon-download" @click="exportQuestion">导出Excel</el-button>
+<el-button type="primary" icon="el-icon-download" @click="exportQuestion" v-if="checkPermission(['export_question'])">导出Excel</el-button>
 <el-button
             type="danger"
             @click="handleDeletes(scope)"
@@ -127,7 +127,7 @@
             size="small"
             @click="handleEdit(scope)"
             icon="el-icon-edit"
-            :disabled="!checkPermission(['question_edit'])"
+            :disabled="!checkPermission(['question_update'])"
           ></el-button>
           <el-button
             type="danger"
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 09173c2..a92373a 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -715,8 +715,8 @@ class CandidateViewSet(RetrieveModelMixin, ListModelMixin, CreateModelMixin, Upd
     出征记录:列表
     """
     perms_map = [
-        {'get': '*'}, {'post': 'candidate_create'},
-        {'put': 'candidate_update'}, {'delete': 'candidate_delete'}]
+        {'get': '*'}, {'post': 'certificate_create'},
+        {'put': 'certificate_update'}, {'delete': 'certificate_delete'}]
     queryset = Candidate.objects.filter(number__isnull=False)
     serializer_class = CandidateSerializer
     pagination_class = CommonPagination
diff --git a/test_server/rbac/models.py b/test_server/rbac/models.py
index f797707..92af2a8 100644
--- a/test_server/rbac/models.py
+++ b/test_server/rbac/models.py
@@ -94,7 +94,7 @@ class Menu(SoftCommonModel):
     
 
     def __str__(self):
-        return self.name
+        return self.name + '-' + str(self.sort)
 
     class Meta:
         verbose_name = '功能权限表'