From bdad06349901c13f8ce2c9381a3ace2b7f80c652 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 14:33:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shiwai.vue | 1
admin/src/views/statistics/platformRecord.vue | 53 ++
admin/src/components/base/BaseComputHeight.vue | 4
admin/src/views/business/deletePersonnel.vue | 2
h5/pages/staff/vehicle/shinei.vue | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2
h5/pages/visitorApplication/memberSel.vue | 1
admin/src/views/statistics/platformStatic.vue | 69 ++-
h5/pages/applicationRecord/applicationRecord.vue | 9
pda/pages/index/queueup.vue | 6
admin/src/views/business/dangerStatic.vue | 39 +-
admin/src/views/business/platformEvent.vue | 37 +-
h5/pages/staff/memberSel.vue | 1
admin/src/views/meeting/bookings.vue | 2
admin/src/views/platform/LogisticsRecord/operation.vue | 66 ++--
admin/src/views/business/visitEvent.vue | 4
h5/pages/staff/vehicle/apply.vue | 18
admin/src/views/business/carEvent.vue | 16
admin/src/components/common/QueryForm/queryForm.vue | 6
admin/src/views/business/blackmailPersonnel.vue | 130 +++----
admin/src/views/business/freezePersonnel.vue | 109 +++----
admin/src/views/platform/queueUp.vue | 7
h5/pages/staff/meetingSel.vue | 2
admin/src/views/platform/LogisticsRecord/operationCity.vue | 43 +-
admin/src/views/platform/platform.vue | 2
admin/src/views/platform/platformReason.vue | 13
h5/pages/staff/task/index.vue | 5
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 23 +
admin/src/views/business/platformBroadcastLog.vue | 48 ++-
h5/pages/staff/vehicle/applePeo.vue | 2
admin/src/views/operation/serviceCar/apprRecord.vue | 167 +++-------
31 files changed, 462 insertions(+), 428 deletions(-)
diff --git a/admin/src/components/base/BaseComputHeight.vue b/admin/src/components/base/BaseComputHeight.vue
index 6a876aa..a1a58f1 100644
--- a/admin/src/components/base/BaseComputHeight.vue
+++ b/admin/src/components/base/BaseComputHeight.vue
@@ -33,8 +33,8 @@
const height12 = document.getElementsByClassName('platgroup_tabs') && document.getElementsByClassName('platgroup_tabs')[0]?20+ document.getElementsByClassName('platgroup_tabs')[0].clientHeight:0
// this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// 鎵撳嵃楂樺害
this.tableHeightNew = height-height3 -height5-height6-height2-height7-height4-height9-height10 -height11 -height12
- console.log('self',height,height3 ,height5,(height6==0?20:height6),height2,height7,height4,height9,height10 ,height11 ,height12)
- console.log('self',this.tableHeightNew)
+ // console.log('self',height,height3 ,height5,(height6==0?20:height6),height2,height7,height4,height9,height10 ,height11 ,height12)
+ // console.log('self',this.tableHeightNew)
})
}
}
diff --git a/admin/src/components/common/QueryForm/queryForm.vue b/admin/src/components/common/QueryForm/queryForm.vue
index 8f75358..52caa69 100644
--- a/admin/src/components/common/QueryForm/queryForm.vue
+++ b/admin/src/components/common/QueryForm/queryForm.vue
@@ -30,7 +30,8 @@
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
:placeholder="item.label" :picker-options="item.pickerOptions || {}" @change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item label="璧锋鏃堕棿" v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
+ <el-form-item :label="item.label ? item.label : '璧锋鏃堕棿'"
+ v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
<el-date-picker v-model="searchForm[item.filed1]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
class="w200"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
@@ -60,7 +61,8 @@
:start-placeholder="item.start || '寮�濮嬫椂闂�'" :end-placeholder="item.end || '缁撴潫鏃堕棿'" class="w400"
@change="changeForm(item.filed)" />
</el-form-item>
- <el-form-item v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed">
+ <el-form-item :label="item.label ? item.label : ''"
+ v-if="item.type === 'slot' && (showZk || index < listLength)" :key="item.filed">
<slot :name="item.filed" />
</el-form-item>
</template>
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index 5f0f848..3eabd5c 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/admin/src/views/business/blackmailPersonnel.vue
@@ -1,14 +1,14 @@
<template>
- <TableLayout :permissions="['business:member:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎿嶄綔浜哄憳" prop="createrId">
+ <TableLayout :permissions="['business:member:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <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="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="鎿嶄綔浜哄憳" prop="createrId">
<el-select v-model="searchForm.createrId" placeholder="璇烽�夋嫨">
<el-option
v-for="item in user"
@@ -17,62 +17,50 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
-<!-- <el-form-item label="浜哄憳绫诲瀷" prop="type">-->
-<!-- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">-->
-<!-- <el-option label="璁垮" value="1"></el-option>-->
-<!-- <el-option label="鍔冲姟" value="0"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绉诲嚭</el-button></li>
- </ul>
- <el-table
- :height="tableHeightNew"
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="80px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcardDecode" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="140px"></el-table-column>
- <el-table-column label="浜哄憳绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.type === 0">鍔冲姟璁垮</span>
- <span v-if="row.type === 1">鏅�氳瀹�</span>
- <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
- </template>
- </el-table-column>
- <el-table-column prop="visitCompanyName" label="缁勭粐" show-overflow-tooltip min-width="200px"></el-table-column>
- <el-table-column prop="optRemark" label="鎿嶄綔淇℃伅" show-overflow-tooltip min-width="200px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="thaw(row.id)">绉诲嚭</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ </el-form-item> -->
+ <!-- <el-form-item label="浜哄憳绫诲瀷" prop="type">-->
+ <!-- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">-->
+ <!-- <el-option label="璁垮" value="1"></el-option>-->
+ <!-- <el-option label="鍔冲姟" value="0"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <section> -->
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ <!-- </section> -->
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
+ <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绉诲嚭</el-button></li>
+ </ul>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="80px"></el-table-column>
+ <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="140px"></el-table-column>
+ <el-table-column label="浜哄憳绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.type === 0">鍔冲姟璁垮</span>
+ <span v-if="row.type === 1">鏅�氳瀹�</span>
+ <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="visitCompanyName" label="缁勭粐" show-overflow-tooltip min-width="200px"></el-table-column>
+ <el-table-column prop="optRemark" label="鎿嶄綔淇℃伅" show-overflow-tooltip min-width="200px"></el-table-column>
+ <el-table-column v-if="containPermissions(['business:member:update', 'business:member:delete'])" label="鎿嶄綔"
+ min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']"
+ @click="thaw(row.id)">绉诲嚭</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -85,7 +73,7 @@
name: 'blackmailPersonnel',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -97,7 +85,7 @@
user: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳淇℃伅琛�',
api: '/business/block',
@@ -108,7 +96,7 @@
this.getUser()
},
methods: {
- thaws () {
+ thaws() {
if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
const ids = this.tableData.selectedRows.map(item => {
return item.id
@@ -119,7 +107,7 @@
this.search()
})
},
- thaw (ids) {
+ thaw(ids) {
this.$confirm('纭畾绉诲嚭姝ょ敤鎴峰悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -134,7 +122,7 @@
})
},
- getUser () {
+ getUser() {
findAllList({})
.then(res => {
this.user = res.map(item => {
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index ed79f61..12a2af9 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -80,7 +80,7 @@
<span v-if="row.inoutType === 1">绂诲洯</span>
</template>
</el-table-column>
-<!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
+ <!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.platePicUrl != null">
<el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -128,7 +128,7 @@
companyName: '',
startTime: '',
endTime: '',
- radio: '0'
+ radio: ''
},
time: []
}
@@ -151,8 +151,16 @@
methods: {
reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
- // this.changeRadio('0')
+ this.searchForm = {
+ eventType: '',
+ keyWords: '',
+ plateNos: '',
+ memberType: '',
+ companyName: '',
+ startTime: '',
+ endTime: '',
+ radio: ''
+ }
this.time = []
this.search()
},
diff --git a/admin/src/views/business/dangerStatic.vue b/admin/src/views/business/dangerStatic.vue
index 0705e66..af9f3ee 100644
--- a/admin/src/views/business/dangerStatic.vue
+++ b/admin/src/views/business/dangerStatic.vue
@@ -13,11 +13,18 @@
<div class="main_content">
<div class="type_wrap">
<div class="title">闅愭偅绫诲瀷缁熻</div>
- <div class="echart1" ref="typeRef"></div>
+ <div v-show="typeList && typeList.length > 0" class="echart1" ref="typeRef"></div>
+ <div v-show="typeList.length == 0" style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;">
+ <img style="width: 240px;" src="@/assets/images/default_homeimg.png" alt="">
+ </div>
+
</div>
<div class="dept_wrap">
<div class="title">闅愭偅褰掑睘閮ㄩ棬缁熻</div>
- <div class="echart2" ref="deptRef"></div>
+ <div v-show="deptList && deptList.length > 0" class="echart2" ref="deptRef"></div>
+ <div v-show="deptList.length == 0" style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;">
+ <img style="width: 240px;" src="@/assets/images/default_homeimg.png" alt="">
+ </div>
</div>
</div>
</div>
@@ -35,7 +42,7 @@
data() {
return {
filters: {
- fastdate: '',
+ fastdate: '29',
queryStartTime: '',
queryEndTime: ''
},
@@ -48,7 +55,7 @@
options: [
{ label: '寰呭鐞�', value: '0' },
{ label: '宸插鐞�', value: '1' },
- { label: '涓嶅鐞�', value: '2' },
+ { label: '宸查��鍥�', value: '2' },
]
},
{
@@ -70,8 +77,8 @@
}
},
mounted() {
- // this.changeRadio('0')
- this.getData()
+ this.changeRadio('29')
+ // this.getData()
},
methods: {
changeRadio(day) {
@@ -85,8 +92,11 @@
if (res) {
this.typeList = res.cateList || []
this.deptList = res.departmentList || []
- this.initType()
- this.initDept()
+ this.$nextTick(() => {
+ this.initType()
+ this.initDept()
+ })
+
}
})
@@ -100,13 +110,13 @@
this.typeList.forEach(i => {
total += i.total
})
- let colors = ['#d75a44', '#e39f4d', '#7ac7f6', '#7ac7f6', '#4469ee', '#698af0', '#9fb5f4', '#b6c7f7', '#c8d5f8']
+ let colors = ['#d75a44', '#e39f4d', '#f0d05f', '#7ac7f6', '#4469ee', '#698af0','#86a2f1','#a1b4f6','#a0b5f5', '#9fb5f4', '#b6c7f7', '#c8d5f8']
let option = {
title: [
{
text: '闅愭偅鎬绘暟',
top: '46%',
- left: '46%',
+ left: '45%',
textStyle: {
color: '#666666',
fontSize: 16,
@@ -114,7 +124,7 @@
}, {
text: total,
top: '50%',
- left: '48%',
+ left: '47.6%',
textStyle: {
color: '#080404',
fontSize: 24,
@@ -139,9 +149,8 @@
},
series: [
{
- name: 'Access From',
type: 'pie',
- radius: ['28%', '46%'],
+ radius: ['24%', '40%'],
label: {
formatter: "{a|{b}}\n\n{c} | {d}%",
rich: {
@@ -250,7 +259,7 @@
}
.type_wrap {
- flex: 5;
+ flex: 11;
flex-shrink: 0;
height: calc(100% - 20px);
border-right: 12px solid #f7f7f7;
@@ -263,7 +272,7 @@
}
.dept_wrap {
- flex: 4;
+ flex: 10;
flex-shrink: 0;
height: calc(100% - 20px);
padding-left: 20px;
diff --git a/admin/src/views/business/deletePersonnel.vue b/admin/src/views/business/deletePersonnel.vue
index f21317f..d4e1e42 100644
--- a/admin/src/views/business/deletePersonnel.vue
+++ b/admin/src/views/business/deletePersonnel.vue
@@ -8,7 +8,7 @@
<el-form-item label="缁勭粐鍚嶇О" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
+ <el-form-item label="涓嬪彂鐘舵��" prop="hkStatus">
<el-select v-model="searchForm.hkStatus" placeholder="璇烽�夋嫨" clearable @change="search">
<el-option label="寰呬笅鍙�" value="0"></el-option>
<el-option label="宸插悓姝�" value="1"></el-option>
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index 9b786bb..9c29ea6 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -1,14 +1,14 @@
<template>
- <TableLayout :permissions="['business:member:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <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="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閮ㄩ棬" prop="companyId">
+ <TableLayout :permissions="['business:member:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <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="code">
+ <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="閮ㄩ棬" prop="companyId">
<el-cascader
:options="options"
v-model="searchForm.companyId"
@@ -17,50 +17,39 @@
@keypress.enter.native="search"
:props="{ checkStrictly: true, value: 'id', label: 'name', children: 'companyDTOList' }"
></el-cascader>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">瑙ｅ喕</el-button></li>
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
- </ul>
- <el-table
- :height="tableHeightNew"
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" show-overflow-tooltip label="閮ㄩ棬" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
- <el-table-column prop="visitsLastDate" label="鏈�鍚庝竴娆￠棬绂佹椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="optRemark" label="鍐荤粨淇℃伅" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit" v-permissions="['business:member:update']">瑙ｅ喕</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ </el-form-item> -->
+ <!-- <section> -->
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ <!-- </section> -->
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
+ <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">瑙ｅ喕</el-button></li>
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="閮ㄩ棬" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+ <el-table-column prop="visitsLastDate" label="鏈�鍚庝竴娆￠棬绂佹椂闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="optRemark" label="鍐荤粨淇℃伅" min-width="100px"></el-table-column>
+ <el-table-column v-if="containPermissions(['business:member:update', 'business:member:delete'])" label="鎿嶄綔"
+ min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit"
+ v-permissions="['business:member:update']">瑙ｅ喕</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -73,7 +62,7 @@
name: 'freezePersonnel',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -85,7 +74,7 @@
options: []
}
},
- created () {
+ created() {
this.config({
module: '鍐荤粨浜哄憳',
api: '/business/block',
@@ -96,7 +85,7 @@
this.getfindCompanyTreePage()
},
methods: {
- thaws () {
+ thaws() {
if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
const ids = this.tableData.selectedRows.map(item => {
// return { id: item.id }
@@ -104,7 +93,7 @@
})
this.thaw(ids.join(','))
},
- thaw (ids) {
+ thaw(ids) {
this.$confirm('纭畾瑙ｅ喕姝ょ敤鎴峰悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -119,11 +108,11 @@
})
},
- changeCompanyId (e) {
+ changeCompanyId(e) {
this.searchForm.companyId = e[e.length - 1]
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage () {
+ getfindCompanyTreePage() {
findCompanyTreePage(1)
.then(res => {
this.options = res
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
index 9a3b37a..68238b4 100644
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -23,10 +23,11 @@
<el-option label="涓嬪彂澶辫触" value="3"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="eventType">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
+ <el-form-item label="" prop="eventType">
+ <el-date-picker @change="changeDate" v-model="searchForm.startDate" type="datetime"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ <el-date-picker @change="changeDate" v-model="searchForm.endDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -113,31 +114,46 @@
})
},
methods: {
+ changeDate(e) {
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.endDate = this.searchForm.startDate
+ this.search()
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ } else {
+ this.search()
+ }
+ },
changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
+ // this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
- this.searchForm.endTime = timeForMat(6)[1]
- this.time = timeForMat(6)
+ this.searchForm.endDate = timeForMat(6)[1]
+ // this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startDate= timeForMat(29)[0]
- this.searchForm.endTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ this.searchForm.startDate = timeForMat(29)[0]
+ this.searchForm.endDate = timeForMat(29)[1]
+ // this.time = timeForMat(29)
}
- this.search()
- },
- seleTime(e) {
- this.searchForm.startTime = e[0]
- this.searchForm.endTime = e[1]
- this.searchForm.radio = null
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.startDate = this.searchForm.endDate
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.search()
},
reset() {
this.$refs.searchForm.resetFields()
this.time = []
+ this.searchForm = {
+ name: '',
+ info: '',
+ deviceType: '',
+ hkStatus: '',
+ startDate: '',
+ endDate: '',
+ }
this.searchForm.radio = ''
// this.changeRadio('0')
this.search()
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index 97f2557..438a834 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/admin/src/views/business/platformEvent.vue
@@ -12,16 +12,17 @@
<el-form-item label="" prop="plateNo">
<el-input v-model="searchForm.plateNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="" prop="eventType">
+ <el-form-item label="" prop="motionStatus">
<el-select v-model="searchForm.motionStatus" placeholder="璇烽�夋嫨杩涘嚭绫诲瀷">
<el-option label="绂诲紑" value="leave"></el-option>
<el-option label="杩涘叆" value="enter"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
+ <el-form-item label="" prop="startDate">
+ <el-date-picker @change="changeDate" v-model="searchForm.startDate" type="datetime"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
+ <el-date-picker @change="changeDate" v-model="searchForm.endDate" type="datetime" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫椂闂�" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -120,26 +121,33 @@
})
},
methods: {
+ changeDate(e) {
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.endDate = this.searchForm.startDate
+ this.search()
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }else{
+ this.search()
+ }
+ },
changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
- this.time = timeForMat(0)
+ // this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.startDate = timeForMat(6)[0]
this.searchForm.endDate = timeForMat(6)[1]
- this.time = timeForMat(6)
+ // this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endDate = timeForMat(29)[1]
- this.time = timeForMat(29)
+ // this.time = timeForMat(29)
}
- this.search()
- },
- seleTime(e) {
- this.searchForm.startDate = e[0]
- this.searchForm.endDate = e[1]
- this.searchForm.radio = null
+ if ((this.searchForm.startDate && this.searchForm.endDate) && this.searchForm.startDate > this.searchForm.endDate) {
+ this.searchForm.startDate = this.searchForm.endDate
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.search()
},
reset() {
@@ -147,7 +155,6 @@
this.searchForm.startDate = ''
this.searchForm.endDate = ''
this.searchForm.radio = ''
- this.time = []
this.search()
}
}
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index d8a64e2..d5d540a 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -52,8 +52,8 @@
<ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']"
@click="exportExcel">瀵煎嚭</el-button></li>
- <li class="ml20"> 鎷滆浜烘锛�<span class="primaryColor">{{staticObj.eventNum}}娆�</span></li>
- <li class="ml20"> 鎷滆浜烘暟锛�<span class="primaryColor">{{staticObj.visitorNum}}浜�</span></li>
+ <li class="ml20"> 鍏ュ洯娆℃暟锛�<span class="primaryColor">{{staticObj.eventNum}}娆�</span></li>
+ <li class="ml20"> 鍏ュ洯浜烘暟锛�<span class="primaryColor">{{staticObj.visitorNum}}浜�</span></li>
</ul>
<el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
<el-table-column prop="personName" label="濮撳悕" min-width="90px"></el-table-column>
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 674d968..b523871 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -26,7 +26,7 @@
<el-form-item label="棰勭害浜�" prop="realName">
<el-input v-model="searchForm.realName" placeholder="璇疯緭鍏ラ绾︿汉" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="浼氳鐘舵��" prop="status">
+ <el-form-item label="浼氳鐘舵��" prop="meetingStatus">
<el-select v-model="searchForm.meetingStatus" filterable clearable placeholder="璇烽�夋嫨鐘舵��">
<el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 805cc84..4d79f02 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -52,70 +52,36 @@
</div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul
- class="toolbar"
- v-permissions="[
- 'business:carusebook:create',
- 'business:carusebook:exportExcel',
- ]"
- >
+ <ul class="toolbar" v-permissions="[
+ 'business:carusebook:create',
+ 'business:carusebook:exportExcel',
+ ]">
<li>
- <el-button
- type="primary"
- @click="handleEdit"
- icon="el-icon-plus"
- v-permissions="['business:carusebook:create']"
- >鏂板缓</el-button
- >
+ <el-button type="primary" @click="handleEdit" icon="el-icon-plus"
+ v-permissions="['business:carusebook:create']">鏂板缓</el-button>
</li>
<li>
- <el-button
- type="primary"
- @click="handleEx"
- v-permissions="['business:carusebook:exportExcel']"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" @click="handleEx" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button>
</li>
</ul>
<el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column
- prop="carCode"
- label="杞︾墝鍙�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="memberName"
- label="鎻愭姤浜�"
- min-width="80px"
- ></el-table-column>
- <el-table-column
- prop="memberNames"
- label="涔樿溅浜�"
- min-width="180px"
- ></el-table-column>
- <el-table-column
- prop="companyName"
- label="鎵�灞炵粍缁�"
- min-width="150px"
- ></el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
+ <el-table-column prop="memberNames" label="涔樿溅浜�" min-width="180px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
<el-table-column label="鐢ㄨ溅鏃堕棿" min-width="170px">
<template slot-scope="{ row }">
- <span v-if="row.startTime">璧�:{{ row.startTime.slice(0,16) }}</span
- ><br />
- <span v-if="row.endTime">姝�:{{ row.endTime.slice(0,16) }}</span>
+ <span v-if="row.startTime">璧�:{{ row.startTime.slice(0, 16) }}</span><br />
+ <span v-if="row.endTime">姝�:{{ row.endTime.slice(0, 16) }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="planUseDate"
- label="鍑哄彂鏃堕棿"
- min-width="150px"
- >
- <template slot-scope="{ row }">
- <span v-if="row.planUseDate">{{ row.planUseDate.slice(0,16) }}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="planUseDate" label="鍑哄彂鏃堕棿" min-width="150px">
+ <template slot-scope="{ row }">
+ <span v-if="row.planUseDate">{{ row.planUseDate.slice(0, 16) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鐩殑鍦�" min-width="200px">
<template slot-scope="{ row }">
<span class="status-green" v-if="row.type === 0">銆愬競鍐呫��</span>
@@ -133,59 +99,29 @@
</template>
</el-table-column>
- <el-table-column
- prop="createDate"
- label="鐢宠鏃堕棿"
- min-width="150px"
- ></el-table-column>
- <el-table-column
- prop="editDate"
- label="鎿嶄綔鏃堕棿"
- min-width="150px"
- ></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- min-width="180"
- align="center"
- fixed="right"
- >
+ <el-table-column prop="createDate" label="鐢宠鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="180" align="center" fixed="right">
<template slot-scope="{ row }">
- <el-button
- type="text"
- icon="el-icon-edit"
- @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <el-button type="text" icon="el-icon-edit"
+ @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)">鏌ョ湅璇︽儏</el-button>
<!-- <el-button v-if="(row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button> -->
- <el-button style="color: red" v-if="row.hasRole ==1" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>
+ <el-button style="color: red" v-if="row.hasRole == 1" type="text" icon="el-icon-delete"
+ @click="rowRevokeClick(row)">鎾ら攢</el-button>
<!-- <el-button style="color: red" v-if="(row.status === 0 && row.creator == userInfo.id)||((row.status === 0 || row.status === 1 ) || ( row.status === 2 && new Date().getTime() < new Date(row.startTime).getTime() ))" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>-->
- <el-button style="color: red" type="text" icon="el-icon-delete" v-permissions="['business:carusebook:delete']" @click="deleteById(row)" >鍒犻櫎</el-button>
+ <el-button style="color: red" type="text" icon="el-icon-delete"
+ v-permissions="['business:carusebook:delete']" @click="deleteById(row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- -->
<el-dialog title="鐢ㄨ溅鎾ら攢" :visible.sync="isShowBack" width="520px">
- <el-form
- :model="backParam"
- :rules="rules"
- ref="backForm"
- label-width="100px"
- class="demo-ruleForm"
- >
+ <el-form :model="backParam" :rules="rules" ref="backForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="璇存槑" prop="info">
- <el-input
- type="textarea"
- :rows="4"
- v-model="backParam.info"
- placeholder="璇疯緭鍏ユ挙閿�璇存槑"
- ></el-input>
+ <el-input type="textarea" :rows="4" v-model="backParam.info" placeholder="璇疯緭鍏ユ挙閿�璇存槑"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -193,10 +129,7 @@
<el-button type="primary" @click="backSubmit">纭畾</el-button>
</span>
</el-dialog>
- <OperaCarUseBookWindow
- ref="OperaDetailsWindow"
- @success="handlePageChange"
- />
+ <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange" />
<OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search" />
</TableLayout>
</template>
@@ -214,15 +147,15 @@
name: 'Empower',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
- data () {
+ data() {
return {
// userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
memberName: '',
companyName: '',
- startTime: '',
- endTime: '',
+ queryStartTime: '',
+ queryEndTime: '',
type: null,
status: null,
radio: 0
@@ -238,7 +171,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '鐢ㄨ溅鐢宠绠＄悊',
api: '/business/carUseBook',
@@ -246,11 +179,11 @@
'field.main': 'id'
})
// this.search()
- this.changeRadio(0)
+ this.changeRadio('0')
this.loadParams()
},
methods: {
- rowRevokeClick (row) {
+ rowRevokeClick(row) {
this.isShowBack = true
this.backParam = {}
this.$set(this.backParam, 'id', row.id)
@@ -258,14 +191,14 @@
this.$refs.backForm.clearValidate()
})
},
- backSubmit () {
+ backSubmit() {
revokeById({ ...this.backParam }).then(res => {
this.$tip.success('鎾ら攢鎴愬姛')
this.isShowBack = false
this.search()
})
},
- handleEx () {
+ handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
@@ -302,10 +235,10 @@
}
this.search()
},
- handleEdit () {
+ handleEdit() {
this.$refs.OperaParamWindow.open()
},
- loadParams () {
+ loadParams() {
allList({
})
.then(res => {
@@ -326,7 +259,7 @@
.finally(() => {
})
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.queryStartTime = null
this.searchForm.queryEndTime = null
if (e != null && e.length >= 2) {
@@ -336,11 +269,19 @@
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = 0
- this.changeRadio(0)
- // this.search()
+ this.searchForm = {
+ memberName: '',
+ companyName: '',
+ queryStartTime: '',
+ queryEndTime: '',
+ type: null,
+ status: null,
+ radio: ''
+ }
+ // this.changeRadio(0)
+ this.search()
}
}
}
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index b00d6d3..ce36fbc 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -1,12 +1,9 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)" @clear="clear">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)"
+ @clear="clear">
<template #fastdate>
- <el-radio-group
- v-model="filters.fastdate"
- size="small"
- @input="changeRadio"
- >
+ <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
<el-radio-button label="6">杩�7澶�</el-radio-button>
<el-radio-button label="29">杩�30澶�</el-radio-button>
@@ -14,9 +11,10 @@
</template>
</QueryForm>
<div class="pt16">
- <el-button :loading="exLoading" @click="handleEx" v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
+ <el-button :loading="exLoading" @click="handleEx"
+ v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
@@ -49,7 +47,7 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { platformJobPage, platformJobExport,platformJobDel } from '@/api'
+import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
import { statusMap } from '../config'
import DriverDetail from "@/views/task/driverDetail"
import GlobalWindow from '@/components/common/GlobalWindow'
@@ -57,8 +55,8 @@
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
-dayjs.extend(duration);
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+dayjs.extend(duration)
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
extends: BaseComputHeight,
components: {
@@ -81,12 +79,14 @@
},
filters: {
selDate: [],
- fastdate: 0
+ fastdate: 0,
+ createDateStart: '',
+ createDateEnd: ''
},
list: [],
queryFormConfig: {
formItems: [
- {
+ {
filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
@@ -102,15 +102,14 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '',
- pickerOptions: {}
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
+ label: '浣滀笟鏃堕棿'
},
{
type: 'slot',
- filed: 'fastdate',
- label: '浣滀笟鏃堕棿'
+ filed: 'fastdate'
}
],
online: true
@@ -122,16 +121,18 @@
this.getList()
},
methods: {
- changeRadio (day) {
+ changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
- this.$set(this.filters, 'selDate', arr)
- this.getList()
+ this.filters.createDateStart = arr[0]
+ this.filters.createDateEnd = arr[1]
+ this.getList(1)
},
- changeForm (str) {
- if (str === 'selDate') {
- this.$set(this.filters, 'fastdate', null)
- this.getList()
+ changeForm(str) {
+ if(this.filters.createDateStart > this.filters.createDateEnd){
+ this.filters.createDateStart = this.filters.createDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
+ this.getList()
},
getList(page) {
const { pagination, filters } = this
@@ -140,8 +141,6 @@
model: {
...filters,
jobType: '0',
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: pagination.pageSize,
@@ -152,10 +151,10 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- if(item.workTime && item.workTime>=24*60*60 ){
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
- }else{
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ if (item.workTime && item.workTime >= 24 * 60 * 60) {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�')
+ } else {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
}
})
this.pagination.total = res.total || 0
@@ -180,8 +179,7 @@
model: {
...filters,
jobType: 0,
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: 10000,
diff --git a/admin/src/views/platform/LogisticsRecord/operationCity.vue b/admin/src/views/platform/LogisticsRecord/operationCity.vue
index 2714f42..c390db5 100644
--- a/admin/src/views/platform/LogisticsRecord/operationCity.vue
+++ b/admin/src/views/platform/LogisticsRecord/operationCity.vue
@@ -14,7 +14,7 @@
<el-button :loading="exLoading" @click="handleEx"
v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="contractNum" label="鍚堝悓鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="reason" label="鍏ュ洯鍘熷洜" min-width="100" show-overflow-tooltip />
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="120" show-overflow-tooltip />
@@ -57,7 +57,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
extends: BaseComputHeight,
components: {
@@ -79,7 +79,8 @@
total: 0
},
filters: {
- selDate: [],
+ createDateStart: '',
+ createDateEnd: '',
fastdate: 0
},
list: [],
@@ -101,10 +102,10 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '',
- pickerOptions: {}
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
+ label: '浣滀笟鏃堕棿'
},
{
type: 'slot',
@@ -123,14 +124,16 @@
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.$set(this.filters, 'selDate', arr)
- this.getList()
+ this.filters.createDateStart = arr[0]
+ this.filters.createDateEnd = arr[1]
+ this.getList(1)
},
changeForm(str) {
- if (str === 'selDate') {
- this.$set(this.filters, 'fastdate', null)
- this.getList()
+ if (this.filters.createDateStart > this.filters.createDateEnd) {
+ this.filters.createDateStart = this.filters.createDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
+ this.getList()
},
getList(page) {
const { pagination, filters } = this
@@ -138,9 +141,7 @@
platformJobPage({
model: {
...filters,
- jobType: 1,
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ jobType: 1
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: pagination.pageSize,
@@ -151,10 +152,10 @@
this.list.forEach(item => {
item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
item.taskOrigin = 'WMS鑾峰彇'
- if(item.workTime && item.workTime>=24*60*60 ){
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�');
- }else{
- item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�');
+ if (item.workTime && item.workTime >= 24 * 60 * 60) {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('D澶〩鏃秏鍒唖绉�')
+ } else {
+ item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
}
// item.workTime = dayjs.duration(item.workTime, 'seconds').format('H鏃秏鍒唖绉�')
})
@@ -179,9 +180,7 @@
platformJobExport({
model: {
...filters,
- jobType: 1,
- createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
+ jobType: 1
},
sorts: [{ direction: 'DESC', property: 'create_date' }],
capacity: 10000,
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index d4fccea..23f162c 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -8,7 +8,7 @@
<el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ユ湀鍙板悕绉�"
@keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="">
+ <el-form-item label="" prop="groupId">
<el-select v-model="searchForm.groupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍" @change="search" clearable>
<el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
diff --git a/admin/src/views/platform/platformReason.vue b/admin/src/views/platform/platformReason.vue
index 1cecfb4..88b7836 100644
--- a/admin/src/views/platform/platformReason.vue
+++ b/admin/src/views/platform/platformReason.vue
@@ -7,16 +7,16 @@
<el-input v-model="searchForm.reason" clearable placeholder="璇疯緭鍏ュ叆鍥師鍥�"
@keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="">
+ <el-form-item label="" prop="groupId">
<el-select v-model="searchForm.groupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍" @change="search" clearable>
<el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
+ <!-- <section> -->
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ <!-- </section> -->
</el-form>
</SearchFormCollapse>
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -27,7 +27,8 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:platformreason:delete']">鍒犻櫎</el-button></li>
</ul>
- <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="reason" label="鍏ュ洯鍘熷洜" fixed min-width="100px"></el-table-column>
<el-table-column prop="groupName" label="瀵瑰簲浣滀笟鏈堝彴缁�" fixed min-width="150px"></el-table-column>
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 40d2439..d06cc24 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@
<span></span>
</div>
</div>
- <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="index" label="搴忓彿" width="80" />
<el-table-column label="杞︾墝鍙�" width="130">
<template slot-scope="{ row }">
@@ -33,7 +33,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" show-overflow-tooltip min-width="140">
<template v-slot="scope">
<span>{{ scope.row.carrierName || '-' }}</span>
</template>
@@ -57,7 +57,8 @@
<el-table-column prop="signDate" label="绛惧埌鏃堕棿" min-width="150" />
<el-table-column label="鐘舵��" align="center" width="80">
<template slot-scope="{ row }">
- <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span>
+ <!-- <span v-if="row.status == 2" class="red">鏈堝彴绛夊緟</span> -->
+ <span v-if="row.status == 2" class="red">绛夊緟鍙彿</span>
<span v-if="row.status == 3" class="primaryColor">鍏ュ洯绛夊緟</span>
<span v-if="row.status == 7" class="primaryColor">杞Щ涓�</span>
</template>
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 556fcc8..013426c 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -1,7 +1,23 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
- <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
+ <template #selDate>
+ <div>
+ <el-date-picker v-model="filters.beginWorkDateStart" type="date" value-format="yyyy-MM-dd" class="w200"
+ @change="getList(1)" />
+ <el-date-picker v-model="filters.beginWorkDateEnd" type="date" value-format="yyyy-MM-dd" class="w200"
+ @change="getList(1)" />
+ </div>
+ </template>
+ <template #fastdate>
+ <el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="6">杩�7澶�</el-radio-button>
+ <el-radio-button label="29">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ </template>
+ </QueryForm>
+ <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="100" show-overflow-tooltip />
<el-table-column prop="platformGroupName" label="鏈堝彴缁�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="杞﹀墠鐗岀収鍙�" min-width="100" show-overflow-tooltip />
@@ -43,7 +59,11 @@
page: 1,
total: 0
},
- filters: {},
+ filters: {
+ fastdate: 0,
+ beginWorkDateStart: '',
+ beginWorkDateEnd: ''
+ },
list: [],
total: 0,
queryFormConfig: {
@@ -66,20 +86,33 @@
label: '杞︾墝鍙�'
},
{
+ type: 'slot',
filed: 'selDate',
- type: 'daterange',
label: '鏃ユ湡'
- }
+ },
+ {
+ type: 'slot',
+ filed: 'fastdate',
+ label: ''
+ },
],
online: true
}
}
},
created() {
- this.getList()
+ // this.getList()
this.getGroupList()
+ this.changeRadio('0')
},
methods: {
+ changeRadio(day) {
+ const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
+ this.filters.beginWorkDateStart = arr[0]
+ this.filters.beginWorkDateEnd = arr[1]
+ this.filters.fastdate = day
+ this.getList()
+ },
handleSub() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
@@ -101,12 +134,13 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
+
platformLogPage({
model: {
...filters,
queryStatus: '6,7,8',
- beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ // beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ // beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
},
sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
@@ -146,8 +180,7 @@
</script>
<style scoped>
-::v-deep .el-table{
+::v-deep .el-table {
margin-bottom: 60px;
}
-
</style>
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 8d495d2..0125d09 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -1,6 +1,14 @@
<template>
<div class="main_app" style="overflow: auto;height: calc(100% - 100px);">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
+ <template #selDate>
+ <div>
+ <el-date-picker v-model="filters.queryDateStart" type="date" value-format="yyyy-MM-dd" class="w200" :clearable="false"
+ @change="getList(1)" />
+ <el-date-picker v-model="filters.queryDateEnd" type="date" value-format="yyyy-MM-dd" class="w200" :clearable="false"
+ @change="getList(1)" />
+ </div>
+ </template>
<template #fastdate>
<el-radio-group v-model="filters.fastdate" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -19,8 +27,9 @@
<div v-if="this.list" style="width: 100%;display: flex;height: 50px;padding-top: 20px;font-size: 18px;color: red">
<div style="flex: 1;min-width: 100px"></div>
<div style="flex: 1;min-width: 100px;">鍚堣锛�</div>
- <div style="flex: 1;min-width: 100px;"> <span style="font-weight: bold; ">{{totalStopCount}}</span>娆� </div>
- <div style="flex: 2;min-width: 100px;"> <span style="font-weight: bold;">{{totalWorkTime.toFixed(2)}}</span>鏃�</div>
+ <div style="flex: 1;min-width: 100px;"> <span style="font-weight: bold; ">{{ totalStopCount }}</span>娆� </div>
+ <div style="flex: 2;min-width: 100px;"> <span style="font-weight: bold;">{{ totalWorkTime.toFixed(2) }}</span>鏃�
+ </div>
</div>
<!-- <pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> -->
</div>
@@ -46,10 +55,11 @@
},
filters: {
fastdate: 0,
- selDate: []
+ queryDateStart: '',
+ queryDateEnd: ''
},
- totalStopCount:0,
- totalWorkTime:0,
+ totalStopCount: 0,
+ totalWorkTime: 0,
list: [],
total: 0,
queryFormConfig: {
@@ -68,15 +78,14 @@
},
{
type: 'slot',
+ filed: 'selDate',
+ label: '鏃ユ湡'
+ },
+ {
+ type: 'slot',
filed: 'fastdate',
label: ''
},
- {
- filed: 'selDate',
- type: 'daterange',
- clearable: false,
- label: '鏃ユ湡'
- }
],
online: true
}
@@ -88,32 +97,34 @@
},
methods: {
getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
+ const { columns, data } = param
+ const sums = []
columns.forEach((column, index) => {
if (index === 0) {
- sums[index] = '鍚堣';
+ sums[index] = '鍚堣'
} else {
- const values = data.map(item => parseInt(item[column.property]));
+ const values = data.map(item => parseInt(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
- const value = parseInt(curr);
+ const value = parseInt(curr)
if (!isNaN(value)) {
- return prev + curr;
+ return prev + curr
} else {
- return prev;
+ return prev
}
- }, 0);
+ }, 0)
} else {
- sums[index] = '0';
+ sums[index] = '0'
}
}
- });
- return sums;
+ })
+ return sums
},
changeRadio(day) {
const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
- this.$set(this.filters, 'selDate', arr)
+ this.filters.queryDateStart = arr[0]
+ this.filters.queryDateEnd = arr[1]
+ this.filters.fastdate = day
this.getList()
},
handleSub() {
@@ -138,11 +149,15 @@
this.totalStopCount = 0
this.totalWorkTime = 0
const { pagination, filters } = this
+ if (filters.queryDateStart > filters.queryDateEnd) {
+ this.filters.queryDateStart = this.filters.queryDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.loading = true
platformWorkReportPage({
...filters,
- queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ // queryDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ // queryDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
}).then(res => {
this.loading = false
this.list = res || []
@@ -162,8 +177,8 @@
selDate: [],
fastdate: ''
}
- this.getList()
- // this.changeRadio('0')
+ // this.getList()
+ this.changeRadio('0')
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
diff --git a/h5/pages/applicationRecord/applicationRecord.vue b/h5/pages/applicationRecord/applicationRecord.vue
index c7b2b4e..5739e07e 100644
--- a/h5/pages/applicationRecord/applicationRecord.vue
+++ b/h5/pages/applicationRecord/applicationRecord.vue
@@ -179,17 +179,18 @@
align-items: center;
justify-content: space-between;
.active {
- border: 1rpx solid $uni-color-primary !important;
+ border: 2rpx solid $uni-color-primary !important;
color: $uni-color-primary !important;
}
.box_head_item {
width: 156rpx;
text-align: center;
height: 60rpx;
- line-height: 60rpx;
- box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ justify-content: center;
border-radius: 30rpx;
- border: 1rpx solid #999999;
+ border: 2rpx solid #999999;
font-size: 26rpx;
font-weight: 400;
color: #333333;
diff --git a/h5/pages/staff/meetingSel.vue b/h5/pages/staff/meetingSel.vue
index cac37aa..8e93b4f 100644
--- a/h5/pages/staff/meetingSel.vue
+++ b/h5/pages/staff/meetingSel.vue
@@ -2,7 +2,7 @@
<view class="main_app" :class="{ popupShow: isShowSelMem }">
<view class="search_inp df_ac">
<image class="mr12 search" src="../../static/ic_search@2x.png" mode="widthFix"></image>
- <input v-model="param.queryParam" @confirm="initData()" type="text" placeholder="鎼滅储"
+ <input v-model="param.queryParam" @confirm="initData()" confirm-type="search" type="text" placeholder="鎼滅储"
placeholder-style="color: #999999;" />
</view>
<view class="member_list">
diff --git a/h5/pages/staff/memberSel.vue b/h5/pages/staff/memberSel.vue
index 5f0f99d..f4aed46 100644
--- a/h5/pages/staff/memberSel.vue
+++ b/h5/pages/staff/memberSel.vue
@@ -11,6 +11,7 @@
@blur="initData()"
type="text"
placeholder="璇疯緭鍏ュ鍚嶈繘琛屾悳绱�"
+ confirm-type="search"
placeholder-style="color: #999999;"
/>
</view>
diff --git a/h5/pages/staff/task/index.vue b/h5/pages/staff/task/index.vue
index 275c5e4..eaa6655 100644
--- a/h5/pages/staff/task/index.vue
+++ b/h5/pages/staff/task/index.vue
@@ -8,6 +8,7 @@
v-model="search.title"
@blur="querylist"
type="text"
+ confirm-type="search"
placeholder="鎼滅储浠诲姟鍚嶇О"
/>
</view>
@@ -497,7 +498,7 @@
justify-content: space-between;
align-items: center;
.active {
- border: 1rpx solid #4c99a8 !important;
+ border: 2rpx solid #4c99a8 !important;
color: #4c99a8 !important;
}
.box_head_item {
@@ -507,7 +508,7 @@
line-height: 60rpx;
box-sizing: border-box;
border-radius: 30rpx;
- border: 1rpx solid #999999;
+ border: 2rpx solid #999999;
font-size: 26rpx;
font-weight: 400;
color: #333333;
diff --git a/h5/pages/staff/vehicle/applePeo.vue b/h5/pages/staff/vehicle/applePeo.vue
index a8b3503..c47defd 100644
--- a/h5/pages/staff/vehicle/applePeo.vue
+++ b/h5/pages/staff/vehicle/applePeo.vue
@@ -2,7 +2,7 @@
<view class="main_app" :style="{ height: windowHeight + 'px' }" :class="{ popupShow: isShowSelMem }">
<view class="search_inp df_ac">
<image class="mr12 search" src="@/static/ic_search@2x.png" mode="widthFix"></image>
- <input v-model="param.queryParam" @confirm="initData()" type="text" placeholder="鎼滅储"
+ <input v-model="param.queryParam" @confirm="initData()" confirm-type="search" type="text" placeholder="鎼滅储"
placeholder-style="color: #999999;" />
</view>
<view class="member_list">
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index 93b9bca..d5c0fbf 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -7,7 +7,7 @@
<text>*</text>
<text>棰勮鐢ㄨ溅鏃舵</text>
</view>
- <view class="value" @click="$goBack()">
+ <view class="value" @click="goBack">
<text class="mr6" :style="{ color: param.startTime ? '#000000' : '#999999' }">
<text v-if="param.startTime">
{{ param.startTime.slice(5, 16) }}鑷硔{
@@ -24,7 +24,7 @@
<text>*</text>
<text>鐢宠杞﹁締</text>
</view>
- <view class="value" @click="$goBack()">
+ <view class="value" @click="goBack">
<input type="text" disabled placeholder="璇疯緭鍏ョ敵璇疯溅杈�" v-model="param.carCode"
placeholder-style="color: #999999;" />
</view>
@@ -130,9 +130,14 @@
this.$set(this.param, 'memberNames', res.map(i => i.realname).join(','))
})
},
+ destroyed() {
+ console.log('椤甸潰閿�姣�');
+ // uni.setStorageSync('vehicleAppForm', {})
+ },
onLoad(option) {
- console.log(option)
- this.param = { ...this.param, ...option }
+ const param = uni.getStorageSync('vehicleAppForm') || {}
+ this.param = { ...param, ...option }
+ console.log(this.param);
this.minDate = new Date().getTime()
this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
},
@@ -160,6 +165,7 @@
...param,
}).then(res => {
if (res.code === 200) {
+ uni.setStorageSync('vehicleAppForm', {})
setTimeout(() => {
uni.showToast({
title: '鎻愪氦鎴愬姛',
@@ -180,6 +186,10 @@
}
this.$jump('/pages/staff/vehicle/applePeo')
},
+ goBack() {
+ uni.setStorageSync('vehicleAppForm', this.param)
+ this.$goBack()
+ },
confirmDate(e) {
this.param.planUseDate = dayjs(e.value).format('YYYY-MM-DD HH:mm')
this.isShowDatetime = false
diff --git a/h5/pages/staff/vehicle/shinei.vue b/h5/pages/staff/vehicle/shinei.vue
index 4704e57..f7b0310 100644
--- a/h5/pages/staff/vehicle/shinei.vue
+++ b/h5/pages/staff/vehicle/shinei.vue
@@ -129,7 +129,8 @@
},
onLoad() {
this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
- this.initData()
+ this.initData();
+ uni.setStorageSync('vehicleAppForm', {})
},
methods: {
formatter(type, value) {
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index 531e6b3..a042bd0 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -144,6 +144,7 @@
// this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:mm') + ':00').getTime()
this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
this.initData()
+ uni.setStorageSync('vehicleAppForm', {})
},
methods: {
formatter(type, value) {
diff --git a/h5/pages/visitorApplication/memberSel.vue b/h5/pages/visitorApplication/memberSel.vue
index 7df8de5..77cd060 100644
--- a/h5/pages/visitorApplication/memberSel.vue
+++ b/h5/pages/visitorApplication/memberSel.vue
@@ -10,6 +10,7 @@
v-model="param.name"
@confirm="initData()"
type="text"
+ confirm-type="search"
placeholder="璇疯緭鍏ュ鍚嶈繘琛屾悳绱�"
placeholder-style="color: #999999;"
/>
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 5cb664e..f1bac4f 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -17,6 +17,7 @@
type="text"
placeholder="鎼滅储杞﹁締鐗岀収"
placeholder-class="placeholder9"
+ confirm-type="search"
@confirm="handleQuery"
/>
</view>
@@ -26,7 +27,7 @@
</view>
<!-- -->
<view class="dataList">
- <view class="item" v-for="item in platformLineUpList" :key="item.id">
+ <view class="item" v-for="item,i in platformLineUpList" :key="i">
<view class="head">
<view v-if="item.carCodeFront" class="code">
<text>{{ item.carCodeFront.slice(0, 1) }}</text>
@@ -34,7 +35,8 @@
<text>路</text>
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
- <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view >
+ <!-- <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view > -->
+ <view class="status green" v-if="item.status == 2">绛夊緟鍙彿</view >
<view class="status" v-if="item.status == 3">鍏ュ洯绛夊緟</view >
<view class="status" v-if="item.status == 7">杞Щ涓�</view >
</view>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 3a6a73b..e5303b1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -410,6 +410,7 @@
@Override
public List<HiddenDanger> findList(HiddenDanger hiddenDanger) {
+ hiddenDanger.setIsdeleted(Constants.ZERO);
QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
return hiddenDangerMapper.selectList(wrapper);
}
@@ -491,6 +492,7 @@
@Override
public long count(HiddenDanger hiddenDanger) {
+ hiddenDanger.setIsdeleted(Constants.ZERO);
QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
return hiddenDangerMapper.selectCount(wrapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 04e8f33..15945db 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2191,15 +2191,22 @@
//宸蹭綔涓氭暟
data.setWorkedNum(platformJobMapper.selectCount(new MPJLambdaWrapper<PlatformJob>()
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
- .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());})
- .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
+ .and(w-> w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey())
+ .or().in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
- ,Constants.PlatformJobStatus.LEAVED.getKey())
- .apply("to_days(done_date) = to_days(now())");})
- .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
- .apply("to_days(error_date) = to_days(now())");})
- .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey())
- .apply("to_days(trans_platform_date) = to_days(now())");})
+ ,Constants.PlatformJobStatus.LEAVED.getKey()).apply("to_days(done_date) = to_days(now())")
+ .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey()).apply("to_days(done_date) = to_days(now())")
+ .or().eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey()).apply("to_days(trans_platform_date) = to_days(now())")
+ )
+// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.WORKING.getKey());})
+// .and(w->{w.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey()
+// ,Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
+// ,Constants.PlatformJobStatus.LEAVED.getKey())
+// .apply("to_days(done_date) = to_days(now())");})
+// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.EXCEPTION.getKey())
+// .apply("to_days(error_date) = to_days(now())");})
+// .and(w->{w.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.TRANSFERING.getKey())
+// .apply("to_days(trans_platform_date) = to_days(now())");})
).intValue());
data.setVideoPluginUrl(getVideoUrl());
--
Gitblit v1.9.3