Merge branch 'test' into 'release'

Test

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!384

package.json

@@ -19,6 +19,7 @@
     "@babel/polyfill": "^7.2.5",
     "axios": "0.16.2",
     "better-scroll": "^0.1.15",
+    "dayjs": "^1.10.7",
     "echarts": "^4.2.0-rc.2",
     "element-ui": "^2.11.1",
     "fastclick": "^1.0.6",
@@ -26,7 +27,7 @@
     "iscroll": "^5.2.0",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
-    "jsencrypt": "^3.0.0-rc.1",
+    "jsencrypt": "^3.2.1",
     "jspdf": "^1.5.3",
     "node-sass": "^4.9.2",
     "pdfh5": "^1.3.9",
@@ -34,6 +35,7 @@
     "qrcodejs2": "^0.0.2",
     "showdown": "^1.6.4",
     "sortablejs": "^1.13.0",
+    "storejs": "^2.0.1",
     "video.js": "^7.8.2",
     "vue": "^2.1.0",
     "vue-infinite-scroll": "^2.0.2",

src/router/router.js

@@ -82,6 +82,8 @@ const plazaList = r => require.ensure([], () => r(require('../views/plaza/plaza-
 const activityMember = r => require.ensure([], () => r(require('../views/activitymanagement/activity-member.vue')), 'activity-member')
 
 const videoManage = r => require.ensure([], () => r(require('../views/shortvideo/video-manage.vue')), 'video-manage')
+const qualificationList = r => require.ensure([], () => r(require('../views/qualification/list.vue')), 'qualification')
+const qualificationDetail = r => require.ensure([], () => r(require('../views/qualification/detail.vue')), 'qualification')
 
 export default [{
     path: '/',
@@ -347,7 +349,14 @@ export default [{
             path: 'video-manage',
             component: videoManage,
         },
-
+        {
+          path: 'qualification-list',
+          component:qualificationList
+        },
+        {
+          path: 'qualification-detail',
+          component:qualificationDetail
+        },
       // {
       //   path: '/followup',
       //   name: 'followUp',

src/style/global.scss

 @import './common.scss';
+// color
+.c0D9078{
+  color:#0D9078;
+}
 //定位
 .relative{
     position: relative;
@@ -18,9 +22,19 @@
     display: flex;
     justify-content: flex-end;
 }
+.flex1{
+  flex: 1;
+}
 .textLeft{
     float: left;
 }
+.cp{
+  cursor: pointer;
+}
+.flex-c{
+  display: flex;
+  align-items: center;
+}
 .center{
     text-align: center;
 }
@@ -125,11 +139,11 @@
         padding-left: 5px !important;
         font-size: 14px !important;
         color: #333;
-    }    
+    }
     .el-checkbox__input.is-checked+.el-checkbox__label {
         color: #449284;
     }
-    .el-checkbox__input.is-checked .el-checkbox__inner, 
+    .el-checkbox__input.is-checked .el-checkbox__inner,
     .el-checkbox__input.is-indeterminate .el-checkbox__inner {
         color: #449284;
     }
@@ -204,7 +218,7 @@
       margin: 0;
       padding: 25px 5px 30px;
       border-top: 0px solid #E4E7ED;
-    }     
+    }
   }
   .el-dialog__footer {
       padding-top: 20px;
@@ -227,7 +241,7 @@
         margin: 0;
         padding: 25px 5px 30px;
         border-top: 1px solid #E4E7ED;
-      }     
+      }
     }
 }
 .el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner {

src/utils-o/operation.js

@@ -641,4 +641,4 @@ export function setSelectedKeys(checkedKeys, halfCheckedKeys) {
     selected.push(obj);
   }
   return selected;
-}
+}
\ No newline at end of file

src/utils/mixins.js

 import fetch from '@/utils/fetch'
 import { getBaseUrl, getReportUrl, getWorkApi, getCmsUrl } from '@/utils/index'
 import { CryptoJS } from '@/plugins/aes'
-import 'jsencrypt'
+import JSEncrypt from 'jsencrypt'
 
 import { getPubKey } from '@/utils/account/accountApi';
 
