货代bug 2024-1-27

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

@@ -39,9 +39,8 @@
                 </el-row>
             </el-form>
         </div>
-
-
-        <el-card class="box-card">
+        <!--显示 admin，应收修改，应收查看，应收查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" class="box-card">
             <avue-crud :option="optionD"
                        :table-loading="loadingD"
                        :data="assemblyForm.feeCenterListD"
@@ -59,28 +58,45 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button type="success" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="GenerateBillsfun('D')">生成账单
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="success" plain size="small"
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button type="danger" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="RevokingBillsfun('D')">撤销账单
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="danger" plain size="small"
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button type="success" plain size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType" @click="templateClick('D')">应收模板</el-button>
-                    <el-button type="info" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="success" plain size="small"
+                               :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                               @click="templateClick('D')">应收模板</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="info" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="feecenterSubmitListfun">一键保存</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button type="primary" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="primary" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addDfun"></el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="primary" size="small" icon="el-icon-plus" circle
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{scope.index + 1}}</span>
@@ -199,8 +215,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <el-card class="box-card" style="margin: 20px 0">
+        <!--显示 admin，应付修改，应付查看，应付查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" class="box-card" style="margin: 20px 0">
             <avue-crud :option="optionC"
                        :table-loading="loadingC"
                        :data="assemblyForm.feeCenterListC"
@@ -218,39 +234,48 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button type="primary" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="GenerateBillsfun('C')" >生成账单
                     </el-button>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button type="success" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="success" plain size="small"
                                :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                                @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button type="primary" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="copyfun('C')">生成应收
                     </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addCfun">
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" size="small" icon="el-icon-plus" circle
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -370,8 +395,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <div style="display: flex;align-items: center;justify-content: space-around">
+        <!--有admin 显示，有收和付各一个也显示出来-->
+        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 ||roleName.indexOf('应付查看') != -1))" style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
                     <div style="text-align: center">
@@ -554,7 +579,6 @@
             </span>
         </el-dialog>
 
-
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -617,7 +641,6 @@
                 reportTypeData:[], // 打印选择的数据
                 reportformsObj:{}, // 打印选择的数据
                 selectPrintingDialog:false, // 打印弹窗
-
                 printingDialog:false, // 打印弹窗开关
                 printingDC:'', // 打印弹窗选择是应收还是应付
                 PrintingData:[], // 打印弹窗列表数据
@@ -669,6 +692,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:true,
                     column:[
                         {
                             label: "index",
@@ -809,6 +833,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:true,
                     column:[
                         {
                             label: "index",
@@ -1056,9 +1081,11 @@
                         value:'teamId',
                     },
                 ],
+                roleName:[], // 当前登录人的角色权限
             }
         },
         async created() {
+            this.roleName =  localStorage.getItem('roleName').split(',') // 获取角色数据
             this.optionD = await this.getColumnData(this.getColumnName(309.2), this.optionDBack);
             this.optionC = await this.getColumnData(this.getColumnName(309.3), this.optionCBack);
             // 导入弹窗的表格
@@ -1252,7 +1279,7 @@
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
                     status:0,
-                    type:'AE'
+                    type:'KYCK'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -224,7 +224,8 @@
                         <!--</basic-container>-->
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="费用信息" name="fy">
+                <el-tab-pane label="费用信息" name="fy"
+                             v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">

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

@@ -39,9 +39,8 @@
                 </el-row>
             </el-form>
         </div>
-
-
-        <el-card class="box-card">
+        <!--显示 admin，应收修改，应收查看，应收查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" class="box-card">
             <avue-crud :option="optionD"
                        :table-loading="loadingD"
                        :data="assemblyForm.feeCenterListD"
@@ -59,28 +58,45 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button type="success" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="GenerateBillsfun('D')">生成账单
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="success" plain size="small"
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button type="danger" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="RevokingBillsfun('D')">撤销账单
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="danger" plain size="small"
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button type="success" plain size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType" @click="templateClick('D')">应收模板</el-button>
-                    <el-button type="info" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="success" plain size="small"
+                               :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                               @click="templateClick('D')">应收模板</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="info" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="feecenterSubmitListfun">一键保存</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button type="primary" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="primary" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addDfun"></el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="primary" size="small" icon="el-icon-plus" circle
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{scope.index + 1}}</span>
@@ -199,8 +215,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <el-card class="box-card" style="margin: 20px 0">
+        <!--显示 admin，应付修改，应付查看，应付查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" class="box-card" style="margin: 20px 0">
             <avue-crud :option="optionC"
                        :table-loading="loadingC"
                        :data="assemblyForm.feeCenterListC"
