From de0e3ab6247895cb9a375fb3c37e659b2297151c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 九月 2024 17:47:05 +0800
Subject: [PATCH] ll
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 292 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 153 insertions(+), 139 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 2f39dd4..ed49adb 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -1,151 +1,100 @@
<template>
<div class="main_app">
- <QueryForm
- v-model="filters"
- :query-form-config="queryFormConfig"
- @handleQuery="getList(1)"
- @clear="clear"
- />
- <div class="mb10 mt20">
- <el-button type="primary" @click="handleEdit()">鏂板</el-button>
+ <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-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>
+ <div class="pt16">
+ <el-button :loading="exLoading" @click="handleEx" v-permissions="['business:platformJob:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table v-loading="loading" :data="list" stripe>
- <el-table-column
- prop="name"
- label="杞︾墝鍓嶇収鍙�"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="浠诲姟鏉ユ簮"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="杩愯緭鍏徃"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="椹鹃┒鍛�"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="鑱旂郴鏂瑰紡"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="浣滀笟绫诲瀷"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="杩愯緭鍗曞彿"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="鎿嶄綔鏃堕棿"
- min-width="100"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="鎿嶄綔"
- min-width="80"
- align="center"
- show-overflow-tooltip
- >
+ <el-table class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table-column prop="code" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
+ <!-- <el-table-column prop="carCodeBack" label="杞︾墝鍚庣収鍙�" min-width="100" show-overflow-tooltip /> -->
+ <el-table-column prop="taskOrigin" label="浠诲姟鏉ユ簮" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="driverName" label="鍙告満" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="drivierPhone" label="鍙告満鐢佃瘽" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="inTypeTemp" label="浣滀笟绫诲瀷" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
- <el-button type="text" @click="handleEdit(scope.row)">杩愬崟璇︽儏</el-button>
- <el-button type="text" class="red" @click="handleDel(scope.row)"
- >鍒犻櫎</el-button
- >
+ <span v-if="scope.row.type == '0'">鑷湁杞﹀嵏璐�</span>
+ <span v-if="scope.row.type == '1'">鑷湁杞﹁璐�</span>
+ <span v-if="scope.row.type == '2'">澶栧崗杞﹀嵏璐�</span>
+ <span v-if="scope.row.type == '3'">澶栧崗杞﹁璐�</span>
+ <span v-if="scope.row.type == '4'">甯傚叕鍙稿鍗忚溅鍗歌揣</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip />
+ <el-table-column prop="name" label="浣滀笟鐘舵��" min-width="100" show-overflow-tooltip>
+ <template v-slot="scope">
+ <span>{{ statusMap[scope.row.status] }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="鎿嶄綔" min-width="120" align="center" fixed="right" show-overflow-tooltip>
+ <template v-slot="scope">
+ <el-button v-if="scope.row.status == 12" type="text" class="red" v-permissions="['business:platformJob:delete']"
+ @click="handleDel(scope.row)">鍒犻櫎</el-button>
+ <el-button type="text" v-permissions="['business:platformJob:query']"
+ @click="handleDetail(scope.row)">棰勭害璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="getList"
- :pagination="pagination"
- />
- <el-dialog
- :title="param.id ? '缂栬緫浣滀笟浠诲姟' : '鏂板浣滀笟浠诲姟'"
- :visible.sync="isShowEdit"
- width="480px"
- >
- <el-form :model="param" :rules="rules" ref="ruleForm" label-width="100px">
- <el-form-item label="鍏ュ洯鍘熷洜" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鍚堝悓鍙�" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鍒板満鏃堕棿" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="杞﹀墠鐗岀収鍙�" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="椹鹃┒鍛�" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鑱旂郴鏂瑰紡" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鍏ュ洯浜嬬敱" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="鎬昏繍杈撻噺" prop="name">
- <el-input v-model="param.aaa" placeholder="璇疯緭鍏�" class="w300"></el-input>
- <span class="ml10">涓囨敮</span>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="isShowEdit = false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleSub">纭畾</el-button>
- </span>
- </el-dialog>
+ <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
+ <!-- -->
+ <!-- -->
+ <DriverDetail v-if="isShowDriver" ref="DriverDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { platformJobPage } from '@/api'
+import { platformJobPage, platformJobExport,platformJobDel } from '@/api'
+import { statusMap } from '../config'
+import DriverDetail from "@/views/task/driverDetail"
+import GlobalWindow from '@/components/common/GlobalWindow'
+import UploadFaceImg from '@/components/common/UploadFaceImg'
+import { Message } from 'element-ui'
+import dayjs from 'dayjs'
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ DriverDetail,
+ GlobalWindow,
+ UploadFaceImg
},
- data () {
+ data() {
return {
+ statusMap,
+ isShowDriver: false,
+ exLoading: false,
loading: false,
pagination: {
pageSize: 10,
page: 1,
total: 0
},
- filters: {},
+ filters: {
+ selDate: [],
+ fastdate: 0
+ },
list: [],
- isShowEdit: false,
- param: {},
- rules: {},
queryFormConfig: {
formItems: [
- {
- filed: 'carCodeFront',
+ {
+ filed: 'code',
type: 'input',
- label: '杞︾墝鍙�'
+ label: '杩愬崟鍙�'
},
{
filed: 'driverName',
@@ -153,14 +102,20 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'code',
+ filed: 'carCodeFront',
type: 'input',
- label: '杩愯緭鍗曞彿'
+ label: '杞︾墝鍙�'
},
{
filed: 'selDate',
- type: 'daterange',
- label: '鎿嶄綔鏃堕棿'
+ type: 'datetimerange',
+ label: '鎿嶄綔鏃堕棿',
+ pickerOptions: {}
+ },
+ {
+ type: 'slot',
+ filed: 'fastdate',
+ label: ''
}
],
online: true
@@ -168,43 +123,102 @@
}
},
created() {
+ this.changeRadio('0')
this.getList()
},
methods: {
- handleSub () {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- alert('submit!')
- }
- })
+ 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()
},
- getList (page) {
+ changeForm (str) {
+ if (str === 'selDate') {
+ this.$set(this.filters, 'fastdate', null)
+ this.getList()
+ }
+ },
+ getList(page) {
const { pagination, filters } = this
this.loading = true
platformJobPage({
- model: { ...filters, jobType: 0 },
+ model: {
+ ...filters,
+ jobType: '0',
+ beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+ beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+ },
capacity: pagination.pageSize,
- page: pagination.page,
+ page: page || pagination.page,
}).then(res => {
this.loading = false
this.list = res.records || []
+ this.list.forEach(item => {
+ item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
+ item.taskOrigin = 'WMS鑾峰彇'
+ })
this.pagination.total = res.total || 0
}, () => {
this.loading = false
})
},
- clear () {
+ handleDel(row) {
+ this.$dialog.exportConfirm('纭鍒犻櫎鍚楋紵').then(() => {
+ platformJobDel(row.id).then(res => {
+ Message.success('鍒犻櫎鎴愬姛')
+ this.getList()
+ })
+ })
+ },
+ handleEx() {
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.exLoading = true
+ platformJobExport({
+ page: this.pagination.page,
+ capacity: 1000000,
+ jobType: '0',
+ model: this.filters
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.exLoading = false
+ })
+ })
+ },
+ clear() {
this.pagination.page = 1
- this.filters = {}
+ this.filters = {
+ selDate: [],
+ fastdate: 0
+ }
this.getList()
},
- handleEdit (row) {
- this.isShowEdit = true
+ handleDetail(row) {
+ this.isShowDriver = true
+ this.$nextTick(() => {
+ this.$refs.DriverDetailRef.id = row.id
+ this.$refs.DriverDetailRef.type = 6
+ this.$refs.DriverDetailRef.getDetail()
+ this.$refs.DriverDetailRef.isShowModal = true
+ })
},
- handleDel () { },
- handleSizeChange (capacity) {
+ handleSizeChange(capacity) {
this.pagination.pageSize = capacity
}
}
}
</script>
+<style lang="scss" scoped>
+.param_title {
+ font-size: 18px;
+ font-weight: 600;
+ color: #000000;
+ margin-bottom: 15px;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3