From 0a357b3765e29c0ca4eb516b5a4b291e8ed6e6a9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Mon, 14 Jun 2021 22:10:11 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/api/candidate.js       |   9 ++
 test_client/src/router/index.js        |  10 +-
 test_client/src/views/exam/issue.vue   | 126 +++++++++++++++++++++++++
 test_mini/app.js                       |   4 +-
 test_mini/pages/admin/exam/detail.js   |  29 +++++-
 test_mini/pages/admin/exam/detail.wxml |  49 +++++++++-
 test_mini/pages/main/main.wxml         |   9 --
 test_mini/pages/my/index.wxml          |  15 ++-
 test_server/crm/models.py              |   2 +-
 test_server/crm/serializers.py         |   1 +
 10 files changed, 231 insertions(+), 23 deletions(-)
 create mode 100644 test_client/src/api/candidate.js
 create mode 100644 test_client/src/views/exam/issue.vue

diff --git a/test_client/src/api/candidate.js b/test_client/src/api/candidate.js
new file mode 100644
index 0000000..4374232
--- /dev/null
+++ b/test_client/src/api/candidate.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getCandidateList(query) {
+  return request({
+    url: '/crm/candidate/',
+    method: 'get',
+    params:query
+  })
+}
\ No newline at end of file
diff --git a/test_client/src/router/index.js b/test_client/src/router/index.js
index af2b724..214f289 100644
--- a/test_client/src/router/index.js
+++ b/test_client/src/router/index.js
@@ -252,13 +252,19 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/exammanage/index',
     name: 'Exammanage',
-    meta: { title: '考试管理', icon: ''},
+    meta: { title: '考证管理', icon: 'component'},
     children: [
       {
         path: 'index',
         name: 'exam',
         component: () => import('@/views/exam/index.vue'),
-        meta: { title: '考试管理', icon: 'component', perms: ['exam_view'] }
+        meta: { title: '正式考试',  perms: ['exam_view'] }
+      },
+      {
+        path: 'issue',
+        name: 'issue',
+        component: () => import('@/views/exam/issue.vue'),
+        meta: { title: '出证记录',  perms: ['candidate_view'] }
       },
     ]
   },
