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-07-01 10:21:31 +08:00
commit 10b3a9e216
4 changed files with 149 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/views/manage/labelfieldinfo/index.vue
View File

@ -222,21 +222,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="字段排序"
:rules="rules.labelFieldInfoList.fieldSort"
:prop="`labelFieldInfoList.${index}.fieldSort`"
>
<el-input-number
v-model="aitem.fieldSort"
controls-position="right"
:min="0"
placeholder="请输入字段排序"
style="width: 210px"
/>
<!-- <el-input v-model="aitem.fieldSort" placeholder="请输入字段排序" oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5"/> -->
</el-form-item>
<el-form-item label="任务类型" prop="taskTypeId"> <el-form-item label="任务类型" prop="taskTypeId">
<el-button <el-button
type="" type=""
@ -293,6 +279,21 @@
>{{ aitem.taskPartitionDictName }}</el-button >{{ aitem.taskPartitionDictName }}</el-button
> >
</el-form-item> </el-form-item>
<el-form-item
label="字段排序"
:rules="rules.labelFieldInfoList.fieldSort"
:prop="`labelFieldInfoList.${index}.fieldSort`"
>
<el-input-number
v-model="aitem.fieldSort"
controls-position="right"
:min="0"
placeholder="请输入字段排序"
style="width: 210px"
/>
<!-- <el-input v-model="aitem.fieldSort" placeholder="请输入字段排序" oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5"/> -->
</el-form-item>
<el-form-item <el-form-item
label="字段编码" label="字段编码"
:rules="rules.labelFieldInfoList.fieldCode" :rules="rules.labelFieldInfoList.fieldCode"
@ -308,7 +309,7 @@
</el-form-item> </el-form-item>
<el-form-item label="字段备注信息" prop="fieldRemark"> <el-form-item label="字段备注信息" prop="fieldRemark">
<el-input <el-input
style="width: 210px" style="width: 530px"
v-model="aitem.fieldRemark" v-model="aitem.fieldRemark"
placeholder="请输入字段备注信息" placeholder="请输入字段备注信息"
type="textarea" type="textarea"
@ -375,14 +376,33 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="字段排序" prop="fieldSort"> <el-form-item label="任务类型" prop="taskTypeId">
<el-input-number <el-button
v-model="form.fieldSort" type=""
controls-position="right" v-if="form.taskTypeName == '请选择任务类型'"
:min="0" @click="clicktypexg()"
placeholder="请输入字段排序" style="
style="width: 210px" width: 210px;
/> text-align: left;
height: 36px;
color: #c0c4cc;
overflow: hidden;
"
>{{ form.taskTypeName }}</el-button
>
<el-button
@click="clicktypexg()"
type=""
v-else
style="
width: 210px;
text-align: left;
height: 36px;
padding-left: -10px;
overflow: hidden;
"
>{{ form.taskTypeName }}</el-button
>
</el-form-item> </el-form-item>
<el-form-item label="任务细分" prop="taskPartitionDictId"> <el-form-item label="任务细分" prop="taskPartitionDictId">
<el-button <el-button
@ -412,6 +432,15 @@
>{{ form.taskPartitionDictName }}</el-button >{{ form.taskPartitionDictName }}</el-button
> >
</el-form-item> </el-form-item>
<el-form-item label="字段排序" prop="fieldSort">
<el-input-number
v-model="form.fieldSort"
controls-position="right"
:min="0"
placeholder="请输入字段排序"
style="width: 210px"
/>
</el-form-item>
<el-form-item label="字段编码" prop="fieldCode"> <el-form-item label="字段编码" prop="fieldCode">
<el-input <el-input
maxlength="50" maxlength="50"
@ -423,7 +452,7 @@
</el-form-item> </el-form-item>
<el-form-item label="字段备注信息" prop="fieldRemark"> <el-form-item label="字段备注信息" prop="fieldRemark">
<el-input <el-input
style="width: 210px" style="width: 530px"
v-model="form.fieldRemark" v-model="form.fieldRemark"
placeholder="请输入字段备注信息" placeholder="请输入字段备注信息"
type="textarea" type="textarea"
@ -595,7 +624,7 @@
:data="taskTypeList" :data="taskTypeList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column label="请选择" width="100" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -675,13 +704,13 @@ export default {
}, },
nnerVisibleindex: '', nnerVisibleindex: '',
taskPartitionDictId: '', taskPartitionDictId: '',
taskTypeId:'', taskTypeId: '',
maxTableHeight: undefined, maxTableHeight: undefined,
totaltask: 0, totaltask: 0,
// 任务类型 // 任务类型
innertype: false, innertype: false,
totaltype:0, totaltype: 0,
taskTypeList:[], taskTypeList: [],
queryType: { queryType: {
pageNum: 1, pageNum: 1,
@ -849,22 +878,38 @@ export default {
}); });
}, },
// 任务类型弹框 // 任务类型弹框
clicktype(aitem, index){ clicktype(aitem, index) {
console.log(aitem,'0000000') console.log(aitem, '0000000')
this.getListType(); this.getListType();
this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : ''; this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
this.nnerVisibleindex = index; this.nnerVisibleindex = index;
this.innertype = true; this.innertype = true;
this.form.taskPartitionDictName= '请选择任务细分'; this.form.taskPartitionDictName = '请选择任务细分';
this.form.taskPartitionDictId=''; this.form.taskPartitionDictId = '';
}, },
// 任务细分弹框 // 任务细分弹框
clickinnerVisible(aitem, index) { clickinnerVisible(aitem, index) {
if (this.taskTypeId == '') {
this.$modal.msgError("请先选择任务类型");
} else {
this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
this.nnerVisibleindex = index;
this.innerVisible = true;
}
// this.getListpartit(); // this.getListpartit();
this.taskTypeId = aitem.taskTypeId ? aitem.taskTypeId : '';
this.nnerVisibleindex = index; },
this.innerVisible = true; // 修改任务类型
clicktypexg() {
if (this.form.taskTypeId) {
this.taskTypeId = this.form.taskTypeId
}
this.getListType();
this.innertype = true;
}, },
// 修改任务细分弹框 // 修改任务细分弹框
clickinnerVisiblexg() { clickinnerVisiblexg() {
@ -883,11 +928,10 @@ export default {
innerVisiblecancel() { innerVisiblecancel() {
this.innerVisible = false; this.innerVisible = false;
}, },
typeecancel(){ typeecancel() {
this.innertype = false; this.innertype = false;
}, },
nurseclickzx(row) { nurseclickzx(row) {
if (this.title == '添加标签字段信息') { if (this.title == '添加标签字段信息') {
this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName = this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName =
row.taskPartitionName; row.taskPartitionName;
@ -903,8 +947,8 @@ export default {
}, },
// 任务类型 // 任务类型
nurseclicktype(row) { nurseclicktype(row) {
console.log(row,'row') console.log(row, 'row')
this.queryParamstask.taskTypeId=row.id this.queryParamstask.taskTypeId = row.id
this.getListpartit() this.getListpartit()
if (this.title == '添加标签字段信息') { if (this.title == '添加标签字段信息') {
this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeName = this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeName =
@ -913,8 +957,9 @@ export default {
row.id; row.id;
} else if (this.titleup == '修改标签字段信息') { } else if (this.titleup == '修改标签字段信息') {
this.form.taskTypeName = row.taskTypeName; this.form.taskTypeName = row.taskTypeName;
this.form.taskTypeId = this.form.taskTypeId =row.id;
row.id; this.form.taskPartitionDictName = "请选择任务细分";
this.form.taskPartitionDictId ='';
} }
this.innertype = false; this.innertype = false;
}, },
@ -937,8 +982,8 @@ export default {
fieldSort: undefined, fieldSort: undefined,
taskPartitionDictName: '请选择任务细分', taskPartitionDictName: '请选择任务细分',
taskPartitionDictId: '', taskPartitionDictId: '',
taskTypeName:'请选择任务类型', taskTypeName: '请选择任务类型',
taskTypeId:'', taskTypeId: '',
fieldCode: null, fieldCode: null,
}; };
@ -979,8 +1024,8 @@ export default {
updateTime: null, updateTime: null,
taskPartitionDictName: null, taskPartitionDictName: null,
taskPartitionDictId: null, taskPartitionDictId: null,
taskTypeId:null, taskTypeId: null,
taskTypeName:null, taskTypeName: null,
}; };
@ -1024,8 +1069,8 @@ export default {
fieldSort: undefined, fieldSort: undefined,
taskPartitionDictName: '请选择任务细分', taskPartitionDictName: '请选择任务细分',
taskPartitionDictId: '', taskPartitionDictId: '',
taskTypeName:'请选择任务类型', taskTypeName: '请选择任务类型',
taskTypeId:'', taskTypeId: '',
}, },
@ -1045,14 +1090,20 @@ export default {
if (!this.form.taskPartitionDictName || this.form.taskPartitionDictName == "") { if (!this.form.taskPartitionDictName || this.form.taskPartitionDictName == "") {
this.form.taskPartitionDictName = '请选择任务细分' this.form.taskPartitionDictName = '请选择任务细分'
} }
if (!this.form.taskTypeName || this.form.taskTypeName == "") {
this.form.taskTypeName = '请选择任务类型'
}
if (this.form.taskTypeId) {
this.queryParamstask.taskTypeId = this.form.taskTypeId
this.getListpartit();
}
this.openup = true; this.openup = true;
this.titleup = "修改标签字段信息"; this.titleup = "修改标签字段信息";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log(this.form)
// return // return
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
var obj = JSON.parse(JSON.stringify(this.form)) var obj = JSON.parse(JSON.stringify(this.form))
@ -1060,21 +1111,29 @@ export default {
if (this.form.id != null) { if (this.form.id != null) {
if (obj.taskPartitionDictName == '请选择任务细分') { if (obj.taskPartitionDictName == '请选择任务细分') {
obj.taskPartitionDictName = "" obj.taskPartitionDictName = ""
} }
console.log(obj, 'obj') if (obj.taskTypeName == '请选择任务类型') {
// return obj.taskTypeName = ""
}
updateLabelfieldinfo(obj).then(response => { updateLabelfieldinfo(obj).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.openup = false; this.openup = false;
this.getList(); this.getList();
}); });
} else { } else {
obj.labelFieldInfoList.forEach(e => { obj.labelFieldInfoList.forEach(e => {
if (e.taskPartitionDictName == '请选择任务细分') { if (e.taskPartitionDictName == '请选择任务细分') {
e.taskPartitionDictName = "" e.taskPartitionDictName = ""
} }
if (e.taskTypeName == '请选择任务类型') {
e.taskTypeName = ""
}
}); });
console.log(obj, 'obj')
// return
addLabelfieldinfo(obj).then(response => { addLabelfieldinfo(obj).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;

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

@ -602,6 +602,8 @@ export default {
departmentName: row.departmentName, departmentName: row.departmentName,
diseaseTypeId: row.diseaseTypeId ? row.diseaseTypeId : null, diseaseTypeId: row.diseaseTypeId ? row.diseaseTypeId : null,
diseaseTypeName: row.diseaseTypeName ? row.diseaseTypeName : null, diseaseTypeName: row.diseaseTypeName ? row.diseaseTypeName : null,
followTemplateId:row.followTemplateId?row.followTemplateId:null,
phoneId:row.phoneId?row.phoneId:null,
}, },
}); });

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

@ -330,7 +330,7 @@ export default {
console.log(this.$route.query, "res"); console.log(this.$route.query, "res");
} else { } 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,6 +345,9 @@ export default {
} }
} }
}); });
}else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.followTemplateId){
console.log('6666666666666666666========')
this.questioninfo();
} }
}, },
methods: { methods: {

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

@ -47,14 +47,10 @@
<div class="bottomheader"> <div class="bottomheader">
<div style="display: flex"> <div style="display: flex">
<!-- 问卷模板 --> <!-- 问卷模板 -->
<div <div class="right" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
class="right" $route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
v-if=" ">
$route.query.taskType == 'QUESTIONNAIRE_SCALE' || <div
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
"
>
<div
style="float: right; margin-top: 20px" style="float: right; margin-top: 20px"
v-if=" v-if="
$route.query.taskType == 'QUESTIONNAIRE_SCALE' || $route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
@ -77,10 +73,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div
class="sport" <div class="sport" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'">
v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE'"
>
问卷模板: Barthel指数评定问卷 问卷模板: Barthel指数评定问卷
</div> </div>
<div <div
@ -232,6 +226,19 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="right_top" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
">
<div style="float: right; margin-top: 20px" v-if="$route.query.taskType == 'QUESTIONNAIRE_SCALE' ||
$route.query.taskType == 'ARTIFICIAL_FOLLOW_UP'
">
<el-form :inline="true" class="demo-form-inline" :model="questiondata" :rules="rules" ref="questiondata">
<el-form-item label="任务处理信息" prop="routeHandleRemark">
<el-input type="textarea" placeholder="请输入任务处理信息" v-model="questiondata.routeHandleRemark" />
</el-form-item>
</el-form>
</div>
</div> -->
<!-- 电话外呼 --> <!-- 电话外呼 -->
<div v-if="$route.query.taskType == 'PHONE_OUTBOUND'"> <div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
<div class="sport">电话外呼</div> <div class="sport">电话外呼</div>
@ -440,8 +447,9 @@ export default {
this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP" this.$route.query.taskType == "ARTIFICIAL_FOLLOW_UP"
) { ) {
this.questioninfo(); this.questioninfo();
} else { } else if(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;
@ -457,6 +465,10 @@ this.infolistword()
} }
} }
}); });
}else if(this.$route.query.taskType=="PHONE_OUTBOUND" && this.$route.query.followTemplateId){
console.log('6666666666666666666========')
this.questioninfo();
} }
}, },
methods: { methods: {
@ -805,6 +817,7 @@ this.infolistword()
.right { .right {
width: 100%; width: 100%;
height: 500px; height: 500px;
// overflow-y: auto;
// background: yellow; // background: yellow;
} }
@ -823,7 +836,7 @@ this.infolistword()
.bottomheader { .bottomheader {
overflow-y: scroll; overflow-y: scroll;
width: 99%; width: 99%;
height: 60vh; height: 65vh;
background-color: #fff; background-color: #fff;
margin: 10px auto; margin: 10px auto;
padding: 10px 20px; padding: 10px 20px;