1、删除供应商dialog关闭按钮事件

2、新增薪资管理页面
3、优化菜单展示
4、更换浙政钉扫码登录回调地址

client/src/views/Login/OALogin.vue

@@ -63,8 +63,8 @@ const { currentRoute, push } = useRouter()
 import { usePermissionStore } from '@/store/modules/permission'
 const permissionStore = usePermissionStore()
 const init = async (type) => {
-  let redirectUri =
-    location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
+  let redirectUri = 'https://ding.ragt.gov.cn:8001/oauth2/auth'
+  // location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
   // 进行跳转
   const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri))
   if (res) {

client/src/views/OaSystem/oaLayout/menus.vue

@@ -12,26 +12,23 @@
         </div>
         <p class="title">{{ item.name }}</p>
       </div>
+      <MenusActive :menuData="menuData" v-if="mouseenterIndex == index" />
     </div> -->
     <div class="menus-tabs">
       <el-menu default-active="2" class="el-menu-vertical-demo">
         <div
           v-for="(item, index) in reactiveData.routes"
           :key="index"
-          class="menuDiv"
+          class="menu_item_box"
           @mouseenter="handleMouseEnter(item, index)"
           @mouseleave="handleMouseLeave(item, index)"
           v-show="item.name != '个人档案'"
         >
-          <el-menu-item @click="menuClick(item, index)" :index="String(index)">
-            <icon :icon="item.icon" />
-            <span>{{ item.name }}</span>
-            <span
-              class="project_corner"
-              v-if="['个人中心'].includes(item.name) && projectCorner > 0"
-            >
-              {{ projectCorner }}
-            </span>
+          <el-menu-item @click="menuClick(item, index)" :index="String(index)" class="menu_item">
+            <div class="icon">
+              <img :src="getAssetsFile(item['icon'])" />
+            </div>
+            <p class="title">{{ item.name }}</p>
           </el-menu-item>
           <MenusActive :menuData="menuData" v-if="mouseenterIndex == index" />
         </div>
@@ -123,7 +120,6 @@ const reactiveData: any = reactive({
 const initMenus = async () => {
   let locals: any = localStorage.getItem('roleRouters')
   let roleRouters = JSON.parse(JSON.parse(locals).v)?.[0]?.children
-  console.log(roleRouters)
   let childArr = roleRouters?.slice(0, roleRouters?.length)
   reactiveData.routes = childArr
 }
@@ -158,11 +154,12 @@ onMounted(() => {
   height: 100%;
   background: #fff;
 }
-.menuDiv {
-  position: relative;
-}
 .menus-tabs {
   .menu_item_box {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    height: 6rem;
     .icon {
       width: 40px;
       height: 40px;
@@ -176,9 +173,14 @@ onMounted(() => {
       font-size: 13px;
       color: #333;
       text-align: center;
-      margin-top: 2px;
+      margin-top: 6px;
       white-space: nowrap;
     }
+    .menu_item {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+    }
   }
 }
 

client/src/views/OaSystem/oaLayout/menusActive.vue

@@ -18,6 +18,7 @@
 </template>
 <script setup lang="ts">
 import { useRouter } from 'vue-router'
+import { generateUUID } from '@/utils'
 const { push } = useRouter()
 const props: any = defineProps({
   menuData: {
@@ -37,13 +38,19 @@ const menuClick = (item: any) => {
     path &&
     (path.toLocaleLowerCase().startsWith('http') || path.toLocaleLowerCase().startsWith('https'))
   ) {
-    console.log(item)
     push({
-      path: item['componentName'],
+      // path: item['componentName'],
+      // query: {
+      //   iframe: '1',
+      //   url: path,
+      //   iFrameId: `${item['componentName']}_001`
+      // }
+      path: '/processContainer',
       query: {
-        iframe: '1',
+        iFrameId: generateUUID(),
         url: path,
-        iFrameId: `${item['componentName']}_001`
+        title: item['name'],
+        iframe: '1'
       }
     })
     return
@@ -67,7 +74,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .menusActive {
   position: absolute;
-  left: 160px;
+  left: 108px;
   top: 0;
   z-index: 99999999;
   // width: 566px;

client/src/views/OaSystem/searchCenter/salary/index.vue

@@ -17,18 +17,18 @@
   </div>
   <div class="container-main">
     <el-table style="width: 100%" :data="list" @row-click="handleRowClick">
-      <el-table-column prop="supplierName" label="供应商名称" />
-      <el-table-column prop="contactPerson" label="联系人" />
-      <el-table-column prop="contactPhone" label="联系电话" />
-      <el-table-column prop="unitAddress" label="所在地" />
-      <el-table-column label="操作" width="200px">
-        <template #default="scope">
-          <el-button size="small" @click.stop="handleEdit(scope.row)">修改</el-button>
-          <el-button size="small" type="danger" @click.stop="handleDelete(scope.row)">
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
+      <!-- 年度、月份、导入时间、人员类型（excel 导入）、身份证号码、银行卡号、银行、单位、应发工资合计、扣发工资合计、实发工资合计 -->
+      <el-table-column prop="supplierName" label="年度" />
+      <el-table-column prop="contactPerson" label="月份" />
+      <el-table-column prop="contactPhone" label="导入时间" />
+      <el-table-column prop="unitAddress" label="人员类型" />
+      <el-table-column prop="unitAddress" label="身份证号码" />
+      <el-table-column prop="unitAddress" label="银行卡号" />
+      <el-table-column prop="unitAddress" label="银行" />
+      <el-table-column prop="unitAddress" label="单位" />
+      <el-table-column prop="unitAddress" label="应发工资合计" />
+      <el-table-column prop="unitAddress" label="扣发工资合计" />
+      <el-table-column prop="unitAddress" label="实发工资合计" />
     </el-table>
     <el-pagination
       background

client/src/views/OaSystem/searchCenter/supplier/index.vue

@@ -42,12 +42,7 @@
   </div>
 
   <!-- 新增供应商的表单弹窗 -->
-  <el-dialog
-    v-model="dialogFormVisible"
-    :close-on-click-modal="false"
-    :title="dialogTitle"
-    @close="handleCloseDialog"
-  >
+  <el-dialog v-model:visible="dialogFormVisible" :close-on-click-modal="false" :title="dialogTitle">
     <el-form label-width="130px" :model="supply" ref="supplyRef">
       <el-form-item prop="supplierId">
         <el-input style="display: none" v-model="supply.supplierId" />