mrshi

MrShi

2024-04-12 57e4e1451fbe0d664c6c523507347d38dec267ce

mrshi

 company/src/components/enterprise/editFactoryChange.vue

@@ -167,6 +167,7 @@
    import { all } from '@/api/business/solutions'
    import { getDetail, findList } from '@/api/business/insuranceApply'
    import { create, update, applyChagneDetailList } from '@/api/business/applyChange'
    import { getDate, compareDates, getTomorrow } from '@/utils/util'
    export default {
        name: 'editFactoryChange',
        extends: BaseOpera,
@@ -282,7 +283,23 @@
                        this.pickerOptions = {
                            disabledDate(time) {
                                // - 8.64e7
                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
                                // return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
                                // 当前日期大于等于生效日期并且最后一次操作时间等于空
                                if ([1, 3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
                                    return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
                                    // 当前日期小于生效日期并且最后一次操作时间等于空
                                } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
                                    return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
                                    // 最后一次操作时间有值
                                } else if (res.lastChangeDate) {
                                    // 当前日期大于最后一次操作时间
                                    if ([1, 3].includes(compareDates(getDate(), res.lastChangeDate))) {
                                        return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
                                        // 当前时间小于最后一次操作时间
                                    } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
                                        return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
                                    }
                                }
                            }
                        };
                        this.changeSolution1(res.solutionId)

 company/src/views/enterprise/insuranceApply.vue

@@ -28,7 +28,7 @@
            <el-form-item label="提交日期" prop="createDate">
                <el-date-picker
                    v-model="searchForm.createDate"
                    @change="search"
                    @change="changeTime"
                    type="daterange"
                    range-separator="至"
                    value-format="yyyy-MM-dd"
@@ -149,6 +149,12 @@
    this.loadSelectList()
  },
  methods: {
      reset() {
          this.searchForm.createTimeS = ''
          this.searchForm.createTimeE = ''
          this.$refs.searchForm.resetFields()
          this.search()
      },
    godetail (row) {
      if (row.solutionType == 1) {
        this.$refs.OperaWtbApplyShopWindow.open('委托投保详情', { id: row.id })
@@ -160,6 +166,11 @@
      solutionAll({ dataType: 2 }).then(res => {
        this.solutionList = res
      })
    },
    changeTime (e) {
        this.searchForm.createTimeS = e[0]
        this.searchForm.createTimeE = e[1]
        this.search()
    }
  }
}

 company/src/views/system/user.vue

@@ -54,6 +54,7 @@
        <el-table-column label="启用状态" min-width="100px">
          <template slot-scope="{row}">
            <el-switch
              v-if="!row.fixed"
              @change="changeStatus($event, row)"
              v-model="row.status"
              active-color="#13ce66"
@@ -69,9 +70,10 @@
          width="270"
          fixed="right"
        >
          <template v-if="isAdmin || (row.id !== userInfo.id && row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
<!--          row.id !== userInfo.id &&-->
          <template v-if="isAdmin || (row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('编辑用户', row)" v-permissions="['system:user:update']">编辑</el-button>
            <el-button type="text" @click="$refs.allocationEnterprises.open('分配企业', row)">分配企业</el-button>
            <el-button type="text" @click="$refs.allocationEnterprises.open('分配企业', row)" v-if="userInfo.type !== 1">分配企业</el-button>
            <el-button type="text" icon="el-icon-s-custom" @click="$refs.roleConfigWindow.open(row)" v-permissions="['system:user:createUserRole']">配置角色</el-button>
            <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">重置密码</el-button>
<!--            <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:user:delete']">删除</el-button>-->