update
This commit is contained in:
ylj20011123
parent
590499fb84
commit
a6692879e0
File diff suppressed because it is too large
Load Diff
@ -64,8 +64,9 @@
|
||||
</view>
|
||||
|
||||
<!-- 插入日历 即悬浮框 -->
|
||||
<uni-calendar ref="calendar" class="selectDateCalendar" :clear-date="true" :date="selectDate" :insert="false"
|
||||
:startDate="info.startDate" :range="info.range" @confirm="handleChangeTime" />
|
||||
<uni-calendar ref="calendar" class="selectDateCalendar" :mask-closable="true" :clear-date="true"
|
||||
:date="selectDate" :insert="false" :startDate="info.startDate" :range="info.range"
|
||||
@confirm="handleChangeTime" />
|
||||
|
||||
|
||||
<view class="thingBox">
|
||||
@ -74,18 +75,19 @@
|
||||
<view class="emergency-header">
|
||||
<view class="emergency-title">
|
||||
<text>🚨 应急事件</text>
|
||||
<!-- <view class="emergency-count">{{ 2 }}</view> -->
|
||||
<view class="emergency-count">{{ emergencyListLength }}</view>
|
||||
</view>
|
||||
<!-- <text>👉</text> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 一般警告提醒 -->
|
||||
<view class="warning-banner" @click="showEmergencyDetails(2)">
|
||||
<view class="emergency-header">
|
||||
<view class="emergency-title">
|
||||
<text>⚠️ 日常问题</text>
|
||||
<!-- <view class="emergency-count">{{ 2 }}</view> -->
|
||||
<view class="emergency-count">{{ dailyListLength }}</view>
|
||||
</view>
|
||||
<!-- <text>👉</text> -->
|
||||
</view>
|
||||
@ -118,7 +120,7 @@
|
||||
<view class="onDutyPersonBoxHeader">
|
||||
<text class="title">{{ selectTab === 1 ? "👥 当前在岗人员" : selectTab === 2 ? "📋 请假人员列表" : selectTab === 3
|
||||
? "👑 值班经理信息" : ""
|
||||
}}</text>
|
||||
}}</text>
|
||||
|
||||
|
||||
<!-- 居中的日历时间 -->
|
||||
@ -486,29 +488,112 @@ export default {
|
||||
],
|
||||
showPopup: false,
|
||||
userDetail: null,
|
||||
isFirst: true
|
||||
isFirst: true,
|
||||
emergencyListLength: 0,
|
||||
dailyListLength: 0,
|
||||
};
|
||||
},
|
||||
onLoad() {
|
||||
this.menu = uni.getMenuButtonBoundingClientRect()
|
||||
let currentService = uni.getStorageSync('currentService')
|
||||
this.handleGetServerpartDetail(currentService.Serverpart_ID || currentService.SERVERPART_ID)
|
||||
this.handleGetCurrentServiceAttendanceData(currentService.SERVERPART_NAME)
|
||||
|
||||
// 防护：确保 currentService 存在
|
||||
if (currentService && (currentService.Serverpart_ID || currentService.SERVERPART_ID)) {
|
||||
this.handleGetServerpartDetail(currentService.Serverpart_ID || currentService.SERVERPART_ID)
|
||||
this.handleGetCurrentServiceAttendanceData(currentService.SERVERPART_NAME)
|
||||
this.handleGetEventsData(currentService.SERVERPART_NAME)
|
||||
} else {
|
||||
console.warn('onLoad: currentService 为空或无效')
|
||||
// 可以考虑跳转回服务区选择页面或显示错误提示
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
let currentService = uni.getStorageSync('currentService')
|
||||
console.log('currentService', currentService);
|
||||
|
||||
if (currentService.Serverpart_ID !== this.serviceInfo.SERVERPART_ID && !this.isFirst) {
|
||||
this.handleGetServerpartDetail(currentService.Serverpart_ID)
|
||||
this.handleGetCurrentServiceAttendanceData(currentService.SERVERPART_NAME)
|
||||
// 防护：检查 currentService 是否有效
|
||||
if (!currentService || (!currentService.Serverpart_ID && !currentService.SERVERPART_ID)) {
|
||||
console.warn('currentService 为空或无效，跳过更新');
|
||||
this.isFirst = false;
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取统一的服务区ID
|
||||
const currentServiceId = currentService.Serverpart_ID || currentService.SERVERPART_ID;
|
||||
const currentServiceName = currentService.SERVERPART_NAME;
|
||||
|
||||
// 只有当服务区真正发生变化且不是首次加载时才更新
|
||||
if (currentServiceId && currentServiceId !== this.serviceInfo.SERVERPART_ID && !this.isFirst) {
|
||||
this.emergencyListLength = 0
|
||||
this.dailyListLength = 0
|
||||
this.handleGetServerpartDetail(currentServiceId);
|
||||
this.handleGetCurrentServiceAttendanceData(currentServiceName);
|
||||
this.handleGetEventsData(currentServiceName)
|
||||
} else {
|
||||
this.isFirst = false
|
||||
this.isFirst = false;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 现在异步调用一个方法 拿到 该服务区应急事件、日常事件
|
||||
async handleGetEventsData(saName) {
|
||||
const req = {
|
||||
bsessionKey: "EA65F66FA29B47FD8072A4AFC66967B3",
|
||||
saName: saName || this.serviceInfo.SERVERPART_NAME
|
||||
}
|
||||
console.log('reqreq', req);
|
||||
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
uni.request({
|
||||
url: "https://fwqznxj.yciccloud.com:9081/ynjt/pushManage/queryEmergency",
|
||||
method: "POST",
|
||||
data: req,
|
||||
header: {
|
||||
"content-type": "application/x-www-form-urlencoded",
|
||||
},
|
||||
success(res) {
|
||||
resolve(res.data.data)
|
||||
},
|
||||
});
|
||||
});
|
||||
let emergencyList = data
|
||||
|
||||
|
||||
const req2 = {
|
||||
bsessionKey: "0DAF3A5982D54A619D4B63A34CA20C55",
|
||||
saName: saName || this.serviceInfo.SERVERPART_NAME
|
||||
}
|
||||
const data2 = await new Promise((resolve, reject) => {
|
||||
uni.request({
|
||||
url: "https://fwqznxj.yciccloud.com:9081/ynjt/pushManage/queryQuestions",
|
||||
method: "POST",
|
||||
data: req2,
|
||||
header: {
|
||||
"content-type": "application/x-www-form-urlencoded",
|
||||
},
|
||||
success(res) {
|
||||
resolve(res.data.data)
|
||||
},
|
||||
});
|
||||
});
|
||||
let dailyList = data2
|
||||
|
||||
|
||||
console.log('emergencyListemergencyListemergencyList', emergencyList);
|
||||
console.log('dailyListdailyListdailyListdailyListdailyList', dailyList);
|
||||
|
||||
|
||||
this.emergencyListLength = emergencyList && emergencyList.length > 0 ? emergencyList.length : "0"
|
||||
this.dailyListLength = dailyList && dailyList.length > 0 ? dailyList.length : "0"
|
||||
|
||||
},
|
||||
// 拿到当前服务区的考勤数据
|
||||
async handleGetCurrentServiceAttendanceData(SERVERPART_NAME) {
|
||||
// 防护：如果服务区名称为空，则不执行请求
|
||||
if (!SERVERPART_NAME) {
|
||||
console.warn('handleGetCurrentServiceAttendanceData: SERVERPART_NAME 为空，跳过请求');
|
||||
return;
|
||||
}
|
||||
|
||||
let req = {
|
||||
bsessionKey: "0B30475A94674D608022885F7763959B",
|
||||
workTime: new Date(this.selectDate).getTime(),
|
||||
@ -583,13 +668,19 @@ export default {
|
||||
},
|
||||
// 查询服务区详情
|
||||
async handleGetServerpartDetail(id) {
|
||||
// 防护：如果ID为空，则不执行请求
|
||||
if (!id) {
|
||||
console.warn('handleGetServerpartDetail: id 为空，跳过请求');
|
||||
return;
|
||||
}
|
||||
|
||||
let currentService = uni.getStorageSync("currentService");
|
||||
let seatInfo = uni.getStorageSync("seatInfo");
|
||||
this.seatInfo = JSON.parse(seatInfo);
|
||||
this.seatInfo = JSON.parse(seatInfo || '{}');
|
||||
let req = {
|
||||
ServerpartId: id || currentService.Serverpart_ID || currentService.SERVERPART_ID,
|
||||
latitude: this.seatInfo.latitude,
|
||||
longitude: this.seatInfo.longitude,
|
||||
ServerpartId: id,
|
||||
latitude: this.seatInfo.latitude || 0,
|
||||
longitude: this.seatInfo.longitude || 0,
|
||||
};
|
||||
console.log('req', req);
|
||||
|
||||
@ -597,8 +688,8 @@ export default {
|
||||
title: "加载中...",
|
||||
});
|
||||
|
||||
const data = await request.$webJavaGet(
|
||||
"/third-party/getServerPartInfo",
|
||||
const data = await request.$webGet(
|
||||
"/CommercialApi/BaseInfo/GetServerpartInfo",
|
||||
req
|
||||
);
|
||||
uni.hideLoading();
|
||||
@ -644,10 +735,12 @@ export default {
|
||||
});
|
||||
},
|
||||
// 改变查询时间
|
||||
handleChangeTime(e) {
|
||||
async handleChangeTime(e) {
|
||||
console.log('e', e);
|
||||
// this.selectDate = e.detail.value
|
||||
this.selectDate = e.fulldate
|
||||
|
||||
await this.handleGetCurrentServiceAttendanceData(this.serviceInfo.SERVERPART_NAME)
|
||||
},
|
||||
// 切换tab
|
||||
handleChangeTab(e) {
|
||||
@ -673,10 +766,9 @@ export default {
|
||||
this.$util.toNextRoute('navigateTo', `/pages/summaryOfPortraits/index?index=0`)
|
||||
} else if (value === 3) {
|
||||
this.$util.toNextRoute('navigateTo', `/pages/attendanceStatus/attendanceStatistics`)
|
||||
} else if (value === 5) {
|
||||
this.$util.toNextRoute('navigateTo', `/pages/attendanceStatus/roster`)
|
||||
}
|
||||
// else if (value === 5) {
|
||||
// this.$util.toNextRoute('navigateTo', `/pages/attendanceStatus/roster`)
|
||||
// }
|
||||
},
|
||||
// 会员详情信息
|
||||
viewStaffDetails(obj) {
|
||||
@ -771,10 +863,12 @@ export default {
|
||||
.uni-input {
|
||||
padding: 0;
|
||||
background: transparent;
|
||||
font-size: 28rpx;
|
||||
font-size: 14px;
|
||||
font-family: PingFangSC-Semibold, PingFang SC;
|
||||
font-weight: 600;
|
||||
color: #160002;
|
||||
line-height: 50rpx;
|
||||
height: 50rpx;
|
||||
}
|
||||
|
||||
.area {
|
||||
@ -957,7 +1051,7 @@ export default {
|
||||
padding: 0 32rpx;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
gap: 50rpx;
|
||||
gap: 16rpx;
|
||||
margin-top: 24rpx;
|
||||
|
||||
.personItem {
|
||||
@ -1000,7 +1094,7 @@ export default {
|
||||
padding: 0 32rpx;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
gap: 50rpx;
|
||||
gap: 16rpx;
|
||||
margin-top: 24rpx;
|
||||
|
||||
.emergency-banner {
|
||||
|
||||
@ -22,34 +22,81 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="rosterContent">
|
||||
<view class="rosterContentTop">
|
||||
<view>
|
||||
<picker>
|
||||
{{ selectPerson || "-" }}
|
||||
</picker>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 居中的日历时间 -->
|
||||
<!-- <view class="dateBox">
|
||||
<!-- 月份和员工选择器 -->
|
||||
<view class="selectorRow">
|
||||
<view class="dateBox">
|
||||
<view class="centerDateBox">
|
||||
<image class="arrowIcon" src="https://eshangtech.com/cyy_DIB/leftArrowIcon.png"
|
||||
@click="handleChangeDate(2)" />
|
||||
<view class="center">
|
||||
<text class="date-text">{{ selectDate ? $util.cutDate(new Date(selectDate), 'YYYY-MM') : ""
|
||||
<text class="date-text">{{ selectDate ? $util.cutDate(new Date(selectDate), 'YYYY-MM') :
|
||||
""
|
||||
}}</text>
|
||||
<!-- <text class="date-icon">📅</text> -->
|
||||
</view>
|
||||
<image class="arrowIcon" src="https://eshangtech.com/cyy_DIB/rightArrowIcon.png"
|
||||
@click="handleChangeDate(1)" />
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
|
||||
|
||||
<!-- 员工选择器 -->
|
||||
<view class="employeeSelector">
|
||||
<picker @change="handleEmployeeChange" :value="selectedEmployeeIndex" :range="userList"
|
||||
:range-key="'userName'">
|
||||
<view class="employeePickerBox">
|
||||
<view class="selectedEmployee">{{ userList[selectedEmployeeIndex] ?
|
||||
userList[selectedEmployeeIndex].userName :
|
||||
'请选择员工' }}
|
||||
</view>
|
||||
<image class="rightArrow"
|
||||
src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
|
||||
</view>
|
||||
</picker>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="calendarBpx">
|
||||
<uni-calendar ref="calendar" class="selectDateCalendar" :insert="true" :startDate="info.startDate"
|
||||
:selected="selectedList" />
|
||||
<!-- 员工信息 -->
|
||||
<view v-if="selectedEmployee" class="employeeDetail">
|
||||
<view class="employeeCard">
|
||||
<view class="employeeInfo">
|
||||
<view class="employeeName">{{ selectedEmployee.userName }}</view>
|
||||
<view class="employeeJob">{{ selectedEmployee.psnJob }}</view>
|
||||
<image class="phoneIcon" src="https://eshangtech.com/cyy_DIB/phoneIcon.png" />
|
||||
<view class="employeePhone">{{ selectedEmployee.phone }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 日历格式排班表 -->
|
||||
<view v-if="selectedEmployee" class="calendarRoster">
|
||||
<view class="weekHeader">
|
||||
<view v-for="(weekName, index) in weekNames" :key="index" class="weekHeaderItem"
|
||||
:class="{ 'weekend': index === 0 || index === 6 }">
|
||||
{{ weekName }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="calendarGrid">
|
||||
<view v-for="i in firstDayOfWeek" :key="`empty-${i}`" class="calendarCell empty"></view>
|
||||
|
||||
<view v-for="day in monthDays" :key="day.date" class="calendarCell" :class="{
|
||||
'weekend': day.isWeekend,
|
||||
'today': day.isToday
|
||||
}">
|
||||
<view class="dateNumber">{{ day.day }}</view>
|
||||
<view class="scheduleInfo" :class="{
|
||||
'work': selectedEmployee && selectedEmployee[`day${day.day}`] && !selectedEmployee[`day${day.day}`].toString().toLowerCase().includes('休'),
|
||||
'rest': selectedEmployee && selectedEmployee[`day${day.day}`] && selectedEmployee[`day${day.day}`].toString().toLowerCase().includes('休'),
|
||||
'empty': !selectedEmployee || !selectedEmployee[`day${day.day}`]
|
||||
}">
|
||||
{{ selectedEmployee && selectedEmployee[`day${day.day}`] ?
|
||||
(selectedEmployee[`day${day.day}`].toString().toLowerCase().includes('休') ? '休' : '班') : ''
|
||||
}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
@ -59,55 +106,109 @@
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
const now = new Date()
|
||||
const currentYear = now.getFullYear()
|
||||
const currentMonthIndex = now.getMonth()
|
||||
const nowDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD') // 有数据的最近日期
|
||||
|
||||
return {
|
||||
menu: {},
|
||||
serviceInfo: {},
|
||||
selectDate: nowDay,// 选中的时间
|
||||
selectPerson: "张三",
|
||||
selectedList: [
|
||||
{
|
||||
date: '2025-08-11',
|
||||
info: "班",
|
||||
},
|
||||
{
|
||||
date: '2025-08-12',
|
||||
info: "班",
|
||||
color: "#000"
|
||||
},
|
||||
{
|
||||
date: '2025-08-13',
|
||||
info: "班",
|
||||
},
|
||||
{
|
||||
date: '2025-08-14',
|
||||
info: "班",
|
||||
},
|
||||
{
|
||||
date: '2025-08-15',
|
||||
info: "班"
|
||||
},
|
||||
{
|
||||
date: '2025-08-16',
|
||||
info: "休",
|
||||
},
|
||||
{
|
||||
date: '2025-08-17',
|
||||
info: "休",
|
||||
},
|
||||
{
|
||||
date: '2025-08-18',
|
||||
info: "班",
|
||||
}
|
||||
]
|
||||
serviceInfo: {},
|
||||
currentYear: currentYear,
|
||||
currentMonth: currentMonthIndex,
|
||||
selectedEmployeeIndex: 0,
|
||||
selectedEmployee: null,
|
||||
weekNames: ['日', '一', '二', '三', '四', '五', '六'],
|
||||
// 模拟排班数据，实际使用时从接口获取
|
||||
rosterData: [],
|
||||
userList: [],// 员工的数组
|
||||
selectUser: "",//当前选择的员工
|
||||
isFirst: true,
|
||||
monthDays: [],
|
||||
firstDayOfWeek: ""
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
// 获取月份第一天是星期几 (0=周日, 1=周一, ..., 6=周六)
|
||||
// firstDayOfWeek() {
|
||||
// const firstDay = new Date(this.currentYear, this.currentMonth, 1)
|
||||
// return firstDay.getDay()
|
||||
// }
|
||||
},
|
||||
onLoad() {
|
||||
this.menu = uni.getMenuButtonBoundingClientRect()
|
||||
let currentService = uni.getStorageSync('currentService')
|
||||
this.serviceInfo = currentService
|
||||
this.handleGetNewMonthData()
|
||||
// 加载排班数据
|
||||
this.loadRosterData(currentService.SERVERPART_NAME)
|
||||
},
|
||||
onShow() {
|
||||
let currentService = uni.getStorageSync('currentService')
|
||||
console.log('currentService', currentService);
|
||||
|
||||
// 防护：检查 currentService 是否有效
|
||||
if (!currentService || (!currentService.Serverpart_ID && !currentService.SERVERPART_ID)) {
|
||||
console.warn('currentService 为空或无效，跳过更新');
|
||||
this.isFirst = false;
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取统一的服务区ID
|
||||
const currentServiceId = currentService.Serverpart_ID || currentService.SERVERPART_ID;
|
||||
const currentServiceName = currentService.SERVERPART_NAME;
|
||||
|
||||
// 只有当服务区真正发生变化且不是首次加载时才更新
|
||||
if (currentServiceId && currentServiceId !== this.serviceInfo.SERVERPART_ID && !this.isFirst) {
|
||||
this.serviceInfo = currentService
|
||||
this.rosterData = []
|
||||
this.userList = []
|
||||
this.selectUser = null
|
||||
this.loadRosterData(currentServiceName)
|
||||
} else {
|
||||
this.isFirst = false;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleGetNewMonthData() {
|
||||
const year = this.currentYear
|
||||
const month = this.currentMonth
|
||||
|
||||
console.log('yearyearyear', year);
|
||||
console.log('monthmonthmonthmonth', month);
|
||||
|
||||
|
||||
const daysInMonth = new Date(year, month + 1, 0).getDate()
|
||||
const today = new Date()
|
||||
const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`
|
||||
|
||||
const days = []
|
||||
const weekTexts = ['日', '一', '二', '三', '四', '五', '六']
|
||||
|
||||
for (let day = 1; day <= daysInMonth; day++) {
|
||||
const date = new Date(year, month, day)
|
||||
const dateStr = `${year}-${String(month + 1).padStart(2, '0')}-${String(day).padStart(2, '0')}`
|
||||
const weekDay = date.getDay()
|
||||
|
||||
days.push({
|
||||
day: day,
|
||||
date: dateStr,
|
||||
weekDay: weekDay,
|
||||
weekText: weekTexts[weekDay],
|
||||
isWeekend: weekDay === 0 || weekDay === 6,
|
||||
isToday: dateStr === todayStr
|
||||
})
|
||||
}
|
||||
|
||||
this.monthDays = days
|
||||
|
||||
const firstDay = new Date(this.currentYear, this.currentMonth, 1)
|
||||
this.firstDayOfWeek = firstDay.getDay()
|
||||
},
|
||||
handleChangeService() {
|
||||
this.$util.toNextRoute("navigateTo", "/pages/map/index?type=attendanceStatus");
|
||||
},
|
||||
// 修改日期
|
||||
async handleChangeDate(type) {
|
||||
// type 1 加一天 2 减一天
|
||||
@ -126,7 +227,91 @@ export default {
|
||||
const d = String(last.getDate()).padStart(2, '0');
|
||||
|
||||
this.selectDate = `${y}-${m}-${d}`;
|
||||
|
||||
// 修复：currentMonth应该是数字类型（0-11），而不是字符串
|
||||
this.currentYear = y
|
||||
this.currentMonth = last.getMonth() // 使用数字类型的月份索引
|
||||
|
||||
this.handleGetNewMonthData()
|
||||
|
||||
this.handleGetCurrentUserScheduleInfo()
|
||||
},
|
||||
// 返回上一页
|
||||
handleBack() {
|
||||
uni.navigateBack()
|
||||
},
|
||||
// 员工选择变化
|
||||
handleEmployeeChange(e) {
|
||||
console.log('eee', e);
|
||||
|
||||
this.selectedEmployeeIndex = Number(e.detail.value)
|
||||
this.selectUser = this.userList && this.userList.length > 0 ? this.userList[this.selectedEmployeeIndex] : ""
|
||||
|
||||
this.handleGetCurrentUserScheduleInfo()
|
||||
},
|
||||
|
||||
// 加载排班数据
|
||||
async loadRosterData(SERVERPART_NAME) {
|
||||
// 先拿到人员列表
|
||||
let req = {
|
||||
bsessionKey: "0B30475A94674D608022885F7763959B",
|
||||
workTime: new Date(this.selectDate).getTime(),
|
||||
saName: SERVERPART_NAME || "",// 服务区名称
|
||||
phone: "",// 手机号码
|
||||
}
|
||||
uni.showLoading({
|
||||
title: "加载中..."
|
||||
})
|
||||
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
uni.request({
|
||||
url: "https://fwqznxj.yciccloud.com:9081/ynjt/pushManage/queryUserSchedule",
|
||||
method: "POST",
|
||||
data: req,
|
||||
header: {
|
||||
"content-type": "application/x-www-form-urlencoded",
|
||||
},
|
||||
success(res) {
|
||||
resolve(res.data.data)
|
||||
},
|
||||
});
|
||||
});
|
||||
uni.hideLoading()
|
||||
|
||||
console.log('人员列表', data);
|
||||
|
||||
this.userList = data
|
||||
this.selectedEmployeeIndex = 0
|
||||
this.selectUser = data && data.length > 0 ? data[0] : ""
|
||||
console.log('this.selectUserthis.selectUserthis.selectUser', this.selectUser);
|
||||
|
||||
await this.handleGetCurrentUserScheduleInfo()
|
||||
},
|
||||
// 拿到当前用户的排班信息
|
||||
async handleGetCurrentUserScheduleInfo() {
|
||||
this.selectedEmployee = null
|
||||
let req = {
|
||||
bsessionKey: "20ED2B50179D4877853C4DED45D8179E",
|
||||
date: new Date(this.selectDate).getTime(),
|
||||
phone: this.selectUser.phone
|
||||
}
|
||||
const data = await new Promise((resolve, reject) => {
|
||||
uni.request({
|
||||
url: "https://fwqznxj.yciccloud.com:9081/ynjt/pushManage/queryWorkDetails",
|
||||
method: "POST",
|
||||
data: req,
|
||||
header: {
|
||||
"content-type": "application/x-www-form-urlencoded",
|
||||
},
|
||||
success(res) {
|
||||
resolve(res.data.data)
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
console.log('datadatadatadatadata', data);
|
||||
this.selectedEmployee = data[0]
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -143,7 +328,6 @@ export default {
|
||||
@warn: #ff9f43;
|
||||
@danger: #ff4757;
|
||||
|
||||
|
||||
.main {
|
||||
width: 100vw;
|
||||
min-height: 100vh;
|
||||
@ -158,7 +342,6 @@ export default {
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100vw;
|
||||
// background: #fff;
|
||||
background-image: url("https://eshangtech.com/minTestImg/pageBg.png");
|
||||
z-index: 99;
|
||||
display: flex;
|
||||
@ -170,7 +353,6 @@ export default {
|
||||
width: 100%;
|
||||
height: 24px;
|
||||
position: absolute;
|
||||
// left: 16px;
|
||||
z-index: 99999999999;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
@ -219,30 +401,11 @@ export default {
|
||||
color: #160002;
|
||||
}
|
||||
|
||||
.area {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #786B6C;
|
||||
line-height: 40px;
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
||||
.rightArrow {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.noticeText {
|
||||
font-size: 24rpx;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #B6BACB;
|
||||
line-height: 40rpx;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -253,93 +416,211 @@ export default {
|
||||
width: 100%;
|
||||
background-color: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 0 24rpx;
|
||||
padding: 0 24rpx 8rpx;
|
||||
border-radius: 8rpx;
|
||||
|
||||
.rosterContentTop {
|
||||
width: 100%;
|
||||
/* 选择器行布局 */
|
||||
.selectorRow {
|
||||
display: flex;
|
||||
gap: 24rpx;
|
||||
padding: 24rpx 0;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.dateBox {
|
||||
box-sizing: border-box;
|
||||
padding: 16rpx 0;
|
||||
.dateBox {
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
.centerDateBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 10rpx;
|
||||
border-radius: 30rpx;
|
||||
background-color: #fff;
|
||||
// border: 2rpx solid #27B35F;
|
||||
// background: rgba(255, 255, 255, .15);
|
||||
|
||||
.centerDateBox {
|
||||
.arrowIcon {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
.center {
|
||||
.date-text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* 员工选择器 */
|
||||
.employeeSelector {
|
||||
.employeePickerBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
// padding: 20rpx 24rpx;
|
||||
// background: #f8f9fa;
|
||||
border-radius: 30rpx;
|
||||
// border: 2rpx solid #e0e0e0;
|
||||
|
||||
.selectedEmployee {
|
||||
font-size: 24rpx;
|
||||
font-weight: 400;
|
||||
color: #000;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
|
||||
.rightArrow {
|
||||
width: 26rpx;
|
||||
height: 26rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 员工信息卡片 */
|
||||
.employeeDetail {
|
||||
margin-bottom: 32rpx;
|
||||
|
||||
.employeeCard {
|
||||
background: #fff;
|
||||
border-radius: 12rpx;
|
||||
padding: 16rpx 24rpx;
|
||||
box-shadow: @shadow;
|
||||
|
||||
.employeeInfo {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10rpx;
|
||||
padding: 10rpx 20rpx;
|
||||
border-radius: 30rpx;
|
||||
background-color: #fff;
|
||||
// border: 2rpx solid #27B35F;
|
||||
// background: rgba(255, 255, 255, .15);
|
||||
|
||||
.arrowIcon {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
.employeeName {
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
margin-right: 24rpx;
|
||||
}
|
||||
|
||||
.center {
|
||||
.date-text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 700;
|
||||
.employeeJob {
|
||||
font-size: 24rpx;
|
||||
color: @primary;
|
||||
background: rgba(39, 178, 95, 0.1);
|
||||
padding: 0 16rpx;
|
||||
border-radius: 20rpx;
|
||||
margin-right: 24rpx;
|
||||
}
|
||||
|
||||
.phoneIcon {
|
||||
width: 24rpx;
|
||||
height: 24rpx;
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
|
||||
.employeePhone {
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 日历格式排班表 */
|
||||
.calendarRoster {
|
||||
background: #fff;
|
||||
border-radius: 12rpx;
|
||||
// padding: 32rpx;
|
||||
box-shadow: @shadow;
|
||||
margin-bottom: 32rpx;
|
||||
|
||||
/* 星期标题 */
|
||||
.weekHeader {
|
||||
display: flex;
|
||||
border-bottom: 2rpx solid #e0e0e0;
|
||||
// margin-bottom: 16rpx;
|
||||
|
||||
.weekHeaderItem {
|
||||
flex: 1;
|
||||
text-align: center;
|
||||
padding: 16rpx 0;
|
||||
font-size: 28rpx;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
|
||||
&.weekend {
|
||||
color: @danger;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 日历网格 */
|
||||
.calendarGrid {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
width: 100%;
|
||||
|
||||
.calendarCell {
|
||||
width: 14.28%;
|
||||
height: 120rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1rpx solid #f0f0f0;
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
|
||||
&.empty {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
&.today {
|
||||
background-color: rgba(39, 178, 95, 0.1);
|
||||
border: 2rpx solid @primary;
|
||||
}
|
||||
|
||||
&.weekend {
|
||||
.dateNumber {
|
||||
// color: @danger;
|
||||
}
|
||||
}
|
||||
|
||||
.dateNumber {
|
||||
font-size: 24rpx;
|
||||
font-weight: 500;
|
||||
color: #333;
|
||||
margin-bottom: 4rpx;
|
||||
}
|
||||
|
||||
.scheduleInfo {
|
||||
font-size: 24rpx;
|
||||
padding: 2rpx 4rpx;
|
||||
border-radius: 4rpx;
|
||||
font-weight: 500;
|
||||
text-align: center;
|
||||
line-height: 1;
|
||||
|
||||
&.work {
|
||||
// background-color: #333;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
&.rest {
|
||||
// background-color: #f5f5f5;
|
||||
// color: #999;
|
||||
color: red;
|
||||
}
|
||||
|
||||
&.empty {
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.calendarBpx {
|
||||
/deep/ .uni-calendar-item__weeks-box-item {
|
||||
width: calc(100% / 7);
|
||||
|
||||
.uni-calendar-item__weeks-box-circle {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
/deep/ .uni-calendar-item--checked {
|
||||
background-color: transparent;
|
||||
color: #000 !important;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
|
||||
/deep/ .uni-calendar-item--isDay {
|
||||
background-color: transparent;
|
||||
color: #000 !important;
|
||||
opacity: 1 !important;
|
||||
}
|
||||
|
||||
/deep/ .uni-calendar-item--isDay-text {
|
||||
white-space: nowrap;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
/deep/ .uni-calendar__backtoday {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* === info 文字颜色控制 === */
|
||||
.selectDateCalendar ::v-deep .uni-calendar__info {
|
||||
color: #000 !important;
|
||||
/* 默认黑色 */
|
||||
}
|
||||
|
||||
/* 如果 info 等于“休”，文字改为红色 */
|
||||
.selectDateCalendar ::v-deep .uni-calendar__info[title="休"],
|
||||
.selectDateCalendar ::v-deep .uni-calendar__info[data-info="休"] {
|
||||
color: red !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@ -85,7 +85,7 @@
|
||||
}"></view>
|
||||
<span class="itemName">{{
|
||||
subItem.name
|
||||
}}</span>
|
||||
}}</span>
|
||||
</view>
|
||||
<view class="itemCenter">
|
||||
{{
|
||||
@ -103,7 +103,7 @@
|
||||
: '',
|
||||
}">{{
|
||||
subItem.addQOQ ? `${subItem.addQOQ}` : ""
|
||||
}}</view>
|
||||
}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -219,7 +219,7 @@
|
||||
src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/monthIcon.svg" />
|
||||
<text class="dateText">{{
|
||||
$util.handleGetMonthDay(nowDay)
|
||||
}}</text>
|
||||
}}</text>
|
||||
<text class="day">/{{ howDay }}</text>
|
||||
</view>
|
||||
<view class="revenyeTopRight">
|
||||
@ -228,8 +228,8 @@
|
||||
</view>
|
||||
|
||||
<view class="revenueMoney">
|
||||
<NumberScroll v-if="currentMoney" :number="currentMoney" />
|
||||
<!-- <text class="moneyText">{{currentMoney}}</text>-->
|
||||
<!-- <NumberScroll v-if="currentMoney" :number="currentMoney" /> -->
|
||||
<text class="moneyText">{{ currentMoney }}</text>
|
||||
<text class="moneyLabel">实时对客销售/元</text>
|
||||
</view>
|
||||
</view>
|
||||
@ -616,7 +616,8 @@ export default {
|
||||
StatisticsDate: this.nowDay,
|
||||
};
|
||||
const res = await request.$webGet("CommercialApi/Revenue/GetCurRevenue", req)
|
||||
this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2);
|
||||
// this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2);
|
||||
this.currentMoney = res.Result_Data.CurRevenueAmount.toLocaleString('zh-CN')
|
||||
|
||||
},
|
||||
// 拿到顶部轮播框的数据
|
||||
@ -1249,14 +1250,18 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 24rpx;
|
||||
// margin-top: 24rpx;
|
||||
margin-top: 4rpx;
|
||||
|
||||
.moneyText {
|
||||
font-size: 44rpx;
|
||||
display: inline-flex;
|
||||
font-family: DINAlternate-Bold, DINAlternate;
|
||||
font-weight: bold;
|
||||
font-size: 36rpx;
|
||||
color: #160002;
|
||||
margin-right: 8rpx;
|
||||
line-height: 40rpx;
|
||||
text-align: right;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.moneyLabel {
|
||||
@ -1267,7 +1272,6 @@ export default {
|
||||
color: #a69e9f;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
<p class="subTitle">取水方式</p>
|
||||
<text class="value">{{ info.ServerpartInfo.WATERINTAKE_TYPE === 1 ? '自来水' :
|
||||
info.ServerpartInfo.WATERINTAKE_TYPE === 2 ? '井水' : ''
|
||||
}}</text>
|
||||
}}</text>
|
||||
</div>
|
||||
<div class="word">
|
||||
<p class="subTitle">污水处理</p>
|
||||
@ -91,12 +91,12 @@
|
||||
<div class="word">
|
||||
<p class="subTitle">市区县镇</p>
|
||||
<text class="text">{{ info.ServerpartInfo.SERVERPART_ADDRESS ? info.ServerpartInfo.SERVERPART_ADDRESS : ''
|
||||
}}</text>
|
||||
}}</text>
|
||||
</div>
|
||||
<div class="word">
|
||||
<p class="subTitle">管理单位</p>
|
||||
<text class="text">{{ info.ServerpartInfo.MANAGERCOMPANY ? info.ServerpartInfo.MANAGERCOMPANY : ''
|
||||
}}</text>
|
||||
}}</text>
|
||||
</div>
|
||||
<div class="word">
|
||||
<p class="subTitle">产权单位</p>
|
||||
@ -125,7 +125,7 @@
|
||||
<div class="word">
|
||||
<p class="subTitleArea">建筑面积</p>
|
||||
<text class="value" v-if="info.ServerpartInfo.SERVERPART_AREA">{{ info.ServerpartInfo.SERVERPART_AREA
|
||||
}}<text style="margin-left: 4px">m²</text></text>
|
||||
}}<text style="margin-left: 4px">m²</text></text>
|
||||
<text class="value" v-else></text>
|
||||
</div>
|
||||
</div>
|
||||
@ -727,9 +727,10 @@ export default {
|
||||
font-size: 12px;
|
||||
font-family: PingFangSC-Regular, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #160002;
|
||||
color: #fff;
|
||||
// color: #160002;
|
||||
padding: 0 6px;
|
||||
background: #EAEAEA;
|
||||
background: #43C677;
|
||||
border-radius: 2px;
|
||||
display: inline-block;
|
||||
width: 80rpx;
|
||||
|
||||
@ -83,6 +83,7 @@
|
||||
* @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
|
||||
* @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
|
||||
* @property {Boolean} showMonth 是否选择月份为背景
|
||||
* @property {Boolean} maskClosable = [true|false] 点击蒙层是否关闭日历，默认为false
|
||||
* @event {Function} change 日期改变，`insert :ture` 时生效
|
||||
* @event {Function} confirm 确认选择`insert :false` 时生效
|
||||
* @event {Function} monthSwitch 切换月份时触发
|
||||
@ -131,6 +132,10 @@
|
||||
clearDate: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
maskClosable: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@ -208,8 +213,13 @@
|
||||
this.init(this.date)
|
||||
},
|
||||
methods: {
|
||||
// 取消穿透
|
||||
clean() {},
|
||||
// 点击蒙层处理
|
||||
clean() {
|
||||
// 如果允许点击蒙层关闭，则关闭日历
|
||||
if (this.maskClosable) {
|
||||
this.close();
|
||||
}
|
||||
},
|
||||
bindDateChange(e) {
|
||||
const value = e.detail.value + '-1'
|
||||
this.setDate(value)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user