From 9ffe50c41999fee1c47bfd5d525b6141c4d22b7a Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 24 一月 2025 15:54:51 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- admin/src/views/platform/LogisticsRecord/operation.vue | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/admin/src/views/platform/LogisticsRecord/operation.vue b/admin/src/views/platform/LogisticsRecord/operation.vue index 2fe8765..ebb64e6 100644 --- a/admin/src/views/platform/LogisticsRecord/operation.vue +++ b/admin/src/views/platform/LogisticsRecord/operation.vue @@ -32,6 +32,7 @@ <el-table-column prop="doneDate" label="浣滀笟瀹屾垚鏃堕棿" min-width="150" show-overflow-tooltip /> <el-table-column prop="workTime" label="浣滀笟鏃堕暱" min-width="100" show-overflow-tooltip /> <el-table-column prop="platformNames" label="鍙彿鏈堝彴" min-width="100" show-overflow-tooltip /> + <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip /> <el-table-column label="浣滀笟鎯呭喌" fixed="right" min-width="100" show-overflow-tooltip> <template v-slot="scope"> <span>{{ statusMap[scope.row.status] }}</span> @@ -84,7 +85,7 @@ queryFormConfig: { formItems: [ { - filed: 'code', + filed: 'billCode', type: 'input', label: '杩愬崟鍙�' }, @@ -107,7 +108,7 @@ { type: 'slot', filed: 'fastdate', - label: '' + label: '浣滀笟鏃堕棿' } ], online: true @@ -137,9 +138,10 @@ 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, + createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null, + createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null, }, + sorts: [{ direction: 'DESC', property: 'create_date' }], capacity: pagination.pageSize, page: page || pagination.page, }).then(res => { @@ -215,4 +217,4 @@ color: #000000; margin-bottom: 15px; } -</style> \ No newline at end of file +</style> -- Gitblit v1.9.3