wkw il y a 6 mois
Parent
commit
670481a73e

+ 116 - 12
src/components/messageCom/messageCom.vue

@@ -259,6 +259,15 @@
 									</div>
 								</div>
 								<div v-if="isShowEmoj" class="message-btom-btn-l-emjs"></div>
+
+								<!-- 常用语 -->
+								<div v-if="isShowCommon"
+									class="message-btom-btn-l-emj flex align-center justify-center">
+									<ul class="message-btom-btn-l-emj-box sentence-panel">
+										<li class="message-text" v-for="item in changYongList" :key="item.id"
+											@click="selConfirm(item.label)">{{ item.label }}</li>
+									</ul>
+								</div>
 							</div>
 							<el-button type="primary" @click="sendMessage(1)">发送</el-button>
 						</div>
@@ -420,6 +429,11 @@
 						src: '/images/postimg/photo.png',
 						srcS: '/images/postimg/photo_s.png',
 					},
+					{
+						name: '',
+						src: '/images/postimg/cyy.png',
+						srcS: '/images/postimg/cyy_s.png',
+					},
 					{
 						name: '发简历',
 						src: '/images/postimg/jl.png',
@@ -436,7 +450,9 @@
 						srcS: '/images/postimg/weichat_s.png',
 					}
 				], //操作图片
-				jobList: []
+				jobList: [],
+				isShowCommon: false, //是否显示常用语
+				changYongList: []
 			}
 		},
 		computed: {
@@ -454,11 +470,11 @@
 				this.getCHarList();
 			}
 			if (this.userType == 1) {
-				this.czList[2].name = '发简历'
+				this.czList[3].name = '发简历'
 				//获取岗位信息
 				this.getPostPushInfo(this.postPushId)
 			} else {
-				this.czList[2].name = '求简历'
+				this.czList[3].name = '求简历'
 				this.czList.push({
 					name: '约面试',
 					src: '/images/postimg/yms.png',
@@ -468,9 +484,37 @@
 			}
 			//建立webscoket连接
 			this.initScoket()
-			this.getStatusInfo()
+			this.getStatusInfo();
+			setTimeout(() => {
+				this.getChangYong();
+			}, 1000);
 		},
 		methods: {
+			getChangYong() {
+				let state = 0
+				if (this.userType == 1) {
+					state = 70
+				} else {
+					state = 80
+				}
+				this.$Request.get(`/app/message/selectMessageByType?page=1&limit=100&state=${state}`)
+					.then(res => {
+						if (res.code == 0) {
+							this.changYongList = [{ label: '你好啊,可以聊一聊~', id: 0 }];
+							res.data.list.forEach(d => {
+								let data = {
+									label: d.content,
+									id: d.id
+								}
+								this.changYongList.push(data);
+							});
+						}
+					});
+			},
+			selConfirm(val) {
+				this.content = val;
+				this.isShowCommon = false;
+			},
 			closePostPush() {
 				this.showDialog = false
 			},
@@ -946,7 +990,10 @@
 					case 0: //显示表情
 						this.isShowEmoj = true
 						break;
-					case 2:
+					case 2: //显示常用语
+						this.isShowCommon = true
+						break;
+					case 3:
 						if (this.userType == 1) { //发简历
 							this.sendResumes()
 						} else { //求简历
@@ -954,19 +1001,43 @@
 						}
 
 						break;
-					case 3: //换电话
+					case 4: //换电话
 						this.currentPhone()
 						break;
-					case 4: //换微信
+					case 5: //换微信
 						this.currentWchat()
 						break;
-					case 5: //约面试
-						this.dialogms = true
+					case 6: //约面试
+						this.openDialog();
 						break;
 					default:
 						break;
 				}
 			},
+			// 赋值地址和联系人数据
+			openDialog() {
+				const addressInfo = localStorage.getItem('companyAddressInfo')
+					? JSON.parse(localStorage.getItem('companyAddressInfo'))
+					: {};
+				this.miamshi = {
+					hrPhone: this.$store.state.phone || '',
+					hrName: this.$store.state.nickName || '',
+					position: '',
+					interviewDateTime: '',
+					companyId: localStorage.getItem('companyId') || '',
+					remarks: '',
+					userId: this.byUserId || '',
+					postPushId: this.postPushId || '',
+					province: addressInfo.province || '',
+					city: addressInfo.city || '',
+					county: addressInfo.county || '',
+					lng: addressInfo.lng || '',
+					lat: addressInfo.lat || '',
+					address: addressInfo.address || '',
+					detailedAddress: addressInfo.detailedAddress || '',
+				}
+				this.dialogms = true;
+			},
 			//获取交换状态
 			getStatusInfo() {
 				let data = {
@@ -992,6 +1063,7 @@
 			//关闭弹窗
 			closeDialog() {
 				this.isShowEmoj = false
+				this.isShowCommon = false
 			},
 			//还原图片
 			resetImageSrc(index) {
@@ -1337,11 +1409,43 @@
 						src: '/images/postimg/emij_s.png'
 					}
 				}
+			}
+		}
+	}
+	.sentence-panel {
+		margin: 0 !important;
+		padding: 0 !important;
+	}
 
