genglw / yxly-teacher · 提交

提交 08ad9bc34604bbe3bfaa887b59ae39cf42e313ae

作者 guomingshu
1 个父辈 d92e1951
构建： 未知

feat: 计划项目合并

内嵌 并排对比
正在显示 23 个修改的文件 包含 362 行增加 和 374 行删除
... ... @@ -120,4 +120,4 @@
120 120 border: nones;
121 121 border-radius: 8rpx;
122 122 }
123   -</style>
  123 +</style>
... ...
... ... @@ -11,10 +11,10 @@ export const getOssInitApi = (params) => http.get('/basic/v1/oss/policy', {
11 11 })
12 12
13 13 // 获取token
14   -export const postTokenApi = (params, config = {}) => http.post('/auth/v1/login', params, config).then(res => {
15   - console.log(res)
16   -
17   - return res;
  14 +export const postTokenApi = (params, config = {}) => http.post('/auth/v1/login', params, config).then(res => {
  15 + console.log(res)
  16 +
  17 + return res;
18 18 })
19 19
20 20 // 获取用户信息
... ... @@ -34,11 +34,11 @@ export const updateUserInfoApi = (params) => http.put('/user/v1/update', params)
34 34 export const delAccountApi = (params) => http.delete('/user/v1/annuluser', params);
35 35
36 36 //撤销注销账户
37   -export const cancelDelAccountApi = (params) => http.put('/user/v1/annulusercancel', params);
38   -
  37 +export const cancelDelAccountApi = (params) => http.put('/user/v1/annulusercancel', params);
  38 +
39 39 // 更新老师头像
40   -export const updateAvatarUrlApi = (params) => http.put('/user/v1/teacher/updateAvatarUrl', params);
41   -
  40 +export const updateAvatarUrlApi = (params) => http.put('/user/v1/teacher/updateAvatarUrl', params);
  41 +
42 42 // 学校列表
43 43 export const getSchoolListApi = (params) => http.get('/user/v1/schoolList', {
44 44 params: params
... ... @@ -52,8 +52,8 @@ export const getTodoListStatisticsApi = (params) => http.get('/internship/v1/ind
52 52 params: params
53 53 })
54 54
55   -// 实习项目列表
56   -export const getProjectListApi = (params) => http.get('/internship/v1/project/simpleList', {
  55 +// 实习计划列表
  56 +export const getPlanListApi = (params) => http.get('/internship/v1/plan/simpleList', {
57 57 params: params
58 58 })
59 59
... ... @@ -83,8 +83,8 @@ export const getLogReviewListApi = (params) => http.get('/internship/v1/formLog/
83 83 // 实习日志详情
84 84 export const getLogDetailApi = (id, params) => http.get(`/internship/v1/formLog/detail/${id}`, {
85 85 params: params
86   -})
87   -
  86 +})
  87 +
88 88 // 日志批阅
89 89 export const putLogReviewApi = (params) => http.put(`/internship/v1/formLog/approve`, params);
90 90
... ... @@ -141,102 +141,102 @@ export const getStudentListApi = (params) => http.get('/internship/v1/form/train
141 141 //实习过程详情
142 142 export const getInternshipProcessDetailApi = (params) => http.get(`/internship/v1/form/internshipProcess`, {
143 143 params: params
144   -})
145   -
  144 +})
  145 +
146 146 // 三方协议列表
147 147 export const getAgreementListApi = (params) => http.get('/internship/v1/treaty/listBySchool', {
148 148 params: params
149   -})
150   -
  149 +})
  150 +
151 151 //三方协议详情
152 152 export const getAgreementDetailApi = (id, params) => http.get(`/internship/v1/treaty/detail/${id}`, {
153 153 params: params
154   -})
155   -
156   -//签到列表
  154 +})
  155 +
  156 +//签到列表
157 157 export const getsignInListApi = (params) => http.get('/internship/v1/attendance/applet/monthAttendanceList', {
158 158 params: params
159   -})
160   -
161   -// 实习岗位列表
  159 +})
  160 +
  161 +// 实习岗位列表
162 162 export const getInternshipJobListApi = (params) => http.get('/internship/v1/form/internshipJob', {
163 163 params: params
164   -})
165   -
166   -// 实践课程列表
  164 +})
  165 +
  166 +// 实践课程列表
167 167 export const getPracticalCoursesListApi = (params) => http.get('/internship/v1/form/internshipCourse', {
168 168 params: params
169   -})
170   -
  169 +})
  170 +
171 171 //实习单详情
172 172 export const getInternshipDetailApi = (id, params) => http.get(`/internship/v1/form/detail/${id}`, {
173 173 params: params
174   -})
175   -
  174 +})
  175 +
176 176 // 请假申请列表
177 177 export const getleaveRecordlistListApi = (params) => http.get('/internship/v1/leaveRecord/list', {
178 178 params: params
179   -})
180   -
181   -// 请假详情
  179 +})
  180 +
  181 +// 请假详情
182 182 export const getleaveRecorddetailApi = (id,params) => http.get('/internship/v1/leaveRecord/detail/'+id, {
183 183 params: params
184   -})
185   -
186   -// 请假审批
187   -export const putleaveRecorddetailApi = (id,params) => http.put(`/internship/v1/leaveRecord/${id}/approve`, params)
188   -
189   -// 变更列表
  184 +})
  185 +
  186 +// 请假审批
  187 +export const putleaveRecorddetailApi = (id,params) => http.put(`/internship/v1/leaveRecord/${id}/approve`, params)
  188 +
  189 +// 变更列表
190 190 export const getformChangeApplyListApi = (params) => http.get('/internship/v1/formChangeApply/list', {
191 191 params: params
192   -})
193   -
194   -// 变更详情
  192 +})
  193 +
  194 +// 变更详情
195 195 export const formChangeApplydetailUrl = (id,params) => http.get('/internship/v1/formChangeApply/detail/'+id, {
196 196 params: params
197   -})
198   -
199   -// 变更审批
200   -export const putformChangeApplyapprovalUrl = (id,params) => http.put('/internship/v1/formChangeApply/approval/'+id,params)
201   -
202   -// 鉴定详情1
203   -export const scoredetailUrl = (id,params) => http.get('/internship/v1/score/detail/'+id,params)
204   -
205   -// 成绩鉴定---实习信息
  197 +})
  198 +
  199 +// 变更审批
  200 +export const putformChangeApplyapprovalUrl = (id,params) => http.put('/internship/v1/formChangeApply/approval/'+id,params)
  201 +
  202 +// 鉴定详情1
  203 +export const scoredetailUrl = (id,params) => http.get('/internship/v1/score/detail/'+id,params)
  204 +
  205 +// 成绩鉴定---实习信息
206 206 export const scoreinternshipInfoUrl = (params) => http.get('/internship/v1/score/internshipInfo',{
207 207 params: params
208   -})
209   -
  208 +})
  209 +
210 210 // 鉴定成绩鉴定
211   -export const putscoreappraisalApi = (params) => http.put('/internship/v1/score/appraisal', params)
212   -
  211 +export const putscoreappraisalApi = (params) => http.put('/internship/v1/score/appraisal', params)
  212 +
213 213 // 实习生详情-实习课程-实习信息
214 214 export const getforminternshipInfoApi = (params) => http.get('/internship/v1/form/internshipInfo', {
215 215 params: params
216   -})
217   -
  216 +})
  217 +
218 218 // 实习申请-列表
219 219 export const getformApplyschoollistApi = (params) => http.get('/internship/v1/formApply/school/list', {
220 220 params: params
221   -})
222   -
  221 +})
  222 +
223 223 // 实习申请-详情
224 224 export const getformApplyschooldetailApi = (id,params) => http.get('/internship/v1/formApply/'+id, {
225 225 params: params
226   -})
227   -
  226 +})
  227 +
