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 | 100 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 58eb7f2..779d9c7 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -1,6 +1,6 @@
<template>
<div class="main_app">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @changeForm='changeForm' @handleQuery="getList(1)"
+ <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">
@@ -11,11 +11,14 @@
</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 class="mb20" v-loading="loading" :data="list" stripe>
+ <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 />
@@ -27,7 +30,7 @@
<span v-if="scope.row.platformWmsJob">{{ scope.row.platformWmsJob.contractNum }}</span>
</template>
</el-table-column>-->
- <el-table-column prop="inTypeTemp" label="浣滀笟绫诲瀷" min-width="100" show-overflow-tooltip>
+ <el-table-column label="浣滀笟绫诲瀷" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
<span v-if="scope.row.type == '0'">鑷湁杞﹀嵏璐�</span>
<span v-if="scope.row.type == '1'">鑷湁杞﹁璐�</span>
@@ -37,13 +40,15 @@
</template>
</el-table-column>
<el-table-column prop="ioCreatedate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip />
- <el-table-column prop="name" label="浣滀笟鐘舵��" min-width="100" 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="name" label="鎿嶄綔" min-width="120" align="center" fixed="right" show-overflow-tooltip>
+ <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']"
@@ -61,14 +66,16 @@
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
-import { platformJobPage, platformJobExport, platformJobDel } 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,
@@ -89,7 +96,9 @@
},
filters: {
selDate: [],
- fastdate: 0
+ fastdate: 0,
+ createDateStart: '',
+ createDateEnd: ''
},
list: [],
queryFormConfig: {
@@ -129,16 +138,28 @@
{ value: 7, label: '杞Щ涓�' },
{ value: 8, label: '寮傚父鎸傝捣' },
{ value: 9, label: '宸叉巿鏉冪鍥�' },
- { value: 10, label: '宸茬鍥�' },
+ // { value: 10, label: '宸茬鍥�' },
{ value: 11, label: '宸茶繃鍙�' },
{ value: 12, label: '宸插彇娑�' },
]
},
{
- filed: 'selDate',
- type: 'datetimerange',
- label: '鎿嶄綔鏃堕棿',
- pickerOptions: {}
+ 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',
@@ -148,22 +169,49 @@
],
online: true
},
+ ids: []
}
},
created() {
this.changeRadio('0')
+ this.$nextTick(() => {
+ this.$refs.QueryForm.zkBtn()
+ })
},
methods: {
+ handleSelectionChange(ids) {
+ this.ids = ids.map(item => item.id)
+ },
+ 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.$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
@@ -171,10 +219,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 => {
@@ -190,7 +236,7 @@
})
},
handleDel(row) {
- this.$dialog.exportConfirm('纭鍒犻櫎鍚楋紵').then(() => {
+ this.$dialog.deleteConfirm('纭鍒犻櫎鍚楋紵').then(() => {
platformJobDel(row.id).then(res => {
Message.success('鍒犻櫎鎴愬姛')
this.getList()
@@ -208,9 +254,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 => {
@@ -226,10 +270,8 @@
},
clear() {
this.pagination.page = 1
- this.filters = {
- selDate: [],
- }
- this.getList()
+ this.filters = {}
+ this.getList(0)
// this.changeRadio('0')
},
handleDetail(row) {
--
Gitblit v1.9.3