From e39f4b6be29eb7a0775368075ae59f88cdb9c7dd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 三月 2025 18:25:49 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/platformBroadcastLog.vue | 4 ++--
admin/src/views/meeting/components/OperaBookingsDetailWindow.vue | 2 +-
admin/src/views/meeting/bookings.vue | 15 ++++-----------
admin/src/views/platform/LogisticsRecord/operation.vue | 19 ++++++++++---------
admin/src/components/base/BaseTable.vue | 1 -
admin/src/router/index.js | 6 +++---
admin/src/views/meeting/components/OperaBookingsWindow.vue | 2 +-
7 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index 4425ae6..b52c214 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -44,7 +44,6 @@
}
},
methods: {
-
// 閰嶇疆
config (extParams) {
if (extParams == null) {
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index d522993..224a5f2 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -99,7 +99,7 @@
})
router.afterEach((to, from, failure) => {
- setTimeout(function (){computeTableHeightIndex()},1000)
+ setTimeout(function () { computeTableHeightIndex() }, 1000)
window.addEventListener('resize', computeTableHeightIndex())
})
function computeTableHeightIndex () {
@@ -118,8 +118,8 @@
const height9 = getEleHeghtByClassName('static_wrap', 0)
const height10 = getEleHeghtByClassName('query_btns', 0)
const height11 = getEleHeghtByClassName('el-tabs-ele', 0)
- const height12 = getEleHeghtByClassName('platgroup_tabs', 0)
- router.app.$store.commit('setTableHeightNew', height - height13 - height3 - height5 - height6 - height2 - height7 - height4 - height9 - height10 - height11 - height12)
+ const height12 = getEleHeghtByClassName('platgroup_tabs', 0,20)
+ router.app.$store.commit('setTableHeightNew', height -10 - height2 - height3 - height4 - height5 - height6 - height7 - height9 - height10 - height11 - height12 - height13)
console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
} else {
console.log('tableLayout========================')
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
index 68238b4..d374fdf 100644
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -6,8 +6,8 @@
<el-form-item label="" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="" prop="content">
- <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="" prop="info">
+ <el-input v-model="searchForm.info" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="" prop="personType">
<el-select v-model="searchForm.deviceType" placeholder="璇烽�夋嫨璁惧绫诲瀷">
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 5d9ee9b..6912d39 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -76,21 +76,13 @@
<span class="long-title-style">{{ row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="160px"></el-table-column>
-
- <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column> -->
- <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column> -->
- <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column> -->
- <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="400px"></el-table-column> -->
-
- <el-table-column prop="managerInfo" label="棰勭害浜�" align="center" min-width="100px"></el-table-column>
-
- <el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" align="center" min-width="150px"></el-table-column>
- <el-table-column prop="roomName" label="浼氳瀹ゅ悕绉�" align="center" min-width="120px" show-overflow-tooltip>
+ <el-table-column prop="roomName" label="浼氳瀹�" align="center" min-width="120px" show-overflow-tooltip>
<template slot-scope="{ row }">
<span class="long-title-style">{{ row.roomName }}</span>
</template>
</el-table-column>
+ <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
+ <el-table-column prop="managerInfo" label="棰勭害浜�" align="center" min-width="100px"></el-table-column>
<el-table-column label="浼氳鐘舵��" align="center" min-width="60px">
<template slot-scope="{ row }">
<span v-if="row.meetingStatus == 1">鏈紑濮�</span>
@@ -101,6 +93,7 @@
<!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="150px"></el-table-column>
<!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
<el-table-column v-if="
containPermissions([
diff --git a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
index 1b0553b..602fa6b 100644
--- a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
@@ -4,7 +4,7 @@
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
- width="600px"
+ width="680px"
>
<div class="title-style">
<div class="header-title">{{ form.name }}</div>
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 83a4d07..71b905e 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -1,6 +1,6 @@
<template>
<GlobalAlertWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm"
- width="840px">
+ width="880px">
<el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�">
<el-form-item label="鍏宠仈浼氳瀹�" prop="roomId">
<el-select v-model="form.roomId" filterable clearable :disabled="isEdit" placeholder="璇烽�夋嫨鍏宠仈浼氳瀹�"
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index dfe6232..4b05cbb 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -80,8 +80,9 @@
filters: {
selDate: [],
fastdate: 0,
- beginWorkDateEnd: '',
- beginDoneDateEnd: ''
+ beginWorkDateStart: '',
+ beginWorkDateEnd: ''
+ // beginDoneDateEnd: ''
},
list: [],
queryFormConfig: {
@@ -102,8 +103,8 @@
label: '椹鹃┒鍛�'
},
{
- filed1: 'beginWorkDateEnd',
- filed2: 'beginDoneDateEnd',
+ filed1: 'beginWorkDateStart',
+ filed2: 'beginWorkDateEnd',
type: 'datetime',
label: '浣滀笟鏃堕棿'
},
@@ -123,13 +124,13 @@
methods: {
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
- this.filters.beginWorkDateEnd = arr[0]
- this.filters.beginDoneDateEnd = arr[1]
+ this.filters.beginWorkDateEnd = arr[1]
+ this.filters.beginWorkDateStart = arr[0]
this.getList(1)
},
changeForm(str) {
- if(this.filters.beginWorkDateEnd > this.filters.beginDoneDateEnd){
- this.filters.beginWorkDateEnd = this.filters.beginDoneDateEnd
+ if(this.filters.beginWorkDateStart> this.filters.beginWorkDateEnd ){
+ this.filters.beginWorkDateEnd = this.filters.beginWorkDateEnd
return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
this.getList()
@@ -179,7 +180,7 @@
model: {
...filters,
jobType: 0,
-
+
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: 10000,
--
Gitblit v1.9.3