浏览代码

货代bug 2024-1-26

caojunjie 1 年之前
父节点
当前提交
d7ac9c5b21

+ 3 - 3
src/views/billM/billingCenter/index.vue

@@ -350,17 +350,17 @@
                   overHidden:true,
               },
               {
-                  label: "已对账金额",
+                  label: "已对账金额USD",
                   prop: "reconciliationAmountUsd",
                   overHidden:true,
               },
               {
-                  label: "已申请结算金额",
+                  label: "已申请结算金额USD",
                   prop: "appliedAmountStlUsd",
                   overHidden:true,
               },
               {
-                  label: "已申请发票结算金额",
+                  label: "已申请发票结算金额USD",
                   prop: "appliedInvoiceAmountStlUsd",
                   overHidden:true,
               },

+ 3 - 1
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -211,7 +211,7 @@
                                                    :detailData="detailData">
                                     </mbinformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="报表管理" name="fourth">
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1"  >
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
@@ -594,6 +594,7 @@ import {
                 activeName:'first',
                 bigtabs:'wt',
                 saberUserInfo:{}, // 当前登录人信息
+                roleName:[],
                 // 需要加判断是否必填的数据
                 messageData:[
                     {
@@ -685,6 +686,7 @@ import {
         },
         created() {
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+            this.roleName =  localStorage.getItem('roleName').split(',')
             // 判断是否员id, 有id 就不显示
             if (!this.form.id) {
                 this.deptGetDetailPolfun() // 收货地 起运港 当前登录人的默认

+ 3 - 1
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -211,7 +211,7 @@
                                                    :detailData="detailData">
                                     </mbinformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="报表管理" name="fourth">
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1" >
                                     <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="KYJK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
@@ -595,6 +595,7 @@ import {
                 activeName:'first',
                 bigtabs:'wt',
                 saberUserInfo:{}, // 当前登录人信息
+                roleName:[], // 当前的角色权限
                 // 需要加判断是否必填的数据
                 messageData:[
                     {
@@ -686,6 +687,7 @@ import {
         },
         created() {
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+            this.roleName =  localStorage.getItem('roleName').split(',')
             // 判断是否员id, 有id 就不显示
             if (!this.form.id) {
                 this.deptGetDetailPolfun() // 收货地 起运港 当前登录人的默认

+ 2 - 2
src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -954,7 +954,7 @@ export default {
                             // 本次金额
                             if (item.dc == 'D') {
                                 // 本次金额
-                                this.$set(item,'currentStlAmountRMB',item.currentStlAmount)
+                                this.$set(item,'currentStlAmountRMB',item.appliedInvoiceCurrentStlAmount)
                             }else {
                                 // 本次金额
                                 this.$set(item,'currentStlAmountRMB',item.appliedCurrentStlAmount)
@@ -969,7 +969,7 @@ export default {
                             // 本次金额
                             if (item.dc == 'D') {
                                 // 本次金额
-                                this.$set(item,'currentStlAmountUSD',item.currentStlAmount)
+                                this.$set(item,'currentStlAmountUSD',item.appliedInvoiceCurrentStlAmount)
                             }else {
                                 // 本次金额
                                 this.$set(item,'currentStlAmountUSD',item.appliedCurrentStlAmount)

+ 3 - 1
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -239,7 +239,7 @@
                                 <!--<el-tab-pane label="MB/L信息" name="third">-->
                                 <!--    <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>-->
                                 <!--</el-tab-pane>-->
-                                <el-tab-pane label="报表管理" name="fourth">
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1" >
                                     <reports :id="form.id" :assemblyForm="form"
                                              :disabled="detailData.seeDisabled"
                                              businessValue="HYJK"></reports>
@@ -602,6 +602,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 activeName:'first',
                 bigtabs:'wt',
                 saberUserInfo:{}, // 当前登录人信息
+                roleName:[], // 当前的角色权限
                 // 需要加判断是否必填的数据
                 messageData:[
                     {
@@ -702,6 +703,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
         },
         created() {
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+            this.roleName =  localStorage.getItem('roleName').split(',')
             // 判断是否员id, 有id 就不显示
             if (!this.form.id) {
                 this.deptGetDetailPolfun() // 目的地 卸货港 当前登录人的默认

+ 5 - 2
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -239,8 +239,9 @@
                                 <el-tab-pane label="MB/L信息" name="third">
                                     <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
                                 </el-tab-pane>
-                                <el-tab-pane label="报表管理" name="fourth">
-                                    <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
+                                <el-tab-pane label="报表管理" name="fourth" v-if="roleName.indexOf('admin') != -1" >
+                                    <reports :id="form.id" :assemblyForm="form"
+                                             :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="EDI CODE" name="sixth">
                                     <edicode :assemblyForm="form" :detailData="detailData"></edicode>
@@ -613,6 +614,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 activeName:'first',
                 bigtabs:'wt',
                 saberUserInfo:{}, // 当前登录人信息
+                roleName:[], // 当前的角色权限
                 // 需要加判断是否必填的数据
                 messageData:[
                     {
@@ -721,6 +723,7 @@ import {editypesList} from "@/api/iosBasicData/editypes";
         },
         created() {
             this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+            this.roleName =  localStorage.getItem('roleName').split(',')
             // 判断是否员id, 有id 就不显示
             if (!this.form.id) {
                 this.deptGetDetailPolfun() // 收货地 装货港 当前登录人的默认

+ 5 - 1
src/views/iosBasicData/seamends/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"
@@ -505,6 +505,7 @@ export default {
             responsiblePartyData:[], // AMEND 原因
             multipleChoiceDArr: [], // 应收多选
             multipleChoiceCArr: [], // 应付多选
+            roleName:[], // 当前的角色权限
             // 是否编辑状态
             editType: false,
             buttonDisable:false, // 按钮的是否禁用
@@ -574,6 +575,9 @@ export default {
             immediate: false  // 第一次改变就执行
         },
     },
+    created() {
+        this.roleName =  localStorage.getItem('roleName').split(',')
+    },
     methods: {
         // 报表预览
         previewreportfun(){