+	.message-text {
+		height: 34px;
+		line-height: 34px;
+		border-radius: 4px;
+		z-index: 1;
+		overflow: hidden;
+		cursor: pointer;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		padding: 0 12px 0 24px;
+		font-size: 13px;
+		font-weight: 400;
+		color: #333;
+		border: none;
+		position: relative;
+	}
 
-			}
+	.message-text:hover {
+		background-color: #f8f8f8;
+	}
 
-			.message-btom-btn-r {}
-		}
+	.message-text:before {
+		content: "";
+		position: absolute;
+		top: 14px;
+		left: 10px;
+		width: 6px;
+		height: 6px;
+		border-radius: 50%;
+		background: #d9d9d9;
 	}
 </style>

+ 16 - 6
src/components/postPush/postPush.vue

@@ -276,7 +276,7 @@ export default {
 				// stationName: '', //岗位名称
 				ruleClassifyName: '', //岗位类型
 				ruleClassifyId: '', //岗位id
-				address: '', //工作地址
+				address: localStorage.getItem('companyAddressInfo') ? JSON.parse(localStorage.getItem('companyAddressInfo')).address : '', //工作地址
 				experience: '', //经验要求
 				education: '', //学历要求
 				salaryRange: '', //薪资范围
@@ -285,12 +285,12 @@ export default {
 				welfareTag: [], //岗位福利
 				positionDetails: '', //岗位介绍
 				province: '', //省
-				city: '', //市
-				county: '', //区
-				lng: '',
-				lat: '',
+				city: localStorage.getItem('companyAddressInfo') ? JSON.parse(localStorage.getItem('companyAddressInfo')).city : '', //市
+				county: localStorage.getItem('companyAddressInfo') ? JSON.parse(localStorage.getItem('companyAddressInfo')).county : '', //区
+				lng: localStorage.getItem('companyAddressInfo') ? JSON.parse(localStorage.getItem('companyAddressInfo')).lng : '',
+				lat: localStorage.getItem('companyAddressInfo') ? JSON.parse(localStorage.getItem('companyAddressInfo')).lat : '',
 				companyId: localStorage.getItem('companyId'),
-				detailedAddress: '', //详细地址
+				detailedAddress: localStorage.getItem('companyAddressInfo') ? JSON.parse(localStorage.getItem('companyAddressInfo')).detailedAddress : '', //详细地址
 			},
 			minSalary:'',
 			maxSalary:'',
@@ -563,6 +563,16 @@ export default {
 			if (postPushId) {
 				data.postPushId = postPushId
 			}
+			let companyAddressInfo = {
+				city: data.city,
+				county: data.county,
+				address: data.address,
+				lat: data.lat,
+				lng: data.lng,
+				detailedAddress: data.detailedAddress,
+			}
+			// 缓存公司地址
+			localStorage.setItem('companyAddressInfo', JSON.stringify(companyAddressInfo))
 			data.address = data.address + '--' + data.detailedAddress
 			this.$Request.post('/app/postPush/savePostPush', data, {
 				type: 'json'

+ 25 - 1
src/views/message/index.vue

@@ -1226,12 +1226,36 @@
 						this.currentWchat()
 						break;
 					case 6: //约面试
-						this.dialogms = true
+						this.openDialog();
 						break;
 					default:
 						break;
 				}
 			},
+			// 赋值地址和联系人数据
+			openDialog() {
+				const addressInfo = localStorage.getItem('companyAddressInfo')
+					? JSON.parse(localStorage.getItem('companyAddressInfo'))
+					: {};
+				this.miamshi = {
+					hrPhone: this.$store.state.phone || '',
+					hrName: this.$store.state.nickName || '',
+					position: '',
+					interviewDateTime: '',
+					companyId: localStorage.getItem('companyId') || '',
+					remarks: '',
+					userId: this.byUserId || '',
+					postPushId: this.postPushId || '',
+					province: addressInfo.province || '',
+					city: addressInfo.city || '',
+					county: addressInfo.county || '',
+					lng: addressInfo.lng || '',
+					lat: addressInfo.lat || '',
+					address: addressInfo.address || '',
+					detailedAddress: addressInfo.detailedAddress || '',
+				}
+				this.dialogms = true;
+			},
 			//还原图片
 			resetImageSrc(index) {
 				this.czIndex = -1

+ 2 - 2
src/views/resume/resumeInfo.vue

@@ -99,7 +99,7 @@
 									{{ detail.startTime ? detail.startTime.slice(0, 7) : '' }} -
 									{{ detail.endTime ? detail.endTime.slice(0, 7) : '至今' }}
 								</div>
-								<div class="timelineItem">
+								<div class="timelineItem" style="white-space: pre-wrap;">
 									{{ detail.workContent ? detail.workContent : '暂无工作描述' }}
 								</div>
 
@@ -127,7 +127,7 @@
 								{{ activity.startTime ? activity.startTime.split(' ')[0] : '' }} -{{ activity.endTime ?
 								activity.endTime.split(' ')[0] : '' }}
 							</div>
-							<div class="timelineItem">{{ activity.detail }}</div>
+							<div class="timelineItem" style="white-space: pre-wrap;">{{ activity.detail }}</div>
 						</el-timeline-item>
 					</el-timeline>
 				</div>