Merge branch 'pdfOrigen' into 'master'

Pdf origen

See merge request !9

package-lock.json

@@ -885,8 +885,7 @@
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
       "resolved": "http://npmprivate.quantgroups.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
-      "dev": true
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
     },
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
@@ -6891,6 +6890,11 @@
         "lower-case": "^1.1.1"
       }
     },
+    "node-ensure": {
+      "version": "0.0.0",
+      "resolved": "http://npmprivate.quantgroups.com/node-ensure/-/node-ensure-0.0.0.tgz",
+      "integrity": "sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc="
+    },
     "node-forge": {
       "version": "0.7.5",
       "resolved": "http://npmprivate.quantgroups.com/node-forge/-/node-forge-0.7.5.tgz",
@@ -7760,6 +7764,15 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pdfjs-dist": {
+      "version": "2.0.943",
+      "resolved": "http://npmprivate.quantgroups.com/pdfjs-dist/-/pdfjs-dist-2.0.943.tgz",
+      "integrity": "sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==",
+      "requires": {
+        "node-ensure": "^0.0.0",
+        "worker-loader": "^2.0.0"
+      }
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -8631,6 +8644,11 @@
         "unpipe": "1.0.0"
       }
     },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "http://npmprivate.quantgroups.com/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao="
+    },
     "read-cache": {
       "version": "1.0.0",
       "resolved": "http://npmprivate.quantgroups.com/read-cache/-/read-cache-1.0.0.tgz",
@@ -10506,6 +10524,23 @@
         }
       }
     },
+    "vue-pdf": {
+      "version": "4.0.7",
+      "resolved": "http://npmprivate.quantgroups.com/vue-pdf/-/vue-pdf-4.0.7.tgz",
+      "integrity": "sha512-fId38x4WrD4NalJV4AFzr30iX+IyycI+ii8fFNcgikWBrhHEytZwfOFDwNv57SLgtgBMocYwm+gBIOTyvixXMg==",
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "^6.18.0",
+        "loader-utils": "^1.2.3",
+        "pdfjs-dist": "2.0.943",
+        "raw-loader": "^0.5.1",
+        "vue-resize-sensor": "^2.0.0"
+      }
+    },
+    "vue-resize-sensor": {
+      "version": "2.0.0",
+      "resolved": "http://npmprivate.quantgroups.com/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz",
+      "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ=="
+    },
     "vue-router": {
       "version": "3.0.6",
       "resolved": "http://npmprivate.quantgroups.com/vue-router/-/vue-router-3.0.6.tgz",
@@ -11056,6 +11091,52 @@
         "errno": "~0.1.7"
       }
     },
+    "worker-loader": {
+      "version": "2.0.0",
+      "resolved": "http://npmprivate.quantgroups.com/worker-loader/-/worker-loader-2.0.0.tgz",
+      "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
+      "requires": {
+        "loader-utils": "^1.0.0",
+        "schema-utils": "^0.4.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "http://npmprivate.quantgroups.com/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "http://npmprivate.quantgroups.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "http://npmprivate.quantgroups.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "http://npmprivate.quantgroups.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        },
+        "schema-utils": {
+          "version": "0.4.7",
+          "resolved": "http://npmprivate.quantgroups.com/schema-utils/-/schema-utils-0.4.7.tgz",
+          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "http://npmprivate.quantgroups.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz",

package.json

@@ -20,6 +20,7 @@
     "moment": "^2.24.0",
     "qs": "^6.7.0",
     "vue": "^2.5.2",
+    "vue-pdf": "^4.0.7",
     "vue-router": "^3.0.1",
     "vue-upload-component": "^2.8.20",
     "vuex": "^3.1.1"

src/api/resume.server.js

@@ -131,18 +131,29 @@ export function forwardResume(params) {
         'Content-Type':'application/json'
     }})
 }
