解决冲突

src/views/modules/supplier/qmsQualityAccident.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-07-13 10:55:01
+ * @LastEditTime: 2023-07-14 15:53:48
  * @LastEditors: DY
  * @Description: 
 -->
@@ -96,7 +96,7 @@ const tableProps = [
   {
     prop: "closedLoop",
     label: i18n.t('supplier.closedLoop'),
-    filter: supplier('whether'),
+    filter: supplier('whether')
   }
 ];
 const tableBtn = [
@@ -167,11 +167,11 @@ export default {
               name:'全部'
             },
             {
-              id: 0,
+              id: '0',
               name: '否'
             },
             {
-              id: 1,
+              id: '1',
               name: '是'
             }
           ],
@@ -217,15 +217,15 @@ export default {
           type: "button",
           btnName: i18n.t('add'),
           name: "add",
-          color: "primary",
-          // plain: true,
+          color: "success",
+          plain: true
         },
         {
           type: "button",
           btnName: i18n.t('export'),
           name: "export",
           color: "primary",
-          // plain: true,
+          plain: true
         }
       ],
     };