fix: 修正文本错误并优化日期处理逻辑
修复多处文案中"点菜集成"为"点采集成" 移除base.vue中多余的条件判断 优化报表页面的日期处理逻辑,使用本地时间并保证格式统一 移除zha.vue中硬编码的status默认值
This commit is contained in:
@@ -178,7 +178,7 @@
|
||||
<el-option label="废品" value="废品" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="getItemLabel" prop="itemId" v-if="!form.coilId">
|
||||
<el-form-item :label="getItemLabel" prop="itemId">
|
||||
<product-select v-if="form.itemType == 'product'" v-model="form.itemId" placeholder="请选择成品"
|
||||
style="width: 100%;" clearable />
|
||||
<raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" placeholder="请选择原料"
|
||||
|
||||
@@ -100,11 +100,18 @@ export default {
|
||||
},
|
||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||||
data() {
|
||||
// 获取昨天0点到今天0点的时间范围
|
||||
// 工具函数:个位数补零,保证格式统一(比如 9 → 09,5 → 05)
|
||||
const addZero = (num) => num.toString().padStart(2, '0')
|
||||
|
||||
const now = new Date()
|
||||
const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
|
||||
const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
|
||||
const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
|
||||
// 基于【本地北京时间】获取年月日
|
||||
const year = now.getFullYear()
|
||||
const month = addZero(now.getMonth() + 1) // 月份+1 补零
|
||||
const day = addZero(now.getDate())
|
||||
|
||||
// ✅ 正确的 北京时间 今日开始/结束时间
|
||||
const startTime = `${year}-${month}-${day} 00:00:00`
|
||||
const endTime = `${year}-${month}-${day} 23:59:59`
|
||||
return {
|
||||
list: [],
|
||||
queryParams: {
|
||||
|
||||
@@ -102,11 +102,18 @@ export default {
|
||||
},
|
||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||||
data() {
|
||||
// 获取昨天0点到今天0点的时间范围
|
||||
// 工具函数:个位数补零,保证格式统一(比如 9 → 09,5 → 05)
|
||||
const addZero = (num) => num.toString().padStart(2, '0')
|
||||
|
||||
const now = new Date()
|
||||
const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
|
||||
const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
|
||||
const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
|
||||
// 基于【本地北京时间】获取年月日
|
||||
const year = now.getFullYear()
|
||||
const month = addZero(now.getMonth() + 1) // 月份+1 补零
|
||||
const day = addZero(now.getDate())
|
||||
|
||||
// ✅ 正确的 北京时间 今日开始/结束时间
|
||||
const startTime = `${year}-${month}-${day} 00:00:00`
|
||||
const endTime = `${year}-${month}-${day} 23:59:59`
|
||||
return {
|
||||
list: [],
|
||||
queryParams: {
|
||||
|
||||
@@ -102,17 +102,24 @@ export default {
|
||||
},
|
||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||||
data() {
|
||||
// 获取昨天0点到今天0点的时间范围
|
||||
// 工具函数:个位数补零,保证格式统一(比如 9 → 09,5 → 05)
|
||||
const addZero = (num) => num.toString().padStart(2, '0')
|
||||
|
||||
const now = new Date()
|
||||
const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
|
||||
const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
|
||||
const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
|
||||
// 基于【本地北京时间】获取年月日
|
||||
const year = now.getFullYear()
|
||||
const month = addZero(now.getMonth() + 1) // 月份+1 补零
|
||||
const day = addZero(now.getDate())
|
||||
|
||||
// ✅ 正确的 北京时间 今日开始/结束时间
|
||||
const startTime = `${year}-${month}-${day} 00:00:00`
|
||||
const endTime = `${year}-${month}-${day} 23:59:59`
|
||||
return {
|
||||
list: [],
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 9999,
|
||||
status: 1,
|
||||
// status: 1,
|
||||
startTime: startTime,
|
||||
endTime: endTime,
|
||||
selectType: 'product',
|
||||
|
||||
Reference in New Issue
Block a user