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

This commit is contained in:
shidongli 2024-07-16 11:31:57 +08:00
commit 1392925528
7 changed files with 156 additions and 182 deletions

View File

@ -1,6 +1,6 @@
<template>
<div style="background-color: #f1f3f5;padding-top:10px">
<div class="title" ref="layout">
<div class="titlemengt" ref="layout">
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="upload">保存</el-button>
</div>
@ -29,7 +29,6 @@
position: absolute;
left: 3%;
top: 195px;
background-color: red;
" v-if="updata.triggerConditionList.length === 3">
<img src="@/assets/images/images.png" class="login-code-img" />
<el-select v-model="item.triggerLogic" style="width: 60px" placeholder=""
@ -315,7 +314,7 @@
</span>
</div>
<div class="itemlist">
时间间隔
时间间隔()
<span>
<el-input v-model.number="formInline.phoneTimeInterval" oninput="value=value.replace(/[^\d]/g,'')"
style="width: 100px">
@ -775,6 +774,14 @@ export default {
};
</script>
<style lang="scss" scoped>
.titlemengt {
width: 98.5%;
border-radius: 10px;
padding: 10px 20px;
margin: 0 auto;
background-color: #fff;
position: relative;
}
::-webkit-scrollbar {
width: 5px;
}
@ -885,14 +892,7 @@ export default {
align-items: center;
}
.title {
width: 98.5%;
border-radius: 10px;
padding: 10px 20px;
margin: 0 auto;
background-color: #fff;
position: relative;
}
.nodes {
// height: var(--heightLine);

View File

@ -2,7 +2,7 @@
<div class="app-container" ref="layout">
<el-row :gutter="20">
<el-col :span="5">
<div class="left" ref="box">
<div class="leftmengt" ref="box">
<div class="name">
第一层
<el-button plain icon="el-icon-circle-plus-outline" size="mini" @click="handleUpdateserve"></el-button>
@ -98,7 +98,7 @@
<el-table-column label="字段名称" align="center" prop="termContent" />
<el-table-column label="层级" align="center" prop="termLevel" />
<el-table-column label="内容排序" align="center" prop="termSort" />
<el-table-column label="内容备注信息" align="center" prop="termRemark" />
<el-table-column label="内容备注信息" align="center" prop="termRemark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-plus" size="mini" @click="handle(scope.row)"
@ -596,7 +596,7 @@ export default {
};
</script>
<style lang="scss">
.left {
.leftmengt {
height: calc(100vh - 119px);
overflow-y: auto;

View File

@ -140,6 +140,7 @@
label="内容备注信息"
align="center"
prop="termRemark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"

View File

@ -262,7 +262,8 @@
<el-form-item label="标准对照概述" prop="normCompareRemark">
<el-input
type="textarea"
style="width: 206px"
style="width: 500px;"
:rows="6"
v-model="form.normCompareRemark"
maxlength="100"
placeholder="请输入标准对照概述"

View File

@ -51,15 +51,11 @@
<!-- 问卷模板 -->
<div
class="right"
v-if="
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
<div
class="handle"
v-if="
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
class="handle"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
<el-form
:inline="true"
@ -301,11 +297,13 @@
<br />
<el-form-item label="是否接通" prop="phone">
<el-radio
disabled
v-model="formlist.phoneConnectStatus"
label="CONNECTED"
>已接通</el-radio
>
<el-radio
disabled
v-model="formlist.phoneConnectStatus"
label="NOTCONNECTED"
>未接通</el-radio
@ -361,6 +359,7 @@
<el-form-item label="任务处理信息" prop="routeHandleRemark">
<el-input
type="textarea"
disabled
v-model="formlist.routeHandleRemark"
style="width: 500px"
placeholder="请输入任务处理信息"
@ -432,9 +431,7 @@ export default {
created() {
this.id = this.$route.query.manageRouteId;
this.info();
if (
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
this.selectlist();
} else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
if (this.$route.query.routeHandleRemark) {
@ -458,7 +455,6 @@ export default {
},
methods: {
scriptlook(e) {
console.log(e, "eeeeee");
if (e == null || e == "") {
this.$message.error("暂无话术图");
} else {
@ -480,7 +476,6 @@ export default {
//
messageontemplateMESSAGE(item) {
console.log(item, "2222222");
this.formlist.phoneMessageTemplateId = item.templateId;
this.formlist.phoneMessageTemplateName = item.templateName;
// this.form.messagePreview = item.templateContent;
@ -543,7 +538,7 @@ export default {
},
// radio
radioChange(e, item, index) {
console.log(e, item, index, "选中某个单选框时");
// console.log(e, item, index, "");
this.questiondata.subjectResultList[index].optionResults.forEach((el) => {
if (el.id == item.id) {
el.optionChooseSign = "0";
@ -551,7 +546,7 @@ export default {
el.optionChooseSign = "1";
}
});
console.log(this.questiondata, "this.questiondata");
// console.log(this.questiondata, "this.questiondata");
this.questiondata;
},
//
@ -724,10 +719,9 @@ export default {
margin-top: 20px;
::v-deep .el-textarea__inner {
width: 500px;
height: 250px;
height: 250px;
}
}
}
}
.headernew {

View File

@ -116,7 +116,10 @@
</el-tabs>
</div>
<!-- 文章模板 -->
<div class="right" v-if="$route.query.taskNodeType == 'PROPAGANDA_ARTICLE'">
<div
class="right"
v-if="$route.query.taskNodeType == 'PROPAGANDA_ARTICLE'"
>
<div class="sport">文章模板:{{ formview.propagandaTitle }}</div>
<div class="bodytop">
<div>
@ -143,16 +146,11 @@
<!-- 问卷模板 -->
<div
class="right"
v-if="
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
<div
class="handle"
v-if="
$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
"
class="handle"
v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
>
<el-form
:inline="true"
@ -343,86 +341,6 @@
label-width="110px"
:inline="true"
>
<!-- <br/> -->
<el-form-item label="是否接通" prop="phone">
<el-radio
v-model="formlist.phoneConnectStatus"
label="CONNECTED"
>已接通</el-radio
>
<el-radio
v-model="formlist.phoneConnectStatus"
label="NOTCONNECTED"
>未接通</el-radio
>
</el-form-item>
<br />
<el-form-item label="任务处理信息" prop="routeHandleRemark">
<el-input
v-model="formlist.routeHandleRemark"
placeholder="请输入任务处理信息"
/>
</el-form-item>
<br />
<!-- <el-form-item label="话术名称" prop="scriptName">
<el-input
disabled
v-model="formlist.scriptName"
placeholder="请输入话术名称"
/>
</el-form-item> -->
<!-- <br /> -->
<el-form-item label="通用话术名称" prop="phoneTemplateName">
<el-input
disabled
v-model="formlist.phoneTemplateName"
placeholder="请输入通用话术名称"
/>
</el-form-item>
<br />
<!-- <el-form-item label="话术简介" prop="scriptIntroduction">
<el-input
disabled
type="textarea"
v-model="formlist.scriptIntroduction"
placeholder="请输入话术简介"
/>
</el-form-item>
<el-form-item label="任务处理信息" prop="routeHandleRemark">
<el-input
type="textarea"
v-model="formlist.routeHandleRemark"
placeholder="请输入任务处理信息"
/>
</el-form-item> -->
<!-- <br /> -->
<el-form-item label="电话推送" prop="phonePushSign">
<!-- <el-input
type="textarea"
v-model="formlist.routeHandleRemark"
placeholder="请输入任务处理信息"
/> -->
<!-- <el-switch
disabled
v-model="formlist.phonePushSign"
active-color="#13ce66"
active-value="1"
inactive-value="0"
>
</el-switch> -->
<el-radio disabled v-model="formlist.phonePushSign" label="1"
>已开启</el-radio
>
<el-radio disabled v-model="formlist.phonePushSign" label="0"
>未开启</el-radio
>
</el-form-item>
<br />
<el-form-item label="电话" prop="patientPhone">
<el-input
disabled
@ -431,61 +349,74 @@
/>
</el-form-item>
<br />
<!-- <div style="background:red;width:200px;height:1600px"> -->
<el-form-item label="重复次数" prop="phoneRedialTimes">
<el-select
v-model="formlist.phoneRedialTimes"
<el-form-item label="是否接通" prop="phone">
<el-radio
disabled
style="width: 200px"
v-model="formlist.phoneConnectStatus"
label="CONNECTED"
>已接通</el-radio
>
<el-option
v-for="item in optionslistS"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
<el-radio
disabled
v-model="formlist.phoneConnectStatus"
label="NOTCONNECTED"
>未接通</el-radio
>
</el-form-item>
<br />
<el-form-item label="通用话术名称" prop="phoneTemplateName">
<el-input
disabled
v-model="formlist.phoneTemplateName"
placeholder="请输入通用话术名称"
/>
</el-form-item>
<br />
<el-form-item label="重复次数" prop="phoneRedialTimes">
<el-input
disabled
v-model="formlist.phoneRedialTimes"
placeholder=""
/>
</el-form-item>
<br />
<el-form-item label="电话短信提醒" prop="phone">
<el-select
<el-input
disabled
v-model="formlist.phoneMessageRemind"
style="width: 200px"
>
<el-option
v-for="item in optionslist"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option>
</el-select>
<!-- <el-input
style="width: 200px"
v-model="formlist.phoneMessageRemind"
placeholder="请输入电话"
/> -->
placeholder=""
/>
</el-form-item>
<br />
<div class="pushMethod">
<el-form-item label="短信模板:" prop="phone">
<span class="spanname">
<message
style="width: 200px; height: 10px"
@on-template="messageontemplateMESSAGE"
:templateId="formlist.phoneMessageTemplateId"
:templateName="formlist.phoneMessageTemplateName"
></message>
</span>
</el-form-item>
</div>
<el-form-item label="短信模板:" prop="phone">
<span class="spanname">
<message
style="width: 200px; height: 50px"
@on-template="messageontemplateMESSAGE"
:templateId="formlist.phoneMessageTemplateId"
:templateName="formlist.phoneMessageTemplateName"
>
</message>
</span>
</el-form-item>
<br />
<el-form-item label="话术图" prop="phone">
<img
:src="formlist.scriptFilePath"
style="width: 250px; height: 200px"
<!-- <img :src="formlist.scriptFilePath" style="width: 250px; height: 200px" /> -->
<el-button
type="primary"
size="small"
@click="scriptlook(formlist.phoneNodeContent)"
>预览</el-button
>
</el-form-item>
<br />
<el-form-item label="任务处理信息" prop="routeHandleRemark">
<el-input
type="textarea"
disabled
v-model="formlist.routeHandleRemark"
style="width: 500px"
placeholder="请输入任务处理信息"
/>
</el-form-item>
<br />
@ -510,6 +441,19 @@
</el-form>
</div> -->
</div>
<!-- 预览 -->
<el-dialog title="话术预览" :visible.sync="lookshow" width="90%">
<Scriptpreview
:phoneNodeContent="phoneNodeContent"
v-if="lookshow"
></Scriptpreview>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="lookshow = false"
> </el-button
>
</span>
</el-dialog>
<!-- 文字提醒 -->
<div v-if="$route.query.taskNodeType == 'TEXT_REMIND'">
<div class="sport">文字提醒</div>
@ -542,11 +486,9 @@
import { getPropaganda } from "@/api/manage/propaganda";
import Editorxj from "../../system/Editorxj/index.vue";
import message from "../components/message.vue";
import Scriptpreview from ".././components/Scriptpreviewopen.vue";
import {
selectPhonePush,
} from "@/api/system/followupsee";
import { selectPhonePush } from "@/api/system/followupsee";
import {
selectVisitRecord,
selectPatientQuestionSubmit,
@ -556,13 +498,21 @@ import { getAgencytype } from "@/api/system/agency";
export default {
components: {
message,
Editorxj
Editorxj,
Scriptpreview,
},
name: "patientdetails",
// components: { },
data() {
return {
checkeddata: [],
lookshow: false,
phoneNodeContent: {
scriptInfoId: null,
flowScheme: null,
nodes: [],
edges: [],
},
formlists: {},
baseUrl: process.env.VUE_APP_BASE_API,
radio: "1",
@ -584,10 +534,9 @@ export default {
};
},
created() {
console.log(this.$route.query);
this.info();
this.infolistMESSAGE();
this.infolistword()
// this.infolistMESSAGE();
// this.infolistword();
//
if (this.$route.query.textRemindContent) {
this.formlists.textRemindContent = this.$route.query.textRemindContent;
@ -600,7 +549,7 @@ export default {
this.getPropagandaLIST();
} else if (
// 访
this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE"
) {
this.selectlist();
@ -609,22 +558,36 @@ export default {
selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
if (response.data) {
this.formlist = response.data;
this.formlist.phoneRedialTimes = response.data.phoneRedialTimes;
this.infolistMESSAGE();
this.infolistword();
if (this.formlist.phonePushSign == 0) {
this.formlist.phonePushSign = '0'
this.formlist.phonePushSign = "0";
} else if (this.formlist.phonePushSign == 1) {
this.formlist.phonePushSign = '1'
this.formlist.phonePushSign = "1";
}
}
});
}
},
methods: {
scriptlook(e) {
if (e == null || e == "") {
this.$message.error("暂无话术图");
} else {
this.phoneNodeContent = e;
this.lookshow = true;
}
},
//
infolistword() {
var dictType = "text_message_remind";
getAgencytype(dictType).then((res) => {
this.optionslist = res.data;
// this.taskinfo();
this.formlist.phoneMessageRemind = this.optionslist.find(
(el) => el.dictValue == this.formlist.phoneMessageRemind
)?.dictLabel;
});
},
@ -640,6 +603,9 @@ export default {
var dictType = "redial_times";
getAgencytype(dictType).then((res) => {
this.optionslistS = res.data;
this.formlist.phoneRedialTimes = this.optionslistS.find(
(el) => el.dictValue == this.formlist.phoneRedialTimes
)?.dictLabel;
});
},
//
@ -701,7 +667,7 @@ export default {
this.questiondata.questionSubjectList[index].optionAnswer = e;
},
radioGroupChange(e, item) { },
radioGroupChange(e, item) {},
// radio
radioChange(e, item, index) {
console.log(e, item, index, "选中某个单选框时");
@ -743,6 +709,14 @@ export default {
};
</script>
<style lang="scss" scoped>
::v-deep .el-input.is-disabled .el-input__inner {
background: #fff !important;
color: #606266;
}
::v-deep .el-textarea.is-disabled .el-textarea__inner {
color: #606266;
background: #fff;
}
::v-deep iframe {
width: 100%;
height: 500px;
@ -831,7 +805,9 @@ export default {
font-size: 16px;
}
}
.spanname {
pointer-events: none;
}
.right {
width: 70%;
padding-bottom: 30px;
@ -843,8 +819,8 @@ export default {
margin-top: 20px;
::v-deep .el-textarea__inner {
width: 350px;
height: 250px;
}
height: 250px;
}
}
}

View File

@ -87,7 +87,9 @@
/> -->
</el-form-item>
<el-form-item label="细分类别概述" prop="remark">
<el-input style="width:206px" type="textarea" v-model="form.remark" maxlength="100" placeholder="请输入细分类别概述" />
<el-input type="textarea" v-model="form.remark" maxlength="100" placeholder="请输入细分类别概述"
style="width: 500px;"
:rows="4" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">