-// export function getPdf(parmars) {
-//   return axios.get(`${sapi}/api/resume/getResumePdfByResumeId/${parmars.uid}`,{
-//     responseType: 'arraybuffer',
-//     headers: {
-//       'Content-Type':'application/json'
-//     }
-//   })
-// }
-// // 是否展示原件的PDF
-// export function isShowPDF(parmars) {
-//     return axios.get(`${sapi}/api/resume//isShowOriPdf/${parmars.uid}`, {headers: {
-//         'Content-Type':'application/json'
-//     }})
-// }
+export function getPdf(parmars) {
+  return axios.get(`${sapi}/api/resume/getResumePdfByResumeId/${parmars.uid}`,{
+    responseType: 'arraybuffer',
+    headers: {
+      'Content-Type':'application/json'
+    }
+  })
+}
+// 是否展示原件的PDF
+export function isShowPDF(parmars) {
+    return axios.get(`${sapi}/api/resume/isShowOriPdf/${parmars.uid}`, {headers: {
+        'Content-Type':'application/json'
+    }})
+}
+export function getpdfUrl(parmars) {
+    return axios.get(`${sapi}/api/resume/getResumePdfUrl/${parmars.uid}`, {headers: {
+        'Content-Type':'application/json'
+    }})
+}
+//获取职位列表
+export function getlist(parmars) {
+    return axios.get(`${sapi}/api/resume/findPositionList?optSourceCode=${parmars.optSourceCode}`, {headers: {
+        'Content-Type':'application/json'
+    }})
+}
 

src/api/stystem.server.js

@@ -69,9 +69,9 @@ export function getErcode(){
         'Content-Type':'application/json',
     }})
 }
-// //下载二维码
-// export function downloadErcode(){
-//     return axios.get(`${sapi}/qrCode/downQrCode`,{headers: {
-//         'Content-Type':'application/json',
-//     }})
-// }
+// //修改账户
+export function updateAccount(parmars){
+    return axios.post(`${sapi}/api/user/modify/${parmars.id}`,parmars,{headers: {
+        'Content-Type':'application/json',
+    }})
+}
\ No newline at end of file

src/components/home.vue

@@ -15,8 +15,8 @@
         </template>
       </Menu>
     </Col>
-    <Col span="21" class="content" style="width:83%;height:100%">
-      <Row class="header" style="height:50px">
+    <Col span="21" class="content" style="width:83%;height:100%;">
+      <Row class="header" style="height:50px;">
         <Col span="20">
           <Menu mode="horizontal" :active-name="levelOneName" @on-select="selectMenu">
             <MenuItem v-for="menu in menuList" :name="menu.name" :key="menu.name" >
@@ -222,7 +222,7 @@ import {mapState} from 'vuex'
           var obj = {
             name: `${item.sourceName}`,
             item: item.sourceName,
-            route: `/channel/${item.sourceCode}`
+            route: `/channel/${item.sourceCode}?handUpload=${item.handUpload==null?'':item.handUpload}`
           }
           this.menuList[0].child[1].child.push(obj)
          })

src/page/interview/interview.vue

