系统设置，操作日志，

src/router/index.js

@@ -65,7 +65,7 @@ export const asyncRouterMap = [
         name: 'goodsCategory',
         component: () => import('@/views/inv/GoodsCateogory'),
         meta: { title: '物品类别', icon: 'product-cate' }
-      },{
+      }, {
         path: 'depotAdmin',
         name: 'depotAdmin',
         component: () => import('@/views/inv/DepotAdmin'),
@@ -141,7 +141,27 @@ export const asyncRouterMap = [
         hidden: true
       }]
   },
-
+  {
+    path: '/set',
+    component: Layout,
+    redirect: '/set/log',
+    name: 'set',
+    meta: { title: '系统设置', icon: 'product-list' },
+    children: [
+      {
+        path: 'log',
+        name: 'log',
+        component: () => import('@/views/set/log'),
+        meta: { title: '操作日志', icon: 'ums-role' },
+        hidden: false
+      },
+      {
+        path: 'setting',
+        name: 'setting',
+        component: () => import('@/views/set/setting'),
+        meta: { title: '配置管理', icon: 'product-list' },
+      }]
+  },
   // 权限模块
   {
     path: '/ums',
@@ -208,20 +228,6 @@ export const asyncRouterMap = [
         component: () => import('@/views/ums/resource/categoryList'),
         meta: { title: '资源分类' },
         hidden: true
-      },
-      {
-        path: 'log',
-        name: 'log',
-        component: () => import('@/views/ums/resource/log'),
-        meta: { title: '操作日志', icon: 'ums-role' },
-        hidden: false
-      },
-      {
-        path: 'setting',
-        name: 'setting',
-        component: () => import('@/views/ums/resource/setting'),
-        meta: { title: '配置管理', icon: 'ums-menu' },
-        hidden: false
       }
     ]
   },

src/views/inv/modules/addGoodsModal.vue

@@ -216,9 +216,9 @@ export default {
       this.visible = false
     },
     handleAdd() {
-      for (var i of this.formData.tableData) {
-        i.isOK = false
-      }
+      // for (var i of this.formData.tableData) {
+      //   i.isOK = false
+      // }
       this.formData.tableData.push({
         name: '',
         goodsNo: '',
@@ -235,12 +235,12 @@ export default {
       // 把每一行的索引放进row
       row.index = rowIndex;
     },
-    dbclick(row, event, column) {
-      for (var i of this.formData.tableData) {
-        i.isOK = false
-      }
-      row.isOK = !row.isOK
-    },
+    // dbclick(row, event, column) {
+    //   for (var i of this.formData.tableData) {
+    //     i.isOK = false
+    //   }
+    //   row.isOK = !row.isOK
+    // },
     submit(formName) {
       // if (!this.formData.tableData.length || !this.formData.tableData[0].name) {
       //   this.$message.warning('请添加物品')

src/views/inv/modules/importGoodsModal.vue

@@ -320,14 +320,12 @@ export default {
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          let data = this.formData.tableData
-          alert(JSON.stringify(data))
           addGoodList({ vankeGoodsList: this.formData.tableData }).then(res => {
             this.$emit('ok')
             this.visible = false
           })
         } else {
-          this.$message.warning('请检查必填项')
+          this.$message.warning('请检查必填项是否输入')
         }
       })
 

src/views/ums/resource/log.vue → src/views/set/log.vue

@@ -42,11 +42,12 @@
         </el-table-column>
         <el-table-column label="操作内容"
                          align="center"
-                         prop="action">
+                         prop="content">
         </el-table-column>
         <el-table-column label="操作时间"
                          align="center"
                          prop="module">
+          <template slot-scope="scope">{{scope.row.createTime | formatTime}}</template>
         </el-table-column>
       </el-table>
     </div>
@@ -66,7 +67,7 @@
 </template>
 <script>
 import { logRequest } from '@/api/login'
-
+import moment from 'moment/moment'
 const defaultListQuery = {
   pageNum: 1,
   pageSize: 10,
@@ -143,7 +144,15 @@ export default {
         this.listLoading = false
       })
     }
-  }
+  },
+  filters: {
+    formatTime(time) {
+      if (!time) {
+        return '--'
+      }
+      return moment(time).format('YYYY-MM-DD HH:mm:ss')
+    }
+  },
 }
 </script>
 <style scoped>