diff --git a/test_client/src/views/exam/issue.vue b/test_client/src/views/exam/issue.vue
new file mode 100644
index 0000000..d1a8618
--- /dev/null
+++ b/test_client/src/views/exam/issue.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container">
+        <div style="margin-top:10px">
+          <el-input
+            v-model="listQuery.search"
+            placeholder="输入关键词进行搜索"
+            style="width: 300px;"
+            class="filter-item"
+            @keyup.enter.native="handleFilter"
+          />
+                <el-button
+        class="filter-item"
+        type="primary"
+        icon="el-icon-refresh-left"
+        @click="resetFilter"
+      >刷新重置</el-button>
+        </div>
+        
+        <el-table
+          :data="tableData.results"
+          style="width: 100%;margin-top:10px;"
+          border
+          fit
+          v-loading="listLoading"
+          highlight-current-row
+          max-height="600"
+          row-key="id"
+          default-expand-all
+        >
+          <el-table-column label="证书号">
+            <template slot-scope="scope">{{ scope.row.number }}</template>
+          </el-table-column>
+          <el-table-column label="姓名">
+            <template slot-scope="scope">{{ scope.row.consumer_name }}</template>
+          </el-table-column>
+          <el-table-column label="身份证号">
+            <template slot-scope="scope">{{ scope.row.ID_number }}</template>
+          </el-table-column>
+          <el-table-column label="工作类别">
+            <template slot-scope="scope">{{ scope.row.workscope_name }}</template>
+          </el-table-column>
+          <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>{{ scope.row.create_admin_username }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="small"
+                @click="handleView(scope)"
+              >查看证书</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+    <pagination
+      v-show="tableData.count>0"
+      :total="tableData.count"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.limit"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { getCandidateList } from "@/api/candidate";
+import { deepClone } from "@/utils";
+import checkPermission from "@/utils/permission";
+import Pagination from "@/components/Pagination"
+
+const listQuery = {
+  page: 1,
+  limit: 20,
+  search: ""
+}
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      listQuery:listQuery,
+      tableData: {count:0},
+      listLoading: true,
+    };
+  },
+  computed: {},
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true
+      getCandidateList(this.listQuery).then(response => {
+        this.tableData = response.data
+        this.listLoading = false
+      });
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        limit: 20,
+        search: ""
+      };
+      this.getList();
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    handleView(scope){
+        window.open('https://apitest.ahctc.cn/crm/candidate/img?id='+scope.row.id)
+    }
+  }
+};
+</script>
diff --git a/test_mini/app.js b/test_mini/app.js
index 307bbe3..877e559 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -70,9 +70,9 @@ App({
   globalData: {
     userInfo: {},
     userinfo: {}, // 服务器传回的消费者信息
-    //host: 'https://apitest.ahctc.cn',
+    host: 'https://apitest.ahctc.cn',
     mediahost: 'https://apitest.ahctc.cn',
-    host: 'http://127.0.0.1:8000',
+    //host: 'http://127.0.0.1:8000',
     //mediahost: 'http://127.0.0.1:8000',
     token : '',
     rlogin:true
diff --git a/test_mini/pages/admin/exam/detail.js b/test_mini/pages/admin/exam/detail.js
index e4eb023..3fee37e 100644
--- a/test_mini/pages/admin/exam/detail.js
+++ b/test_mini/pages/admin/exam/detail.js
@@ -6,7 +6,10 @@ Page({
    * 页面的初始数据
    */
   data: {
-    exam:{},
+    exam:{
+      qdimgs:[],
+      xcimgs:[]
+    },
     tests:[]
   },
 
@@ -16,7 +19,7 @@ Page({
   onLoad: function (options) {
     if(options.id){
       let id = options.id
-      that.data.exam.id = id
+      this.data.exam.id = id
       api.requesta('/examtest/examtest/', 'GET', {exam:id, pageoff:true}).then(res=>{
         this.setData({
           tests:res.data
@@ -27,11 +30,31 @@ Page({
   getExam: function(){
     let id = this.data.exam.id
     api.requesta(`/examtest/exam/${id}/`, 'GET').then(res=>{
+      let exam = res.data
+      for(var i=0;i<exam.qdimgs.length;i++){
+        exam.qdimgs[i] = getApp().globalData.host+exam.qdimgs[i]
+      }
+      for(var i=0;i<exam.xcimgs.length;i++){
+        exam.xcimgs[i] = getApp().globalData.host+exam.xcimgs[i]
+      }
       this.setData({
-        exam:res.data
+        exam:exam
       })
     })
   },
+  previewImage: function (e) {
+    if(e.currentTarget.dataset.type=='qdimgs'){
+    wx.previewImage({
+      current: e.currentTarget.id, // 当前显示图片的http链接
+      urls: this.data.exam.qdimgs // 需要预览的图片http链接列表
+    })
+  }else{
+    wx.previewImage({
+      current: e.currentTarget.id, // 当前显示图片的http链接
+      urls: this.data.exam.xcimgs // 需要预览的图片http链接列表
+    })
+    }
+  },
   issue: function(){
     wx.showLoading({
       title: '正在生成...',
diff --git a/test_mini/pages/admin/exam/detail.wxml b/test_mini/pages/admin/exam/detail.wxml
index 46901ca..e0e92df 100644
--- a/test_mini/pages/admin/exam/detail.wxml
+++ b/test_mini/pages/admin/exam/detail.wxml
@@ -19,9 +19,52 @@
             监考人:{{exam.proctor_name}}-{{exam.proctor_phone}}
           </view>
         </view>
-        <view style="text-align:right;padding-right:8rpx">
-            <button type="primary" size="mini" bindtap="upImg" data-id="{{exam.id}}">上传图片</button>
-          </view>
+        <view style="text-align:right;padding-right:8rpx" wx:if="{{exam.qdimgs.length==0}}">
+          <button type="primary" size="mini" bindtap="upImg" data-id="{{exam.id}}">上传图片</button>
+        </view>
+        <view class="weui-cell" style="padding:8px;font-size:14px;" wx:if="{{exam.qdimgs.length>0}}">
+                <view class="weui-cell__bd">
+                    <view class="weui-uploader">
+                        <view class="weui-uploader__hd">
+                          <view class="weui-uploader__overview">
+                              <view class="weui-uploader__title">签到表图片</view>
+                          </view>
+                        </view>
+                        <view class="weui-uploader__bd">
+                            <view class="weui-uploader__files" id="uploaderFiles">
+                                <block wx:for="{{exam.qdimgs}}" wx:key="*this">
+                                    <view class="weui-uploader__file" bindtap="previewImage" id="{{item}}" data-type="qdimgs"
+                                    data-index="{{index}}">
+                                        <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="weui-cell" style="padding:8px;font-size:14px;" wx:if="{{exam.xcimgs.length>0}}">
+                <view class="weui-cell__bd">
+                    <view class="weui-uploader">
+                        <view class="weui-uploader__hd">
+                          <view class="weui-uploader__overview">
+                              <view class="weui-uploader__title">现场照片</view>
+                          </view>
+                        </view>
+                        <view class="weui-uploader__bd">
+                            <view class="weui-uploader__files" id="uploaderFiles">
+                                <block wx:for="{{exam.xcimgs}}" wx:key="*this">
+                                    <view class="weui-uploader__file" bindtap="previewImage" id="{{item}}" data-type="xcimgs" 
+                                    data-index="{{index}}">
+                                        <image class="weui-uploader__img" src="{{item}}" mode="aspectFill" />
+                                    </view>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
       </view>
     </view>
     <view class="weui-panel weui-panel_access">
diff --git a/test_mini/pages/main/main.wxml b/test_mini/pages/main/main.wxml
index b80716f..1b2c954 100644
--- a/test_mini/pages/main/main.wxml
+++ b/test_mini/pages/main/main.wxml
@@ -63,15 +63,6 @@
 		</view>
 	</view>
 		<view class="weui-cells weui-cells_after-title" style="margin-top:6px">
-		<navigator url="/pages/quota/quota" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-			<view class="weui-cell__hd">
-				<image src="/images/quota.svg" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
-			</view>
-			<view class="weui-cell__bd">考核名额监控</view>
-			<view class="weui-cell__ft weui-cell__ft_in-access" style="color:red">
-				<!-- <span wx:if="{{to_read}}">{{to_read}}条未读</span> -->
-			</view>
-		</navigator>
 		<navigator url="/pages/candidate/index" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
 			<view class="weui-cell__hd">
 				<image src="/images/candidate.svg" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
diff --git a/test_mini/pages/my/index.wxml b/test_mini/pages/my/index.wxml
index 7659c07..9837a27 100644
--- a/test_mini/pages/my/index.wxml
+++ b/test_mini/pages/my/index.wxml
@@ -71,6 +71,15 @@
 			<view class="weui-cell__bd">个人防护用品检测(铅当量)</view>
       <view class="weui-cell__ft weui-cell__ft_in-access" style="color:red"></view>
 		</navigator>
+    <navigator url="/pages/quota/quota" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+			<view class="weui-cell__hd">
+				<image src="/images/quota.svg" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
+			</view>
+			<view class="weui-cell__bd">考核名额监控</view>
+			<view class="weui-cell__ft weui-cell__ft_in-access" style="color:red">
+				<!-- <span wx:if="{{to_read}}">{{to_read}}条未读</span> -->
+			</view>
+		</navigator>
     </view>
     <view class="weui-cells__title">管理员操作台</view>
     <view class="weui-cells weui-cells_after-title">
@@ -79,10 +88,10 @@
           <view class="weui-cell__ft weui-cell__ft_in-access" style="color:red"></view>
       </navigator>
     </view>
-    <view class="weui-footer weui-footer_fixed-bottom">
-      <!-- <view class="weui-footer__text" bindtap="intro">点击下载系统/小程序文档介绍</view> -->
+    <!-- <view class="weui-footer weui-footer_fixed-bottom">
+      
       <view class="weui-footer__text">更多服务请联系课程顾问</view>
-    </view>
+    </view> -->
 
 
   </view>
diff --git a/test_server/crm/models.py b/test_server/crm/models.py
index b712860..66b5e26 100644
--- a/test_server/crm/models.py
+++ b/test_server/crm/models.py
@@ -105,7 +105,7 @@ class SendCode(CommonModel):
     code = models.CharField(max_length=4, verbose_name= '验证码')
 
 class Candidate(CommonModel):
-    consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE, related_name='candidate_consumer')
+    consumer = models.ForeignKey(Consumer, on_delete=models.DO_NOTHING, related_name='candidate_consumer')
     workscope = models.ForeignKey(WorkScope, on_delete=models.DO_NOTHING, related_name='candidate_workscope')
 
 
diff --git a/test_server/crm/serializers.py b/test_server/crm/serializers.py
index e5be1dd..e9e8a88 100644
--- a/test_server/crm/serializers.py
+++ b/test_server/crm/serializers.py
@@ -76,6 +76,7 @@ class ConsumerDetailSerializer(serializers.ModelSerializer):
 
 
 class CandidateSerializer(serializers.ModelSerializer):
+    create_admin_username = serializers.StringRelatedField(source='create_admin', read_only=True)
     class Meta:
         model = Candidate
         fields = '__all__'
\ No newline at end of file