From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/LogisticsRecord/subscribe.vue | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index 4c2a070..933b5b1 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/admin/src/views/platform/LogisticsRecord/subscribe.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>
@@ -16,7 +13,8 @@
<div class="pt16">
<el-button type="primary" @click="handleEdit" icon="el-icon-plus"
v-permissions="['business:platformbooks:create']">鏂板缓</el-button>
- <el-button :loading="exLoading" @click="handleEx" v-permissions="['business:platformbooks:exportExcel']">瀵煎嚭</el-button>
+ <el-button :loading="exLoading" @click="handleEx"
+ v-permissions="['business:platformbooks:exportExcel']">瀵煎嚭</el-button>
</div>
<el-table class="mb20" v-loading="loading" :data="list" stripe>
<el-table-column prop="contractNum" label="鍚堝悓鍗曞彿" min-width="100" show-overflow-tooltip />
@@ -43,6 +41,7 @@
<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:platformjob:delete']" @click="handleDel(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -62,8 +61,8 @@
<el-input v-model="param.contractNum" class="w300" placeholder="璇疯緭鍏ュ悎鍚屽彿"></el-input>
</el-form-item>
<el-form-item label="鍒板満鏃堕棿" prop="arriveDate">
- <el-date-picker v-model="param.arriveDate" @change="checkSurplus" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" class="w300"
- placeholder="璇烽�夋嫨">
+ <el-date-picker v-model="param.arriveDate" @change="checkSurplus" value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime" class="w300" placeholder="璇烽�夋嫨">
</el-date-picker>
</el-form-item>
<el-form-item label="鍏ュ簱绫诲瀷" prop="inType">
@@ -73,7 +72,8 @@
</div>
</el-form-item>
<el-form-item label="鎬昏繍杈撻噺" prop="totalNum">
- <el-input @blur="checkSurplus" oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 10)" v-model="param.totalNum" placeholder="璇疯緭鍏�" class="w300"></el-input>
+ <el-input @blur="checkSurplus" oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 10)"
+ v-model="param.totalNum" placeholder="璇疯緭鍏�" class="w300"></el-input>
<span class="ml10">涓囨敮</span>
</el-form-item>
<el-form-item label="鍑嗚繍璇佺収鐗�" prop="transportImg">
@@ -86,7 +86,8 @@
<el-input v-model="param.driverName" placeholder="璇疯緭鍏�" class="w300"></el-input>
</el-form-item>
<el-form-item label="鍙告満鎵嬫満鍙�" prop="driverPhone">
- <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="param.driverPhone" placeholder="璇疯緭鍏�" class="w300"></el-input>
+ <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="param.driverPhone"
+ placeholder="璇疯緭鍏�" class="w300"></el-input>
</el-form-item>
<el-form-item label="杞﹀墠鐗岀収鍙�" prop="carCodeFront">
<el-input v-model="param.carCodeFront" placeholder="璇疯緭鍏�" class="w300"></el-input>
@@ -105,7 +106,7 @@
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import { platformBooksPage, platformReasonList, platformBooksApply, platformBooksExport } from '@/api'
-import { checkSurplusNum } from '@/api/platform/platform'
+import { checkSurplusNum } from '@/api/platform/platform'
import DriverDetail from "@/views/task/driverDetail"
import GlobalWindow from '@/components/common/GlobalWindow'
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
@@ -144,7 +145,6 @@
rules: {
contractNum: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
totalNum: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
- driverName: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
driverPhone: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
carCodeFront: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
carCodeBack: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
@@ -197,7 +197,7 @@
}
],
online: true
- },
+ }
}
},
created() {
@@ -207,25 +207,25 @@
methods: {
checkSurplus() {
const { arriveDate, reasonId, totalNum } = this.param
- if(!arriveDate || !reasonId || !totalNum) return
+ if (!arriveDate || !reasonId || !totalNum) return
checkSurplusNum({
arriveDate,
reasonId,
totalNum
}).then(res => {
- console.log('res', res);
-
- if( res == 0 || res < Number(totalNum)){
+ console.log('res', res)
+
+ if (res == 0 || res < Number(totalNum)) {
Message.error(`褰撴棩鍓╀綑鍙绾︿綔涓氶噺${res}涓囨敮涓嶈冻璇烽�夋嫨鍏朵粬鍒板満鏃ユ湡`)
}
})
},
- 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()
},
- changeForm (str) {
+ changeForm(str) {
if (str === 'selDate') {
this.$set(this.filters, 'fastdate', null)
this.getList()
@@ -256,11 +256,16 @@
handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
+ const { filters } = this
this.exLoading = true
platformBooksExport({
page: this.pagination.page,
capacity: 1000000,
- model: this.filters
+ model: {
+ ...filters,
+ arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ },
})
.then(response => {
this.download(response)
@@ -278,9 +283,13 @@
const param = this.param
param.inReason = this.reasonList.find(item => param.reasonId == item.id).reason
if (valid) {
+ this.subLoading = true
platformBooksApply({ ...param }).then(res => {
this.getList()
+ this.subLoading = false
this.isShowEdit = false
+ }, () => {
+ this.subLoading = false
})
}
})
@@ -316,9 +325,9 @@
this.pagination.page = 1
this.filters = {
selDate: [],
- fastdate: 0,
}
- this.changeRadio('0')
+ this.getList()
+ // this.changeRadio('0')
},
handleDetail(row) {
this.isShowDriver = true
@@ -332,6 +341,7 @@
handleDel() { },
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
@@ -343,4 +353,4 @@
color: #000000;
margin-bottom: 15px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3