货代bug 2024-1-27

src/views/iosBasicData/ComputationCenter/index.vue

@@ -225,8 +225,8 @@ import {bbusinesstypeList} from "@/api/iosBasicData/bbusinesstype";
                             overHidden:true,
                         },
                         {
-                            label: "备注",
-                            prop: "billNo",
+                            label: "事由",
+                            prop: "collectionSituation",
                             overHidden:true,
                         },
                     ]

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -1074,7 +1074,6 @@ export default {
                 this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
                 this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                 this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
-
                 finstlbillsRevokeSettlement(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');

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

@@ -52,7 +52,7 @@
         </div>
 
 
-        <el-card class="box-card">
+        <el-card v-show="roleName.indexOf('应收修改') != -1?true:roleName.indexOf('应收查看') != -1" class="box-card">
             <avue-crud :option="optionD"
                        :table-loading="loadingD"
                        :data="assemblyForm.feeCenterListD"
@@ -70,28 +70,45 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="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('应收修改') != -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('应收修改') != -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('应收修改') != -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"
+                               type="info" plain size="small"
+                               :disabled="detailData.seeDisabled || pleasereviewType"
+                               @click="feecenterSubmitListfun">一键保存</el-button>
+                    <el-button v-if="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('应收修改') != -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('应收修改') != -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>
@@ -213,7 +230,7 @@
             </avue-crud>
         </el-card>
 
-        <el-card class="box-card" style="margin: 20px 0">
+        <el-card v-show="roleName.indexOf('应付修改') != -1?true:roleName.indexOf('应付查看') != -1" class="box-card" style="margin: 20px 0">
             <avue-crud :option="optionC"
                        :table-loading="loadingC"
                        :data="assemblyForm.feeCenterListC"
@@ -231,39 +248,48 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button type="danger" plain size="small"
+                    <el-button v-if="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('应付修改') != -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('应付修改') != -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('应付修改') != -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('应付修改') != -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('应付修改') != -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('应付修改') != -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('应付修改') != -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">
@@ -386,7 +412,7 @@
             </avue-crud>
         </el-card>
 
-        <div style="display: flex;align-items: center;justify-content: space-around">
+        <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">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
                     <div style="text-align: center">
@@ -570,7 +596,6 @@
             </span>
         </el-dialog>
 
-
         <!--费用打印-->
         <reportContainer ref="reportContainer"></reportContainer>
     </div>
@@ -686,6 +711,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:false,
                     column:[
                         {
                             label: "index",
@@ -826,6 +852,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
+                    menu:false,
                     column:[
                         {
                             label: "index",
@@ -1093,9 +1120,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);
             // 导入弹窗的表格

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

@@ -256,7 +256,8 @@
                         </basic-container>
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="费用信息" name="fy">
+                <el-tab-pane label="费用信息" name="fy"
+                             v-if="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">