冲突

src/views/question/index.vue

@@ -63,18 +63,21 @@
     </el-table>
 
     <!-- <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
-    <QuestionForm v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" @update="getList" />
+    <QuestionForm v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" @refreshDataList="getList" />
+    <QuestionAddForm v-if="dialogAddVisible" ref="dialogAddForm" :dialog-visible="dialogAddVisible" @refreshDataList="getList" />
+
   </div>
 </template>
 
 <script>
 import { searchQuestion } from '@/api/question';
 import QuestionForm from './components/QuestionForm.vue';
+import QuestionAddForm from './components/QuestionAddForm.vue';
 
 export default {
   name: 'Question',
   components: {
-    QuestionForm
+    QuestionForm, QuestionAddForm
   },
   data() {
     return {
@@ -85,11 +88,12 @@ export default {
       tableList: [],
       // 查询参数
       queryParams: {
-        question: ''
-        // carTypeId: 1001,
-        // subject: 1
+        question: '',
+        carTypeId: 1001,
+        subject: 1
       },
-      dialogVisible: false
+      dialogVisible: false,
+      dialogAddVisible: false
     };
   },
   created() {
@@ -124,6 +128,12 @@ export default {
       this.$nextTick(() => {
         this.$refs.dialogForm.init(item);
       });
+    },
+    handleAdd(item) {
+      this.dialogAddVisible = true;
+      this.$nextTick(() => {
+        this.$refs.dialogAddForm.init(item);
+      });
     }
   }
 };