Merge branch 'dev' into 'master'

Dev

See merge request !25

src/common/components/element-ui.js

@@ -24,6 +24,8 @@ import {
   MenuItemGroup,
   MenuItemGroup,
   Tag,
   Tag,
   Checkbox,
   Checkbox,
+  Tabs,
+  TabPane,
   Tree,
   Tree,
   Dropdown,
   Dropdown,
   DropdownItem,
   DropdownItem,
@@ -50,6 +52,8 @@ const components = [
   MenuItem,
   MenuItem,
   Submenu,
   Submenu,
   MenuItemGroup,
   MenuItemGroup,
+  Tabs,
+  TabPane,
   Tag,
   Tag,
   Checkbox,
   Checkbox,
   Tree,
   Tree,

src/views/basics/currency.vue

@@ -160,7 +160,7 @@ export default {
         ],
         ],
       },
       },
       paginationOptions: {
       paginationOptions: {
-        pageSize: 100,
+        pageSize: 10,
         currentPage: 1,
         currentPage: 1,
         total: 0,
         total: 0,
       },
       },

src/views/home/navMenu.vue

@@ -187,14 +187,14 @@ export default {
               index: '/saas/currency',
               index: '/saas/currency',
               children: [],
               children: [],
             },
             },
-            // {
-            //   id: 4,
-            //   path: '',
-            //   label: '定时任务',
-            //   icon: 'el-icon-message-solid',
-            //   index: '/saas/timed_task',
-            //   children: [],
-            // },
+            {
+              id: 4,
+              path: '',
+              label: '定时任务',
+              icon: 'el-icon-message-solid',
+              index: '/saas/timed_task',
+              children: [],
+            },
           ],
           ],
         },
         },
       ],
       ],

src/views/taskManage/index.vue

@@ -467,12 +467,11 @@ export default {
     Edit,
     Edit,
   },
   },
   data() {
   data() {
-    const userInfo = localStorage.getItem('userinfo')
+    const userInfo = localStorage.getItem('user')
     let employeeId
     let employeeId
     if (userInfo) {
     if (userInfo) {
       employeeId = JSON.parse(userInfo).employeeId
       employeeId = JSON.parse(userInfo).employeeId
     }
     }
-
     return {
     return {
       loading: false,
       loading: false,
       detailLoading: false,
       detailLoading: false,
@@ -483,6 +482,7 @@ export default {
         currentPage: 1,
         currentPage: 1,
         total: 0,
         total: 0,
       },
       },
+      userInfo: JSON.parse(userInfo),
       taskLeader: '',
       taskLeader: '',
       assignVisible: false,
       assignVisible: false,
       periodTime: [],
       periodTime: [],
@@ -527,7 +527,7 @@ export default {
     )
     )
   },
   },
   computed: {
   computed: {
-    ...mapState(['deptStaff', 'userInfo']),
+    ...mapState(['deptStaff']),
     tableColumns() {
     tableColumns() {
       // const employeeId = this.employeeId
       // const employeeId = this.employeeId
       return [
       return [
@@ -536,7 +536,7 @@ export default {
           key: 'title',
           key: 'title',
           minWidth: 120,
           minWidth: 120,
           align: 'left',
           align: 'left',
-          render: (item) => (
+          render: item => (
             <span style="position: relative;">
             <span style="position: relative;">
               <span>{item.title}</span>
               <span>{item.title}</span>
               {item.sign === 1 &&
               {item.sign === 1 &&
@@ -567,6 +567,11 @@ export default {
           width: 80,
           width: 80,
         },
         },
         {
         {
+          label: '验收意见',
+          key: 'evaluations',
+          width: 140,
+        },
+        {
           label: '负责人',
           label: '负责人',
           key: 'leaderNames',
           key: 'leaderNames',
           width: 80,
           width: 80,
@@ -579,7 +584,7 @@ export default {
         {
         {
           label: '描述',
           label: '描述',
           key: 'content',
           key: 'content',
-          render: (item) => {
+          render: item => {
             return (
             return (
               <div
               <div
                 class="description"
                 class="description"
@@ -618,7 +623,7 @@ export default {
           fixed: 'right',
           fixed: 'right',
           width: 80,
           width: 80,
           align: 'center',
           align: 'center',
-          render: (item) => (
+          render: item => (
             <span>
             <span>
               {
               {
                 <span
                 <span
@@ -848,8 +853,10 @@ export default {
     },
     },
     async getlist() {
     async getlist() {
       this.loading = true
       this.loading = true
-      const { pageSize, currentPage } =
-        this.centerPageOptions
+      const {
+        pageSize,
+        currentPage,
+      } = this.centerPageOptions
       axios
       axios
         .post('platform/platformWorkOrder/list_page', {
         .post('platform/platformWorkOrder/list_page', {
           pageSize,
           pageSize,
@@ -862,7 +869,7 @@ export default {
             this.searchForm.leaders &&
             this.searchForm.leaders &&
             this.searchForm.leaders.join(','),
             this.searchForm.leaders.join(','),
         })
         })
-        .then((res) => {
+        .then(res => {
           if (res.code !== 200) return
           if (res.code !== 200) return
           this.sourceData = res.data.records
           this.sourceData = res.data.records
           this.centerPageOptions.total = res.data.total
           this.centerPageOptions.total = res.data.total
@@ -966,7 +973,7 @@ export default {
         .get(
         .get(
           `platform/platformWorkOrderChat/getByWorkOrder?workOrderId=${item.id}`,
           `platform/platformWorkOrderChat/getByWorkOrder?workOrderId=${item.id}`,
         )
         )
-        .then((res) => {
+        .then(res => {
           if (res.code === 200) {
           if (res.code === 200) {
             this.chatRecord = res.data
             this.chatRecord = res.data
           }
           }