0.3.0 数据隔离

src/views/bst/customer/index.vue

@@ -248,7 +248,8 @@ export default {
         {key: 'followName', visible: true, label: '跟进人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'lastFollowTime', visible: true, label: '最近跟进', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
         {key: 'nextFollowTime', visible: true, label: '下次跟进', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
-        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
+        {key: 'createName', visible: true, label: '创建人', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
       ],
       // 排序方式

src/views/bst/customer/view/index.vue

@@ -23,13 +23,13 @@
 
     <el-card class="card-box" v-if="detail.id">
       <el-tabs lazy>
-        <el-tab-pane label="跟进记录">
+        <el-tab-pane label="跟进记录" v-if="checkPermi(['bst:customerFollow:list'])">
           <customer-follow 
             :query="{customerId: detail.id}" 
             :hide-columns="['customerName']" 
             :init-data="{customerId: detail.id, customerName: detail.name}" />
         </el-tab-pane>
-        <el-tab-pane label="项目列表">
+        <el-tab-pane label="项目列表" v-if="checkPermi(['bst:project:list'])">
           <project
             :query="{customerId: detail.id}" 
             :hide-columns="['customerName']" 
@@ -44,6 +44,7 @@
 import { getCustomer } from '@/api/bst/customer'
 import CustomerFollow from '@/views/bst/customerFollow/index.vue'
 import Project from '@/views/bst/project/index.vue'
+import { checkPermi } from '@/utils/permission'
 
 export default {
   name: 'CustomerView',
@@ -64,6 +65,7 @@ export default {
     this.getDetail()
   },
   methods: {
+    checkPermi,
     getDetail() {
       this.loading = true
       getCustomer(this.$route.params.id).then(res => {

src/views/bst/project/index.vue

@@ -134,8 +134,7 @@
               {{d.row.expectedCompleteDate | dv}}
             </template>
             <template v-else-if="column.key === 'time'">
-              创建时间:{{d.row.createTime |dv}}<br/>
-              {{getExpireTime(d.row).label | dv}}:{{getExpireTime(d.row).value | dv}}
+              {{getExpireTime(d.row).value | dv}}
             </template>
             <template v-else>
               {{d.row[column.key]}}
@@ -308,7 +307,7 @@ export default {
         {key: 'receivedAmount', visible: false, label: '已收金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'operationAmount', visible: false, label: '运维费用', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
-        {key: 'time', visible: true, label: '时间', minWidth: null, sortable: false, overflow: false, align: 'left', width: "220"},
+        {key: 'time', visible: true, label: '截止时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
         {key: 'createTime', visible: false, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
         {key: 'taskCount', visible: true, label: '任务(总数/已通过/待审核)', minWidth: null, sortable: true, overflow: false, align: 'center', width: "200"},
       ],

src/views/bst/project/utils.js

@@ -15,11 +15,6 @@ export const ProjectUtils = {
           label: '开发预计',
           value: row.expectedCompleteTime
         };
-      case ProjectStatus.COMPLETED:
-        return {
-          label: '开发完成',
-          value: row.completeTime
-        };
       case ProjectStatus.MAINTENANCE:
       case ProjectStatus.MAINTENANCE_OVERDUE:
         return {

src/views/bst/project/view/index.vue

@@ -122,7 +122,7 @@
     <el-row>
       <el-card class="box-card">
         <el-tabs v-if="detail.id" lazy>
-          <el-tab-pane label="任务列表">
+          <el-tab-pane label="任务列表" v-if="checkPermi(['bst:task:list'])">
             <task :query="{ projectId: detail.id }" :init-data="{projectId: detail.id}" :hide-columns="['projectName']"/>
           </el-tab-pane>
         </el-tabs>
@@ -155,6 +155,7 @@ import ProjectStartDialog from '@/views/bst/project/components/ProjectStartDialo
 import ProjectMaintenanceDialog from '@/views/bst/project/components/ProjectMaintenanceDialog.vue';
 import AvatarList from '@/components/AvatarList/index.vue';
 import CustomerLink from '@/components/Business/Customer/CustomerLink.vue';
+import { checkPermi } from '@/utils/permission';
 export default {
   name: "ProjectView",
   components: {
@@ -202,6 +203,7 @@ export default {
     this.getDetail();
   },
   methods: {
+    checkPermi,
     // 验收
     handleAccept(row) {
       this.$modal.confirm('是否确认验收项目编号为"' + row.no + '"的数据项？')

src/views/system/role/index.vue

@@ -318,6 +318,10 @@ export default {
         {
           value: "6",
           label: "负责部门数据权限"
+        },
+        {
+          value: "7",
+          label: "本部门及本人数据权限"
         }
       ],
       // 菜单列表