Merge remote-tracking branch 'origin/master'

src/components/city-cascader/main.vue

@@ -82,4 +82,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>

src/store/modules/area.js

@@ -58,7 +58,7 @@ const area = {
         id = item.parentId;
         res.unshift(item);
         item = state.dic[id];
-      }      
+      }
       return res
     }
   }

src/views/manage/station/inviteCode.vue

@@ -32,8 +32,8 @@
         </el-button>
       </template>
       <template slot="menu" slot-scope="{row}">
-        <el-button type="text" @click="rowUpdate(row)">编辑</el-button>
+        <el-button type="text" size="small" @click="rowUpdate(row)">编辑</el-button>
-        <el-button type="text" @click="rowDel(row)">删除</el-button>
+        <el-button type="text" size="small" @click="rowDel(row)">删除</el-button>
       </template>
       <template slot="isEnabled" slot-scope="{ row }">
         <el-switch
@@ -128,11 +128,14 @@ const curdOptions = {
   editBtn: false,
   delBtn: false,
   height: "auto",
+  viewBtn: true,
   border: true,
   searchMenuSpan: 48,
   selection: true,
   index: true,
   indexLabel: "序号",
+  dialogType: "drawer",
+  align: 'center',
   column: [{
     label: '机构名称',
     prop: 'companyName',
@@ -141,17 +144,14 @@ const curdOptions = {
     label: '企业名称',
     prop: 'comname',
     search: true,
+  }, {
+    label: '统一信用代码',
+    prop: 'companyId',
+    hide: true,
   }, {
     label: '绑定用户',
     prop: 'realName',
-    // search: true,
   },
-    // {
-    //   label: '邀请码',
-    //   prop: 'inviteCode',
-    //   search: true,
-    // },
-
     {
       label: '手机号',
       prop: 'phone',
@@ -162,10 +162,10 @@ const curdOptions = {
       search: true,
       formatter: (_, value, label) => value
     },
-    // {
+    {
-    //   label: '备注',
+      label: '驳回原因',
-    //   prop: 'remarks',
+      prop: 'reviewMsg',
-    // },
+    },
     {
       label: '启用状态',
       prop: 'isEnabled',
@@ -178,7 +178,18 @@ const curdOptions = {
       type: 'select',
       dicData: recruitStatus,
       display: false,
-    }]
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      hide: true,
+    },
+    {
+      label: '创建用户',
+      prop: 'createUser',
+      hide: true,
+    }
+  ]
 }
 const page = {
   pageSize: 10,