Mauve/mgm-daylight-mcrm-mobile-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge limo to daylight

Browse Source
This commit is contained in:
Mauve
2026-09-22 16:37:00 +08:00
parent 0c92868836
commit a7359d443b
73 changed files with 11614 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salessupport/todoList/todoList.vue
+21 -15
View File
@@ -10,7 +10,7 @@
height: navbarHeight+'px',
backgroundColor: bgColor,
}"></view>
<view :class="[true && 'u-navbar--fixed']">
<view :class="[true && 'u-navbar--fixed']">
<u-status-bar :bgColor="bgColor"></u-status-bar>
<view class="u-navbar__content" :style="{
height: navbarHeight,
@@ -117,8 +117,6 @@
<image
v-show="index == 0 && currentIndex !== 2 && rowRecord.hasLimoRecord =='-1'"
src="../../static/images/limo_warn.png" class="icon-img-limo"></image>
<span v-show="index === 0 && rowRecord.isQueue"> (In Queue) </span>
<span v-show="index === 0 && rowRecord.roomReady"> (Room Ready) </span>
</span>
</view>
<!-- 直接使用v-if配合CSS动画类 -->
@@ -237,7 +235,7 @@
</u-col>
<u-col span="6">
<view class="hz-font-12px">R6M TPD: {{formatNumber(rowRecord.detailData.r6MTPD)}}</view>
<view class="hz-font-12px">R6M Win: {{formatNumber(rowRecord.detailData.r6MWin)}}</view>
<view class="hz-font-12px">R6M Win: {{formatNumber(rowRecord.detailData.r6MWin)}}</view>:
<view class="hz-font-12px">R6M RI:
{{getPercentFormat(rowRecord.detailData.r6MRIPercentage)}}</view>
<view v-show="currentIndex === 2 && filterType ==='MASS'" class="hz-font-12px">R6M Theo : {{formatNumber(rowRecord.detailData.r6MTheo)}}
@@ -320,9 +318,6 @@
</view>
</view>
</view>
<view v-if="currentIndex === 2 && rowRecord.roomReady" class="hz-font-12px todo-description-text" >
[Room Ready]
</view>
</uni-card>
<template v-slot:right>
<view v-if="currentIndex === 0" class="hz-flex-row" style="height:100%;align-items: center;margin-left:15px;"
@@ -447,7 +442,7 @@
getSetting,
getExtendBooking
} from '../../api/configApi.js';
import { normalizeApiKeys } from '../../common/normalizeApiKeys.js';
import { normalizeApiKeys, getApiRecords } from '../../common/normalizeApiKeys.js';
export default {
components: {
mgmHeader, // 注册组件
@@ -736,7 +731,12 @@
return num?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") || "0";
},
formarHour(num){
let hourStr = num > 1 ? num + ' hours' : num + ' hour';
let hourStr = '';
if(num!==null && num!==0){
hourStr = num > 1 ? num + ' hours' : num + ' hour';
}else{
hourStr = 0 + ' hour'
}
return hourStr;
},
checkPassEtaTime(record) {
@@ -1042,7 +1042,7 @@
if (i.keys == "VIEW_YESTERDAY_TODOLIST_START") {
dbStart = i.keyValues;
}else if(i.keys == "VIEW_YESTERDAY_TODOLIST_END"){
dbEnd = i.keyValues
dbEnd = i.keyValues
}
}
let today = new Date();
@@ -1254,6 +1254,7 @@
if (requestSeq !== this.todoListRequestSeq) return;
this.currentTask = null;
const records = res && res.data && Array.isArray(res.data.records) ? res.data.records : [];
if (res && res.success == true && records.length > 0) {
this.showTodoListView=true;
@@ -1272,8 +1273,8 @@
}))
}));
}else{
const errorCode = res && (res.errorCode || res.code) ? String(res.errorCode || res.code).toUpperCase() : '';
if(errorCode.indexOf('NO RECORD') !== -1 || (res && res.success == true && records.length === 0)){
const errorCode = res && res.errorCode ? res.errorCode.toUpperCase() : "";
if(errorCode.indexOf('NO RECORD') != -1 || (res && res.success == true && records.length == 0)){
this.dataNull = this.$t("common.noRecord");
}else{
this.dataNull = this.$t("todo.returnError");
@@ -1283,7 +1284,6 @@
}
} catch (e) {
if (requestSeq !== this.todoListRequestSeq) return;
if (e.errMsg && e.errMsg.includes("abort")) {
} else if (e.data!==null&&e.data!==undefined&&e.data.message!==undefined){
@@ -1330,6 +1330,7 @@
const res = await getTodoDetail(params);
if (res != null && res.success == true) {
record.detailData = normalizeApiKeys(res.data);
console.log(record.detailData.r3MTOD);
if(record.detailData.descriptions!==null){
for(let i=0;i<record.detailData.descriptions.length;i++){
if(record.detailData.descriptions[i].itemRecordType == 'Offer'){
@@ -1599,7 +1600,8 @@
getETALable() {
return function(record) {
if (this.currentIndex !== 1 && this.currentIndex !== 2) {
return record.eta;
console.log(record);
return record.eTA;
} else if (record.bigLossFlag === 1) {
return "BIGLOSS";
} else if (record.bigWinFlag === 1) {
@@ -1657,7 +1659,11 @@
},
getPercentFormat() {
return function(val) {
return Math.trunc((val * 100)) + "%";
if(val){
return Math.trunc((val * 100)) + "%";
}else{
return "0%"
}
}
},
getOtherDescription(){