@@ -19,7 +19,7 @@ module.exports = {
       //  this.token = this.getUrlKey('token') || (query && query.token) || null
     },
     mounted: function() {
-      
+
     },
     methods: {
 
@@ -56,7 +56,7 @@ module.exports = {
                         cb && cb(params);
                     }
                 }else{
-                    this.$message({  
+                    this.$message({
                         message: (res && res.message) || '接口出错',
                         type: 'warning'
                     });
@@ -85,7 +85,7 @@ module.exports = {
             return encrypted.toString();
         },
         // RSA encrypt
-        RsaEncrypt(aesKey, pubKey){  
+        RsaEncrypt(aesKey, pubKey){
             let _encrypt = new JSEncrypt();
             let boss_public_key = pubKey;
             _encrypt.setPublicKey(boss_public_key);
@@ -159,7 +159,7 @@ module.exports = {
                     setEntry: 'headers',
                 }
             let url = 'contents/searchKeyword/searchContent'
-      
+
             let csourceData = await this.GET(url, para).then(res => {
                 // _this.searchText = ''
                 if (res.code == '000000') {
@@ -182,7 +182,7 @@ module.exports = {
             })
             return csourceData
         },
-      
+
         setEventByModuleCode(itemData){
             let modeCode = itemData.appModuleInfo.code || '';
             let paramList = itemData.appModuleInfo.paramList ? itemData.appModuleInfo.paramList : ''
@@ -253,7 +253,7 @@ module.exports = {
             params: para
           })
         },
-        
+
         // 通用DELETE请求
         DELETE(api, para, callback,str) {
             // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"

src/utils/qualification/index.js

+import fetch from '../fetch';
+import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
+let headers = {
+  'Content-Type': 'application/json;charset=UTF-8',
+  token: localStorage.getItem('storageToken'),
+};
+export const getCertifyList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/certify/list`),
+    method: 'post',
+    data:params,
+    description: '审核记录列表(批发和供应商)',
+  })
+};
+export const getCertifyHistory = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`certify/certifyHistory`),
+    method: 'get',
+    data:params,
+    description: '查看审核历史',
+  })
+};
+export const getCertifyDetail = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/certify/certifyDetail`),
+    method: 'get',
+    description: '获取认证申请的审核详情',
+  })
+};
+export const getRefuseTemplate = (type) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/cert/constant/refuse/template?type=${type}`),
+    method: 'get',
+    description: '获取错误模板',
+  })
+};
+export const postCertifyAudit = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/certify/audit`),
+    method: 'post',
+    data:params,
+    description: '审核',
+  })
+};

src/utils/shop/index.js

@@ -155,3 +155,41 @@ export const getStoreAdressRepot = (storeId) => {
     description: "获取店铺退货地址信息",
   });
 };
+
+export const OCRStore = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/ocr/license`),
+    method: 'post',
+    data: params,
+    description: 'ocr店铺',
+  })
+};
+
+export const idCardOcr = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/ocr/idCard`),
+    method: 'post',
+    data: params,
+    description: '身份证ocr',
+  })
+};
+
+export const orgOptionList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/cert/constant/org/type`),
+    method: 'get',
+    description: '企业类型列表',
+  })
+};
+
+export const orgScopeOptionList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/cert/constant/biz/scope`),
+    method: 'get',
+    description: '经营范围',
+  })
+};

src/views/learning/item-data-all.vue

