Merge branch 'dev' into 'master'

Dev

See merge request !27

src/common/components/element-ui.js

@@ -12,6 +12,8 @@ import {
   MessageBox,
   Pagination,
   Loading,
+  Row,
+  Col,
   DatePicker,
   Switch,
   Select,
@@ -56,6 +58,8 @@ const components = [
   Submenu,
   MenuItemGroup,
   Tabs,
+  Row,
+  Col,
   TabPane,
   Tag,
   Checkbox,

src/router/index.js

@@ -66,10 +66,16 @@ const routes = [
         meta: { title: '定时任务' },
       },
       {
-        path: '/saas/announceManage',
-        component: () => import('@/views/system/announceManage.vue'),
-        name: 'system_announce_manage',
-        meta: { title: '公告管理' },
+        path: '/saas/countryCode',
+        component: () => import('@/views/system/countryCode.vue'),
+        name: 'system_countryCode',
+        meta: { title: '国家代码' },
+      },
+      {
+        path: '/saas/abbreviation',
+        component: () => import('@/views/system/abbreviation.vue'),
+        name: 'system_abbreviation',
+        meta: { title: '州省简称' },
       },
     ],
   },

src/views/home/navMenu.vue

@@ -198,9 +198,17 @@ export default {
             {
               id: 5,
               path: '',
-              label: '公告管理',
-              icon: 'el-icon-s-promotion',
-              index: '/saas/announceManage',
+              label: '国家代码',
+              icon: 'el-icon-s-flag',
+              index: '/saas/countryCode',
+              children: [],
+            },
+            {
+              id: 6,
+              path: '',
+              label: '州省简称',
+              icon: 'el-icon-s-help',
+              index: '/saas/abbreviation',
               children: [],
             },
           ],

src/views/taskManage/index.vue

@@ -998,7 +998,9 @@ export default {
         },
       ],
       pendingVisible: false,
-      pendingForm: {},
+      pendingForm: {
+        closeReason: '',
+      },
       imgPreviewUrl: '',
       subscript: 0,
       imgList: [],
@@ -1222,6 +1224,12 @@ export default {
           width: 80,
         },
         {
+          label: '取消原因',
+          key: 'userCanncelReason',
+          show: this.statusCode === 'CLOSED',
+          width: 80,
+        },
+        {
           label: '操作',
           fixed: 'right',
           width: this.columnWidth(),