问卷修改

1

src/views/setQuestions/operation.vue

@@ -512,8 +512,12 @@ export default {
         "*"
       );
     },
+<<<<<<< Updated upstream
         settemplateType(index) {
           if(this.disabled)return
+=======
+        setPreTemplate(index) {
+>>>>>>> Stashed changes
       this.$set(this.form, "templateType", index);
       if (this.checkList.indexOf(index) == -1) {
         this.checkList.push(index);