物品新增和导入物品

src/views/inv/StoreList.vue

@@ -65,7 +65,7 @@
           <el-button type="primary" @click="handleAdd">新增</el-button>
           <el-button type="success" @click="handleAdd">扫码入库</el-button>
           <el-button type="info" @click="handleAdd">扫码出库</el-button>
-          <el-button type="warning" @click="handleAdd">导入</el-button>
+          <el-button type="warning" @click="handleImport">导入</el-button>
       </el-row>
       <div class="table-container">
         <el-table :data="list"
@@ -119,14 +119,16 @@
       </div>
     </el-card>
 <!--    弹窗-->
-    <add-goods ref="addGoods" @ok="getList"></add-goods>
+    <add-goods-modal ref="addGoods" @ok="getList"></add-goods-modal>
+    <import-goods-modal ref="importGoods" @ok="getList"></import-goods-modal>
   </div>
 </template>
 <script>
 import moment from 'moment'
 import { getGoodsList,getGoodsCategoryList,getStockRooms, getAuditDetail, updateMcht } from '@/api/inventory'
 import {getSuppliersList} from '@/api/supplier'
-import AddGoods from './modules/addGoodsModal'
+import AddGoodsModal from './modules/addGoodsModal'
+import ImportGoodsModal from './modules/importGoodsModal'
 // 列表查询参数默认值
 const defaultListQuery = {
   pageNum: 1,
@@ -139,7 +141,10 @@ const defaultListQuery = {
 
 export default {
   name: 'StoreList',
-  components: {AddGoods},
+  components: {
+    AddGoodsModal,
+    ImportGoodsModal
+  },
   data() {
     return {
       listQuery: Object.assign({}, defaultListQuery),
@@ -218,8 +223,13 @@ export default {
         this.listLoading = false
       })
     },
+    // 新增
     handleAdd(){
       this.$refs.addGoods.add()
+    },
+    // 导入
+    handleImport(){
+      this.$refs.importGoods.add()
     }
   }
 }

src/views/inv/modules/addGoodsModal.vue

@@ -13,11 +13,12 @@
       <el-table
         :data="formData.tableData"
         style="width: 100%"
-        @row-dblclick="dbclick">
+        @row-dblclick="dbclick"
+        :row-class-name="tableRowClassName">
         <el-table-column prop="name"  label="物品名称">
           <template slot-scope="scope">
               <el-form-item size="mini" :prop="'tableData.' + scope.$index + '.name'"
-                            :rules="[{required: true,trigger: 'blur',message: '物品名称不能为空'}]">
+                            :rules="[{required: true,trigger: 'change',message: '物品名称不能为空'}]">
                 <el-autocomplete
                   class="input-width"
                   v-model="scope.row.name"
@@ -230,8 +231,12 @@ export default {
         isOK: true
       },)
     },
+    tableRowClassName ({row, rowIndex}) {
+      // 把每一行的索引放进row
+      row.index = rowIndex;
+    },
     dbclick(row, event, column) {
-      for (var i of this.tableData) {
+      for (var i of this.formData.tableData) {
         i.isOK = false
       }
       row.isOK = !row.isOK