xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
辉 2024-04-11 17:11:35 +08:00
commit 46716ecd48
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/manage/propaganda/index.vue
View File

@ -438,6 +438,7 @@
</el-form-item> </el-form-item>
<el-form-item label="添加封面" prop="propagandaCoverPath"> <el-form-item label="添加封面" prop="propagandaCoverPath">
<stationAcatar <stationAcatar
v-if="open"
@imgUrl="imgUrl" @imgUrl="imgUrl"
:img="form.propagandaCoverPath" :img="form.propagandaCoverPath"
:type="'propagandaCoverUrl'" :type="'propagandaCoverUrl'"

3
src/views/system/followup/index.vue
View File

@ -333,7 +333,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-notebook-2" icon="el-icon-notebook-2"
@click="handledatail(scope.row)" @click="handleUpdate(scope.row)"
>详情</el-button >详情</el-button
> >
</template> </template>
@ -771,6 +771,7 @@ export default {
age: row.birthDate ? getAge(row.birthDate) : "", age: row.birthDate ? getAge(row.birthDate) : "",
manageRouteId: row.manageRouteId, manageRouteId: row.manageRouteId,
manageRouteNodeId: row.manageRouteNodeId, manageRouteNodeId: row.manageRouteNodeId,
visitRecordId:row.visitRecordId,
departmentId: row.departmentId, departmentId: row.departmentId,
departmentName: row.departmentName, departmentName: row.departmentName,

1
src/views/system/followupsee/index.vue
View File

@ -388,6 +388,7 @@ export default {
this.questiondata.manageRouteName = this.$route.query.manageRouteName this.questiondata.manageRouteName = this.$route.query.manageRouteName
this.questiondata.manageRouteNodeName = this.$route.query.manageRouteNodeName this.questiondata.manageRouteNodeName = this.$route.query.manageRouteNodeName
this.questiondata.taskType = this.$route.query.taskType this.questiondata.taskType = this.$route.query.taskType
this.questiondata.visitRecordId=this.$route.query.visitRecordId
this.questiondata.totalScore = 0 this.questiondata.totalScore = 0
this.questiondata.questionSubjectList.forEach(e => { this.questiondata.questionSubjectList.forEach(e => {
if (e.questionType == 'MULTIPLE_CHOICE' || e.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || e.questionType == 'SCORING_QUESTIONS' || e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') { if (e.questionType == 'MULTIPLE_CHOICE' || e.questionType == 'MULTIPLE_CHOICE_QUESTIONS' || e.questionType == 'SCORING_QUESTIONS' || e.questionType == 'COMBINATION_RADIO_SUBJECT' || e.questionType == 'COMBINATION_MULTIPLE_SUBJECT' || e.questionType == 'COMBINATION_SCORING_SUBJECT') {