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 
# Conflicts:
#	src/views/system/followupsee/index.vue
This commit is contained in:
闫晓茹 2024-07-02 10:02:01 +08:00
commit b9f2ff9512
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/system/followupdetails/index.vue
View File

@ -97,7 +97,7 @@
<div v-if="item.questionType == 'FILL_IN_THE_BLANKS' || <div v-if="item.questionType == 'FILL_IN_THE_BLANKS' ||
item.questionType == 'COMBINATION_BLANKS_SUBJECT' item.questionType == 'COMBINATION_BLANKS_SUBJECT'
" class="tk"> " class="tk">
<el-input disabled v-model="item.fillBlanksAnswer" placeholder="请输入答案" type="textarea" /> <el-input disabled v-model="item.fillBlanksAnswer" placeholder="请输入答案" type="textarea" />
<!-- <el-input></el-input> --> <!-- <el-input></el-input> -->
</div> </div>
<!-- 日期填空题、 --> <!-- 日期填空题、 -->
@ -327,10 +327,7 @@ export default {
this.info(); this.info();
if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE' || this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') { if (this.$route.query.taskType == 'QUESTIONNAIRE_SCALE' || this.$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP') {
this.selectlist(); this.selectlist();
} else if(this.$route.query.taskType=="PHONE_OUTBOUND"){
console.log(this.$route.query, "res");
} else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.phoneId){
if (this.$route.query.routeHandleRemark) { if (this.$route.query.routeHandleRemark) {
this.questiondata.routeHandleRemark = this.questiondata.routeHandleRemark =
this.$route.query.routeHandleRemark; this.$route.query.routeHandleRemark;
@ -345,9 +342,6 @@ export default {
} }
} }
}); });
}else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.followTemplateId){
console.log('6666666666666666666========')
this.questioninfo();
} }
}, },
methods: { methods: {
@ -515,6 +509,7 @@ export default {
.tk { .tk {
::v-deep .el-textarea__inner { ::v-deep .el-textarea__inner {
margin: 20px 0 10px 30px; margin: 20px 0 10px 30px;
width: 60% !important;
} }
} }

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

@ -481,20 +481,14 @@ export default {
this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP" this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
) { ) {
this.questioninfo(); this.questioninfo();
} else if ( } else if (this.$route.query.taskType == "PHONE_OUTBOUND") {
this.$route.query.taskType == "PHONE_OUTBOUND" &&
this.$route.query.phoneId
) {
selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => { selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
console.log("===================");
if (response.data) { if (response.data) {
this.formlist = response.data; this.formlist = response.data;
this.formlist.phoneRedialTimes = response.data.phoneRedialTimes; this.formlist.phoneRedialTimes = response.data.phoneRedialTimes;
this.formlist.phoneMessageRemind = response.data.phoneMessageRemind; this.formlist.phoneMessageRemind = response.data.phoneMessageRemind;
// console.log(this.formlist, " this.formlist.phoneRedialTimes");
this.infolistMESSAGE(); this.infolistMESSAGE();
this.infolistword(); this.infolistword()
if (this.formlist.phonePushSign == 0) { if (this.formlist.phonePushSign == 0) {
this.formlist.phonePushSign = "0"; this.formlist.phonePushSign = "0";
} else if (this.formlist.phonePushSign == 1) { } else if (this.formlist.phonePushSign == 1) {
@ -502,14 +496,8 @@ export default {
} }
} }
}); });
} else if (
this.$route.query.taskType == "PHONE_OUTBOUND" &&
this.$route.query.followTemplateId
) {
console.log("6666666666666666666========");
this.questioninfo();
} }
}, },
methods: { methods: {
scriptlook(e) { scriptlook(e) {
@ -519,7 +507,7 @@ export default {
} else { } else {
this.phoneNodeContent = e this.phoneNodeContent = e
this.lookshow = true; this.lookshow = true;
} }
}, },
// 发送短信 // 发送短信
@ -559,7 +547,7 @@ export default {
timepickerselect(e, index) { timepickerselect(e, index) {
this.questiondata.questionSubjectList[index].fillBlanksAnswer = e; this.questiondata.questionSubjectList[index].fillBlanksAnswer = e;
}, },
radioGroupChange(e, item) {}, radioGroupChange(e, item) { },
// 选中某个单选框时，由radio时触发 // 选中某个单选框时，由radio时触发
radioChange(e, item, index) { radioChange(e, item, index) {
console.log(e, item, index, "选中某个单选框时"); console.log(e, item, index, "选中某个单选框时");
@ -798,6 +786,7 @@ export default {
.tk { .tk {
::v-deep .el-textarea__inner { ::v-deep .el-textarea__inner {
margin: 20px 0 10px 30px; margin: 20px 0 10px 30px;
width: 60% !important;
} }
} }