228 228 // 实习申请-审核
229   -export const putformApplyApi = (id,params) => http.put('/internship/v1/formApply/audit/'+id, params)
230   -
231   -// 公告
  229 +export const putformApplyApi = (id,params) => http.put('/internship/v1/formApply/audit/'+id, params)
  230 +
  231 +// 公告
232 232 export const msginfoUrl = (params) => http.get('/basic/v1/student/msg/info', {
233 233 params: params
234   -})
235   -
236   -// 公告列表
  234 +})
  235 +
  236 +// 公告列表
237 237 export const msglistUrl = (params) => http.get('/basic/v1/student/msg/list', {
238 238 params: params
239   -})
240   -
241   -// 公告详情
  239 +})
  240 +
  241 +// 公告详情
242 242 export const msgdetailUrl = (id,params) => http.get('/basic/v1/student/msg/detail/'+id, params)
\ No newline at end of file
... ...
... ... @@ -5,13 +5,13 @@ module.exports = (vm) => {
5 5 /* config 为默认全局配置*/
6 6
7 7 // 测试环境
8   - // config.baseURL = "http://47.110.250.177:8000";
  8 + config.baseURL = "http://47.110.250.177:8000";
9 9
10 10 // 预生产环境
11 11 // config.baseURL = "https://api-isxpre.workai.com.cn";
12 12
13 13 // 线上环境
14   - config.baseURL = "https://api-isx.workai.com.cn";
  14 + // config.baseURL = "https://api-isx.workai.com.cn";
15 15
16 16 config.header = {
17 17 // 'content-type': 'xxx'
... ...
... ... @@ -35,7 +35,7 @@
35 35 NO.{{item.form.studentIDNumber}}
36 36 </view>
37 37 <view class="t2 t2top14">
38   - 实习项目: {{item.form.projectName?item.form.projectName:'--'}}
  38 + 实习计划: {{item.form.planName?item.form.planName:'--'}}
39 39 </view>
40 40 <view class="t2">
41 41 指导老师: {{item.form.teacherName?item.form.teacherName:'--'}}
... ... @@ -63,12 +63,12 @@
63 63 <view class="popup">
64 64 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
65 65 <view class="title">
66   - 项目筛选
  66 + 计划筛选
67 67 </view>
68 68 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
69 69 </view>
70 70 <view class="search">
71   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  71 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
72 72 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()"
73 73 @search="workSearch()">
74 74 </u-search>
... ... @@ -80,14 +80,14 @@
80 80 <view class="item_title">
81 81 {{item.name}}
82 82 </view>
83   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
  83 + <image v-if="item.id == planId" style="width: 20px; height: 20px;"
84 84 :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
85 85 </view>
86 86 </view>
87 87 </scroll-view>
88 88 <view v-else class="no_data" @click="jumpVerified">
89 89 <view class="text_black_28">
90   - 暂未搜索到该项目
  90 + 暂未搜索到该计划
91 91 </view>
92 92 </view>
93 93 </view>
... ... @@ -106,7 +106,7 @@
106 106
107 107 import {
108 108 getAchievementAppraisalListApi,
109   - getProjectListApi,
  109 + getPlanListApi,
110 110 } from '@/config/api.js';
111 111
112 112 export default {
... ... @@ -128,7 +128,7 @@
128 128 status: '',
129 129
130 130 },
131   - projectId: '',
  131 + planId: '',
132 132 switchValue: false,
133 133 curNow: 1,
134 134 sxsearch: '',
... ... @@ -241,8 +241,8 @@
241 241 params.keySearch = this.keyword
242 242 }
243 243
244   - if (this.projectId) {
245   - params.projectId = this.projectId
  244 + if (this.planId) {
  245 + params.planId = this.planId
246 246 }
247 247
248 248 return await getAchievementAppraisalListApi(params);
... ... @@ -308,7 +308,7 @@
308 308 if (this.sxsearch) {
309 309 params['keyWord'] = this.sxsearch
310 310 }
311   - getProjectListApi(params).then(async res => {
  311 + getPlanListApi(params).then(async res => {
312 312 if (res) {
313 313 this.total = res.total
314 314 // this.loading = 'loadmore'
... ... @@ -318,7 +318,7 @@
318 318 },
319 319 popupSelItem(item) {
320 320 this.show = false
321   - this.projectId = item.id;
  321 + this.planId = item.id;
322 322 this.finished = false;
323 323 this.loading = "loadmore";
324 324 this.page = 0;
... ...
... ... @@ -11,8 +11,8 @@
11 11 <text>{{detail.number || '--'}}</text>
12 12 </view>
13 13 <view class="company">
14   - <text>实习项目</text>
15   - <text>{{detail.projectName|| '--'}}</text>
  14 + <text>实习计划</text>
  15 + <text>{{detail.planName|| '--'}}</text>
16 16 </view>
17 17 </view>
18 18
... ... @@ -230,17 +230,17 @@
230 230
231 231 handelRecord(type) {
232 232
233   - switch (type) {
234   -
235   - case 'signin':
236   - this.$u.route({
237   - url: `pages/main/internship/signInList/signInList?studentId=${this.detail.studentId}&projectId=${this.detail.projectId}`
238   - })
239   - break;
  233 + switch (type) {
  234 +
  235 + case 'signin':
  236 + this.$u.route({
  237 + url: `pages/main/internship/signInList/signInList?studentId=${this.detail.studentId}&planId=${this.detail.planId}`
  238 + })
  239 + break;
240 240
241   - case 'aggrent':
242   - this.$u.route({
243   - url: `pages/main/internship/agreementDetail/agreementDetail?&id=${this.detail.treatyId ? this.detail.treatyId : ''}`
  241 + case 'aggrent':
  242 + this.$u.route({
  243 + url: `pages/main/internship/agreementDetail/agreementDetail?&id=${this.detail.treatyId ? this.detail.treatyId : ''}`
244 244 })
245 245 break;
246 246
... ... @@ -297,10 +297,10 @@
297 297 }]
298 298 }).then(data => {
299 299 if (data) {
300   - this.showModal = false;
301   -
302   - uni.navigateBack({
303   - delta: 1
  300 + this.showModal = false;
  301 +
  302 + uni.navigateBack({
  303 + delta: 1
304 304 });
305 305 }
306 306 })
... ... @@ -377,7 +377,7 @@
377 377 margin: 0 0 24rpx 0;
378 378 display: flex;
379 379 // flex-flow: row nowrap;
380   - justify-content: space-between;
  380 + justify-content: space-between;
381 381 align-items: center;
382 382
383 383 text {
... ... @@ -518,4 +518,4 @@
518 518
519 519 }
520 520 }
521   -</style>
  521 +</style>
... ...
... ... @@ -10,7 +10,7 @@
10 10 </view>
11 11 </view>
12 12 <view class="t2 t2top14">
13   - 实习项目: {{detailObj.form.projectName?detailObj.form.projectName:'--'}}
  13 + 实习计划: {{detailObj.form.planName?detailObj.form.planName:'--'}}
14 14 </view>
15 15 <view class="t2">
16 16 指导老师: {{detailObj.form.teacherName?detailObj.form.teacherName:'--'}}
... ... @@ -55,9 +55,6 @@
55 55 <view class="list_right_item" style="margin: 10px 0;">
56 56 实习计划：{{detailObj.form.planName}}
57 57 </view>
58   - <view class="list_right_item">
59   - 实习项目：{{detailObj.form.projectName}}
60   - </view>
61 58 </view>
62 59 </view>
63 60 <view class="inter-end">
... ...
... ... @@ -5,7 +5,7 @@
5 5 {{detailObj.studentName}}提交的请假申请
6 6 </view>
7 7 <view class="t1">
8   - {{detailObj.projectName}}
  8 + {{detailObj.planName}}
9 9 </view>
10 10 <view class="t2">
11 11 {{detailObj.courseName}}
... ...
... ... @@ -31,7 +31,7 @@
31 31 {{item.studentName}}提交的请假申请
32 32 </view>
33 33 <view class="t3">
34   - {{item.projectName}}
  34 + {{item.planName}}
35 35 </view>
36 36 <view class="t2 t2top14">
37 37 请假类型: {{getCategoryList(item.category)}}
... ... @@ -65,12 +65,12 @@
65 65 <view class="popup">
66 66 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
67 67 <view class="title">
68   - 项目筛选
  68 + 计划筛选
69 69 </view>
70 70 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
71 71 </view>
72 72 <view class="search">
73   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  73 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
74 74 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
75 75 </u-search>
76 76 </view>
... ... @@ -81,13 +81,13 @@
81 81 <view class="item_title">
82 82 {{item.name}}
83 83 </view>
84   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  84 + <image v-if="item.id == planId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
85 85 </view>
86 86 </view>
87 87 </scroll-view>
88 88 <view v-else class="no_data" @click="jumpVerified">
89 89 <view class="text_black_28">
90   - 暂未搜索到该项目
  90 + 暂未搜索到该计划
91 91 </view>
92 92 </view>
93 93 </view>
... ... @@ -96,10 +96,10 @@
96 96 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
97 97 <view class="popup_search">
98 98 <view class="content">
99   - <view class="title">按项目筛选</view>
  99 + <view class="title">按计划筛选</view>
100 100 <scroll-view class="scroll" scroll-y="true">
101 101 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
102   - <view class="selectItem" v-if="item.id == projectId">
  102 + <view class="selectItem" v-if="item.id == planId">
103 103 <text>{{item.name}}</text>
104 104 </view>
105 105 <view v-else>
... ... @@ -141,7 +141,7 @@
141 141
142 142 import {
143 143 getleaveRecordlistListApi,
144   - getProjectListApi,
  144 + getPlanListApi,
145 145 } from '@/config/api.js';
146 146
147 147 export default {
... ... @@ -163,7 +163,7 @@
163 163 status: '',
164 164
165 165 },
166   - projectId: '',
  166 + planId: '',
167 167 switchValue: false,
168 168 categoryList: [{
169 169 label: '事假',
... ... @@ -313,8 +313,8 @@
313 313 params.keySearch = this.keyword
314 314 }
315 315
316   - if (this.projectId) {
317   - params.projectId = this.projectId
  316 + if (this.planId) {
  317 + params.planId = this.planId
318 318 }
319 319
320 320 return await getleaveRecordlistListApi(params);
... ... @@ -353,7 +353,7 @@
353 353
354 354 handelClick(values) {
355 355 console.log(values);
356   - this.projectId = values.id;
  356 + this.planId = values.id;
357 357 },
358 358
359 359 handelChange(e) {
... ... @@ -365,7 +365,7 @@
365 365
366 366 handelCancel() {
367 367 this.switchValue = false;
368   - this.projectId = '';
  368 + this.planId = '';
369 369 },
370 370
371 371 hancelSubmit() {
... ... @@ -407,7 +407,7 @@
407 407 if (this.sxsearch) {
408 408 params['keyWord'] = this.sxsearch
409 409 }
410   - getProjectListApi(params).then(async res => {
  410 + getPlanListApi(params).then(async res => {
411 411 if (res) {
412 412 this.total = res.total
413 413 // this.loading = 'loadmore'
... ... @@ -417,7 +417,7 @@
417 417 },
418 418 popupSelItem(item) {
419 419 this.show = false
420   - this.projectId = item.id;
  420 + this.planId = item.id;
421 421 this.finished = false;
422 422 this.loading = "loadmore";
423 423 this.page = 0;
... ...
... ... @@ -115,7 +115,7 @@
115 115 附件
116 116 </view>
117 117 </view>
118   - <view class="pdffj" v-for="(item,index) in fileList " @click="openLink(item)">
  118 + <view class="pdffj" v-for="(item,index) in fileList " @click="openLink(item)" :key="index">
119 119 <image class="img" src="/static/img/home/link.png"></image>
120 120 <text class="look">{{item.filename}}</text>
121 121 <!-- <text class="look">{{item.filename}}</text> -->
... ... @@ -226,7 +226,7 @@
226 226 if (res) {
227 227 this.detailObj = res;
228 228
229   - this.title = res.form.projectName
  229 + this.title = res.form.planName
230 230 this.desc = res.form.courseName
231 231
232 232 if (res.auditStatus == "wait") {
... ...
... ... @@ -32,7 +32,7 @@
32 32 {{item.studentName}}提交的实习变更申请
33 33 </view>
34 34 <view class="t3">
35   - {{item.projectName}}
  35 + {{item.planName}}
36 36 </view>
37 37 <view class="t2 t2top14">
38 38 变更类型: {{item.changeType=="internal_transfer"?'内部转岗':'其他企业岗位'}}
... ... @@ -76,12 +76,12 @@
76 76 <view class="popup">
77 77 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
78 78 <view class="title">
79   - 项目筛选
  79 + 计划筛选
80 80 </view>
81 81 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
82 82 </view>
83 83 <view class="search">
84   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  84 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
85 85 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
86 86 </u-search>
87 87 </view>
... ... @@ -92,14 +92,14 @@
92 92 <view class="item_title">
93 93 {{item.name}}
94 94 </view>
95   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
  95 + <image v-if="item.id == planId" style="width: 20px; height: 20px;"
96 96 :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
97 97 </view>
98 98 </view>
99 99 </scroll-view>
100 100 <view v-else class="no_data" @click="jumpVerified">
101 101 <view class="text_black_28">
102   - 暂未搜索到该项目
  102 + 暂未搜索到该计划
103 103 </view>
104 104 </view>
105 105 </view>
... ... @@ -108,10 +108,10 @@
108 108 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
109 109 <view class="popup_search">
110 110 <view class="content">
111   - <view class="title">按项目筛选</view>
  111 + <view class="title">按计划筛选</view>
112 112 <scroll-view class="scroll" scroll-y="true">
113 113 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
114   - <view class="selectItem" v-if="item.id == projectId">
  114 + <view class="selectItem" v-if="item.id == planId">
115 115 <text>{{item.name}}</text>
116 116 </view>
117 117 <view v-else>
... ... @@ -153,7 +153,7 @@
153 153
154 154 import {
155 155 getformChangeApplyListApi,
156   - getProjectListApi,
  156 + getPlanListApi,
157 157 } from '@/config/api.js';
158 158
159 159 export default {
... ... @@ -175,7 +175,7 @@
175 175 status: '',
176 176
177 177 },
178   - projectId: '',
  178 + planId: '',
179 179 switchValue: false,
180 180 categoryList: [{
181 181 label: '事假',
... ... @@ -334,8 +334,8 @@
334 334 params.keySearch = this.keyword
335 335 }
336 336
337   - if (this.projectId) {
338   - params.projectId = this.projectId
  337 + if (this.planId) {
  338 + params.planId = this.planId
339 339 }
340 340
341 341 return await getformChangeApplyListApi(params);
... ... @@ -374,7 +374,7 @@
374 374
375 375 handelClick(values) {
376 376 console.log(values);
377   - this.projectId = values.id;
  377 + this.planId = values.id;
378 378 },
379 379
380 380 handelChange(e) {
... ... @@ -386,7 +386,7 @@
386 386
387 387 handelCancel() {
388 388 this.switchValue = false;
389   - this.projectId = '';
  389 + this.planId = '';
390 390 },
391 391
392 392 hancelSubmit() {
... ... @@ -428,7 +428,7 @@
428 428 if (this.sxsearch) {
429 429 params['keyWord'] = this.sxsearch
430 430 }
431   - getProjectListApi(params).then(async res => {
  431 + getPlanListApi(params).then(async res => {
432 432 if (res) {
433 433 this.total = res.total
434 434 // this.loading = 'loadmore'
... ... @@ -438,7 +438,7 @@
438 438 },
439 439 popupSelItem(item) {
440 440 this.show = false
441   - this.projectId = item.id;
  441 + this.planId = item.id;
442 442 this.finished = false;
443 443 this.loading = "loadmore";
444 444 this.page = 0;
... ...
... ... @@ -31,7 +31,7 @@
31 31 {{item.studentName}}提交的实习申请
32 32 </view>
33 33 <view class="t3">
34   - {{item.projectName}}
  34 + {{item.planName}}
35 35 </view>
36 36 <view class="t2 t2top14">
37 37 申请类型: {{getCategoryList(item.type)}}
... ... @@ -65,12 +65,12 @@
65 65 <view class="popup">
66 66 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
67 67 <view class="title">
68   - 项目筛选
  68 + 计划筛选
69 69 </view>
70 70 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
71 71 </view>
72 72 <view class="search">
73   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  73 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
74 74 bgColor="#F4F4F4" :showAction="true" :clearabled="false" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()" @clear="workSearch()">
75 75 </u-search>
76 76 </view>
... ... @@ -81,13 +81,13 @@
81 81 <view class="item_title">
82 82 {{item.name}}
83 83 </view>
84   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  84 + <image v-if="item.id == planId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
85 85 </view>
86 86 </view>
87 87 </scroll-view>
88 88 <view v-else class="no_data" @click="jumpVerified">
89 89 <view class="text_black_28">
90   - 暂未搜索到该项目
  90 + 暂未搜索到该计划
91 91 </view>
92 92 </view>
93 93 </view>
... ... @@ -96,10 +96,10 @@
96 96 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
97 97 <view class="popup_search">
98 98 <view class="content">
99   - <view class="title">按项目筛选</view>
  99 + <view class="title">按计划筛选</view>
100 100 <scroll-view class="scroll" scroll-y="true">
101 101 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
102   - <view class="selectItem" v-if="item.id == projectId">
  102 + <view class="selectItem" v-if="item.id == planId">
103 103 <text>{{item.name}}</text>
104 104 </view>
105 105 <view v-else>
... ... @@ -141,7 +141,7 @@
141 141
142 142 import {
143 143 getformApplyschoollistApi,
144   - getProjectListApi,
  144 + getPlanListApi,
145 145 } from '@/config/api.js';
146 146
147 147 export default {
... ... @@ -163,7 +163,7 @@
163 163 status: '',
164 164
165 165 },
166   - projectId: '',
  166 + planId: '',
167 167 switchValue: false,
168 168 categoryList: [{
169 169 label: '开始实习申请',
... ... @@ -305,8 +305,8 @@
305 305 params.keySearch = this.keyword
306 306 }
307 307
308   - if (this.projectId) {
309   - params.projectId = this.projectId
  308 + if (this.planId) {
  309 + params.planId = this.planId
310 310 }
311 311
312 312 return await getformApplyschoollistApi(params);
... ... @@ -345,7 +345,7 @@
345 345
346 346 handelClick(values) {
347 347 console.log(values);
348   - this.projectId = values.id;
  348 + this.planId = values.id;
349 349 },
350 350
351 351 handelChange(e) {
... ... @@ -357,7 +357,7 @@
357 357
358 358 handelCancel() {
359 359 this.switchValue = false;
360   - this.projectId = '';
  360 + this.planId = '';
361 361 },
362 362
363 363 hancelSubmit() {
... ... @@ -399,7 +399,7 @@
399 399 if (this.sxsearch) {
400 400 params['keyWord'] = this.sxsearch
401 401 }
402   - getProjectListApi(params).then(async res => {
  402 + getPlanListApi(params).then(async res => {
403 403 if (res) {
404 404 this.total = res.total
405 405 // this.loading = 'loadmore'
... ... @@ -409,7 +409,7 @@
409 409 },
410 410 popupSelItem(item) {
411 411 this.show = false
412   - this.projectId = item.id;
  412 + this.planId = item.id;
413 413 this.finished = false;
414 414 this.loading = "loadmore";
415 415 this.page = 0;
... ...
... ... @@ -5,7 +5,7 @@
5 5 {{detailObj.studentName}}提交的实习申请
6 6 </view>
7 7 <view class="t1">
8   - {{detailObj.projectName}}
  8 + {{detailObj.planName}}
9 9 </view>
10 10 <!-- <view class="t2">
11 11 {{detailObj.courseName}}
... ...
... ... @@ -79,12 +79,12 @@
79 79 <view class="popup">
80 80 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
81 81 <view class="title">
82   - 项目筛选
  82 + 计划筛选
83 83 </view>
84 84 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
85 85 </view>
86 86 <view class="search">
87   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  87 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
88 88 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
89 89 </u-search>
90 90 </view>
... ... @@ -95,13 +95,13 @@
95 95 <view class="item_title">
96 96 {{item.name}}
97 97 </view>
98   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  98 + <image v-if="item.id == planId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
99 99 </view>
100 100 </view>
101 101 </scroll-view>
102 102 <view v-else class="no_data" @click="jumpVerified">
103 103 <view class="text_black_28">
104   - 暂未搜索到该项目
  104 + 暂未搜索到该计划
105 105 </view>
106 106 </view>
107 107 </view>
... ... @@ -110,10 +110,10 @@
110 110 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
111 111 <view class="popup_search">
112 112 <view class="content">
113   - <view class="title">按项目筛选</view>
  113 + <view class="title">按计划筛选</view>
114 114 <scroll-view class="scroll" scroll-y="true">
115 115 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
116   - <view class="selectItem" v-if="item.id == projectId">
  116 + <view class="selectItem" v-if="item.id == planId">
117 117 <text>{{item.name}}</text>
118 118 </view>
119 119 <view v-else>
... ... @@ -153,7 +153,7 @@
153 153
154 154 import {
155 155 getLogReviewListApi,
156   - getProjectListApi,
  156 + getPlanListApi,
157 157 } from '@/config/api.js';
158 158
159 159 export default {
... ... @@ -186,7 +186,7 @@
186 186
187 187 list: [], //列表必须为key list的数组
188 188
189   - projectId: '',
  189 + planId: '',
190 190 showTime: false,
191 191 timeValue: '',
192 192 switchValue: false,
... ... @@ -202,7 +202,7 @@
202 202 onLoad(option) {
203 203 console.log(option)
204 204 this.studentId = option.studentId;
205   - this.projectId = option.projectId;
  205 + this.planId = option.planId;
206 206
207 207 // this.$store.dispatch(`home/getProjectList`, {
208 208 // pageSize: -1,
... ... @@ -403,8 +403,8 @@
403 403 params.studentId = this.studentId
404 404 }
405 405
406   - if (this.projectId) {
407   - params.projectId = this.projectId
  406 + if (this.planId) {
  407 + params.planId = this.planId
408 408 }
409 409
410 410 return await getLogReviewListApi(params);
... ... @@ -442,7 +442,7 @@
442 442 },
443 443
444 444 handelClick(values) {
445   - this.projectId = values.id;
  445 + this.planId = values.id;
446 446 },
447 447
448 448 handelChange(e) {
... ... @@ -453,7 +453,7 @@
453 453
454 454 handelCancel() {
455 455 this.switchValue = false;
456   - this.projectId = '';
  456 + this.planId = '';
457 457 },
458 458
459 459 hancelSubmit() {
... ... @@ -495,7 +495,7 @@
495 495 if (this.sxsearch) {
496 496 params['keyWord'] = this.sxsearch
497 497 }
498   - getProjectListApi(params).then(async res => {
  498 + getPlanListApi(params).then(async res => {
499 499 if (res) {
500 500 this.total = res.total
501 501 // this.loading = 'loadmore'
... ... @@ -505,7 +505,7 @@
505 505 },
506 506 popupSelItem(item) {
507 507 this.show = false
508   - this.projectId = item.id;
  508 + this.planId = item.id;
509 509 this.finished = false;
510 510 this.loading = "loadmore";
511 511 this.page = 0;
... ...
... ... @@ -21,9 +21,9 @@
21 21 </view>
22 22
23 23 <view class="icon_item">
24   - <u-icon size="32rpx" label="实习项目" labelSize="28rpx" labelColor="#909097"
  24 + <u-icon size="32rpx" label="实习计划" labelSize="28rpx" labelColor="#909097"
25 25 :name="vuex_baseImgUrl && `${vuex_baseImgUrl}internshipProgramIcon.png`"></u-icon>
26   - <text>{{registrationDetail.projectName}}</text>
  26 + <text>{{registrationDetail.planName}}</text>
27 27 </view>
28 28
29 29 <view class="border_top item">
... ...
... ... @@ -71,12 +71,12 @@
71 71 <view class="popup">
72 72 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
73 73 <view class="title">
74   - 项目筛选
  74 + 计划筛选
75 75 </view>
76 76 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
77 77 </view>
78 78 <view class="search">
79   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  79 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
80 80 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
81 81 </u-search>
82 82 </view>
... ... @@ -87,13 +87,13 @@
87 87 <view class="item_title">
88 88 {{item.name}}
89 89 </view>
90   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
  90 + <image v-if="item.id == planId" style="width: 20px; height: 20px;" :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
91 91 </view>
92 92 </view>
93 93 </scroll-view>
94 94 <view v-else class="no_data" @click="jumpVerified">
95 95 <view class="text_black_28">
96   - 暂未搜索到该项目
  96 + 暂未搜索到该计划
97 97 </view>
98 98 </view>
99 99 </view>
... ... @@ -102,10 +102,10 @@
102 102 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
103 103 <view class="popup_search">
104 104 <view class="content">
105   - <view class="title">按项目筛选</view>
  105 + <view class="title">按计划筛选</view>
106 106 <scroll-view class="scroll" scroll-y="true">
107 107 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
108   - <view class="selectItem" v-if="item.id == projectId">
  108 + <view class="selectItem" v-if="item.id == planId">
109 109 <text>{{item.name}}</text>
110 110 </view>
111 111 <view v-else>
... ... @@ -147,7 +147,7 @@
147 147
148 148 import {
149 149 getRegistrationReviewApi,
150   - getProjectListApi,
  150 + getPlanListApi,
151 151 } from '@/config/api.js';
152 152
153 153 export default {
... ... @@ -169,7 +169,7 @@
169 169 status: 'wait,pass,reject',
170 170
171 171 },
172   - projectId: '',
  172 + planId: '',
173 173 switchValue: false,
174 174 curNow: 1,
175 175 sxsearch: '',
... ... @@ -306,8 +306,8 @@
306 306 params.keySearch = this.keyword
307 307 }
308 308
309   - if (this.projectId) {
310   - params.projectId = this.projectId
  309 + if (this.planId) {
  310 + params.planId = this.planId
311 311 }
312 312
313 313 return await getRegistrationReviewApi(params);
... ... @@ -346,7 +346,7 @@
346 346
347 347 handelClick(values) {
348 348 console.log(values);
349   - this.projectId = values.id;
  349 + this.planId = values.id;
350 350 },
351 351
352 352 handelChange(e) {
... ... @@ -358,7 +358,7 @@
358 358
359 359 handelCancel() {
360 360 this.switchValue = false;
361   - this.projectId = '';
  361 + this.planId = '';
362 362 },
363 363
364 364 hancelSubmit() {
... ... @@ -400,7 +400,7 @@
400 400 if (this.sxsearch) {
401 401 params['keyWord'] = this.sxsearch
402 402 }
403   - getProjectListApi(params).then(async res => {
  403 + getPlanListApi(params).then(async res => {
404 404 if (res) {
405 405 this.total = res.total
406 406 // this.loading = 'loadmore'
... ... @@ -410,7 +410,7 @@
410 410 },
411 411 popupSelItem(item) {
412 412 this.show = false
413   - this.projectId = item.id;
  413 + this.planId = item.id;
414 414 this.finished = false;
415 415 this.loading = "loadmore";
416 416 this.page = 0;
... ...
... ... @@ -70,12 +70,12 @@
70 70 <view class="popup">
71 71 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
72 72 <view class="title">
73   - 项目筛选
  73 + 计划筛选
74 74 </view>
75 75 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
76 76 </view>
77 77 <view class="search">
78   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  78 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
79 79 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
80 80 </u-search>
81 81 </view>
... ... @@ -86,14 +86,14 @@
86 86 <view class="item_title">
87 87 {{item.name}}
88 88 </view>
89   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
  89 + <image v-if="item.id == planId" style="width: 20px; height: 20px;"
90 90 :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
91 91 </view>
92 92 </view>
93 93 </scroll-view>
94 94 <view v-else class="no_data" @click="jumpVerified">
95 95 <view class="text_black_28">
96   - 暂未搜索到该项目
  96 + 暂未搜索到该计划
97 97 </view>
98 98 </view>
99 99 </view>
... ... @@ -102,10 +102,10 @@
102 102 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
103 103 <view class="popup_search">
104 104 <view class="content">
105   - <view class="title">按项目筛选</view>
  105 + <view class="title">按计划筛选</view>
106 106 <scroll-view class="scroll" scroll-y="true">
107 107 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
108   - <view class="selectItem" v-if="item.id == projectId">
  108 + <view class="selectItem" v-if="item.id == planId">
109 109 <text>{{item.name}}</text>
110 110 </view>
111 111 <view v-else>
... ... @@ -147,7 +147,7 @@
147 147
148 148 import {
149 149 getReportReviewListApi,
150   - getProjectListApi,
  150 + getPlanListApi,
151 151 } from '@/config/api.js';
152 152
153 153 export default {
... ... @@ -180,7 +180,7 @@
180 180 timeValue: `${year}-${month}-${date}`,
181 181 defaultDateMultiple: [`${year}-${month}-${date}`],
182 182 list: [], //列表必须为key list的数组
183   - projectId: '',
  183 + planId: '',
184 184 switchValue: false,
185 185 curNow: 1,
186 186 sxsearch: '',
... ... @@ -193,7 +193,7 @@
193 193 onLoad(option) {
194 194 console.log(option)
195 195 this.studentId = option.studentId;
196   - this.projectId = option.projectId;
  196 + this.planId = option.planId;
197 197
198 198 // this.$store.dispatch(`home/getProjectList`, {
199 199 // pageSize: -1,
... ... @@ -342,8 +342,8 @@
342 342 params.studentId = this.studentId
343 343 }
344 344
345   - if (this.projectId) {
346   - params.projectId = this.projectId
  345 + if (this.planId) {
  346 + params.planId = this.planId
347 347 }
348 348
349 349 return await getReportReviewListApi(params);
... ... @@ -382,7 +382,7 @@
382 382
383 383 handelClick(values) {
384 384 console.log(values);
385   - this.projectId = values.id;
  385 + this.planId = values.id;
386 386 },
387 387
388 388 handelChange(e) {
... ... @@ -394,7 +394,7 @@
394 394
395 395 handelCancel() {
396 396 this.switchValue = false;
397   - this.projectId = '';
  397 + this.planId = '';
398 398 },
399 399
400 400 hancelSubmit() {
... ... @@ -436,7 +436,7 @@
436 436 if (this.sxsearch) {
437 437 params['keyWord'] = this.sxsearch
438 438 }
439   - getProjectListApi(params).then(async res => {
  439 + getPlanListApi(params).then(async res => {
440 440 if (res) {
441 441 this.total = res.total
442 442 // this.loading = 'loadmore'
... ... @@ -446,7 +446,7 @@
446 446 },
447 447 popupSelItem(item) {
448 448 this.show = false
449   - this.projectId = item.id;
  449 + this.planId = item.id;
450 450 this.finished = false;
451 451 this.loading = "loadmore";
452 452 this.page = 0;
... ...
... ... @@ -38,8 +38,8 @@
38 38 <view class="number">{{item.studentNumber}}</view>
39 39 </view>
40 40 <view class="company">
41   - <text>实习项目</text>
42   - <text>{{item.projectName || '--'}}</text>
  41 + <text>实习计划</text>
  42 + <text>{{item.planName || '--'}}</text>
43 43 </view>
44 44 <view class="company">
45 45 <text>班级</text>
... ... @@ -66,12 +66,12 @@
66 66 <view class="popup">
67 67 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
68 68 <view class="title">
69   - 项目筛选
  69 + 计划筛选
70 70 </view>
71 71 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
72 72 </view>
73 73 <view class="search">
74   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  74 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
75 75 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
76 76 </u-search>
77 77 </view>
... ... @@ -82,14 +82,14 @@
82 82 <view class="item_title">
83 83 {{item.name}}
84 84 </view>
85   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
  85 + <image v-if="item.id == planId" style="width: 20px; height: 20px;"
86 86 :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
87 87 </view>
88 88 </view>
89 89 </scroll-view>
90 90 <view v-else class="no_data" @click="jumpVerified">
91 91 <view class="text_black_28">
92   - 暂未搜索到该项目
  92 + 暂未搜索到该计划
93 93 </view>
94 94 </view>
95 95 </view>
... ... @@ -98,10 +98,10 @@
98 98 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
99 99 <view class="popup_search">
100 100 <view class="content">
101   - <view class="title">按项目筛选</view>
  101 + <view class="title">按计划筛选</view>
102 102 <scroll-view class="scroll" scroll-y="true">
103 103 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
104   - <view class="selectItem" v-if="item.id == projectId">
  104 + <view class="selectItem" v-if="item.id == planId">
105 105 <text>{{item.name}}</text>
106 106 </view>
107 107 <view v-else>
... ... @@ -144,7 +144,7 @@
144 144
145 145 import {
146 146 getStudentSignInListApi,
147   - getProjectListApi,
  147 + getPlanListApi,
148 148 } from '@/config/api.js';
149 149
150 150 export default {
... ... @@ -179,7 +179,7 @@
179 179 timeValue: `${year}-${month}-${date}`,
180 180 defaultDateMultiple: [`${year}-${month}-${date}`],
181 181 list: [], //列表必须为key list的数组
182   - projectId: '',
  182 + planId: '',
183 183 switchValue: false,
184 184
185 185 curNow: 1,
... ... @@ -345,8 +345,8 @@
345 345 params.keySearch = this.keyword
346 346 }
347 347
348   - if (this.projectId) {
349   - params.projectId = this.projectId
  348 + if (this.planId) {
  349 + params.planId = this.planId
350 350 }
351 351
352 352 if (this.time) {
... ... @@ -389,7 +389,7 @@
389 389
390 390 handelClick(values) {
391 391 console.log(values);
392   - this.projectId = values.id;
  392 + this.planId = values.id;
393 393 },
394 394
395 395 handelChange(e) {
... ... @@ -400,7 +400,7 @@
400 400
401 401 handelCancel() {
402 402 this.switchValue = false;
403   - this.projectId = '';
  403 + this.planId = '';
404 404 },
405 405
406 406 hancelSubmit() {
... ... @@ -442,7 +442,7 @@
442 442 if (this.sxsearch) {
443 443 params['keyWord'] = this.sxsearch
444 444 }
445   - getProjectListApi(params).then(async res => {
  445 + getPlanListApi(params).then(async res => {
446 446 if (res) {
447 447 this.total = res.total
448 448 // this.loading = 'loadmore'
... ... @@ -452,7 +452,7 @@
452 452 },
453 453 popupSelItem(item) {
454 454 this.show = false
455   - this.projectId = item.id;
  455 + this.planId = item.id;
456 456 this.finished = false;
457 457 this.loading = "loadmore";
458 458 this.page = 0;
... ...
1 1 <template>
2 2 <view class="agreemen_detail" :style="vuex_theme">
3   -
4   - <view v-if="id">
5   - <view class="box">
6   - <view class="title">{{detail.title}}</view>
7   - <view class="item">
8   - <text>创建时间</text>
9   - <text>{{timeFormat(detail.createdTime)}}</text>
10   - </view>
11   - </view>
12   -
13   - <view class="list_box">
14   - <view class="item">
15   - <view class="company">
16   - <text>实习单号</text>
17   - <text @click="handelDetail" :style="{color:'var(--primary-color)'}">{{detail.formNumber || '--'}}</text>
18   - </view>
19   - <view class="company">
20   - <text>学生姓名</text>
21   - <text>{{detail.studentName|| '--'}}</text>
22   - </view>
23   - <view class="company">
24   - <text>课程名称</text>
25   - <text>{{detail.courseName|| '--'}}</text>
26   - </view>
27   - <view class="company">
28   - <text>项目名称</text>
29   - <text>{{detail.projectName|| '--'}}</text>
30   - </view>
31   - <view class="company">
32   - <text>三方协议</text>
33   - <view class="item_box">
34   - <text :style="{color:'var(--primary-color)'}" v-for="(item,index) in attachments" :key="index"
35   - @click="openLink(item)">{{item.filename}}</text>
36   - </view>
37   -
38   - </view>
39   -
40   - </view>
41   - </view>
42   - </view>
43   -
44   - <view v-else class="no_data">
45   - <c-no-data></c-no-data>
  3 +
  4 + <view v-if="id">
  5 + <view class="box">
  6 + <view class="title">{{detail.title}}</view>
  7 + <view class="item">
  8 + <text>创建时间</text>
  9 + <text>{{timeFormat(detail.createdTime)}}</text>
  10 + </view>
  11 + </view>
  12 +
  13 + <view class="list_box">
  14 + <view class="item">
  15 + <view class="company">
  16 + <text>实习单号</text>
  17 + <text @click="handelDetail" :style="{color:'var(--primary-color)'}">{{detail.formNumber || '--'}}</text>
  18 + </view>
  19 + <view class="company">
  20 + <text>学生姓名</text>
  21 + <text>{{detail.studentName|| '--'}}</text>
  22 + </view>
  23 + <view class="company">
  24 + <text>课程名称</text>
  25 + <text>{{detail.courseName|| '--'}}</text>
  26 + </view>
  27 + <view class="company">
  28 + <text>计划名称</text>
  29 + <text>{{detail.planName|| '--'}}</text>
  30 + </view>
  31 + <view class="company">
  32 + <text>三方协议</text>
  33 + <view class="item_box">
  34 + <text :style="{color:'var(--primary-color)'}" v-for="(item,index) in attachments" :key="index"
  35 + @click="openLink(item)">{{item.filename}}</text>
  36 + </view>
  37 +
  38 + </view>
  39 +
  40 + </view>
  41 + </view>
  42 + </view>
  43 +
  44 + <view v-else class="no_data">
  45 + <c-no-data></c-no-data>
46 46 </view>
47 47
48 48 </view>
... ... @@ -56,7 +56,7 @@
56 56 } from 'vuex'
57 57 import listMixin from "@/common/mixins/list-mixin.js";
58 58
59   - import {
  59 + import {
60 60 getImgUrlApi,
61 61 getAgreementDetailApi,
62 62 } from '@/config/api.js';
... ... @@ -70,11 +70,11 @@
70 70 }
71 71 },
72 72
73   - onLoad(option) {
74   -
75   - this.id = option.id;
76   -
77   - if(!option.id) {
  73 + onLoad(option) {
  74 +
  75 + this.id = option.id;
  76 +
  77 + if(!option.id) {
78 78 return;
79 79 }
80 80
... ... @@ -89,63 +89,63 @@
89 89 methods: {
90 90 timeFormat(timestamp, format = 'yyyy-mm-dd') {
91 91 return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
92   - },
93   -
94   - handelDetail(record) {
95   - this.$u.route({
96   - url: `pages/main/internship/intershipInfo/intershipInfo?id=${this.detail.formId}`
97   - })
98   - },
99   -
100   - openLink(e) {
101   - var _this = this
102   -
103   - uni.showLoading({
104   - title: '努力加载中~',
105   - mask: true
106   - })
107   -
108   - getImgUrlApi({
109   - bucket: e.bucket,
110   - filePath: e.object
111   - }).then(data => {
112   - console.log("data...", data)
113   - if (e.mime_type.indexOf("image") != -1) {
114   - _this.openImage(data.url)
115   - } else {
116   - uni.downloadFile({
117   - url: data.url,
118   - success: function(res) {
119   - var filePath = res.tempFilePath;
120   - uni.openDocument({
121   - filePath: filePath,
122   - showMenu: true,
123   - success: function(res) {
124   - console.log('打开文档成功');
125   - },
126   - complete: function() {
127   - uni.hideLoading();
128   - }
129   - });
130   - }
131   - });
132   - }
133   - })
134   - },
135   -
136   - openImage(imgPath) {
137   - let array = new Array(1).fill(imgPath);
138   - uni.previewImage({
139   - urls: array,
140   - success(res) {
141   - uni.hideLoading();
142   - console.log('openImage success');
143   - },
144   - fail(res) {
145   - uni.hideLoading();
146   - console.log('openImage fail:', res);
147   - }
148   - });
  92 + },
  93 +
  94 + handelDetail(record) {
  95 + this.$u.route({
  96 + url: `pages/main/internship/intershipInfo/intershipInfo?id=${this.detail.formId}`
  97 + })
  98 + },
  99 +
  100 + openLink(e) {
  101 + var _this = this
  102 +
  103 + uni.showLoading({
  104 + title: '努力加载中~',
  105 + mask: true
  106 + })
  107 +
  108 + getImgUrlApi({
  109 + bucket: e.bucket,
  110 + filePath: e.object
  111 + }).then(data => {
  112 + console.log("data...", data)
  113 + if (e.mime_type.indexOf("image") != -1) {
  114 + _this.openImage(data.url)
  115 + } else {
  116 + uni.downloadFile({
  117 + url: data.url,
  118 + success: function(res) {
  119 + var filePath = res.tempFilePath;
  120 + uni.openDocument({
  121 + filePath: filePath,
  122 + showMenu: true,
  123 + success: function(res) {
  124 + console.log('打开文档成功');
  125 + },
  126 + complete: function() {
  127 + uni.hideLoading();
  128 + }
  129 + });
  130 + }
  131 + });
  132 + }
  133 + })
  134 + },
  135 +
  136 + openImage(imgPath) {
  137 + let array = new Array(1).fill(imgPath);
  138 + uni.previewImage({
  139 + urls: array,
  140 + success(res) {
  141 + uni.hideLoading();
  142 + console.log('openImage success');
  143 + },
  144 + fail(res) {
  145 + uni.hideLoading();
  146 + console.log('openImage fail:', res);
  147 + }
  148 + });
149 149 },
150 150
151 151 }
... ... @@ -244,15 +244,15 @@
244 244 margin: 0 0 0 30rpx;
245 245 }
246 246
247   - .item_box {
248   - width: 450rpx;
  247 + .item_box {
  248 + width: 450rpx;
249 249 margin: 0 0 0 30rpx;
250 250 text {
251 251 display: inline-block;
252 252 width: 450rpx;
253 253 overflow: hidden;
254 254 white-space: nowrap;
255   - text-overflow: ellipsis;
  255 + text-overflow: ellipsis;
256 256 margin: 0;
257 257
258 258 }
... ... @@ -262,4 +262,4 @@
262 262 }
263 263 }
264 264 }
265   -</style>
  265 +</style>
... ...
... ... @@ -13,10 +13,6 @@
13 13 <text>{{item.planName|| '--'}}</text>
14 14 </view>
15 15 <view class="company">
16   - <text>实习项目</text>
17   - <text>{{item.projectName|| '--'}}</text>
18   - </view>
19   - <view class="company">
20 16 <text>学生名称</text>
21 17 <text>{{item.studentName|| '--'}}</text>
22 18 </view>
... ... @@ -64,7 +60,7 @@
64 60
65 61 onLoad(option) {
66 62 this.studentId = option.studentId;
67   - this.projectId = option.projectId;
  63 + this.planId = option.planId;
68 64
69 65 this.finished = false;
70 66 this.loading = "loadmore";
... ... @@ -115,8 +111,8 @@
115 111 params.studentId = this.studentId
116 112 }
117 113
118   - if (this.projectId) {
119   - params.projectId = this.projectId
  114 + if (this.planId) {
  115 + params.planId = this.planId
120 116 }
121 117
122 118 return await getAgreementListApi(params);
... ...
... ... @@ -59,8 +59,8 @@
59 59 <text v-else class="value_type">--</text>
60 60 </view> -->
61 61 </view>
62   - <!-- 项目信息 -->
63   - <text class="text_title">项目信息</text>
  62 + <!-- 计划信息 -->
  63 + <text class="text_title">计划信息</text>
64 64 <view class="divide_line"></view>
65 65 <view class="content_box">
66 66 <view class="item" :style="{margin:'0rpx'}">
... ... @@ -75,10 +75,6 @@
75 75 <text>实习计划</text>
76 76 <text class="value_type"><text class="value_type">{{interDetail.planName}}</text></text>
77 77 </view>
78   - <view class="item">
79   - <text>实习项目</text>
80   - <text class="value_type">{{interDetail.projectName}}</text></text>
81   - </view>
82 78 <view style="margin-top: 32rpx;">
83 79 <text>实习形式</text>
84 80 <text v-if="projectDetail.practiceForm == 'oneself'" class="value_type">自主</text>
... ...
... ... @@ -57,11 +57,11 @@
57 57
58 58 onLoad(option) {
59 59 this.studentId = option.studentId;
60   - this.projectId = option.projectId;
  60 + this.planId = option.planId;
61 61
62 62 getsignInListApi({
63 63 studentId: option.studentId,
64   - projectId: option.projectId,
  64 + planId: option.planId,
65 65 }).then(data => {
66 66 this.initList = data;
67 67 if (data && data.length > 0) {
... ...
... ... @@ -54,10 +54,10 @@
54 54 <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
55 55 <view class="popup_search">
56 56 <view class="content">
57   - <view class="title">按项目筛选</view>
  57 + <view class="title">按计划筛选</view>
58 58 <scroll-view class="scroll" scroll-y="true">
59 59 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
60   - <view class="selectItem" v-if="item.id == projectId">
  60 + <view class="selectItem" v-if="item.id == planId">
61 61 <text>{{item.name}}</text>
62 62 </view>
63 63 <view v-else>
... ... @@ -97,7 +97,6 @@
97 97
98 98 import {
99 99 getLogReviewListApi,
100   - getProjectListApi,
101 100 } from '@/config/api.js';
102 101
103 102 export default {
... ... @@ -131,7 +130,7 @@
131 130
132 131 list: [], //列表必须为key list的数组
133 132
134   - projectId: '',
  133 + planId: '',
135 134 showTime: false,
136 135 timeValue: '',
137 136 switchValue: false,
... ... @@ -142,7 +141,7 @@
142 141 onLoad(option) {
143 142 console.log(option)
144 143 this.studentId = option.studentId;
145   - this.projectId = option.projectId;
  144 + this.planId = option.planId;
146 145 this.formId = option.formId;
147 146
148 147 this.$store.dispatch(`home/getProjectList`, {
... ... @@ -314,8 +313,8 @@
314 313 params.studentId = this.studentId
315 314 }
316 315
317   - if (this.projectId) {
318   - params.projectId = this.projectId
  316 + if (this.planId) {
  317 + params.planId = this.planId
319 318 }
320 319
321 320 if (this.formId) {
... ... @@ -357,7 +356,7 @@
357 356 },
358 357
359 358 handelClick(values) {
360   - this.projectId = values.id;
  359 + this.planId = values.id;
361 360 },
362 361
363 362 handelChange(e) {
... ... @@ -368,7 +367,7 @@
368 367
369 368 handelCancel() {
370 369 this.switchValue = false;
371   - this.projectId = '';
  370 + this.planId = '';
372 371 },
373 372
374 373 hancelSubmit() {
... ...
... ... @@ -132,8 +132,8 @@
132 132 <view class="projiect_item" v-for="(ele, index) in item.entryDataList" :key="index" @click="projiectSel(ele)">
133 133
134 134 <view class="projiect">
135   - <text>项目名称</text>
136   - <text>{{ele.projectName || '--'}}</text>
  135 + <text>计划名称</text>
  136 + <text>{{ele.planName || '--'}}</text>
137 137 </view>
138 138 <view class="projiect">
139 139 <text>实习时间</text>
... ... @@ -171,12 +171,12 @@
171 171 <view class="popup">
172 172 <view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
173 173 <view class="title">
174   - 项目筛选
  174 + 计划筛选
175 175 </view>
176 176 <image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
177 177 </view>
178 178 <view class="search">
179   - <u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
  179 + <u-search placeholder="请输入计划关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
180 180 bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
181 181 </u-search>
182 182 </view>
... ... @@ -187,14 +187,14 @@
187 187 <view class="item_title">
188 188 {{item.name}}
189 189 </view>
190   - <image v-if="item.id == projectId" style="width: 20px; height: 20px;"
  190 + <image v-if="item.id == planId" style="width: 20px; height: 20px;"
191 191 :src="vuex_baseImgUrl && `${vuex_baseImgUrl}popselect.png`" mode=""></image>
192 192 </view>
193 193 </view>
194 194 </scroll-view>
195 195 <view v-else class="no_data" @click="jumpVerified">
196 196 <view class="text_black_28">
197   - 暂未搜索到该项目
  197 + 暂未搜索到该计划
198 198 </view>
199 199 </view>
200 200 </view>
... ... @@ -203,10 +203,10 @@
203 203 <!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
204 204 <view class="popup_search">
205 205 <view class="content">
206   - <view class="title">按项目筛选</view>
  206 + <view class="title">按计划筛选</view>
207 207 <scroll-view class="scroll" scroll-y="true">
208 208 <view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
209   - <view class="selectItem" v-if="item.id == projectId">
  209 + <view class="selectItem" v-if="item.id == planId">
210 210 <text>{{item.name}}</text>
211 211 </view>
212 212 <view v-else>
... ... @@ -243,7 +243,7 @@
243 243 getInternshipProcessDetailApi,
244 244 getInternshipJobListApi,
245 245 getPracticalCoursesListApi,
246   - getProjectListApi,
  246 + getPlanListApi,
247 247 } from '@/config/api.js';
248 248
249 249 export default {
... ... @@ -260,7 +260,7 @@
260 260 name: '实践课程'
261 261 }],
262 262 show: false,
263   - projectId: '',
  263 + planId: '',
264 264 list: [],
265 265 search: {
266 266 //搜索对象必须为key search的对象
... ... @@ -352,42 +352,42 @@
352 352 switch (type) {
353 353
354 354 case 'signin':
355   - if(!this.projectId) {
356   - this.$u.toast('请先选择实习项目');
  355 + if(!this.planId) {
  356 + this.$u.toast('请先选择实习计划');
357 357 return;
358 358 }
359 359 this.$u.route({
360   - url: `pages/main/internship/signInList/signInList?studentId=${this.detail.studentId}&projectId=${this.projectId}`
  360 + url: `pages/main/internship/signInList/signInList?studentId=${this.detail.studentId}&planId=${this.planId}`
361 361 })
362 362 break;
363 363
364 364 case 'aggrent':
365 365 this.$u.route({
366   - url: `pages/main/internship/agreementList/agreementList?studentId=${this.detail.studentId}&projectId=${this.projectId}`
  366 + url: `pages/main/internship/agreementList/agreementList?studentId=${this.detail.studentId}&planId=${this.planId}`
367 367 })
368 368 break;
369 369
370 370 case 'daily':
371 371 this.$u.route({
372   - url: `pages/main/internship/studentLogReview/studentLogReview?category=daily&studentId=${this.detail.studentId}&projectId=${this.projectId}`
  372 + url: `pages/main/internship/studentLogReview/studentLogReview?category=daily&studentId=${this.detail.studentId}&planId=${this.planId}`
373 373 })
374 374 break;
375 375
376 376 case 'weekly':
377 377 this.$u.route({
378   - url: `pages/main/internship/studentLogReview/studentLogReview?category=weekly&studentId=${this.detail.studentId}&projectId=${this.projectId}`
  378 + url: `pages/main/internship/studentLogReview/studentLogReview?category=weekly&studentId=${this.detail.studentId}&planId=${this.planId}`
379 379 })
380 380 break;
381 381
382 382 case 'monthly':
383 383 this.$u.route({
384   - url: `pages/main/internship/studentLogReview/studentLogReview?category=monthly&studentId=${this.detail.studentId}&projectId=${this.projectId}`
  384 + url: `pages/main/internship/studentLogReview/studentLogReview?category=monthly&studentId=${this.detail.studentId}&planId=${this.planId}`
385 385 })
386 386 break;
387 387
388 388 case 'report':
389 389 this.$u.route({
390   - url: `pages/main/home/reportReview/reportReview?studentId=${this.detail.studentId}&projectId=${this.projectId}`
  390 + url: `pages/main/home/reportReview/reportReview?studentId=${this.detail.studentId}&planId=${this.planId}`
391 391 })
392 392 break;
393 393 }
... ... @@ -403,12 +403,12 @@
403 403 },
404 404
405 405 handelClick(values) {
406   - this.projectId = values.id;
  406 + this.planId = values.id;
407 407 },
408 408
409 409 handelCancel() {
410 410 this.switchValue = false;
411   - this.projectId = '';
  411 + this.planId = '';
412 412 },
413 413
414 414 hancelSubmit() {
... ... @@ -416,7 +416,7 @@
416 416
417 417 getInternshipProcessDetailApi({
418 418 studentId: this.studentId,
419   - projectId: this.projectId,
  419 + planId: this.planId,
420 420 }).then(data => {
421 421 if (data) {
422 422 this.detail = data;
... ... @@ -533,7 +533,7 @@
533 533 if (this.sxsearch) {
534 534 params['keyWord'] = this.sxsearch
535 535 }
536   - getProjectListApi(params).then(async res => {
  536 + getPlanListApi(params).then(async res => {
537 537 if (res) {
538 538 this.total = res.total
539 539 // this.loading = 'loadmore'
... ... @@ -542,12 +542,12 @@
542 542 })
543 543 },
544 544 popupSelItem(item) {
545   - this.projectId = item.id;
  545 + this.planId = item.id;
546 546 this.finished = false;
547 547
548 548 getInternshipProcessDetailApi({
549 549 studentId: this.studentId,
550   - projectId: this.projectId,
  550 + planId: this.planId,
551 551 }).then(data => {
552 552 if (data) {
553 553 this.detail = data;
... ...
请 注册 或 登录 后发表评论