Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.isCleared == 1"
@@ -467,9 +467,11 @@ export default {
                     {required: true, message: '请输入收款情况', trigger: 'blur'},
                 ],
             },
+            roleName:[], // 当前的角色权限
         }
     },
     created() {
+        this.roleName =  localStorage.getItem('roleName').split(',')
     },
     methods:{
         // 打印

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button  size="small" type="success" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '0' || form.status == '4'"
@@ -521,9 +521,11 @@
                         {required: true, message: '请输入收款情况', trigger: 'blur'},
                     ],
                 },
+                roleName:[], // 当前的角色权限
             }
         },
         created() {
+            this.roleName =  localStorage.getItem('roleName').split(',')
         },
         methods:{
             // 开户账户跳转维护

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4" :disabled="!form.id"
@@ -503,6 +503,7 @@ export default {
             responsiblePartyData:[], // AMEND 原因
             multipleChoiceDArr: [], // 应收多选
             multipleChoiceCArr: [], // 应付多选
+            roleName:[], // 当前的角色权限
             // 是否编辑状态
             editType: false,
             buttonDisable:false, // 按钮的是否禁用
@@ -571,6 +572,9 @@ export default {
             immediate: false  // 第一次改变就执行
         },
     },
+    created() {
+        this.roleName =  localStorage.getItem('roleName').split(',')
+    },
     methods: {
         // 报表预览
         previewreportfun(){

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -10,7 +10,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.status == 3"
@@ -656,6 +656,7 @@ export default {
                         {required: true, message: '请输入所属发票币别', trigger: 'blur'},
                     ],
                 },
+                roleName:[], // 当前的角色权限
             }
         },
         props:{
@@ -680,6 +681,7 @@ export default {
             },
         },
          created() {
+             this.roleName =  localStorage.getItem('roleName').split(',')
             if (!this.form.id) {
                 getRateList({current:1,size:30}).then(res=>{
                     for (let item of res.data.data.records) {

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -13,7 +13,7 @@
                 <el-button size="small" style="margin-right: 8px"
                            :loading="saveLoading" :disabled="!form.id" @click="previewreportfun" >预 览
                 </el-button>
-                <el-button size="small" style="margin-right: 8px"
+                <el-button size="small" style="margin-right: 8px" v-if="roleName.indexOf('admin') != -1"
                            :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true" >报表设计
                 </el-button>
                 <el-button  size="small" type="warning" plain  style="margin-right: 8px" :disabled="!form.id" v-if="form.isChecked == 1"
@@ -670,6 +670,7 @@
                     }
                 ],
                 submitType:false, // 是否提交
+                roleName:[], // 当前的角色权限
             }
         },
         watch:{
@@ -688,6 +689,7 @@
             },
         },
         created() {
+            this.roleName =  localStorage.getItem('roleName').split(',')
             this.allyesnoWorkDictsfun() // 获取 字典数据
             this.invoiceWorkDictsfun() // 获取 发票的数据
         },