From 57e4e1451fbe0d664c6c523507347d38dec267ce Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 12 四月 2024 14:09:04 +0800
Subject: [PATCH] mrshi
---
company/src/views/system/user.vue | 6 ++++--
company/src/views/enterprise/insuranceApply.vue | 13 ++++++++++++-
company/src/components/enterprise/editFactoryChange.vue | 19 ++++++++++++++++++-
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index d1b4d52..f4ef3b3 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/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)
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index e77ea30..a9eb6de 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/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()
}
}
}
diff --git a/company/src/views/system/user.vue b/company/src/views/system/user.vue
index 6ebbe61..e43e158 100644
--- a/company/src/views/system/user.vue
+++ b/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>-->
--
Gitblit v1.9.3