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

src/views/manage/continueSigning/index.vue

@@ -191,7 +191,11 @@ export default {
                         hardwareType: undefined,
                     }
                 ],
-                informeds: []
+                informeds: [],
+                route: {
+                    routeId: undefined,
+                    routeName: ''
+                },
             },
             rules: {
                 routeId: [
@@ -301,8 +305,10 @@ export default {
                 this.signPackage.healthManageName = this.attendingPhysicianlist.find(e => e.userId == this.signPackage.healthManageId)?.nickName
             }
             this.form.signPackage = this.signPackage
+            this.form.route.routeId = this.signPackage.routeId
+            this.form.route.routeName = this.signPackage.routeName
             addsign(this.form).then(res => {
-                this.$confirm('签约成功, 是否返回上一页?', '提示', {
+                this.$confirm('续约成功, 是否返回上一页?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'success'
@@ -313,7 +319,7 @@ export default {
                         });
                     })
                 }).catch(() => {
-                    this.$modal.msgSuccess("签约成功");
+                    this.$modal.msgSuccess("续约成功");
                 });
             })
         },