From 8093070b19412312f64046244ebf9ed9c5c77a7b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 三月 2025 18:37:26 +0800
Subject: [PATCH] ll
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 40 ++++++-------
admin/src/views/platform/LogisticsRecord/subscribe.vue | 76 ++++++++++++-------------
screen/src/views/LogisticsEfficiency.vue | 15 ++++-
admin/src/views/platform/LogisticsRecord/operation.vue | 16 ++--
4 files changed, 76 insertions(+), 71 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue
index 25b80b0..dfe6232 100644
--- a/admin/src/views/platform/LogisticsRecord/operation.vue
+++ b/admin/src/views/platform/LogisticsRecord/operation.vue
@@ -80,8 +80,8 @@
filters: {
selDate: [],
fastdate: 0,
- createDateStart: '',
- createDateEnd: ''
+ beginWorkDateEnd: '',
+ beginDoneDateEnd: ''
},
list: [],
queryFormConfig: {
@@ -102,8 +102,8 @@
label: '椹鹃┒鍛�'
},
{
- filed1: 'createDateStart',
- filed2: 'createDateEnd',
+ filed1: 'beginWorkDateEnd',
+ filed2: 'beginDoneDateEnd',
type: 'datetime',
label: '浣滀笟鏃堕棿'
},
@@ -123,13 +123,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.createDateStart = arr[0]
- this.filters.createDateEnd = arr[1]
+ this.filters.beginWorkDateEnd = arr[0]
+ this.filters.beginDoneDateEnd = arr[1]
this.getList(1)
},
changeForm(str) {
- if(this.filters.createDateStart > this.filters.createDateEnd){
- this.filters.createDateStart = this.filters.createDateEnd
+ if(this.filters.beginWorkDateEnd > this.filters.beginDoneDateEnd){
+ this.filters.beginWorkDateEnd = this.filters.beginDoneDateEnd
return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
}
this.getList()
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index f07969e..d877082 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -41,7 +41,8 @@
<template v-slot="scope">
<el-button type="text" v-permissions="['business:platformbooks:detail']"
@click="handleDetail(scope.row)">棰勭害璇︽儏</el-button>
- <el-button type="text" class="red" v-permissions="['business:platformbooks:delete']" @click="handleDel(scope.row)">鍒犻櫎</el-button>
+ <el-button type="text" class="red" v-permissions="['business:platformbooks:delete']"
+ @click="handleDel(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -112,7 +113,7 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
-import BaseComputHeight from "@/components/base/BaseComputHeight";
+import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
extends: BaseComputHeight,
components: {
@@ -122,7 +123,7 @@
GlobalWindow,
UploadAvatarImage
},
- data () {
+ data() {
return {
isShowDriver: false,
exLoading: false,
@@ -133,7 +134,8 @@
total: 0
},
filters: {
- selDate: [],
+ arriveDateStart: '',
+ arriveDateEnd: '',
fastdate: 0
},
list: [],
@@ -187,10 +189,10 @@
]
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '鎿嶄綔鏃堕棿',
- pickerOptions: {}
+ filed1: 'arriveDateStart',
+ filed2: 'arriveDateEnd',
+ type: 'datetime',
+ label: '鎿嶄綔鏃堕棿'
},
{
type: 'slot',
@@ -202,12 +204,12 @@
}
}
},
- created () {
+ created() {
this.changeRadio('0')
- this.getList()
+ // this.getList()
},
methods: {
- checkSurplus () {
+ checkSurplus() {
const { arriveDate, reasonId, totalNum } = this.param
if (!arriveDate || !reasonId || !totalNum) return
checkSurplusNum({
@@ -222,25 +224,25 @@
}
})
},
- 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.filters.arriveDateStart = arr[0]
+ this.filters.arriveDateEnd = arr[1]
+ this.getList(1)
+ },
+ changeForm(str) {
+ if (this.filters.arriveDateStart > this.filters.arriveDateEnd) {
+ this.filters.arriveDateStart = this.filters.arriveDateEnd
+ return this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ }
this.getList()
},
- changeForm (str) {
- if (str === 'selDate') {
- this.$set(this.filters, 'fastdate', null)
- this.getList()
- }
- },
- getList (page) {
+ getList(page) {
const { pagination, filters } = this
this.loading = true
platformBooksPage({
model: {
- ...filters,
- arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
+ ...filters
},
capacity: pagination.pageSize,
page: page || pagination.page
@@ -255,7 +257,7 @@
this.loading = false
})
},
- handleEx () {
+ handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
const { filters } = this
@@ -264,9 +266,7 @@
page: this.pagination.page,
capacity: 1000000,
model: {
- ...filters,
- arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
- arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
+ ...filters
}
})
.then(response => {
@@ -280,7 +280,7 @@
})
})
},
- onSubmit () {
+ onSubmit() {
this.$refs.ruleForm.validate((valid) => {
const param = this.param
param.inReason = this.reasonList.find(item => param.reasonId == item.id).reason
@@ -296,11 +296,11 @@
}
})
},
- uploadSuccess (file) {
+ uploadSuccess(file) {
this.$set(this.param, 'transportImg', file.imgurl)
this.$set(this.param, 'transportImgFull', file.imgurlfull)
},
- handleEdit (row) {
+ handleEdit(row) {
this.isShowEdit = true
this.param = {
inType: 0
@@ -311,27 +311,25 @@
this.$set(this.param, 'arriveDate', dayjs().format('YYYY-MM-DD HH:mm:ss'))
this.getplatformReason()
},
- getplatformReason () {
+ getplatformReason() {
platformReasonList().then(res => {
this.reasonList = res || []
})
},
- handleSub () {
+ handleSub() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
alert('submit!')
}
})
},
- clear () {
+ clear() {
this.pagination.page = 1
- this.filters = {
- selDate: []
- }
+ this.filters = {}
this.getList()
// this.changeRadio('0')
},
- handleDetail (row) {
+ handleDetail(row) {
this.isShowDriver = true
this.$nextTick(() => {
this.$refs.DriverDetailRef.id = row.id
@@ -340,7 +338,7 @@
this.$refs.DriverDetailRef.isShowModal = true
})
},
- handleDel (row) {
+ handleDel(row) {
this.$confirm('纭畾鍒犻櫎璇ヨ褰曞悧, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -355,7 +353,7 @@
}).catch(() => {
})
},
- handleSizeChange (capacity) {
+ handleSizeChange(capacity) {
this.pagination.pageSize = capacity
this.getList(1)
}
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 0069e50..802fd43 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -91,7 +91,9 @@
},
filters: {
selDate: [],
- fastdate: 0
+ fastdate: 0,
+ createDateStart: '',
+ createDateEnd: ''
},
list: [],
queryFormConfig: {
@@ -137,10 +139,10 @@
]
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '鎿嶄綔鏃堕棿',
- pickerOptions: {}
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
+ label: '鎿嶄綔鏃堕棿'
},
{
type: 'slot',
@@ -158,14 +160,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
@@ -173,10 +177,8 @@
platformJobPage({
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,
- },
+ jobType: '0'
+ },
capacity: pagination.pageSize,
page: page || pagination.page,
}).then(res => {
@@ -210,9 +212,7 @@
jobType: '0',
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,
+ jobType: '0'
}
})
.then(response => {
@@ -228,10 +228,8 @@
},
clear() {
this.pagination.page = 1
- this.filters = {
- selDate: [],
- }
- this.getList()
+ this.filters = {}
+ this.getList(0)
// this.changeRadio('0')
},
handleDetail(row) {
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 9b631a8..e4bfd5b 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -353,7 +353,8 @@
<div class="list">
<div class="item" v-for="item in activeCar.contractList">
<div class="head">
- <div class="code">鍚堝悓鍙凤細<span v-if="item.detailList && item.detailList.length > 0">{{ item.detailList[0].contractNum }}</span></div>
+ <div class="code">鍚堝悓鍙凤細<span v-if="item.detailList && item.detailList.length > 0">{{
+ item.detailList[0].contractNum }}</span></div>
<div class="addr">鏀惰揣鍦帮細{{ item.address }}</div>
</div>
<div class="line" v-for="i in item.detailList">
@@ -633,6 +634,8 @@
const echartMap = ref()
const initMap = () => {
+ console.log('----')
+
var myChart = echarts.init(echartMap.value)
echarts.registerMap('js', ahJSON)
const scatterData = data7.value.carsList.map(item => {
@@ -830,7 +833,7 @@
myChart.on('click', function (params) {
const item = params.data
getCarsJobDetails({ carCode: item.code }).then(res => {
- // getCarsJobDetails({ id: item.id }).then(res => {
+ // getCarsJobDetails({ id: item.id }).then(res => {
// getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
showModal.value = true
activeCar.value = { ...res.data, carCode: item.code }
@@ -853,7 +856,7 @@
}
const taskClick = (item) => {
// getCarsJobDetails({ carCode: item.carCodeFront }).then(res => {
- getJobDetailsById({ id: item.id }).then(res => {
+ getJobDetailsById({ id: item.id }).then(res => {
// getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
showModal.value = true
activeCar.value = { ...res.data, carCode: item.carCodeFront }
@@ -957,6 +960,11 @@
carsListPost().then(res => {
const result = res.data || {}
data7.value = result
+ initMap()
+ }, () => {
+ data7.value = {
+ carsList: []
+ }
initMap()
})
carsEventListP().then(res => {
@@ -1917,6 +1925,7 @@
border-bottom: 1px solid rgba(255, 255, 255, 0.16);
margin-bottom: 10px;
padding-right: 10px;
+
.code {
font-weight: 500;
font-size: 14px;
--
Gitblit v1.9.3