修改

src/api/system/specialDiseaseNode.js

@@ -1,23 +1,31 @@
 import request from '@/utils/request'
 
-// /system/partition/taskPartitionList 任务细分
+// 任务细分
 export function taskPartitionList(taskTypeId) {
     return request({
         url: `/system/partition/taskPartitionList?taskTypeId=${taskTypeId}`,
         method: 'get',
     })
 }
-///system/taskType/selectTaskTypeList 任务类型
+// 任务类型
 export function selectTaskTypeList() {
     return request({
         url: '/system/taskType/selectTaskTypeList',
         method: 'get',
     })
 }
-// /system/taskStatus/taskStatusDictList 任务状态
+// 任务状态
 export function taskStatusDictList() {
     return request({
         url: '/system/taskStatus/taskStatusDictList',
         method: 'get',
     })
-}
+}
+//新增修改节点
+export function specialDiseaseNode(data) {
+    return request({
+        url: `/system/specialDiseaseNode/edit`,
+        method: 'put',
+        data
+    })
+}

src/views/system/components/propaganda.vue

@@ -71,9 +71,9 @@
                         <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.propagandaCode">选择</el-button>
+                                    v-if="handleselectId != scope.row.id">选择</el-button>
                                 <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                                    v-if="handleselectId == scope.row.propagandaCode">取消选择</el-button>
