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

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1498,12 +1498,14 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',') // 获取角色数据
         console.log("roleName", this.roleName)
         this.isAdmin = this.roleName.indexOf('admin') >= 0;
-        this.isFeeViewD = this.isAdmin || this.roleName.indexOf('应收查看') >= 0;
-        this.isFeeViewC = this.isAdmin || this.roleName.indexOf('应付查看') >= 0;
-        this.isFeeView = this.isAdmin || this.isFeeViewD || this.isFeeViewC;
-        this.isFeeEditD = this.isAdmin || this.isFeeViewD && this.roleName.indexOf('应收修改') >= 0;
-        this.isFeeEditC = this.isAdmin || this.isFeeViewC && this.roleName.indexOf('应付修改') >= 0;
-        this.isFeeEdit = this.isAdmin || this.isFeeEditD || this.isFeeEditC;
+        this.isFeeEditD = this.isAdmin || this.roleName.indexOf('应收修改') >= 0;
+        this.isFeeEditC = this.isAdmin || this.roleName.indexOf('应付修改') >= 0;
+        this.isFeeEdit = this.isFeeEditD || this.isFeeEditC;
+
+        this.isFeeViewD = this.isFeeEditD || this.roleName.indexOf('应收查看') >= 0;
+        this.isFeeViewC = this.isFeeEditC || this.roleName.indexOf('应付查看') >= 0;
+        this.isFeeView = this.isFeeViewD || this.isFeeViewC;
+
         this.isProfitView = this.isAdmin || this.roleName.indexOf('利润查看') >= 0;
 
         this.optionD = await this.getColumnData(this.getColumnName(309.2), this.optionDBack);