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

src/views/manage/newSigning/index.vue

@@ -592,7 +592,7 @@
         </span>
       </el-dialog>
       <el-dialog :visible.sync="dialogVisible" title="查看图片">
-        <img width="60%" :src=" dialogImageUrl"  alt="" />
+        <img width="60%" :src="dialogImageUrl" alt="" />
       </el-dialog>
     </div>
   </div>
@@ -905,7 +905,6 @@ export default {
       if (files.length > 0) {
         this.$refs.upload.submit();
         this.uploadsave();
-
       } else {
         this.uploadsave();
       }
@@ -938,12 +937,12 @@ export default {
         }
         this.form.signPackage = this.signPackage;
         this.form.route = this.route;
-        if(this.form.record.signPatientRecordId ){
+        if (this.$route.query.signPatientRecordId) {
           this.form.record.signPatientRecordId = Number(
-          this.$route.query.signPatientRecordId
+            this.$route.query.signPatientRecordId
-        );
+          );
         }
-        if (!this.form.record.signPatientRecordId) {
+        if (!this.form.record.signPatientRecordId ) {
           addsign(this.form).then((res) => {
             this.$confirm("签约成功, 是否返回上一页?", "提示", {
               confirmButtonText: "确定",
@@ -980,7 +979,7 @@ export default {
                   });
               })
               .catch(() => {
-                this.$modal.msgSuccess("签约成功");
+                this.$modal.msgSuccess("修改签约成功");
               });
           });
         }
@@ -1007,11 +1006,10 @@ export default {
     delhardware(index) {
       this.form.devices.splice(index, 1);
     },
-    handleRemove(file, fileList) {
+    handleRemove(file, fileList) {},
-    },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
-      this.dialogVisible=true
+      this.dialogVisible = true;
     },
     // 撤销签约
     cancelback() {