bug_5112 财务系统弹窗显示异常

src/layout/sideBar/sidebarItem.vue

@@ -54,7 +54,9 @@ const resolvePath=(path)=>{
           <el-sub-menu :index="resolvePath(item.path)" >
             <template #title>
               <el-icon size="16px" style="margin-right: 10px;" 
-              :style="{'color':item.children.some(child => resolvePath(child.path)===active)?'var(--themeColor)':'#666'}">
+              :style="{
+                'color':item.children.some(child => active.indexOf(resolvePath(child.path) + '/')!=-1 || resolvePath(child.path)===active)?'var(--themeColor)':'#666'
+              }">
                 <svg-Icon v-if="item.meta.icon_path.startsWith('svgIcon')" :name="item.meta.icon_path"
                 :color="item.children.some(child => resolvePath(child.path)===active)?'var(--themeColor)':'#666'" />
                 <component :is="item.meta.icon_path" v-else/>

src/permission.js

@@ -27,9 +27,8 @@ router.beforeEach(async (to,from,next)=>{
         location.reload() // 刷新页面，重置路由数组和权限按钮数据
       }else{
         // 没有之前的路由数据，放行
-        next()
         NProgress.done()
-        return 
+        return next()
       }
     }
     // console.log(to);
@@ -39,8 +38,8 @@ router.beforeEach(async (to,from,next)=>{
     }
     if(store.getters.routes.length && to.name){
       // console.log('放行');
-      next()  
       NProgress.done()
+      next()  
     }else{
       // console.log('拦截');
       await store.dispatch('router/setRoutes')
@@ -60,11 +59,11 @@ router.beforeEach(async (to,from,next)=>{
     }
   }else{
       if(whileList.indexOf(to.path) !== -1){
-          next()
-          NProgress.done()
+        NProgress.done()
+        next()
       }else{
-          // 不在访问白名单 需要登录
-          next('/login')
+        // 不在访问白名单 需要登录
+        next('/login')
       }
   }
 

src/views/financialManagement/components/permissionDia.vue

@@ -99,7 +99,7 @@ import {getPermissionList} from '@/api/crm'
 <template>
     <div id="permission-container">
       <el-dialog title="选择品种" :model-value="props.visible"
-       :close-on-click-modal="false" width="940" @close="closeDia">
+       :close-on-click-modal="false" width="940px" @close="closeDia">
        <div class="variety-box" >
         <div v-for="item in permissionDia.permissionList" class="variety-item" :key="item.classify_name" >
             <el-checkbox v-model="item.checked" :indeterminate="item.check_list.length>0 && item.check_list.length < item.items.length" 

src/views/financialManagement/components/permissionQyDia.vue

@@ -106,7 +106,7 @@
 <template>
   <div id="permission-qy-container">
     <el-dialog title="选择品种" :model-value="props.visible"
-    :close-on-click-modal="false" width="360" @close="closeDia">
+    :close-on-click-modal="false" width="360px" @close="closeDia">
       <div class="variety-big-box" v-show='props.serviceType==1'>
         <el-radio model-value="权益大套餐" label="权益大套餐" :disabled="props.type=='view'">
           <span class="first-level">权益大套餐：</span>

src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -783,7 +783,7 @@
       <div class="info-row" id="contract-info-container">
         <div class="info-row-title">合同信息</div>
         <div style="margin: 0px 42px 0 62px;">
-          <el-form :model="compliance.form" inline ref="contractInfoForm" label-width="130" 
+          <el-form :model="compliance.form" inline ref="contractInfoForm" label-width="130px" 
           :disabled="operationtype!='compliance'"
           :rules="compliance.rules" class="contractInfo-form">
             <el-form-item label="合同来源" prop="contract_source" >
@@ -989,7 +989,7 @@
       :permissionData="serviceData.qYDiaType==1?serviceItem.serviceArrayQy[0]?.children:serviceItem.serviceArrayQy[1]?.children"
       :hasCheckedPermission="serviceData.qYDiaType==1?serviceData.checkedPermissionQyBig:serviceData.checkedPermissionQySmall"></permission-qy-dia>
       <!-- 查看套餐弹窗 -->
-      <el-dialog v-model="serviceData.serviceShow" style="min-width: 800px;" title="" width="70vw" top="5vh">
+      <el-dialog v-model="serviceData.serviceShow" custom-class="dialog-custom" title="" width="70vw" top="5vh">
         <template #header>
           <div style="text-align: center;">{{previewImageTitle}}</div>
         </template>
@@ -1062,4 +1062,7 @@
     }
   }
 }
