From 047808a2d34b40cc9ad2be83e5141bcc3a07d91f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 16 六月 2025 10:39:47 +0800
Subject: [PATCH] 提交
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 367 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 228 insertions(+), 139 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 2f39dd4..779d9c7 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -1,151 +1,112 @@
<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 ref="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 type="primary" @click="complete(ids)">瀹屾垚浣滀笟</el-button>
+ <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 :height="tableHeightNew" v-loading="loading" :data="list" @selection-change="handleSelectionChange" stripe>
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="totalNum" label="鎬讳綔涓氶噺锛堜竾鍙級" min-width="130" 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="wmsContractNum" label="WMS鍚堝悓鍙�" min-width="100" show-overflow-tooltip >
+ <template v-slot="scope">
+ <span v-if="scope.row.platformWmsJob">{{ scope.row.platformWmsJob.contractNum }}</span>
+ </template>
+ </el-table-column>-->
+ <el-table-column 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="ioCreatedate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip />
+ <el-table-column 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="editUserName" label="鏈�鍚庢搷浣滀汉鍛�" min-width="150" show-overflow-tooltip />
+ <el-table-column prop="name" label="鎿嶄綔" min-width="170" align="center" fixed="right" show-overflow-tooltip>
+ <template v-slot="scope">
+ <el-button type="text" @click="complete([scope.row.id])" v-if="[0,1,2].includes(scope.row.status)">瀹屾垚浣滀笟</el-button>
+ <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 v-if="scope.row != 12" 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" />
+ <!-- -->
+ <!-- -->
+ <WaybillDetailRef v-if="isShowDetail" ref="WaybillDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { platformJobPage } from '@/api'
+import { platformJobPage, platformJobExport, platformJobDel, dealJobFinish } from '@/api'
+import { statusMap } from '../config'
+import WaybillDetailRef from "../components/WaybillDetail.vue"
+import GlobalWindow from '@/components/common/GlobalWindow'
+import UploadFaceImg from '@/components/common/UploadFaceImg'
+import { Message } from 'element-ui'
+import dayjs from 'dayjs'
+import BaseComputHeight from "@/components/base/BaseComputHeight";
export default {
+ extends: BaseComputHeight,
components: {
Pagination,
- QueryForm
+ QueryForm,
+ WaybillDetailRef,
+ GlobalWindow,
+ UploadFaceImg
},
- data () {
+ data() {
return {
+ statusMap,
+ isShowDetail: false,
+ exLoading: false,
loading: false,
pagination: {
pageSize: 10,
page: 1,
total: 0
},
- filters: {},
+ filters: {
+ selDate: [],
+ fastdate: 0,
+ createDateStart: '',
+ createDateEnd: ''
+ },
list: [],
- isShowEdit: false,
- param: {},
- rules: {},
queryFormConfig: {
formItems: [
{
- filed: 'carCodeFront',
+ filed: 'billCode',
type: 'input',
- label: '杞︾墝鍙�'
+ label: '杩愬崟鍙�'
},
{
filed: 'driverName',
@@ -153,58 +114,186 @@
label: '椹鹃┒鍛�'
},
{
- filed: 'code',
+ filed: 'wmsContractNum',
type: 'input',
- label: '杩愯緭鍗曞彿'
+ label: '鍚堝悓鍙�'
},
{
- filed: 'selDate',
- type: 'daterange',
+ filed: 'carCodeFront',
+ type: 'input',
+ label: '杞︾墝鍙�'
+ },
+ {
+ filed: 'status',
+ type: 'select',
+ label: '浣滀笟鐘舵��',
+ options: [
+ { value: 0, label: '寰呯‘璁�' },
+ { value: 1, label: '寰呯鍒�' },
+ { value: 2, label: '绛夊緟鍙彿' },
+ { value: 3, label: '鍏ュ洯绛夊緟' },
+ { value: 4, label: '鏈堝彴绛夊緟' },
+ { value: 5, label: '浣滀笟涓�' },
+ { value: 6, label: '浣滀笟瀹屾垚' },
+ { value: 7, label: '杞Щ涓�' },
+ { value: 8, label: '寮傚父鎸傝捣' },
+ { value: 9, label: '宸叉巿鏉冪鍥�' },
+ // { value: 10, label: '宸茬鍥�' },
+ { value: 11, label: '宸茶繃鍙�' },
+ { value: 12, label: '宸插彇娑�' },
+ ]
+ },
+ {
+ filed: 'type',
+ type: 'select',
+ label: '浣滀笟绫诲瀷',
+ options: [
+ { value: 0, label: '鑷湁杞﹀嵏璐�' },
+ { value: 1, label: '鑷湁杞﹁璐�' },
+ { value: 2, label: '澶栧崗杞﹀嵏璐�' },
+ { value: 3, label: '澶栧崗杞﹁璐�' },
+ { value: 4, label: '甯傚叕鍙稿鍗忚溅鍗歌揣' }
+ ]
+ },
+ {
+ filed1: 'createDateStart',
+ filed2: 'createDateEnd',
+ type: 'datetime',
label: '鎿嶄綔鏃堕棿'
+ },
+ {
+ type: 'slot',
+ filed: 'fastdate',
+ label: ''
}
],
online: true
},
+ ids: []
}
},
created() {
- this.getList()
+ this.changeRadio('0')
+ this.$nextTick(() => {
+ this.$refs.QueryForm.zkBtn()
+ })
},
methods: {
- handleSub () {
- this.$refs.ruleForm.validate((valid) => {
- if (valid) {
- alert('submit!')
- }
- })
+ handleSelectionChange(ids) {
+ this.ids = ids.map(item => item.id)
},
- getList (page) {
+ complete(ids) {
+ var that = this;
+ if (ids.length === 0) {
+ return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ }
+ this.$confirm('鏄惁纭瀹屾垚浣滀笟锛�, 鏄惁纭?', '鎻愮ず', {
+ confirmButtonText: '纭',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ dealJobFinish(ids)
+ .then(res => {
+ that.getList()
+ })
+ }).catch(() => {
+
+ });
+ },
+ 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.getList(1)
+ },
+ 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
this.loading = true
platformJobPage({
- model: { ...filters, jobType: 0 },
+ model: {
+ ...filters,
+ jobType: '0'
+ },
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.deleteConfirm('纭鍒犻櫎鍚楋紵').then(() => {
+ platformJobDel(row.id).then(res => {
+ Message.success('鍒犻櫎鎴愬姛')
+ this.getList()
+ })
+ })
+ },
+ handleEx() {
+ this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
+ .then(() => {
+ this.exLoading = true
+ const { filters } = this
+ platformJobExport({
+ page: this.pagination.page,
+ capacity: 1000000,
+ jobType: '0',
+ model: {
+ ...filters,
+ jobType: '0'
+ }
+ })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.exLoading = false
+ })
+ })
+ },
+ clear() {
this.pagination.page = 1
this.filters = {}
- this.getList()
+ this.getList(0)
+ // this.changeRadio('0')
},
- handleEdit (row) {
- this.isShowEdit = true
+ handleDetail(row) {
+ this.isShowDetail = true
+ this.$nextTick(() => {
+ this.$refs.WaybillDetailRef.isShowModal = true
+ this.$refs.WaybillDetailRef.id = row.id
+ this.$refs.WaybillDetailRef.getDetail()
+ })
},
- handleDel () { },
- handleSizeChange (capacity) {
+ handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
</script>
+<style lang="scss" scoped>
+.param_title {
+ font-size: 18px;
+ font-weight: 600;
+ color: #000000;
+ margin-bottom: 15px;
+}
+</style>
--
Gitblit v1.9.3