Merge remote-tracking branch 'origin/master'

src/views/qw/sopTemp/updateSopTemp.vue

@@ -1056,6 +1056,7 @@ export default {
       data.list = dataList;
       this.loading = true;
       addOrUpdateSetting(data).then(e => {
+        this.$message.success(e.msg)
         let content = this.setting[this.tabIndex].content;
         for (let j = 0; j < content.length; j++) {
           if (content[j].addTag != null) {
@@ -1071,6 +1072,8 @@ export default {
           ...this.setting[this.tabIndex],
           id: e.data.id,
         });
+      }).catch(() => {
+        this.loading = false;
       });
     },
     checkData(data) {