提交 b8a1edce authored 作者: lidongxu's avatar lidongxu

fix(mobile&pc): 修改移动端城市经理查不到自己计划问题_修改PC和移动端城市经理只能新增下个月计划

同上
上级 854ea877
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
v-model:show="showSearch" v-model:show="showSearch"
v-model:query="query" v-model:query="query"
:planColumns="planColumns" :planColumns="planColumns"
:allEmpolyeeList="allEmpolyeeList"
@query="querySearch" /> @query="querySearch" />
<!-- 新增组件(浮动气泡) --> <!-- 新增组件(浮动气泡) -->
<van-floating-bubble icon="plus" <van-floating-bubble icon="plus"
...@@ -88,7 +89,7 @@ import userStore from '@/store/modules/user' ...@@ -88,7 +89,7 @@ import userStore from '@/store/modules/user'
import { parseTime } from '@/utils' import { parseTime } from '@/utils'
import { checkPlanExpire } from '@/hooks' import { checkPlanExpire } from '@/hooks'
import { getPromotionActiveStatus } from '@/dicts' import { getPromotionActiveStatus } from '@/dicts'
import { getPlanListAPI, deletePlanAPI, batchUpdatePlanAPI } from '@/api' import { getPlanListAPI, deletePlanAPI, batchUpdatePlanAPI, getChargeListAPI } from '@/api'
import PlanSearch from './plan-search.vue' import PlanSearch from './plan-search.vue'
import PickerBelong from '../components/PickerBelong' import PickerBelong from '../components/PickerBelong'
...@@ -130,6 +131,22 @@ const planColumns = [ ...@@ -130,6 +131,22 @@ const planColumns = [
} }
] ]
// 归属人
const allEmpolyeeList = ref([])
const getEmployeeList = async () => {
const res = await getChargeListAPI()
allEmpolyeeList.value = res.data.map(item => {
return {
text: item.name,
value: item.id,
employeeNo: item.employeeNo,
deptQcName: item.deptQcName,
deptQcId: item.deptQcId
}
})
}
const getPlanList = async () => { const getPlanList = async () => {
// 搜索条件改变/刷新时,页码重置为 1 // 搜索条件改变/刷新时,页码重置为 1
!loading.value && (query.pageNum = 1) !loading.value && (query.pageNum = 1)
...@@ -204,7 +221,8 @@ const deletePlan = (row) => { ...@@ -204,7 +221,8 @@ const deletePlan = (row) => {
}) })
} }
onMounted(() => { onMounted(async () => {
await getEmployeeList()
getPlanList() getPlanList()
}) })
......
...@@ -142,6 +142,13 @@ const confirmPlan = (val) => { ...@@ -142,6 +142,13 @@ const confirmPlan = (val) => {
// 归属人 // 归属人
const showEmployee = ref(false) const showEmployee = ref(false)
// 如果是城市经理,设置默认归属人
watch(() => props.allEmpolyeeList, (newVal) => {
if (newVal.length > 0 && promotionIdentity.value) {
props.query.employeeName = newVal.find(o => o.employeeNo === userStore().employeeNo)?.text
props.query.employeeId = newVal.find(o => o.employeeNo === userStore().employeeNo)?.value
}
})
// 确定归属人 // 确定归属人
const onEmployeeConfirm = (val) => { const onEmployeeConfirm = (val) => {
......
...@@ -1053,18 +1053,18 @@ const addOrEditPlanFormRules = reactive({ ...@@ -1053,18 +1053,18 @@ const addOrEditPlanFormRules = reactive({
// 定义禁用日期的函数 // 定义禁用日期的函数
const disabledDateFn = (time) => { const disabledDateFn = (time) => {
// 城市经理只能新增下个月一整个月的 // 城市经理只能新增下个月一整个月的
// if (isCityManager.value) { if (isCityManager.value) {
// const now = new Date(); const now = new Date();
// const start = new Date(now.getFullYear(), now.getMonth() + 1, 1); const start = new Date(now.getFullYear(), now.getMonth() + 1, 1);
// const end = new Date(now.getFullYear(), now.getMonth() + 2, 0); const end = new Date(now.getFullYear(), now.getMonth() + 2, 0);
// return time.getTime() < start.getTime() || time.getTime() > end.getTime() return time.getTime() < start.getTime() || time.getTime() > end.getTime()
// } else { } else {
// 职能角色能添加当月今天往后和下个月一整个月 // 职能角色能添加当月今天往后和下个月一整个月
const now = new Date(); const now = new Date();
const thisMonthStart = new Date(now.getFullYear(), now.getMonth(), now.getDate()); const thisMonthStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
const nextMonthEnd = new Date(now.getFullYear(), now.getMonth() + 2, 0); const nextMonthEnd = new Date(now.getFullYear(), now.getMonth() + 2, 0);
return time.getTime() < thisMonthStart.getTime() || time.getTime() > nextMonthEnd.getTime(); return time.getTime() < thisMonthStart.getTime() || time.getTime() > nextMonthEnd.getTime();
// } }
} }
const handleAdd = () => { const handleAdd = () => {
resetAddOrEditPlanForm() resetAddOrEditPlanForm()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论