提交一把

jiangping

2024-06-18 2d513a9f0e1ebb83e529973e9e79befdaea7d740

提交一把

 company/src/components/business/OperaInsuranceApplyWindow.vue

@@ -485,10 +485,10 @@
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'

import applyReturn from '@/components/enterprise/applyReturn'
import { getDetail, getSignLink, applyDetailPage, applyChagneDetailPage, exportExcel, applyChagneDetailExcel, applyOpt } from "@/api/business/insuranceApply";
import { findListByDTO } from "@/api/business/dispatchUnit";
import { fetchList } from "@/api/business/applyChange";
import { findListByDTO as worktypeFindListByDTO } from "@/api/business/worktype";
import { getDetail, getSignLink, applyDetailPage, applyChagneDetailPage, exportExcel, applyChagneDetailExcel, applyOpt } from '@/api/business/insuranceApply'
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'

@@ -565,7 +565,7 @@
    },
  methods: {
     open(title,target){
        this.visible = true;
      this.visible = true
        this.title = title
        this.model = {}
        this.dataId = null
@@ -602,7 +602,7 @@
              })
          }).catch(() => {

          });
      })
      },
      // 派遣单位
      getDW() {
@@ -730,9 +730,9 @@
                 this.$nextTick(() => {
                     console.log(this.$refs.table)
                     if (this.$refs.table && this.$refs.table.doLayout) {
                         this.$refs.table.doLayout();
              this.$refs.table.doLayout()
                     }
                 });
          })
             })
         } else {
             fetchList({
@@ -755,9 +755,9 @@
                 this.$nextTick(() => {
                     console.log(this.$refs.table)
                     if (this.$refs.table && this.$refs.table.doLayout) {
                         this.$refs.table.doLayout();
              this.$refs.table.doLayout()
                     }
                 });
          })
             })
         }
      },
@@ -787,8 +787,7 @@
         setTimeout(() => {
           this.$refs.OperaPdfViewerWindow.open('查看投保单',this.model.toubaodanSignedFile.fileurlFull)
           // window.open(this.model.toubaodanSignedFile.fileurlFull)
         }, 500);

        }, 500)
       } else if(this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull){
         setTimeout(() => {
           this.$refs.OperaPdfViewerWindow.open('查看投保单',this.model.toubaodanFile.fileurlFull)

 server/service/src/main/java/com/doumee/dao/system/model/SystemPermission.java

@@ -59,6 +59,13 @@
    private Boolean deleted;
    @ApiModelProperty(value = "类型 0平台用户 1企业用户 2商户用户")
    private Integer type;

    @ApiModelProperty(value = "企业是否可见 0不可见 1可见")
    private Integer iscom;
    @ApiModelProperty(value = "商户是否可见 0不可见 1可见")
    private Integer isshop;
    @ApiModelProperty(value = "平台是否可见 0不可见 1可见")
    private Integer isadmin;
    @ApiModelProperty(value = "类型集合")
    @TableField(exist = false)
    private List<Integer> typeList;

 server/service/src/main/resources/mappers/SystemPermissionMapper.xml

@@ -16,7 +16,7 @@
  </resultMap>
  <select id="selectManageList" resultMap="SystemPermissionListVO">
    SELECT
      perm.`ID`, perm.`type`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`FIXED`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`,
      perm.*,
      create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
      update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
    FROM SYSTEM_PERMISSION perm
@@ -40,7 +40,7 @@
  <!-- 根据用户ID查询权限 -->
  <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
    SELECT
      perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
      perm.*
    FROM SYSTEM_PERMISSION perm
    INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
    INNER JOIN SYSTEM_ROLE role ON role.ID = role_perm.ROLE_ID AND role.DELETED = 0
@@ -54,7 +54,7 @@
  <!-- 根据角色ID查询权限 -->
  <select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
    SELECT
      perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
      perm.*
    FROM SYSTEM_PERMISSION perm
    INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
    <where>