@@ -218,39 +234,48 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button type="primary" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="GenerateBillsfun('C')" >生成账单
                     </el-button>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button type="success" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="success" plain size="small"
                                :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                                @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button type="primary" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="copyfun('C')">生成应收
                     </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addCfun">
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" size="small" icon="el-icon-plus" circle
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -370,8 +395,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <div style="display: flex;align-items: center;justify-content: space-around">
+        <!--有admin 显示，有收和付各一个也显示出来-->
+        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 ||roleName.indexOf('应付查看') != -1))" style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
                     <div style="text-align: center">
@@ -669,6 +694,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:true,
                     column:[
                         {
                             label: "index",
@@ -809,6 +835,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:true,
                     column:[
                         {
                             label: "index",
@@ -1056,9 +1083,11 @@
                         value:'teamId',
                     },
                 ],
+                roleName:[], // 当前登录人的角色权限
             }
         },
         async created() {
+            this.roleName =  localStorage.getItem('roleName').split(',') // 获取角色数据
             this.optionD = await this.getColumnData(this.getColumnName(309.2), this.optionDBack);
             this.optionC = await this.getColumnData(this.getColumnName(309.3), this.optionCBack);
             // 导入弹窗的表格
@@ -1252,7 +1281,7 @@
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
                     status:0,
-                    type:'AI'
+                    type:'KYJK'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -224,7 +224,8 @@
                         <!--</basic-container>-->
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="费用信息" name="fy">
+                <el-tab-pane label="费用信息" name="fy"
+                             v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">

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

@@ -40,8 +40,8 @@
             </el-form>
         </div>
 
-
-        <el-card class="box-card">
+        <!--显示 admin，应收修改，应收查看，应收查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" class="box-card">
             <avue-crud :option="optionD"
                        :table-loading="loadingD"
                        :data="assemblyForm.feeCenterListD"
@@ -59,28 +59,44 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button type="success" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="GenerateBillsfun('D')">生成账单
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="success" plain size="small"
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button type="danger" plain size="small"
-                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType" @click="RevokingBillsfun('D')">撤销账单
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="danger" plain size="small"
+                               :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
+                               @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button type="success" plain size="small" :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType" @click="templateClick('D')">应收模板</el-button>
-                    <el-button type="info" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="success" plain size="small"
+                               :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
+                               @click="templateClick('D')">应收模板</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="info" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="feecenterSubmitListfun">一键保存</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button type="primary" plain size="small" :disabled="detailData.seeDisabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="primary" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addDfun"></el-button>
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                               type="primary" size="small" icon="el-icon-plus" circle
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="addDfun"></el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
                     <span>{{scope.index + 1}}</span>
@@ -201,8 +217,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <el-card class="box-card" style="margin: 20px 0">
+        <!--显示 admin，应付修改，应付查看，应付查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" class="box-card" style="margin: 20px 0">
             <avue-crud :option="optionC"
                        :table-loading="loadingC"
                        :data="assemblyForm.feeCenterListC"
@@ -220,39 +236,48 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button  v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                                type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button type="primary" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="GenerateBillsfun('C')" >生成账单
                     </el-button>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button type="success" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="success" plain size="small"
                                :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                                @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button type="info" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button type="primary" plain size="small"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="copyfun('C')">生成应收
                     </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button type="primary" size="small" icon="el-icon-plus" circle
-                               :disabled="detailData.seeDisabled || pleasereviewType" @click="addCfun">
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                               type="primary" size="small" icon="el-icon-plus" circle
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -374,8 +399,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <div style="display: flex;align-items: center;justify-content: space-around">
+        <!--有admin 显示，有收和付各一个也显示出来-->
+        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 ||roleName.indexOf('应付查看') != -1))" style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
                     <div style="text-align: center">