+.dialog-custom{
+  min-width: 800px;
+}
 </style>

src/views/financialManagement/contractProgress-component/InvoiceAndPayment.vue

@@ -529,12 +529,12 @@
           <el-form ref="iandPFormRef" :model="amountForm" 
           :disabled="operationtype!='invoice'&&type=='开票' || operationtype!='placement'&&type=='到款'">
             <el-table :data="amountForm.amountData" border v-if="amountForm.amountData.length>0" style="width: 100%;"> 
-              <el-table-column label="序号" width="80" align="center">
+              <el-table-column label="序号" width="80px" align="center">
                 <template #default="{row,$index}">
                   {{$index+1}}
                 </template>
               </el-table-column>
-              <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="sellerListType==3">
+              <el-table-column label="套餐类型" width="160px" align="center" prop="service_product_id" v-if="sellerListType==3">
                 <template #header>
                   <span style="color: var(--dangerColor);">*</span>套餐类型
                 </template>
@@ -550,7 +550,7 @@
                   <span v-show="row.invoice_id">{{ row.service_product_id?row.service_product_id==1?'FICC套餐':'权益套餐' : '--' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :label="type+'金额'" width="160" show-overflow-tooltip  align="center" prop="origin_amount">
+              <el-table-column :label="type+'金额'" width="160px" show-overflow-tooltip  align="center" prop="origin_amount">
                 <template #header>
                   <span style="color: var(--dangerColor);">*</span>{{ type }}金额
                 </template>
@@ -571,13 +571,13 @@
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column label="换算金额（元）" show-overflow-tooltip width="160" align="center" prop="amount">
+              <el-table-column label="换算金额（元）" show-overflow-tooltip width="160px" align="center" prop="amount">
                 <template #default="{row,$index}">
                   <span v-if="row.amount">{{ row.amount.toFixed(2)}}</span>
                   <span v-else style="color: var(--hitTextColorOne);">{{type}}金额为空</span>
                 </template>
               </el-table-column>
-              <el-table-column :label="type+'日'" width="140" align="center" prop="invoice_date">
+              <el-table-column :label="type+'日'" width="140px" align="center" prop="invoice_date">
                 <template #header>
                   <span style="color: var(--dangerColor);">*</span>{{type}}日
                 </template>
@@ -590,7 +590,7 @@
                   <span v-show="row.invoice_id && !row.isEdit">{{ row.invoice_date || '--' }}</span>
                 </template>
               </el-table-column >
-              <el-table-column label="销售" width="160" align="center" prop="seller_id">
+              <el-table-column label="销售" width="160px" align="center" prop="seller_id">
                 <template #header>
                   <span style="color: var(--dangerColor);">*</span>销售
                 </template>
@@ -611,7 +611,7 @@
                   <span v-show="row.invoice_id && !row.isEdit">{{ row.seller_name || '--' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="备注" width="160" align="center" prop="remark" show-overflow-tooltip >
+              <el-table-column label="备注" width="160px" align="center" prop="remark" show-overflow-tooltip >
                 <template #default="{row,$index}">
                   <el-form-item  v-show="!row.invoice_id || row.isEdit">             
                     <label :for="(type=='开票'?'invoice':'payment')+$index+'remark'" style="cursor: pointer;" v-show="row.remarkDomType=='text'" 
@@ -623,7 +623,7 @@
                   <span v-show="row.invoice_id && !row.isEdit">{{row.remark || '--'}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="120" align="center" 
+              <el-table-column label="操作" width="120px" align="center" 
               v-if="operationtype=='invoice'&&type=='开票' || operationtype=='placement'&&type=='到款'">
                 <template #default="{row,$index}">
                   <span class="table-operation-button" v-show="$index==amountForm.amountData.length-1" 

src/views/financialManagement/financialList.vue

@@ -281,41 +281,41 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
             <el-table :data="financial.tableData" border max-height="640px" size="default" 
             :row-key="setRowKey"> 
               <el-table-column label="合同编号" align="center" show-overflow-tooltip 
-              prop="contract_code" fixed="left" min-width="150"></el-table-column>
+              prop="contract_code" fixed="left" min-width="150px"></el-table-column>
               <el-table-column label="客户名称" align="center" prop="company_name"
-              show-overflow-tooltip min-width="120"></el-table-column>
-              <el-table-column label="销售" align="center" prop="seller_name" width="120">
+              show-overflow-tooltip min-width="120px"></el-table-column>
+              <el-table-column label="销售" align="center" prop="seller_name" width="120px">
                 <template #default="{row}">
                   {{ row.seller_name+(row.seller_name&&row.rai_seller_name?`、`:'')+row.rai_seller_name }}
                 </template>
               </el-table-column>
-              <el-table-column label="合同类型" align="center" width="90" prop="contract_type_string"
+              <el-table-column label="合同类型" align="center" width="90px" prop="contract_type_string"
               v-if="financial.tabelColumnShowArr.includes('contract_type')">
               </el-table-column>
-              <el-table-column label="套餐信息" align="center" prop="services" min-width="120"></el-table-column>
-              <el-table-column label="合同有效期" align="center" prop="contractDate" width="210" 
+              <el-table-column label="套餐信息" align="center" prop="services" min-width="120px"></el-table-column>
+              <el-table-column label="合同有效期" align="center" prop="contractDate" width="210px" 
               v-if="financial.tabelColumnShowArr.includes('contractDate')">
                 <template #default="{row}">
                   {{(row.start_date+' 至 '+row.end_date)}}
                 </template>
               </el-table-column>
-              <el-table-column label="合同金额" align="center" width="100" prop="contract_amount"></el-table-column>
-              <el-table-column label="约定付款时间" align="center" width="120" prop="agreed_pay_time"
+              <el-table-column label="合同金额" align="center" width="100px" prop="contract_amount"></el-table-column>
+              <el-table-column label="约定付款时间" align="center" width="120px" prop="agreed_pay_time"
               v-if="financial.tabelColumnShowArr.includes('agreed_pay_time')" show-overflow-tooltip ></el-table-column>
-              <el-table-column label="签订日" align="center" prop="sign_date" width="110"
+              <el-table-column label="签订日" align="center" prop="sign_date" width="110px"
               v-if="financial.tabelColumnShowArr.includes('sign_date')"></el-table-column>
-              <el-table-column label="合同状态" align="center" width="90" prop="contract_status">
+              <el-table-column label="合同状态" align="center" width="90px" prop="contract_status">
                 <template #default="{row}">
                   {{contractStatusArray[row.contract_status-1]?.label}}
                 </template>
               </el-table-column>
-              <el-table-column label="已开票金额" align="center" prop="invoiced_amount" width="100"
+              <el-table-column label="已开票金额" align="center" prop="invoiced_amount" width="100px"
               v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']">
                 <template #default="{row}">
                   <span style="color: var(--themeColor);cursor: pointer;" @click="invoiceDetail(row)">{{row.invoiced_amount}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="已到款金额" align="center" prop="payment_amount" width="100"
+              <el-table-column label="已到款金额" align="center" prop="payment_amount" width="100px"
               v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']">
                 <template #default="{row}">
                   <span style="color: var(--themeColor);cursor: pointer;" @click="refundDetail(row)">{{row.payment_amount}}</span>
@@ -323,14 +323,14 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
               </el-table-column>
               <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip
               v-if="financial.tabelColumnShowArr.includes('remark')"></el-table-column>
-              <el-table-column label="登记状态" align="center" prop="register_status" width="90">
+              <el-table-column label="登记状态" align="center" prop="register_status" width="90px">
                 <template #default="{row}">
                   {{statusArray[row.register_status-1]?.label}}
                 </template>
               </el-table-column>
               <el-table-column label="登记时间" v-if="financial.tabelColumnShowArr.includes('create_time')"
-               align="center" prop="create_time" width="165"></el-table-column>
-              <el-table-column label="操作"  fixed="right" width="120">
+               align="center" prop="create_time" width="165px"></el-table-column>
+              <el-table-column label="操作"  fixed="right" width="120px">
                 <template #header>
                   <div class="table-column-select">
                     <span>操作</span>

src/views/financialManagement/registrationPre.vue

@@ -722,20 +722,20 @@ placementPreList()
       <el-table :data="placemenetPre.tableData" border max-height="695px"
       size="default"> 
         <el-table-column label="客户名称" prop="company_name"
-        show-overflow-tooltip min-width="120"></el-table-column>
-        <el-table-column label="约定起始日期" width="110" prop="start_date"></el-table-column>
-        <el-table-column label="约定结束日期" width="110" prop="end_date"></el-table-column>
-        <el-table-column label="合同类型" align="center" width="90" prop="contract_type_string"></el-table-column>
+        show-overflow-tooltip min-width="120px"></el-table-column>
+        <el-table-column label="约定起始日期" width="110px" prop="start_date"></el-table-column>
+        <el-table-column label="约定结束日期" width="110px" prop="end_date"></el-table-column>
+        <el-table-column label="合同类型" align="center" width="90px" prop="contract_type_string"></el-table-column>
         <el-table-column label="套餐" prop="services" show-overflow-tooltip></el-table-column>
-        <el-table-column label="开票日" prop="invoice_time" width="110"></el-table-column>
-        <el-table-column label="开票金额" prop="origin_amount" width="120"></el-table-column>
-        <el-table-column label="开票换算金额（元）" prop="amount" width="151"></el-table-column>
-        <el-table-column label="开票销售" width="100" prop="seller_name"></el-table-column>
-        <el-table-column label="到款日" prop="arrive_time" width="110"></el-table-column>
-        <el-table-column label="到款金额" prop="arrive_origin_amount" width="120"></el-table-column>
-        <el-table-column label="到款换算金额（元）" prop="arrive_amount" width="151"></el-table-column>
-        <el-table-column label="到款销售" width="100" prop="payment_seller_name"></el-table-column>
-        <el-table-column label="操作" fixed="right" min-width="100">
+        <el-table-column label="开票日" prop="invoice_time" width="110px"></el-table-column>
+        <el-table-column label="开票金额" prop="origin_amount" width="120px"></el-table-column>
+        <el-table-column label="开票换算金额（元）" prop="amount" width="151px"></el-table-column>
+        <el-table-column label="开票销售" width="100px" prop="seller_name"></el-table-column>
+        <el-table-column label="到款日" prop="arrive_time" width="110px"></el-table-column>
+        <el-table-column label="到款金额" prop="arrive_origin_amount" width="120px"></el-table-column>
+        <el-table-column label="到款换算金额（元）" prop="arrive_amount" width="151px"></el-table-column>
+        <el-table-column label="到款销售" width="100px" prop="payment_seller_name"></el-table-column>
+        <el-table-column label="操作" fixed="right" min-width="100px">
           <template #default="{row}">
             <div class="table-options" style="padding-right: 20px;">
               <span class="table-option-buttons" v-permission="'financial:registrationPre:supplementary'"
@@ -807,12 +807,12 @@ placementPreList()
      width="942px" @closed="dialogClosed"
      :close-on-click-modal="false">
       <el-form :model="dialog.registrationPreForm" inline ref="registrationPreFormRef" style="margin:0 10px;"> 
-        <el-form-item label="客户名称" prop="company_name" label-width="90" style="margin-right: 30px;"
+        <el-form-item label="客户名称" prop="company_name" label-width="90px" style="margin-right: 30px;"
         :rules="{required:true,message:'客户名称不能为空',trigger:'blur'}"> 
           <el-input v-model="dialog.registrationPreForm.company_name"
           placeholder="请输入客户名称" style="width:320px" />
         </el-form-item>
-        <el-form-item label="约定有效期" prop="end_date" label-width="102" style="margin-right: 20px;"
+        <el-form-item label="约定有效期" prop="end_date" label-width="102px" style="margin-right: 20px;"
         :rules="{required:true,message:'约定有效期不能为空',trigger:'change'}">
           <el-date-picker type="daterange" 
             v-model="dialog.validityDate" style="max-width: 320px;"
@@ -820,7 +820,7 @@ placementPreList()
             :clearable="false">
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="套餐" prop="services" label-width="90" style="margin-right: 30px;"
+        <el-form-item label="套餐" prop="services" label-width="90px" style="margin-right: 30px;"
         :rules="{required:true,message:'套餐不能为空',trigger:'change'}">
           <el-cascader filterable :options="servicesList" placeholder="请选择套餐" @change="(value)=>servicesChange(value,1)"
             :show-all-levels="true" v-model="dialog.selectServices" :clearable="false" ref="selectServicesRef"
@@ -828,7 +828,7 @@ placementPreList()
             key="seriveces" style="min-width: 320px;z-index: 100;">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="合同类型" prop="contract_type" label-width="102" style="margin-right: 20px;"
+        <el-form-item label="合同类型" prop="contract_type" label-width="102px" style="margin-right: 20px;"
           :rules="{required:true,message:'合同类型不能为空',trigger:'change'}">
           <el-cascader :options="contractTypeArray" placeholder="请选择合同类型" style="min-width: 320px;"
             v-model="contractTypeCheck" :clearable="false" key="contractType" @change="contractTypeChange">
@@ -840,7 +840,7 @@ placementPreList()
                   border:dialog.currentEditPreId==item.pre_register_id?'1px solid #E9DDA2':'none'}"
           v-for="(item,index) in dialog.registrationPreForm.IorPInfo" :key="index">
             <el-form-item label="套餐类型" :prop="`IorPInfo.${index}.service_product_id`" v-if="serviceType==3"
-            label-width="90" style="margin-right: 20px;"
+            label-width="90px" style="margin-right: 20px;"
             :rules="{required:true,message:'套餐类型不能为空',trigger:'change'}">
               <el-select v-model="item.service_product_id" style="width: 176px;" @change="productIdChange(item)"
               placeholder="请选择套餐" :disabled="dialog.registrationType=='到款' && item.has_invoice_seller==1">
@@ -848,7 +848,7 @@ placementPreList()
                 <el-option label="权益套餐" :value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="dialog.registrationType+'金额'" :prop="`IorPInfo.${index}.amount`" label-width="90"  style="margin-right: 20px;"
+            <el-form-item :label="dialog.registrationType+'金额'" :prop="`IorPInfo.${index}.amount`" label-width="90px"  style="margin-right: 20px;"
             :rules="[{required:true,message:'金额不能为空',trigger:'blur'},
               {validator:(rule,value,callback)=>currencyValidator(item,callback),trigger:'blur'}]">
               <el-input v-model.trim="item.amount" 
@@ -858,14 +858,14 @@ placementPreList()
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="dialog.registrationType+'日'" :prop="`IorPInfo.${index}.register_date`" label-width="73" 
+            <el-form-item :label="dialog.registrationType+'日'" :prop="`IorPInfo.${index}.register_date`" label-width="73px" 
             :style="{marginRight:serviceType==3?'0':'20px'}"
             :rules="{required:true,message:dialog.registrationType+'日不能为空',trigger:'change'}">
               <el-date-picker v-model="item.register_date" style="max-width: 156px!important;"
                 :placeholder="`请选择${dialog.registrationType}日`" value-format="YYYY-MM-DD" :clearable="false">
               </el-date-picker>
             </el-form-item>
-            <el-form-item :label="dialog.registrationType+'销售'" :prop="`IorPInfo.${index}.seller_id`" label-width="90" style="margin-right: 0;"
+            <el-form-item :label="dialog.registrationType+'销售'" :prop="`IorPInfo.${index}.seller_id`" label-width="90px" style="margin-right: 0;"
             :rules="{required:true,message:'销售不能为空',trigger:'change'}" >
               <el-cascader :options="item.service_product_id==1?sellerInvoiceListFandQ:onlyQYSellerData" 
               :disabled="dialog.registrationType=='到款' && item.has_invoice_seller==1" 
@@ -878,7 +878,7 @@ placementPreList()
                 @visible-change="selectVisible">
               </el-select>
             </el-form-item>
-            <el-form-item label="备注" :prop="`IorPInfo.${index}.remark`" label-width="90" 
+            <el-form-item label="备注" :prop="`IorPInfo.${index}.remark`" label-width="90px" 
             style="margin-right: 0;" :style="{marginLeft:serviceType==3 ?'20px':'0'}"> 
               <el-input v-model="item.remark" placeholder="请输入备注" :style="{width:serviceType==3?'486px':'772px'}" />
             </el-form-item>

src/views/financialStatistics/commodityPayment.vue

@@ -444,7 +444,7 @@ const moment = inject('$moment')
         :total="commodityPData.total" @handleCurrentChange="changePageNo" @handleSizeChange="changePageSize"/>
       </div>
       <!-- 编辑付款方式弹窗 -->
-      <el-dialog title="编辑付款方式" v-model="editPayTypeDia.diaShow" width="492"
+      <el-dialog title="编辑付款方式" v-model="editPayTypeDia.diaShow" width="492px"
        :close-on-click-modal="false">
        <div style="display: flex;justify-content: center;">
         <el-form :model="editPayTypeDia.form" ref="editPayTypeRef" style="display: flex;justify-self: center">
@@ -466,7 +466,7 @@ const moment = inject('$moment')
       </el-dialog>
 
       <!-- 设置套餐信息弹窗 -->
-      <el-dialog title="套餐信息" v-model="setServiceInfoDia.diaShow" width="774"
+      <el-dialog title="套餐信息" v-model="setServiceInfoDia.diaShow" width="774px"
       :close-on-click-modal="false">
         <el-table :data="setServiceInfoDia.dataForm.list" border max-height="500px">
           <el-table-column label="套餐类型" align="center" prop="service_product_id">