Merge branch 'ckeditor' of http://git.quantgroup.cn/ui/recruiting-management into Ztext1

Conflicts:
	src/page/resume/allResume.vue
	src/service/util.js

src/api/resume.server.js

@@ -121,3 +121,13 @@ export function sendEmail(parmars) {
         // 'Content-Type':'application/json'
     }})
 }
+export function findCompanyEmailByKey(key) { //公司通讯录
+    return axios.get(`${sapi}/api/companyEmail/findCompanyEmailByKey?key=${key}`)
+}
+// 转发邮箱通知
+export function forwardResume(params) {
+    return axios.post(`${sapi}/api/resume/forwardResume`,params, {headers: {
+        'Content-Type':'application/json'
+    }})
+}
+

src/components/ckeditor.vue

 <template>
     <div>
-        <textarea id="editor" rows="10" cols="80" v-model="editorValue"></textarea>
+      <textarea id="editor" rows="10" cols="80"></textarea>
     </div>
 </template>
 <script type="text/ecmascript-6">
@@ -31,20 +31,23 @@
     },
     data() {
       return {
-        editorValue : this.value
+        isInit: false
       };
     },
+    watch: {
+      value:{
+        deep: true,
+        immediate:true,
+        handler(value) {
+          this.isInit&&this.editor.setData(value.value)
+        }
+      }
+    },
     mounted() {
       this.init()
     },
     beforeDestroy() {
     },
-    computed: {},
-    watch: {
-      value:function (value) {
-         this.editor.setData()
-      },
-    },
     methods: {
       init () {
         CKEDITOR.replace('editor', {
@@ -55,16 +58,13 @@
           filebrowserImageUploadUrl: this.uploadUrl,
           filebrowserUploadMethod: 'form'
           });
-        this.editor = CKEDITOR.instances.editor;
-        this.editor.on( 'change', ( evt ) =>{
-            // getData() returns CKEditor's HTML content.
-          this.$emit('getValue', evt.editor.getData())
-        });
+          this.editor = CKEDITOR.instances.editor;
+          setTimeout(()=> {
+            this.isInit = true
+          }, 1000)
       },
-    },
-    watch:{
-      value: function(value) {
-        this.editor.setData(value)
+      getValue(){
+        return this.editor.getData()
       }
     },
     components: {}

src/main.js

@@ -8,6 +8,7 @@ import router from './router';
 import initRouter from './service/init.service.js'
 import 'vue-happy-scroll/docs/happy-scroll.css'
 import {Notice} from 'iview'
+import store from '../src/store'
 Vue.use(iView);
 Vue.use(Notice)
 Vue.config.productionTip = false;
@@ -16,6 +17,7 @@ initRouter.init(router)
 new Vue({
   el: '#app',
   router,
+  store,
   components: { App },
   template: '<App/>',
 });

src/service/util.js

@@ -4,7 +4,6 @@ export function _debounce (fn, delay) {
 
   return function () {
     let args = arguments
-    
 
     if (timer) {
       clearTimeout(timer)
@@ -12,7 +11,6 @@ export function _debounce (fn, delay) {
 
     timer = setTimeout(function () {
       timer = null
-      // console.log(this)
       fn.apply(this, args)
     }.bind(this), delay)
   }

src/store/actions.js

@@ -4,8 +4,14 @@ let action = {
 	cookieTipsShow({commit}, value) {
 		commit(types.COOKIE_SHOW, value)
 	},
-	cookieTipsHide ({commit}, value) {
-		commit(types.COOKIE_HIDE, value)
+	addInterviewee ({commit}, value) {
+		commit(types.ADD_INTERVIEWEE, value)
+	},
+	removeInterviewee ({commit}, value) {
+		commit(types.REMOVE_INTERVIEWEE, value)
+	},
+	clearInterviewee ({commit}, value) {
+		commit(types.CLEAR_INTERVIEWEE, value)
 	}
 }
 export default action
\ No newline at end of file

src/store/index.js

@@ -6,7 +6,9 @@ import actions from './actions.js'
 Vue.use(Vuex)
 
 const state = {
-	cookieTips: false
+	cookieTips: false,
+	interviewee: [],
+	channelInterviewee: [],
 }
 export default new Vuex.Store({
 	mutations,

src/store/muationsType.js

 export const COOKIE_SHOW = 'COOKIE_SHOW'
 export const COOKIE_HIDE = 'COOKIE_HIDE'
+export const ADD_INTERVIEWEE = 'ADD_INTERVIEWEE'
+export const REMOVE_INTERVIEWEE = 'REMOVE_INTERVIEWEE'
+export const CLEAR_INTERVIEWEE = 'CLEAR_INTERVIEWEE'
+
+

src/store/mutations.js

-import {COOKIE_SHOW, COOKIE_HIDE} from './muationsType'
+import {COOKIE_SHOW, COOKIE_HIDE,ADD_INTERVIEWEE,REMOVE_INTERVIEWEE, CLEAR_INTERVIEWEE} from './muationsType'
 export default {
 	[COOKIE_SHOW] (state, value) {
 		state.cookieTips = value || true
 	},
 	[COOKIE_HIDE](state, value) {
 		state.cookieTips = value || false
+	},
+	[ADD_INTERVIEWEE] (state, object) {
+		let flag = false
+		let data = object.data
+        if (object.type=='channel') {
+        	console.log(data)
+          state.channelInterviewee.map(item => {
+	           if (data&&item.id == data.id) {
+	           	 flag = true
+	           	 return
+	           } 
+			})
+			if (!flag) {
+	           state.channelInterviewee.push(data)
+			}
+        } else {
+        	state.interviewee.map(item => {
+	           if (data&&item.id == data.id) {
+	           	 flag = true
+	           	 return
+	           } 
+			})
+			if (!flag) {
+	           state.interviewee.push(data)
+			}
+        }
+		
+	},
+	[REMOVE_INTERVIEWEE](state, object) {
+		let data = object.data
+		if (object.type=='channel') {
+			state.channelInterviewee.map((item, index) => {
+	          if (data&&item.id == data.id) {
+	          	state.channelInterviewee.splice(index, 1)
+	          }
+			})
+		} else {
+			state.interviewee.map((item, index) => {
+	          if (data&&item.id == data.id) {
+	          	state.interviewee.splice(index, 1)
+	          }
+			})
+		}
+		
+	},
+	[CLEAR_INTERVIEWEE](state, object) {
+		let type = object.type
+		if (type == 'channel') {
+		   state.channelInterviewee = []
+		   console.log('===')
+		} else {
+           state.interviewee = []
+		}
 	}
 }
\ No newline at end of file