cornyuan 7 месяцев назад
Родитель
Сommit
5fc704c6d7

+ 1 - 1
src/views/universalMission/resumeDetails.vue

@@ -1016,7 +1016,7 @@
 				let resumesId = this.$route.query.resumesId
 				let resumesId = this.$route.query.resumesId
 				this.tableDataLoading = true
 				this.tableDataLoading = true
 				this.$http({
 				this.$http({
-					url: this.$http.adornUrl('resumes/selectResumesByResumesId'),
+					url: this.$http.adornUrl('resumes/selectResumesByResumesIdForAdmin'),
 					method: 'get',
 					method: 'get',
 					params: this.$http.adornParams({
 					params: this.$http.adornParams({
 						'resumesId': resumesId,
 						'resumesId': resumesId,

+ 14 - 13
src/views/user/userDetail.vue

@@ -520,18 +520,18 @@
 					<el-input style="width:50%;" disabled class="margin15" placeholder="请输入家庭住址"
 					<el-input style="width:50%;" disabled class="margin15" placeholder="请输入家庭住址"
 						v-model="dingdanData.address" autosize></el-input>
 						v-model="dingdanData.address" autosize></el-input>
 				</div>
 				</div>
-				<div class="content_item" style="position: relative;">
-					<span
-						style="width: 120px;text-align: left;display:inline-block;position: absolute;top: 0;">工作经历:</span>
-					<span style="width:50%;margin-left: 120px;">
-						<div class="bigDiv" v-for="(item,index) in dingdanData.resumesCompanyList">
-							<div class="titleGz">{{item.resumesTitle}}</div>
-							<div class="spanGz"><span>{{item.resumesPost}}</span><span
-									class="spanTime">{{item.resumesTime.substring(0,10)}}
-									<!-- ~
-									{{item.createTime.substring(0,10)}} -->
-								</span></div>
-							<div class="delGz">{{item.resumesContent}}</div>
+				<div class="content_div">
+					<span class="content_item">工作经历:</span>
+					<span >
+						<div v-for="(item2,index2) in dingdanData.workExpList" >
+							<div class="titleGz"><span style="width:80%;margin-left: 120px;">所在公司:{{item2.companyName}}</span></div>
+							<div v-for="(item,index) in item2.workExpDetailList" style="width:80%;margin-left: 120px;">
+								<div><span>所担职务:<span>{{item.position}}</span></span> </div>
+								<div><span>职位级别:<span>{{item.positionLevel}}</span></span> </div>
+								<div><span>工作时间:<span>{{item.startTime}} - {{item.endTime}}</span></span> </div>
+								<div><span>工作内容:<span>{{item.workContent}}</span></span> </div>
+								&nbsp;
+							</div>
 						</div>
 						</div>
 					</span>
 					</span>
 				</div>
 				</div>
@@ -1186,6 +1186,7 @@
 				quillOption: quillConfig,
 				quillOption: quillConfig,
 				companyId: '',
 				companyId: '',
 				indexType: '',
 				indexType: '',
+				workExpList: [],
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -1949,7 +1950,7 @@
 				this.tableDataLoading = true
 				this.tableDataLoading = true
 				let userId = this.$route.query.userId
 				let userId = this.$route.query.userId
 				this.$http({
 				this.$http({
-					url: this.$http.adornUrl('resumes/selectResumesByUserId'),
+					url: this.$http.adornUrl('resumes/selectResumesByUserIdForAdmin'),
 					method: 'get',
 					method: 'get',
 					params: this.$http.adornParams({
 					params: this.$http.adornParams({
 						'userId': userId
 						'userId': userId

+ 14 - 13
src/views/user/userDetail1.vue

@@ -520,18 +520,18 @@
 					<el-input style="width:50%;" disabled class="margin15" placeholder="请输入家庭住址"
 					<el-input style="width:50%;" disabled class="margin15" placeholder="请输入家庭住址"
 						v-model="dingdanData.address" autosize></el-input>
 						v-model="dingdanData.address" autosize></el-input>
 				</div>
 				</div>
-				<div class="content_item" style="position: relative;">
-					<span
-						style="width: 120px;text-align: left;display:inline-block;position: absolute;top: 0;">工作经历:</span>
-					<span style="width:50%;margin-left: 120px;">
-						<div class="bigDiv" v-for="(item,index) in dingdanData.resumesCompanyList">
-							<div class="titleGz">{{item.resumesTitle}}</div>
-							<div class="spanGz"><span>{{item.resumesPost}}</span><span
-									class="spanTime">{{item.resumesTime.substring(0,10)}}
-									<!-- ~
-									{{item.createTime.substring(0,10)}} -->
-								</span></div>
-							<div class="delGz">{{item.resumesContent}}</div>
+				<div class="content_div">
+					<span class="content_item">工作经历:</span>
+					<span >
+						<div v-for="(item2,index2) in dingdanData.workExpList" >
+							<div class="titleGz"><span style="width:80%;margin-left: 120px;">所在公司:{{item2.companyName}}</span></div>
+							<div v-for="(item,index) in item2.workExpDetailList" style="width:80%;margin-left: 120px;">
+								<div><span>所担职务:<span>{{item.position}}</span></span> </div>
+								<div><span>职位级别:<span>{{item.positionLevel}}</span></span> </div>
+								<div><span>工作时间:<span>{{item.startTime}} - {{item.endTime}}</span></span> </div>
+								<div><span>工作内容:<span>{{item.workContent}}</span></span> </div>
+								&nbsp;
+							</div>
 						</div>
 						</div>
 					</span>
 					</span>
 				</div>
 				</div>
@@ -1186,6 +1186,7 @@
 				quillOption: quillConfig,
 				quillOption: quillConfig,
 				companyId: '',
 				companyId: '',
 				indexType: '',
 				indexType: '',
+				workExpList: [],
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -1949,7 +1950,7 @@
 				this.tableDataLoading = true
 				this.tableDataLoading = true
 				let userId = this.$route.query.userId
 				let userId = this.$route.query.userId
 				this.$http({
 				this.$http({
-					url: this.$http.adornUrl('resumes/selectResumesByUserId'),
+					url: this.$http.adornUrl('resumes/selectResumesByUserIdForAdmin'),
 					method: 'get',
 					method: 'get',
 					params: this.$http.adornParams({
 					params: this.$http.adornParams({
 						'userId': userId
 						'userId': userId

+ 1 - 1
src/views/user/userDetailQ.vue

@@ -1952,7 +1952,7 @@
 				this.tableDataLoading = true
 				this.tableDataLoading = true
 				let userId = this.$route.query.userId
 				let userId = this.$route.query.userId
 				this.$http({
 				this.$http({
-					url: this.$http.adornUrl('resumes/selectResumesByUserId'),
+					url: this.$http.adornUrl('resumes/selectResumesByUserIdForAdmin'),
 					method: 'get',
 					method: 'get',
 					params: this.$http.adornParams({
 					params: this.$http.adornParams({
 						// 'page': this.page,
 						// 'page': this.page,

+ 1 - 1
src/views/user/userDetailQ1.vue

@@ -1952,7 +1952,7 @@
 				this.tableDataLoading = true
 				this.tableDataLoading = true
 				let userId = this.$route.query.userId
 				let userId = this.$route.query.userId
 				this.$http({
 				this.$http({
-					url: this.$http.adornUrl('resumes/selectResumesByUserId'),
+					url: this.$http.adornUrl('resumes/selectResumesByUserIdForAdmin'),
 					method: 'get',
 					method: 'get',
 					params: this.$http.adornParams({
 					params: this.$http.adornParams({
 						// 'page': this.page,
 						// 'page': this.page,