+                                    v-if="handleselectId == scope.row.id">取消选择</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -197,9 +197,9 @@ export default {
             this.$emit("on-template", { templateId: '', templateName: '' });
         },
         handleselect(item) {
-            this.handleselectId = item.propagandaCode
+            this.handleselectId = item.id
             this.handleselectName = item.propagandaTitle
-            this.$emit("on-template", { templateId: item.propagandaCode, templateName: item.propagandaTitle });
+            this.$emit("on-template", { templateId: item.id, templateName: item.propagandaTitle });
             this.classificationOpen = false
         },
         classificationOpenfalse() {

src/views/system/components/question.vue

@@ -57,9 +57,9 @@
                         <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.questionnaireId">选择</el-button>
+                                    v-if="handleselectId != scope.row.id">选择</el-button>
                                 <el-button size="mini" type="text" @click="nohandleselect(scope.row)"
-                                    v-if="handleselectId == scope.row.questionnaireId">取消选择</el-button>
+                                    v-if="handleselectId == scope.row.id">取消选择</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -93,7 +93,6 @@ export default {
             total: 0,
             // 问卷基本信息表格数据
             questionList: [],
-            departmentlist: [],
             // 查询参数
             queryParams: {
                 pageNum: 1,
@@ -102,6 +101,7 @@ export default {
                 departmentName: null,
                 diseaseTypeName: null,
                 questionnaireName: null,
+                questionnaireStatus: "PUBLISHED",
             },
             handleselectId: '',
             handleselectName: null,
@@ -129,9 +129,9 @@ export default {
             this.$emit("on-template", { templateId: '', templateName: '' });
         },
         handleselect(item) {
-            this.handleselectId = item.questionnaireId
+            this.handleselectId = item.id
             this.handleselectName = item.questionnaireName
-            this.$emit("on-template", { templateId: item.questionnaireId, templateName: item.questionnaireName });
+            this.$emit("on-template", { templateId: item.id, templateName: item.questionnaireName });
             this.classificationOpen = false
         },
         classificationOpenfalse() {
@@ -150,16 +150,14 @@ export default {
         /** 查询科室下拉树结构 */
         getTreeselect() {
             getDepartmentList({
-                departmentName: this.departmentName
+                departmentName: this.departmentName,
+                questionnaireStatus: "PUBLISHED",
             }).then(response => {
                 // response.data.forEach(e => {
                 //     e.label = e.departmentName
                 // })
                 this.deptOptions = response.data;
             });
-            selectUserDepartment().then(res => {
-                this.departmentlist = res.data
-            })
         },
         /** 查询问卷基本信息列表 */
         getList() {

src/views/system/components/wangEditor.vue

@@ -131,6 +131,7 @@ export default ({
                     fileName: '',
                     fileSpan: '',
                 }
+                this.editor.focus()
             }, 100);
         },
         fieldclick() {
@@ -155,6 +156,7 @@ export default ({
                     fileName: '',
                     fileSpan: '',
                 }
+                this.editor.focus()
             }, 100);
         },
         onCreated(editor) {

src/views/system/editorialSpecialization/index.vue

@@ -404,6 +404,8 @@ export default {
             width: 400px;
             display: flex;
             align-items: center;
+            margin: 0px;
+            color: black;
 
             span {
                 padding-left: 10px;

src/views/system/specialDiseaseNode/index.vue

@@ -83,8 +83,7 @@
                             <el-input v-model="form.secondClassifyDescribe" style="width:100px"></el-input>
                         </el-form-item>
                         <el-form-item label="执行时间" prop="">
-                            <el-time-select v-model="form.executionTime" style="width:120px"
+                            <el-time-select v-model="form.executionTime" style="width:120px" placeholder="选择时间">
-                                :picker-options="{ start: '08:30', step: '00:30', end: '18:30' }" placeholder="选择时间">
                             </el-time-select>
                         </el-form-item>
                         <el-form-item label="问卷库模板选择" prop=""
@@ -120,7 +119,7 @@
                             <div class="text">
                                 短信预览：
                             </div>
-                            <el-input style="border:none" class="textarea" v-model="form.messagePreview"></el-input>
+                            <el-input class="textarea" v-model="form.messagePreview" disabled></el-input>
                         </div>
                     </div>
                     <div class="card">
@@ -147,8 +146,7 @@
                             <div class="text">
                                 提醒内容：
                             </div>
-                            <el-input v-model="form.officialRemindContent" placeholder="" class="textarea"
+                            <el-input v-model="form.officialRemindContent" class="textarea" disabled></el-input>
-                                style="border: none;"></el-input>
                         </div>
                     </div>
                     <div class="card">
@@ -175,15 +173,13 @@
                             <div class="text">
                                 提醒内容：
                             </div>
-                            <el-input v-model="form.input" placeholder="" class="textarea"
+                            <el-input v-model="form.appletRemindContent" class="textarea" disabled></el-input>
-                                style="border: none;"></el-input>
                         </div>
                         <div class="flextwo">
                             <div class="text">
                                 提示说明：
                             </div>
-                            <el-input v-model="form.input" placeholder="" class="textarea"
+                            <el-input v-model="form.appletPromptDescription" class="textarea" disabled></el-input>
-                                style="border: none;"></el-input>
                         </div>
                     </div>
                     <!-- <div class="card" style="height: 250px;">
@@ -269,7 +265,7 @@ import propaganda from '../components/propaganda.vue'
 import officialAccount from '../components/officialAccount.vue'
 import miniProgram from '../components/miniProgram.vue'
 import {
-    selectTaskTypeList, taskPartitionList, taskStatusDictList
+    selectTaskTypeList, taskPartitionList, taskStatusDictList, specialDiseaseNode
 } from '@/api/system/specialDiseaseNode'
 import {
     selectSpecialDisease
@@ -280,8 +276,10 @@ export default {
     data() {
         return {
             updata: {
+                specialDiseaseRouteId: '',
                 suitRange: '',
                 routeName: '',
+                specialDiseaseNodeList: [],
             },
             form: {
                 nodeContent: '',
@@ -298,6 +296,10 @@ export default {
                 officialPushSign: '0',
                 messagePushSign: '0',
                 taskSubdivisiontemplateType: '',
+                officialRemindContent: '',
+                messagePreview: '',
+                appletRemindContent: '',
+                appletPromptDescription: '',
             },
             itemindex: 0,
             listindex: 0,
@@ -319,7 +321,11 @@ export default {
                         appletPushSign: '0',
                         officialPushSign: '0',
                         messagePushSign: '0',
+                        messagePreview: '',
+                        officialRemindContent: '',
                         taskSubdivisiontemplateType: '',
+                        appletRemindContent: '',
+                        appletPromptDescription: '',
                     },
                 ],
             }],
@@ -338,8 +344,9 @@ export default {
         if (this.$route.query) {
             this.updata.suitRange = this.$route.query.suitRange
             this.updata.routeName = this.$route.query.routeName
-            selectSpecialDisease(this.$route.query.id).then(res => {
+            this.updata.specialDiseaseRouteId = this.$route.query.id
-            })
+            // selectSpecialDisease(this.$route.query.id).then(res => {
+            // })
         }
     },
     beforeDestroy() { },
@@ -365,7 +372,7 @@ export default {
             this.form.messagePreview = item.templateContent
         },
         //公众号传值
-        officialAccountontemplate() {
+        officialAccountontemplate(item) {
             this.form.officialTemplateId = item.templateId
             this.form.officialTemplateName = item.templateName
             this.form.officialRemindContent = item.templateContent
@@ -373,7 +380,15 @@ export default {
         //暂存
         TemporaryStorage() {
             this.$refs.wangeditor.emit()
-            console.log(this.lists)
+            this.lists.forEach(e => {
+                e.list.length > 0 ? e.list.forEach(el => {
+                    el.routeNodeDay = e.routeNodeDay
+                    el.routeNodeName = e.routeNodeName
+                    this.updata.specialDiseaseNodeList.push(el)
+                }) : ""
+            })
+            specialDiseaseNode(this.updata).then(res => {
+            })
         },
         //问卷传值
         questionontemplate(item) {
@@ -411,6 +426,9 @@ export default {
             taskPartitionList(id).then(res => {
                 this.taskPartitionList = res.data
             })
+            this.form.taskSubdivision = ''
+            this.form.taskSubdivisionName = ''
+            this.form.taskSubdivisiontemplateType = ''
             this.selectTaskTypeList.forEach(el => {
                 if (id == el.id) {
                     this.form.taskTypeName = el.taskTypeName
@@ -420,6 +438,7 @@ export default {
         changetaskSubdivision(e) {
             this.taskPartitionList.forEach(el => {
                 if (e == el.id) {
+                    this.form.executionTime = el.executionTime
                     this.form.taskSubdivisionName = el.taskTypeName
                     this.form.taskSubdivisiontemplateType = el.templateType
                 }
@@ -436,14 +455,18 @@ export default {
                         templateName: '',
                         taskType: '',
                         taskTypeName: '',
+                        officialRemindContent: '',
                         taskSubdivision: '',
                         taskSubdivisionName: '',
+                        appletRemindContent: '',
+                        appletPromptDescription: '',
                         taskStatus: '',
                         secondClassifyDescribe: '',
                         executionTime: '',
                         appletPushSign: '0',
                         officialPushSign: '0',
                         messagePushSign: '0',
+                        messagePreview: '',
                         taskSubdivisiontemplateType: '',
                     },
                 ]
@@ -456,6 +479,7 @@ export default {
                 templateName: '',
                 taskType: '',
                 taskTypeName: '',
+                officialRemindContent: '',
                 taskSubdivision: '',
                 taskSubdivisionName: '',
                 taskStatus: '',
@@ -463,7 +487,9 @@ export default {
                 executionTime: '',
                 appletPushSign: '0',
                 officialPushSign: '0',
-                messagePushSign: '0',
+                messagePushSign: '0', appletRemindContent: '',
+                appletPromptDescription: '',
+                messagePreview: '',
                 taskSubdivisiontemplateType: '',
             })
         },
@@ -503,12 +529,18 @@ export default {
                 color: #64666A;
             }
 
+            ::v-deep .el-input__inner {
+                color: black !important;
+                background-color: #fff !important;
+                cursor: default !important
+            }
+
             .textarea {
                 width: 90%;
                 padding: 0 10px;
                 height: 50px;
                 line-height: 50px;
-                border: 1px solid #DCDFE6;
+                // border: 1px solid #DCDFE6;
                 border-radius: 5px;
                 display: flex;
                 align-items: center;