@@ -1100,8 +1100,7 @@ export default {
     },
     //机构人员分页
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-      vm.formTable.pageSize = val;
+        vm.formTable.pageSize = val;
       vm.formTable.pageNo = 1;
       if(vm.downloadId == null) {
         vm.searchPerson(1);

src/views/qualification/components/historyDialog.vue

+<template>
+  <el-dialog
+    title="提示"
+    :visible.sync="hidden"
+    width="80%"
+    :before-close="handleClose"
+  >
+    <el-table :data="gridData">
+      <el-table-column property="date" label="审核时间"></el-table-column>
+      <el-table-column property="name" label="审核人"></el-table-column>
+      <el-table-column property="address" label="审核结果"></el-table-column>
+      <el-table-column property="address" label="失败原因" width="200">
+        <template class=""> </template>
+      </el-table-column>
+      <el-table-column property="address" label="操作">
+        <template>
+          <el-button
+            @click="goDetail(scope.row)"
+            class="c0D9078"
+            type="text"
+            size="small"
+            >查看详情</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleNumChange"
+        :current-page="pageNo"
+        :page-sizes="[10, 30, 50, 100]"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getCertifyHistory } from "@/utils/qualification";
+export default {
+  props: {
+    hidden: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    id: {
+      type: Number,
+      default: () => {
+        return 0;
+      },
+    },
+  },
+  data() {
+    return {
+      pageNo: 0,
+      pageSize: 10,
+      total: 100,
+      gridData: [],
+    };
+  },
+  created() {},
+  methods: {
+    init() {
+      const params = {
+        certificateInfoId: this.id,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+      };
+      getCertifyHistory(params).then((res) => {
+        this.gridData = res.data.contentList;
+      });
+    },
+    handleSizeChange(value) {
+      this.pageSize = value;
+      this.init();
+    },
+    handleNumChange(value) {
+      this.pageNo = value;
+    },
+    goDetail() {
+
+    },
+    show() {},
+    handleClose() {
+      this.pageSize = 10;
+      this.pageNo = 1;
+      this.gridData = [];
+      this.$emit("close");
+    },
+  },
+};
+</script>
+<style lang='less' scoped>
+</style>

src/views/qualification/components/refuseDialog.vue

+<template>
+  <el-dialog
+    title="拒绝原因"
+    :visible.sync="dialogVisible"
+    width="40%"
+    :before-close="handleClose"
+  >
+    <div class="refuse-dialog">
+      <el-radio
+        class="radio"
+        v-model="checkId"
+        v-for="item in list"
+        :key="item.id"
+        :label="item.id"
+        >{{ item.name }}</el-radio
+      >
+      <el-radio class="radio" v-model="checkId" :label="-1">手动输入</el-radio>
+      <el-input
+        v-if="checkId === -1"
+        type="textarea"
+        placeholder="请输入拒绝原因"
+        v-model="refuse"
+        maxlength="30"
+        show-word-limit
+      />
+    </div>
+    <div class="btn">
+      <el-button type="default" size="small" @click="handleClose"
+        >取消</el-button
+      >
+      <el-button type="primary" size="small" @click="confirm">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getRefuseTemplate } from "@/utils/qualification";
+
+export default {
+  props: {},
+  data() {
+    return {
+      dialogVisible: false,
+      checkId: -1,
+      refuse: "",
+      list: [],
+      type: "",
+      typeData: {
+        1: "公司信息",
+        2: "营业执照",
+        3: "上一年年度报告",
+        4: "委托人身份证照片",
+        5: "委托书",
+        6: "法人身份证照片",
+        7: "药品经营许可证",
+        8: "药品经营质量管理规范认证证书",
+        9: "食品经营许可证",
+        10: "医疗器械经营许可证",
+        11: "二级医疗器械经营备案凭证",
+        12: "事业单位法人证",
+      },
+    };
+  },
+  created() {},
+  methods: {
+    init() {
+      getRefuseTemplate(this.type).then((res) => {
+        console.log(res);
+        this.list = res.data || [];
+      });
+    },
+    show(type) {
+      console.log(type);
+      this.type = type;
+      this.init(type);
+      this.dialogVisible = true;
+    },
+    handleClose() {
+      this.list = [];
+      this.refuse = "";
+      this.checkId = -1;
+      this.dialogVisible = false;
+    },
+    confirm() {
+      const params = {
+        refuseTemplateNo: this.checkId,
+        infoType: this.type,
+        infoTypeName:this.typeData[this.type]
+      };
+      if (this.checkId === -1) {
+        params.refuseContent = this.refuse;
+      } else {
+        params.refuseContent = this.list.filter((v) => {
+          return v.id === this.checkId;
+        })[0].name;
+      }
+      this.handleClose();
+      this.$emit("confirm", params);
+    },
+  },
+};
+</script>
+<style lang='less' scoped>
+.refuse-dialog {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 20px;
+}
+.radio {
+  margin-bottom: 10px;
+}
+.btn {
+  text-align: right;
+}
+</style>