Merge remote-tracking branch 'origin/master'

src/views/qw/sop/addSop.vue

@@ -765,6 +765,9 @@ export default {
     },
     //查询模板
     selectListSopTemp(type) {
+      if(this.form.filterMode == 2){
+        type = 5;
+      }
       this.tempOpen = true;
       setTimeout(() => {
         this.$refs.SopTempComments.getList(type, undefined, this.form.type == 3);

src/views/qw/sopTemp/updateSopTemp.vue

@@ -814,6 +814,7 @@ export default {
     const id = this.$route.params && this.$route.params.id;
     this.id = id;
     this.formType = this.$route.params && this.$route.params.type;
+    console.info(this.form)
     this.handleUpdate(id);
   },
   methods: {