@@ -558,7 +583,6 @@
             </span>
         </el-dialog>
 
-
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -643,6 +667,7 @@
                     delBtn: false,
                     editBtn: false,
                     menuWidth: '100',
+                    menu:false,
                     column: [
                         {
                             label: "客户名称",
@@ -673,6 +698,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:false,
                     column:[
                         {
                             label: "index",
@@ -1076,9 +1102,11 @@
                         value:'teamId',
                     },
                 ],
+                roleName:[], // 当前登录人的角色权限
             }
         },
         async created() {
+            this.roleName =  localStorage.getItem('roleName').split(',') // 获取角色数据
             this.optionD = await this.getColumnData(this.getColumnName(309.2), this.optionDBack);
             this.optionC = await this.getColumnData(this.getColumnName(309.3), this.optionCBack);
             // 导入弹窗的表格
@@ -1272,7 +1300,7 @@
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
                     status:0,
-                    type:'SI'
+                    type:'HYJK'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -257,7 +257,8 @@
                         </basic-container>
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="费用信息" name="fy">
+                <el-tab-pane label="费用信息" name="fy"
+                             v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">

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

@@ -50,9 +50,8 @@
                 </el-row>
             </el-form>
         </div>
-
-
-        <el-card v-show="roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" class="box-card">
+        <!--显示 admin，应收修改，应收查看，应收查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" class="box-card">
             <avue-crud :option="optionD"
                        :table-loading="loadingD"
                        :data="assemblyForm.feeCenterListD"
@@ -70,42 +69,42 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
                                type="danger" plain size="small"
                                :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 ||  roleName.indexOf('应收修改') != -1"
                                type="success" plain size="small"
                                :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                                @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 ||  roleName.indexOf('应收修改') != -1"
                                type="danger" plain size="small"
                                :disabled="!selectionDList.length || detailData.seeDisabled || pleasereviewType"
                                @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
                                type="success" plain size="small"
                                :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                                @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
                                type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
                                type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
                                type="primary" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button v-if="roleName.indexOf('应收修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
                                type="primary" size="small" icon="el-icon-plus" circle
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="addDfun"></el-button>
@@ -229,8 +228,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <el-card v-show="roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" class="box-card" style="margin: 20px 0">
+        <!--显示 admin，应付修改，应付查看，应付查看只有打印账单一个功能 -->
+        <el-card v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" class="box-card" style="margin: 20px 0">
             <avue-crud :option="optionC"
                        :table-loading="loadingC"
                        :data="assemblyForm.feeCenterListC"
@@ -248,45 +247,45 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="primary" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="GenerateBillsfun('C')" >生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="danger" plain size="small"
                                :disabled="!selectionCList.length || detailData.seeDisabled || pleasereviewType"
                                @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="success" plain size="small"
                                :disabled="!this.assemblyForm.id || detailData.seeDisabled || pleasereviewType"
                                @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="info" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="primary" plain size="small"
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="copyfun('C')">生成应收
                     </el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button v-if="roleName.indexOf('应付修改') != -1"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
                                type="primary" size="small" icon="el-icon-plus" circle
                                :disabled="detailData.seeDisabled || pleasereviewType"
                                @click="addCfun">
@@ -411,8 +410,8 @@
                 </template>
             </avue-crud>
         </el-card>
-
-        <div v-if="(roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 ||roleName.indexOf('应付查看') != -1)" style="display: flex;align-items: center;justify-content: space-around">
+        <!--有admin 显示，有收和付各一个也显示出来-->
+        <div v-if="roleName.indexOf('admin') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 ||roleName.indexOf('应付查看') != -1))" style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
                     <div style="text-align: center">
@@ -1318,7 +1317,7 @@
                 losbfeestemplateGetListTemplate(1,50,{
                     dc:dc,
                     status:0,
-                    type:'SE'
+                    type:'HYCK'
                 }).then(res=>{
                     this.templateData = res.data.data.records
                     // 查第一条的明细

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -256,8 +256,9 @@
                         </basic-container>
                     </div>
                 </el-tab-pane>
+
                 <el-tab-pane label="费用信息" name="fy"
-                             v-if="roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1 " >
+                             v-if="roleName.indexOf('admin') != -1?true:roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1" >
                     <feecenter :assemblyForm="form" :detailData="detailData" :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)"></feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz">

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -272,11 +272,11 @@
                 label="应对账USD" width="100px">
             </el-table-column>
             <el-table-column
-                prop="stlTtlAmountRMB"
+                prop="reconciliationAmount"
                 label="已对账CNY" width="100px">
             </el-table-column>
             <el-table-column
-                prop="stlTtlAmountUSD"
+                prop="reconciliationAmountUsd"
                 label="已对账USD" width="100px">
             </el-table-column>
             <!--<el-table-column-->

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -939,13 +939,11 @@
                             this.$set(item,'amountRMB',item.amount)
                             this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
                             this.$set(item,'unsettledAmountRMB',item.unsettledAmount)
-                            this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
                             this.$set(item,'currentStlAmountRMB',item.currentStlAmount)
                         }else {
                             this.$set(item,'amountUSD',item.amount)
                             this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
                             this.$set(item,'unsettledAmountUSD',item.unsettledAmount)
-                            this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
                             this.$set(item,'currentStlAmountUSD',item.currentStlAmount)
                         }
                         this.$set(item,'costDate',[])
@@ -1013,7 +1011,7 @@
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.invoiceNo = this.form.invoiceNo // 发票号
                 obj.bookingNo = this.form.bookingNo // 订舱号 BKNO
-                obj.createUserName = this.form.updateUser // 操作员id
+                obj.createUserName = this.form.updateUser?this.form.updateUser:null // 操作员id
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.threeInspectionsNo = this.form.threeInspectionsNo // 三检单号
                 obj.voyageNo = this.form.voyageNo // 航次
@@ -1053,7 +1051,7 @@
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.invoiceNo = this.form.invoiceNo // 发票号
                 obj.bookingNo = this.form.bookingNo // 订舱号 BKNO
-                obj.createUserName = this.form.updateUser // 操作员id
+                obj.createUserName = this.form.updateUser?this.form.updateUser:null // 操作员id
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.threeInspectionsNo = this.form.threeInspectionsNo // 三检单号
                 obj.voyageNo = this.form.voyageNo // 航次
@@ -1075,13 +1073,11 @@
                             this.$set(item,'amountRMB',item.amount)
                             this.$set(item,'currentInvoiceAmountRMB',item.currentInvoiceAmount)
                             this.$set(item,'unsettledAmountRMB',item.unsettledAmount)
-                            this.$set(item,'stlTtlAmountRMB',item.stlTtlAmount)
                             this.$set(item,'currentStlAmountRMB',item.reconciliationCurrentAmount)
                         }else {
                             this.$set(item,'amountUSD',item.amount)
                             this.$set(item,'currentInvoiceAmountUSD',item.currentInvoiceAmount)
                             this.$set(item,'unsettledAmountUSD',item.unsettledAmount)
-                            this.$set(item,'stlTtlAmountUSD',item.stlTtlAmount)
                             this.$set(item,'currentStlAmountUSD',item.reconciliationCurrentAmount)
                         }
                         return item