build

src/views/netOrderEntry/netOrderEnter/importTemplateModal.vue

@@ -28,7 +28,6 @@
 import { columns, getTableProperty } from './template'
 import companyHelper from '@/mixins/companyHelper'
 import { MessageBox } from 'element-ui'
-import { h } from 'vue'
 export default {
   mixins: [companyHelper],
   props: ['visible'],
@@ -122,12 +121,13 @@ export default {
         })
       }
 
-      console.log(Object.keys(messages), messages['1'])
       if (!finalValid) {
         MessageBox({
-          type: 'warning',
+          type: 'error',
           title: '数据填写错误',
-          message: h('ul', null, [])
+          message: Object.keys(messages).map(row => {
+            return `第${row}行,${messages[row]}`
+          }).join('\n')
         })
       }
 
@@ -185,7 +185,7 @@ export default {
 
       const isValid = this.validateFields(this.tableData)
 
-      if (isValid) {
+      if (!isValid) {
         this.tableData = []
       }
     }