Browse Source

中心职工用户权限控制,隐藏基础信息修改权限

dylan 2 years ago
parent
commit
ff48a0098a

+ 11 - 0
src/api/business/order/order.js

@@ -88,6 +88,17 @@ export const submitSetting = (data) => {
     })
 }
 
+export const orderConfirm = (params) => {
+    return request({
+        url: '/api/galaxy-business/rtu/check/order/confirm',
+        method: 'post',
+        data: {
+            ...params,
+        }
+    })
+}
+
+
 export const orderClose = (params) => {
     return request({
         url: '/api/galaxy-business/rtu/check/order/close',

+ 8 - 4
src/config/website.js

@@ -49,10 +49,14 @@ export default {
     // 报表设计器地址(cloud端口为8108,boot端口为80)
     reportUrl: 'http://localhost:8000/ureport',
     //文件存储服务器地址,末尾必须/
-    ossServer: 'http://172.9.0.165:80/oss/galaxy/',
-    // ossServer: 'https://nmwx.dahengsi.com:20001/oss/galaxy/',
-    //ossServer: 'http://111.204.228.227:20002/oss/galaxy/',
+    //ossServer: 'http://172.9.0.165:80/oss/galaxy/',
+    //ossServer: 'https://nmwx.dahengsi.com:20001/oss/galaxy/',
+    ossServer: 'http://111.204.228.227:20002/oss/galaxy/',
     //文件预览服务器地址
     kkfileviewServer: 'http://localhost:8012',
-
+    nm_post_code_sysadmin_id: '1562989286284906498',
+    nm_post_code_sysadmin_code: '0',
+    //nm_post_code_office_personnel_id: '1683328513757200385',
+    nm_post_code_office_personnel_id: '1683356455274676225',
+    nm_post_code_office_personnel_code: '1',
 }

+ 26 - 10
src/views/baseinfo/orgadminperson.vue

@@ -35,7 +35,8 @@
 <script>
 
 import { getPage, getDetail, add, update, remove } from "@/api/baseinfo/serviceperson.js";
-
+import { getStore } from '@/util/store.js';
+import { mapGetters } from "vuex";
 export default {
     components: {
 
@@ -43,6 +44,7 @@ export default {
     data() {
         return {
             id: "",
+            post_code: '0',
             editForm: {},
             editDialog: false,
             form: {},
@@ -71,8 +73,6 @@ export default {
                 selection: false,
                 viewBtn: false,
                 viewTitle: "运维人员信息",
-                editBtn: true,
-                delBtn: true,
                 menuWidth: 220,
                 dialogType: "drawer",
                 dialogClickModal: false,
@@ -172,14 +172,23 @@ export default {
         };
     },
     computed: {
-        // ...mapGetters(["userInfo", "permission"]),
+        ...mapGetters(["userInfo", "permission"]),
         permissionList() {
-            return {
-                // addBtn: this.vaildData(this.permission.docCategory_add, false),
-                // viewBtn: this.vaildData(this.permission.docCategory_view, false),
-                // delBtn: this.vaildData(this.permission.docCategory_delete, false),
-                // editBtn: this.vaildData(this.permission.docCategory_edit, false),
-            };
+            if (this.post_code == '0') {
+                return {
+                    addBtn: true,
+                    viewBtn: false,
+                    delBtn: true,
+                    editBtn: true,
+                };
+            } else {
+                return {
+                    addBtn: false,
+                    viewBtn: false,
+                    delBtn: false,
+                    editBtn: false,
+                };
+            }
         },
         ids() {
             let ids = [];
@@ -191,6 +200,13 @@ export default {
     },
     mounted() { },
     created() {
+        let u = getStore({ name: 'userInfo' });
+        console.log(JSON.stringify(u));
+        if (u.post_id == this.website.nm_post_code_sysadmin_id) {
+            this.post_code = this.website.nm_post_code_sysadmin_code;
+        } else if (u.post_id == this.website.nm_post_code_office_personnel_id) {
+            this.post_code = this.website.nm_post_code_office_personnel_code;
+        }
     },
     methods: {
         rowSave(row, done, loading) {

+ 34 - 11
src/views/baseinfo/orgdept.vue

@@ -18,10 +18,12 @@
                         @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
                         @before-open="beforeOpen" @select-change="selectChange">
                         <template slot-scope="{ row, index }" slot="menu">
-                            <el-button type="text" size="small" @click="excludeRegion(row)" icon="el-icon-view">排除行政区划
+                            <el-button v-if="permissionList.excludeRegion" type="text" size="small"
+                                @click="excludeRegion(row)" icon="el-icon-view">排除行政区划
                             </el-button>
 
-                            <el-button type="text" size="small" @click="resetRegion(row)" icon="el-icon-view">重置行政区划
+                            <el-button v-if="permissionList.resetRegion" type="text" size="small" @click="resetRegion(row)"
+                                icon="el-icon-view">重置行政区划
                             </el-button>
                         </template>
                     </avue-crud>
@@ -43,6 +45,8 @@
 <script>
 import { getPage, getDetail, add, update, remove } from "@/api/baseinfo/org.js";
 import { excludeRegion, resetRegion } from "@/api/baseinfo/region.js";
+import { getStore } from '@/util/store.js';
+import { mapGetters } from "vuex";
 export default {
     components: {
 
@@ -50,6 +54,7 @@ export default {
     data() {
         return {
             id: "",
+            post_code: '0',
             editForm: {},
             editDialog: false,
             excludeRegionDialog: false,
@@ -114,8 +119,6 @@ export default {
                 selection: false,
                 viewBtn: false,
                 viewTitle: "运维人员信息",
-                editBtn: true,
-                delBtn: true,
                 menuWidth: 300,
                 dialogType: "drawer",
                 dialogClickModal: false,
@@ -175,14 +178,27 @@ export default {
         };
     },
     computed: {
-        // ...mapGetters(["userInfo", "permission"]),
+        ...mapGetters(["userInfo", "permission"]),
         permissionList() {
-            return {
-                // addBtn: this.vaildData(this.permission.docCategory_add, false),
-                // viewBtn: this.vaildData(this.permission.docCategory_view, false),
-                // delBtn: this.vaildData(this.permission.docCategory_delete, false),
-                // editBtn: this.vaildData(this.permission.docCategory_edit, false),
-            };
+            if (this.post_code == '0') {
+                return {
+                    addBtn: true,
+                    viewBtn: false,
+                    delBtn: true,
+                    editBtn: true,
+                    excludeRegion: true,
+                    resetRegion: true,
+                };
+            } else {
+                return {
+                    addBtn: false,
+                    viewBtn: false,
+                    delBtn: false,
+                    editBtn: false,
+                    excludeRegion: false,
+                    resetRegion: false,
+                };
+            }
         },
         ids() {
             let ids = [];
@@ -194,6 +210,13 @@ export default {
     },
     mounted() { },
     created() {
+        let u = getStore({ name: 'userInfo' });
+        console.log(JSON.stringify(u));
+        if (u.post_id == this.website.nm_post_code_sysadmin_id) {
+            this.post_code = this.website.nm_post_code_sysadmin_code;
+        } else if (u.post_id == this.website.nm_post_code_office_personnel_id) {
+            this.post_code = this.website.nm_post_code_office_personnel_code;
+        }
     },
     methods: {
         excludeRegion(row) {

+ 28 - 11
src/views/baseinfo/rtu/index.vue

@@ -70,6 +70,7 @@
 <script>
 import { getPage, getDetail, add, update, remove } from "@/api/baseinfo/rtu.js";
 import { getTree } from "@/api/baseinfo/region.js";
+import { getStore } from '@/util/store.js';
 import { mapGetters } from "vuex";
 import rtuImportHistoryView from './rtuimport.vue';
 import rtuImportView from './rtuImportProcess.vue';
@@ -87,6 +88,7 @@ export default {
             rtuImportHistoryDialog: false,
             videoSiteAddDialog: false,
             id: "",
+            post_code: '0',
             form: {},
             selectionList: [],
             query: {},
@@ -584,21 +586,36 @@ export default {
     computed: {
         ...mapGetters(["userInfo", "permission"]),
         permissionList() {
-            return {
-                addBtn: this.vaildData(this.permission.rtu_add, false),
-                viewBtn: this.vaildData(this.permission.rtu_view, false),
-                delBtn: this.vaildData(this.permission.rtu_del, false),
-                editBtn: this.vaildData(this.permission.rtu_edit, false),
-                importBtn: this.vaildData(this.permission.rtu_import, false),
-                videoSiteAdd: this.vaildData(this.permission.video_site_add, false),
-            };
+            if (this.post_code == '0') {
+                return {
+                    addBtn: this.vaildData(this.permission.rtu_add, false),
+                    viewBtn: this.vaildData(this.permission.rtu_view, false),
+                    delBtn: this.vaildData(this.permission.rtu_del, false),
+                    editBtn: this.vaildData(this.permission.rtu_edit, false),
+                    importBtn: this.vaildData(this.permission.rtu_import, false),
+                    videoSiteAdd: this.vaildData(this.permission.video_site_add, false),
+                };
+            } else {
+                return {
+                    addBtn: false,
+                    viewBtn: true,
+                    delBtn: false,
+                    editBtn: false,
+                    importBtn: false,
+                    videoSiteAdd: false
+                };
+            }
         },
     },
     created() {
+        let u = getStore({ name: 'userInfo' });
+        console.log(JSON.stringify(u));
+        if (u.post_id == this.website.nm_post_code_sysadmin_id) {
+            this.post_code = this.website.nm_post_code_sysadmin_code;
+        } else if (u.post_id == this.website.nm_post_code_office_personnel_id) {
+            this.post_code = this.website.nm_post_code_office_personnel_code;
+        }
         this.initTree();
-    },
-    beforeDestroy() {
-
     },
     methods: {
         initTree() {

+ 17 - 0
src/views/business/order/checkorderlist.vue

@@ -87,6 +87,10 @@
                                 type="text" size="small" @click="orderChange(row)" icon="el-icon-position">
                                 任务转派
                             </el-button>
+                            <el-button v-if="permission.order_confirm && row.orderConfirm == 0" style="color:orange"
+                                type="text" size="small" @click="orderConfirm(row)" icon="el-icon-circle-check">
+                                任务确认
+                            </el-button>
                         </template>
                     </avue-crud>
                 </basic-container>
@@ -122,6 +126,7 @@ import {
     getDetail,
     orderChange,
     getCountInfo,
+    orderConfirm
 } from "@/api/business/order/order.js";
 
 import { getTree } from "@/api/baseinfo/region.js";
@@ -398,6 +403,7 @@ export default {
             return {
                 closeBtn: this.vaildData(this.permission.order_close, false),
                 changeBtn: this.vaildData(this.permission.order_change, false),
+                confirmBtn: this.vaildData(this.permission.order_confirm, false),
             };
         },
     },
@@ -495,6 +501,17 @@ export default {
             });
             done();
         },
+        orderConfirm(item) {
+            orderConfirm({ id: item.id }).then((res) => {
+                if (res.data.code == 200) {
+                    this.$message({
+                        type: "success",
+                        message: "操作成功",
+                    });
+                    this.refreshChange();
+                }
+            });
+        },
         searchReset() {
             this.query = {};
             this.query['adCode'] = this.treeCode;

+ 2 - 2
src/views/business/order/rtucheckorderhistorylist.vue

@@ -140,8 +140,8 @@ export default {
                         }
                     },
                     {
-                        label: "处理人",
-                        prop: "processorName",
+                        label: "填报人",
+                        prop: "processUserName",
                         span: 12,
                     },
                     {