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

src/views/manage/components/signingRecords.vue

@@ -23,14 +23,13 @@
                 </el-descriptions>
                 <el-descriptions title="签约信息" style="margin-top: 40px;">
                     <el-descriptions-item label="服务包">{{ ByRecord.packageName }}</el-descriptions-item>
-                    <el-descriptions-item label="服务包缴费状态">{{
+                    <el-descriptions-item label="服务包缴费状态">{{ ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' :
-                        ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' ?
+                ByRecord.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}</el-descriptions-item>
-                        '未缴费' : ''
-                    }}</el-descriptions-item>
                     <el-descriptions-item label="到期时间">{{ ByRecord.serviceEndTime }}</el-descriptions-item>
                     <el-descriptions-item label="服务包价格">{{ ByRecord.packagePrice }}</el-descriptions-item>
                     <el-descriptions-item label="服务时间">{{ ByRecord.serviceStartTime }}</el-descriptions-item>
-                    <el-descriptions-item label="服务周期">{{ ByRecord.serviceCycle }}月</el-descriptions-item>
+                    <el-descriptions-item label="服务周期">{{ ByRecord.packageTerm }}{{ ByRecord.packageTermUnit }}
+                    </el-descriptions-item>
                     <el-descriptions-item label="签约时间">{{ ByRecord.signTime }}</el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions title="硬件信息" style="margin-top: 20px;" class="descriptions">
@@ -52,6 +51,8 @@
                 </el-descriptions>
                 <el-descriptions title="其他材料" style="margin-top: 20px;" class="descriptions">
                     <el-descriptions-item>
+                        <el-image v-for="item in ByRecord.signPatientInformeds" :key="item.signPatientRecordId"
+                            class="img" :src="item.informedFilePath" :preview-src-list="srcList" />
                     </el-descriptions-item>
                 </el-descriptions>
             </div>
@@ -67,6 +68,7 @@ export default {
     name: "signingRecords",
     data() {
         return {
+            srcList: [],
             //左侧类型选中
             categoryindex: 0,
             //左侧选中的item
@@ -92,6 +94,10 @@ export default {
         getByRecordIdinfo() {
             getByRecordId(this.categoryItem.id).then(res => {
                 this.ByRecord = res.data
+                this.ByRecord.signPatientInformeds.forEach(e => {
+                    e.informedFilePath = process.env.VUE_APP_BASE_API + e.informedFilePath
+                    this.srcList.push(e.informedFilePath)
+                })
             })
         },
         clickcategory(item, index) {
@@ -103,6 +109,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.img {
+    width: 100px;
+    height: 100px;
+}
+
 .header {
     background-color: #fff !important;
     padding: 0 !important;
@@ -176,4 +187,3 @@ export default {
     }
 }
 </style>
-  

src/views/system/ManuallyCreatingTasks/index.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="title">
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary">执行</el-button>
+                <el-button type="primary" @click="upload">执行</el-button>
             </div>
             <el-descriptions title="手动创建任务">
             </el-descriptions>
@@ -19,6 +19,11 @@
                     </el-select>
                 </el-form-item>
             </el-form>
+            <el-form :inline="true" :model="updata" class="demo-form-inline">
+                <el-form-item label="任务名称">
+                    <el-input v-model="updata.routeName" placeholder="审批人"></el-input>
+                </el-form-item>
+            </el-form>
         </div>
         <div class="nodes">
             <div class="nodenames">
@@ -31,7 +36,7 @@
                         :color="listindex == index ? '#409EFF' : ''" @click.native='clicktimelineitem(item, index)'>
                         <div class="top">
                             <div class="toptop">
-                                <el-select style="width:87px" v-model="formInline">
+                                <el-select style="width:90px" v-model="item.routeNodeName">
                                     <el-option label="出院后" value="AFTER_DISCHARGE" />
                                     <el-option label="入院后" value="AFTER_ADMISSION" />
                                     <el-option label="就诊后" value="AFTER_CONSULTATION" />
@@ -39,7 +44,7 @@
                                     <el-option label="术前" value="PREOPERATIVE" />
                                     <el-option label="术后" value="POSTOPERATIVE" />
                                 </el-select>
-                                <el-input style="width: 50px;"></el-input>
+                                <el-input style="width: 70px;" v-model="item.routeNodeDay"></el-input>
                                 <span>天</span>
                             </div>
                             <div>
@@ -47,13 +52,19 @@
                             </div>
                         </div>
                         <el-card :class="listindex == index ? 'cards' : ''">
-                            <h3 style="height: 20px;">2</h3>
+                            <h3 style="height: 20px;">
-                            <p style="height: 16px;">3333333</p>
+                                {{ item.taskType == 'PHONE_OUTBOUND' ? "电话外呼" : "" }}
+                                {{ item.taskType == 'QUESTIONNAIRE_SCALE' ? "问卷量表" : "" }}
+                                {{ item.taskType == 'PROPAGANDA_ARTICLE' ? "宣教文案" : "" }}
+                                {{ item.taskType == 'TEXT_REMIND' ? "文字提醒" : "" }}
+                                {{ item.taskType == 'ARTIFICIAL_FOLLOW_UP' ? "人工随访" : "" }}
+                            </h3>
                         </el-card>
                     </el-timeline-item>
                 </el-timeline>
             </div>
             <div class="nodetexts">
+                <div style=" background-color: #fff; border-radius: 10px;padding:20px;height:160px">
                     <el-form :model="formInline" class="demo-form-inline">
                         <el-form-item label="任务内容">
                             <el-radio-group v-model="formInline.taskType">
@@ -65,34 +76,60 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="电话模板" v-if="formInline.taskType == 'PHONE_OUTBOUND'">
-
+                            <scriptphone @on-template="scriptphoneontemplate"></scriptphone>
                         </el-form-item>
                         <el-form-item label="宣教模板" v-if="formInline.taskType == 'PROPAGANDA_ARTICLE'">
-
+                            <propaganda @on-template="propagandaontemplate"></propaganda>
                         </el-form-item>
                         <el-form-item label="提醒内容" v-if="formInline.taskType == 'TEXT_REMIND'">
-                        <el-input type="textarea" :rows="2" placeholder="请输入内容" />
+                            <el-input type="textarea" v-model="formInline.textRemindContent" :rows="6"
+                                placeholder="请输入内容" />
                         </el-form-item>
                         <el-form-item label="人工随访模板" v-if="formInline.taskType == 'ARTIFICIAL_FOLLOW_UP'">
+                            <question @on-template="questionontemplate"></question>
                         </el-form-item>
                     </el-form>
                     <el-form :model="formInline" class="demo-form-inline" :inline="true"
                         v-if="formInline.taskType == 'QUESTIONNAIRE_SCALE'">
                         <el-form-item label="问卷模板">
-
+                            <question @on-template="questionontemplate"></question>
                         </el-form-item>
                         <el-form-item label="问卷有效期">
                             <el-input-number v-model="formInline.questionExpirationDate" :min="1" :max="99"
                                 label="描述文字"></el-input-number>
+                            天
                         </el-form-item>
                     </el-form>
                 </div>
+                <div class="PushMethod">
+                    <span>推送方式：短信</span>
+                    <el-switch v-model="formInline.messagePushSign" active-color="#13ce66" active-value="1"
+                        inactive-value="0">
+                    </el-switch>
+                </div>
+                <div class="PushMethod">
+                    <span>推送方式：公众号</span>
+                    <el-switch v-model="formInline.officialPushSign" active-color="#13ce66" active-value="1"
+                        inactive-value="0">
+                    </el-switch>
+                </div>
+                <div class="PushMethod">
+                    <span>推送方式：小程序</span>
+                    <el-switch v-model="formInline.appletPushSign" active-color="#13ce66" active-value="1"
+                        inactive-value="0">
+                    </el-switch>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 
 <script>
+import propaganda from '../components/propaganda.vue'
+import scriptphone from '../components/script.vue'
+import question from '../components/question.vue'
 export default {
+    components: { scriptphone, question, propaganda },
     name: "ManuallyCreatingTasks",
     data() {
         return {
@@ -101,33 +138,105 @@ export default {
                 suitRange: ''
             },
             formInline: {
+                routeNodeDay: '',
                 taskType: '',
-                questionExpirationDate: "",
+                routeNodeName: '',
+                questionExpirationDate: 7,
+                questionInfoId: "",
+                questionnaireName: "",
+                phoneTemplateId: "",
+                phoneTemplateName: "",
+                propagandaInfoId: '',
+                propagandaTitle: "",
+                textRemindContent: '',
+                officialPushSign: '0',
+                messagePushSign: '0',
+                appletPushSign: '0',
             },
-            list: [{
+            list: [
-
+                {
-            }, {}],
+                    routeNodeDay: '',
+                    taskType: '',
+                    routeNodeName: '',
+                    questionExpirationDate: 7,
+                    questionInfoId: "",
+                    questionnaireName: "",
+                    phoneTemplateId: "",
+                    phoneTemplateName: "",
+                    propagandaInfoId: '',
+                    propagandaTitle: "",
+                    textRemindContent: '',
+                    officialPushSign: '0',
+                    messagePushSign: '0',
+                    appletPushSign: '0',
+                }
+            ],
             listindex: 0,
         }
     },
     created() {
+        this.formInline = this.list[0]
     },
     methods: {
+        //宣教传值
+        propagandaontemplate(item) {
+            this.formInline.propagandaInfoId = item.templateId
+            this.formInline.propagandaTitle = item.templateName
+        },
+        //问卷传值
+        questionontemplate(item) {
+            this.formInline.questionInfoId = item.templateId
+            this.formInline.questionnaireName = item.templateName
+        },
+        //话术传值
+        scriptphoneontemplate(item) {
+            this.formInline.phoneTemplateId = item.templateId
+            this.formInline.phoneTemplateName = item.templateName
+        },
         clicktimelineitem(item, index) {
             this.formInline = item
             this.listindex = index
         },
         additem(item) {
             this.list.push({
+                routeNodeDay: '',
+                taskType: '',
+                routeNodeName: '',
+                questionExpirationDate: 7,
+                questionInfoId: "",
+                questionnaireName: "",
+                phoneTemplateId: "",
+                phoneTemplateName: "",
+                propagandaInfoId: '',
+                propagandaTitle: "",
+                textRemindContent: '',
+                officialPushSign: '0',
+                messagePushSign: '0',
+                appletPushSign: '0',
             })
         },
         delitem(item, index) {
             this.list.splice(index, 1)
         },
+        upload() {
+            console.log(this.list)
+        },
     }
 };
 </script>
 <style lang="scss" scoped>
+.PushMethod {
+    height: 100px;
+    padding: 20px;
+    line-height: 60px;
+    margin-top: 10px;
+    border-radius: 10px;
+    background-color: #fff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
 .title {
     padding: 20px;
 }
@@ -164,9 +273,7 @@ export default {
     .nodetexts {
         border-radius: 10px;
         width: 70%;
-        background-color: #fff;
         height: 700px;
-        padding: 20px;
     }
 }
 

src/views/system/components/question.vue

@@ -179,6 +179,7 @@ export default {
         /** 查询问卷基本信息列表 */
         getList() {
             this.loading = true;
+            this.queryParams.questionnaireStatus = "PUBLISHED"
             listQuestion(this.queryParams).then(response => {
                 this.questionList = response.rows;
                 this.total = response.total;

src/views/system/components/script.vue

@@ -0,0 +1,306 @@
+<template>
+    <div class="app-container">
+        <el-button size="small" @click="classificationOpen = true" style="width: 200px;font-size:14px;text-align:left"
+            :style="handleselectName ? 'color:black' : 'color:#C0C4CC'">{{ handleselectName ? handleselectName :
+                '请选择'
+            }}</el-button>
+        <el-dialog title="话书库模板选择" :visible.sync="classificationOpen" width="70%"
+            :before-close="classificationOpenfalse">
+            <el-row :gutter="20">
+                <!--部门数据-->
+                <el-col :span="6" :xs="24">
+                    <div class="leftscript" ref="box">
+                        <div class="name">科室名称</div>
+                        <div>
+                            <el-input v-model="name" placeholder="请输入科室名称" clearable
+                                @keyup.enter.native="handleQuery" />
+                        </div>
+                        <div class="listitem">
+                            <div :class="itemname == null ? 'allactive' : 'all'" @click="itemdata()">
+                                全部
+                            </div>
+                            <span class="count">{{ count }}</span>
+                        </div>
+                        <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index"
+                            @click="itemdata(item)">
+                            <div :class="itemname == item.id ? 'allactive' : 'all'">
+                                {{ item.departmentName }}
+                            </div>
+                            <span class="count">{{ item.countNum }}</span>
+                        </div>
+                    </div>
+                </el-col>
+                <!--用户数据-->
+                <el-col :span="18" :xs="24">
+                    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                        label-width="100px">
+                        <el-form-item label="通用话术名称" prop="commonScriptName">
+                            <el-input v-model="queryParams.commonScriptName" placeholder="请输入通用话术名称" clearable
+                                @keyup.enter.native="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="话术名称" prop="scriptName">
+                            <el-input v-model="queryParams.scriptName" placeholder="请输入话术名称" clearable
+                                @keyup.enter.native="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="话术ID" prop="scriptId">
+                            <el-input v-model="queryParams.scriptId" placeholder="请输入话术ID" clearable
+                                @keyup.enter.native="handleQuery" />
+                        </el-form-item>
+                        <el-form-item label="平台ID" prop="platformId">
+                            <el-input v-model="queryParams.platformId" placeholder="请输入平台ID" clearable
+                                @keyup.enter.native="handleQuery" />
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" size="mini"
+                                @click="handleQuery">搜索</el-button>
+                            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                        </el-form-item>
+                    </el-form>
+                    <el-table v-loading="loading" :data="scriptList" @row-dblclick="handleselect">
+                        <el-table-column label="序号" align="center" prop="sort" type="index" />
+                        <el-table-column label="通用话术名称" align="center" prop="commonScriptName"
+                            :show-overflow-tooltip="true" />
+                        <el-table-column label="话术名称" align="center" prop="scriptName" :show-overflow-tooltip="true" />
+                        <el-table-column label="话术ID" align="center" prop="scriptId" :show-overflow-tooltip="true" />
+                        <el-table-column label="平台ID" align="center" prop="platformId" :show-overflow-tooltip="true" />
+                        <el-table-column label="话术简介" align="center" prop="scriptIntroduction"
+                            :show-overflow-tooltip="true" />
+                        <el-table-column label="病种名称" align="center" prop="diseaseTypeName"
+                            :show-overflow-tooltip="true" />
+                        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" @click="handleselect(scope.row)"
+                                    v-if="handleselectId != scope.row.textMessageId">选择</el-button>
+                                <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
+                                    v-if="handleselectId == scope.row.textMessageId">取消选择</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                        :limit.sync="queryParams.pageSize" @pagination="getList" />
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { listScript, getScript, delScript, addScript, updateScript, departmentDisease, department, listDisease, listScriptNum } from "@/api/manage/script";
+import stationAcatar from "../../system/stationAvatar/index.vue";
+export default {
+    components: { stationAcatar },
+    name: "Script",
+    data() {
+        return {
+            handleselectName: '',
+            handleselectId: '',
+            classificationOpen: false,
+            itemname: null,
+            departmentName: null,
+            diseaseTypeName: null,
+            name: '',
+            departmentId: null,
+            count: '',//全部
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 话术信息表格数据
+            scriptList: [],
+            DepartmentoList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            //分类管理
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                departmentId: null,
+                departmentName: null,
+                diseaseTypeId: null,
+                diseaseTypeName: null,
+                commonScriptName: null,
+                scriptName: null,
+                scriptId: null,
+                platformId: null,
+                scriptStatus: "NORMAL",
+                scriptIntroduction: null,
+                scriptSort: null,
+                scriptRemark: null,
+            },
+            querydepartmen: {
+                departmentName: "",
+                // pageNum: 1,
+                // pageSize: 10,
+            },
+        };
+    },
+    created() {
+        this.getList();
+        this.Departmentlist();
+    },
+    watch: {
+        name(val) {
+            this.querydepartmen.departmentName = val
+            this.Departmentlist();
+        }
+    },
+    methods: {
+        nohandleselect() {
+            this.handleselectId = ''
+            this.handleselectName = ''
+            this.$emit("on-template", { templateId: '', templateName: '', templateContent: "" });
+        },
+        handleselect(item) {
+            this.handleselectId = item.id
+            this.handleselectName = item.commonScriptName
+            this.$emit("on-template", { templateId: item.id, templateName: item.commonScriptName });
+            this.classificationOpen = false
+        },
+        classificationOpenfalse() {
+            this.classificationOpen = false
+        },
+        // 左侧科室
+        Departmentlist() {
+            this.loading = true;
+            this.querydepartmen.scriptStatus = "NORMAL"
+            listScriptNum(this.querydepartmen).then(response => {
+                this.DepartmentoList = response.data;
+                //定义
+                let sum = 0;
+                this.DepartmentoList.forEach((item) => {
+                    if (item.countNum != null) {
+                        sum += item.countNum;
+                    }
+                    this.count = sum;
+                });
+                this.loading = false;
+            });
+        },
+        // 左侧科室
+        itemdata(item) {
+            if (item) {
+                this.itemname = item.id
+                this.departmentName = item.departmentName
+                this.loading = true;
+                this.queryParams.departmentId = item.id
+                this.getList()
+            } else {
+                this.queryParams.departmentId = ''
+                this.itemname = null
+                this.getList()
+            }
+        },
+        /** 查询话术信息列表 */
+        getList() {
+            this.loading = true;
+            this.queryParams.scriptStatus = "NORMAL"
+            listScript(this.queryParams).then(response => {
+                this.scriptList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.departmentId = null;
+            this.itemname = null;
+            this.queryParams = {
+                pageNum: 1,
+                pageSize: 10,
+                departmentId: null,
+                departmentName: null,
+                diseaseTypeId: null,
+                diseaseTypeName: null,
+                commonScriptName: null,
+                scriptName: null,
+                scriptId: null,
+                platformId: null,
+                scriptStatus: 'NORMAL',
+                scriptIntroduction: null,
+                scriptSort: null,
+                scriptRemark: null,
+            }
+            this.resetForm("queryForm");
+            this.getList();
+        },
+    }
+};
+</script>
+<style lang="scss" scoped>
+::v-deep .el-input-number .el-input__inner {
+    text-align: left;
+}
+
+.app-container {
+    display: inline-block;
+    padding: 0 !important;
+}
+
+::v-deep .el-textarea__inner {
+    width: 206px;
+}
+
+.leftscript {
+    // width: 30%;
+    height: 650px;
+    overflow: auto;
+
+    .name {
+        font-weight: 700;
+        margin-bottom: 10px;
+    }
+
+    .listitem {
+        width: 100%;
+        height: 50px;
+        border-bottom: 1px solid #dcdfe6;
+        position: relative;
+
+        .count {
+            display: inline-block;
+            position: absolute;
+            left: 210px;
+            color: #a4a6aa;
+            top: 10px;
+            font-size: 13px;
+        }
+
+        .all {
+            height: 50px;
+            line-height: 50px;
+            padding-left: 13px;
+        }
+
+        .allactive {
+            background: #e8f4ff;
+            height: 50px;
+            line-height: 50px;
+            padding-left: 13px;
+            border-left: 3px solid #4d9de7;
+        }
+    }
+}
+
+.button {
+    display: inline-block;
+    position: relative;
+    left: 20px;
+    top: -11px;
+}
+</style>

src/views/system/editorialSpecialization/index.vue

@@ -8,7 +8,7 @@
                 <!-- <el-button type="primary">发布</el-button> -->
             </el-form-item>
         </el-form>
-        <el-form ref="form" :inline="true" :model="form" label-width="80px" :rules="rules">
+        <el-form ref="form" :inline="true" :model="form" label-width="100px" :rules="rules">
             <el-form-item label="路径名称" prop="routeName">
                 <el-input v-model="form.routeName" style="width:160px"></el-input>
             </el-form-item>
@@ -26,8 +26,16 @@
                 <el-button type="primary" plain size="mini" @click="goManageNodeInformation">人工添加触发条件</el-button>
             </el-form-item>
         </el-form>
+        <el-form label-width="100px" ref="form" :model="form" :rules="rules">
+            <el-form-item label="所属服务包" prop="servicePackageId">
+                <el-select v-model="form.servicePackageId" placeholder="请选择所属服务包" style="width:600px" multiple>
+                    <el-option v-for="item in addpackagelist" :key="item.id" :label="item.packageName"
+                        :value="item.id" />
+                </el-select>
+            </el-form-item>
+        </el-form>
         <div class="list" v-if="list">
-            <div class="item" @click.stop="edit">
+            <div class="item">
                 <div class="title">
                     <el-tag>主路径</el-tag>
                     <span>{{ list.routeName }}</span>
@@ -172,6 +180,9 @@ import {
 import {
     specialDiseaseRoute, triggerConditiondel, specialDiseaseRoutedel, triggerConditionadd, triggerCondition, triggerConditionedit
 } from "@/api/system/editorialSpecialization";
+import {
+    servicepackageinfo
+} from '@/api/manage/signRecord.js'
 export default {
     name: "editorialSpecialization",
     data() {
@@ -181,6 +192,8 @@ export default {
                 routeName: '',
                 id: '',
                 diseaseTypeName: '',
+                servicePackageId: [],
+                routePackageList: [],
             },
             open: false,
             updata: {
@@ -196,6 +209,9 @@ export default {
             updataform: {},
             // 表单校验
             rules: {
+                servicePackageId: [
+                    { required: true, message: '不能为空', trigger: 'change' }
+                ],
                 routeName: [
                     { required: true, message: '不能为空', trigger: 'change' }
                 ],
@@ -203,7 +219,8 @@ export default {
                     { required: true, message: '不能为空', trigger: 'change' }
                 ],
             },
-            list: undefined,
+            list: {},
+            addpackagelist: [],
         };
     },
     created() {
@@ -220,6 +237,13 @@ export default {
             specialDiseaseRoute(this.$route.query.id).then(res => {
                 this.list = res.data
                 this.list.percentage = this.list.agreeNumber / this.list.totalNumber * 100
+                res.data.routePackageList?.forEach(e => {
+                    e.servicePackageId ? this.form.servicePackageId.push(e.servicePackageId) : ''
+                })
+                //服务包
+                servicepackageinfo({ departmentId: res.data.departmentId }).then(res => {
+                    this.addpackagelist = res.data
+                })
             })
         },
         edit() {
@@ -318,6 +342,23 @@ export default {
         },
         //保存
         preserve() {
+            if (this.form.servicePackageId?.length > 0 && this.addpackagelist?.length > 0) {
+                let routePackageList = []
+                this.addpackagelist.forEach(e => {
+                    this.form.servicePackageId.forEach(el => {
+                        if (e.id == el) {
+                            let item = {
+                                servicePackageId: el,
+                                packageName: e.packageName
+                            }
+                            routePackageList.push(item)
+                        }
+                    })
+                })
+                this.form.routePackageList = routePackageList
+            }
+            this.$refs["form"].validate(valid => {
+                if (valid) {
                     this.$confirm('是否确认保存?', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
@@ -327,7 +368,7 @@ export default {
                                 type: 'success',
                                 title: '提示',
                                 message: '保存成功,即将返回上一页',
-                        duration: 0
+                                duration: 3000
                             });
                             setTimeout(() => {
                                 this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
@@ -338,6 +379,8 @@ export default {
                             }, 3000);
                         });
                     })
+                }
+            })
         },
         //触发条件修改详情
         triggerConditionedit(item) {

src/views/system/specialDiseaseRoute/index.vue

@@ -120,7 +120,7 @@
               <el-button size="mini" type="text" v-if="scope.row.releaseStatus == 'PUBLISHED'"
                 @click="norelease(scope.row)">取消发布</el-button>
               <el-button size="mini" type="text" v-else @click="release(scope.row)">发布</el-button>
-              <el-button size="mini" type="text">复制</el-button>
+              <!-- <el-button size="mini" type="text">复制</el-button> -->
               <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:specialDiseaseRoute:edit']">编辑</el-button>
               <el-button size="mini" type="text" @click="handleDelete(scope.row)"
@@ -407,7 +407,7 @@ export default {
             if (e.id == el) {
               let item = {
                 servicePackageId: el,
-                servicePackageName: e.packageName
+                packageName: e.packageName
               }
               routePackageList.push(item)
             }