@@ -664,6 +664,7 @@ export default {
                     flowStatusList:this.searchInfo.STA,
                     interviewerName:this.interviewerName,
                     inviterName:this.inviterName,
+                    handUpload:''
                 }
             }
              SerchList(parmars).then(res=>{

src/page/login/login.vue

@@ -14,7 +14,7 @@
                   <div class="login_content">
                         <Form ref="formInline" :model="formInline" :rules="ruleInline" style="height:161px">
                             <FormItem prop="user" style="height:60px">
-                                <Input type="text" v-model="formInline.user" placeholder="请输入账号" class="wordStyle" size="large">
+                                <Input type="text" v-model="formInline.user" placeholder="请输入企业邮箱账号" class="wordStyle" size="large">
                                     <Icon type="ios-person-outline" slot="prepend" ></Icon>
                                 </Input>
                             </FormItem>
@@ -53,7 +53,7 @@ export default {
                 },
                 ruleInline: {
                     user: [
-                        {  required: true, pattern:/^[1][3,4,5,7,8,6,9][0-9]{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
+                        {  required: true, pattern:/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/, message: '请输入正确的邮箱账号', trigger: 'blur' }
                     ],
                     password: [
                         { required: true, message: '请输入正确的密码', trigger: 'blur' },

src/page/system/emailMange.vue

@@ -3,7 +3,7 @@
         <div class="addEmail">
             <p style="margin-top:10px">
              <span style="font-size:18px;color:#2d8cf0;margin-left:18px">新增接收邮箱</span>
-             <span style="margin-left:10px;color:Grey">绑定邮箱以接收简历</span>
+             <span style="margin-left:10px;color:Grey">绑定邮箱以接收简历,仅可绑定一个邮箱</span>
             </p>
             <Form :label-width="100" :model="formInline" :rules="ruleInline">
                 <FormItem label="邮箱账号" style="margin-top:20px" prop="emailNumber">
@@ -20,7 +20,7 @@
                  <FormItem label="所属人" style="margin-top:20px; position: absolute;top:110px;left: 410px"  prop="UserName" :label-width="180">
                    <Input placeholder="请输入所属者正确姓名" style="width:300px" v-model="formInline.UserName" :maxlength="5"/>
                 </FormItem>  
-                 <span type="primary" style="line-height:30px;text-align:center; width:110px;height:30px;position: absolute;top:130px;left: 910px;border-radius: 5px;background:rgb(0, 146, 255);color:rgb(255,255,255);cursor:pointer" @click="bindingSynchronizat">绑定并开始同步</span>    
+                 <Button type="primary" style="position: absolute;top:130px;left: 910px;" :disabled='disabled' @click="bindingSynchronizat">绑定并开始同步</Button>    
             </Form>
         </div>
         <div class="Emailmange">
@@ -69,7 +69,7 @@
               <h3 style="text-align:center">提示</h3>
               <p style="height:30px;line-height:30px">同步完成，如密码发生改变，请及时点击<br><span>修改</span>来重置密码</p>
               <!-- <h2 style="text-align:center;font-size:18px;color:#2d8cf0;height:40px;line-height:40px;margin-top:30px" @click="pushlist">我已知晓</h2> -->
-              <Button type="primary" style="margin:40px 0 0 80px" @click="modal2=false">我已知晓</Button>
+              <Button type="primary" style="margin:40px 0 0 80px" @click="iKnow">我已知晓</Button>
         </Modal>
         <!-- 同步绑定 -->
          <Modal
@@ -133,6 +133,7 @@
 </template>
 <script>
 import { queryemailList,Synchronization,jiebangEmail,updateemailTWO,UntyingAll} from '../../api/stystem.server.js'
+import moment from 'moment'
 export default {
     data(){
         return {
@@ -165,6 +166,7 @@ export default {
             Tblengs:'',
             checkboxList:[],
             checked: false,
+            disabled:false,
             pageIndex:1,
             pageSize:30,
             totalSize:null,
@@ -181,7 +183,7 @@ export default {
                 ruleInline: {
                     emailNumber: [
                         // derong.zhang@quantgroup.cn
-                        { required: true, pattern:/\S+@quantgroup.cn/, message: '请输入正确的邮箱账号', trigger: 'blur' }
+                        { required: true, pattern:/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/, message: '请输入正确的邮箱账号', trigger: 'blur' }
                     ],
                     emailPsd: [
                         { required: true, message: '请输入正确的密码', trigger: 'blur' },
@@ -217,12 +219,13 @@ export default {
                 });
                 return
             }
+            this.disabled=true
             this.modal3=true
             let parmars={
                 emailName:this.formInline.emailNumber,
                 emailPassword:this.formInline.emailPsd,
                 belongs:this.formInline.UserName,
-                syncStartDate:this.DATA
+                syncStartDate:moment(this.DATA).format('YYYY-MM-DD HH:mm:ss')
             }
             Synchronization(parmars).then(res=>{
                 if(res.data.success==true){
@@ -233,9 +236,11 @@ export default {
                     this.formInline.UserName=''
                     this.DATA=''
                     this.SearchList()
+                    // this.disabled=false
                 }
                 if(res.data.success==false){
                     this.modal3=false
+                    this.disabled=false
                     this.Massage=res.data.body.message
                      this.$Notice.error({
                         title: '提示',
@@ -249,6 +254,10 @@ export default {
                 this.formInline.emailPsd=''
             })
         },
+        iKnow(){
+          this.modal2=false,
+          this.disabled=false
+        },
         //选择同步的时间
         selectTime(b){
             this.DATA=b

src/service/http.service.js

@@ -33,7 +33,7 @@ function tryHideFullScreenLoading() {
       }, 200)
     }
   }
-let needLoading = ['resume/findListByQueryVO', 'sendMail/sendEmailTemplate', 'resume/forwardResume', 'interview/findListByQueryVO']
+let needLoading = ['resume/findListByQueryVO', 'sendMail/sendEmailTemplate', 'resume/forwardResume', 'interview/findListByQueryVO','resume/delete']
 instance.interceptors.request.use(function (config) {
     // 在发送请求之前做些什么
     if (!config.headers['Content-Type']) {