From fb4d5e435badf4d8c90b638f70559980b1432c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 9 Apr 2024 15:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/ManuallyCreatingTasks/index.vue    |  5 ++
 .../system/editorialSpecialization/index.vue  | 48 ++++++++++---------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue
index a14631c..f45165d 100644
--- a/src/views/system/ManuallyCreatingTasks/index.vue
+++ b/src/views/system/ManuallyCreatingTasks/index.vue
@@ -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">
diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue
index 8957af1..8f1d595 100644
--- a/src/views/system/editorialSpecialization/index.vue
+++ b/src/views/system/editorialSpecialization/index.vue
@@ -26,8 +26,8 @@
                 <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">
-            <el-form-item label="所属服务包" prop="servicePackageId" required="servicePackageId">
+        <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" />
@@ -237,8 +237,8 @@ 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 => {
-                    this.form.servicePackageId.push(e.servicePackageId)
+                res.data.routePackageList?.forEach(e => {
+                    e.servicePackageId ? this.form.servicePackageId.push(e.servicePackageId) : ''
                 })
                 //服务包
                 servicepackageinfo({ departmentId: res.data.departmentId }).then(res => {
@@ -357,25 +357,29 @@ export default {
                 })
                 this.form.routePackageList = routePackageList
             }
-            this.$confirm('是否确认保存?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-            }).then(() => {
-                updateSpecialDiseaseRoute(this.form).then(response => {
-                    this.$notify({
-                        type: 'success',
-                        title: '提示',
-                        message: '保存成功,即将返回上一页',
-                        duration: 3000
-                    });
-                    setTimeout(() => {
-                        this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
-                            this.$router.push({
-                                path: "/specialdisease/specialDiseaseRoute",
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    this.$confirm('是否确认保存?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                    }).then(() => {
+                        updateSpecialDiseaseRoute(this.form).then(response => {
+                            this.$notify({
+                                type: 'success',
+                                title: '提示',
+                                message: '保存成功,即将返回上一页',
+                                duration: 3000
                             });
-                        })
-                    }, 3000);
-                });
+                            setTimeout(() => {
+                                this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+                                    this.$router.push({
+                                        path: "/specialdisease/specialDiseaseRoute",
+                                    });
+                                })
+                            }, 3000);
+                        });
+                    })
+                }
             })
         },
         //触发条件修改详情