From 7e20000c437a315b623aa8002fcd4e727557fda4 Mon Sep 17 00:00:00 2001 From: lzq Date: Mon, 25 Aug 2025 17:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=94=B6=E7=BA=B3=E7=82=B9?= =?UTF-8?q?=E7=85=A7=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/utils/times.ts | 5 + .../combobox-table/ComboboxTable.vue | 140 ++++++++++++++++++ .../combobox-table/combobox-table.d.ts | 8 + src/dts/components.d.ts | 2 + src/pages/dispose-recode/DisposeRecode.vue | 32 +++- .../dispose-recode/DisposeRecodeDetail.vue | 67 ++++++--- src/pages/dispose-recode/dispose-recode.d.ts | 2 + src/pages/tsp-photo/PhotoList.vue | 1 + src/pages/tsp/PhotoPanel.vue | 1 + src/pages/tsp/Tsp.vue | 16 +- src/pages/tsp/create-tsp.vue | 35 ++++- src/pages/tsp/tsp.d.ts | 1 + 12 files changed, 274 insertions(+), 36 deletions(-) create mode 100644 src/components/combobox-table/ComboboxTable.vue create mode 100644 src/components/combobox-table/combobox-table.d.ts diff --git a/src/common/utils/times.ts b/src/common/utils/times.ts index 7fcb740..a7debc7 100644 --- a/src/common/utils/times.ts +++ b/src/common/utils/times.ts @@ -150,6 +150,10 @@ export function beginOfMonth(date?: DateTime) { return date.startOf('month') } +export function toDate(date: DateTime) { + return date.toJSDate() +} + export default { now, parse, @@ -158,4 +162,5 @@ export default { FMT, endOfMonth, beginOfMonth, + toDate, } diff --git a/src/components/combobox-table/ComboboxTable.vue b/src/components/combobox-table/ComboboxTable.vue new file mode 100644 index 0000000..bdc3aac --- /dev/null +++ b/src/components/combobox-table/ComboboxTable.vue @@ -0,0 +1,140 @@ + + + + + diff --git a/src/components/combobox-table/combobox-table.d.ts b/src/components/combobox-table/combobox-table.d.ts new file mode 100644 index 0000000..ba3e3aa --- /dev/null +++ b/src/components/combobox-table/combobox-table.d.ts @@ -0,0 +1,8 @@ +export {} +declare global { + namespace ComboboxTableTypes { + interface TableData { + [key: string]: any; + } + } +} diff --git a/src/dts/components.d.ts b/src/dts/components.d.ts index c765d28..490e856 100644 --- a/src/dts/components.d.ts +++ b/src/dts/components.d.ts @@ -8,6 +8,7 @@ export {} declare module 'vue' { export interface GlobalComponents { Charts: typeof import('./../components/echarts/Charts.vue')['default'] + ComboboxTable: typeof import('./../components/combobox-table/ComboboxTable.vue')['default'] Dialog: typeof import('./../components/dialog/Dialog.vue')['default'] District: typeof import('./../components/district/District.vue')['default'] Funbar: typeof import('./../components/fun-bar/Funbar.vue')['default'] @@ -18,6 +19,7 @@ declare module 'vue' { IxCard: typeof import('@idux/components/card')['IxCard'] IxCol: typeof import('@idux/components/grid')['IxCol'] IxDatePicker: typeof import('@idux/components/date-picker')['IxDatePicker'] + IxDateRangePicker: typeof import('@idux/components/date-picker')['IxDateRangePicker'] IxDivider: typeof import('@idux/components/divider')['IxDivider'] IxDropdown: typeof import('@idux/components/dropdown')['IxDropdown'] IxEmpty: typeof import('@idux/components/empty')['IxEmpty'] diff --git a/src/pages/dispose-recode/DisposeRecode.vue b/src/pages/dispose-recode/DisposeRecode.vue index 93437a7..41cbf53 100644 --- a/src/pages/dispose-recode/DisposeRecode.vue +++ b/src/pages/dispose-recode/DisposeRecode.vue @@ -7,6 +7,7 @@ import Charts from '@/components/echarts/Charts.vue' import DisposeRecodeDetail from '@/pages/dispose-recode/DisposeRecodeDetail.vue' import DisposeRecodeApi from '@/pages/dispose-recode/dispose-recode-api.ts' import Times from '@/common/utils/times.ts' +import times, { FMT } from '@/common/utils/times.ts' const disposeRecodeDetail = ref | null>(null) const chartOption = reactive({ @@ -104,6 +105,11 @@ const columns: TableColumn[] = [ title: '出场时间', dataKey: 'outTime', }, + { + title: '状态', + dataKey: 'timeOutStatusTxt', + customCell: 'timeOutStatus', + }, { title: '操作', key: 'action', @@ -144,10 +150,21 @@ function searchHandler() { }) } -function exportHandler() { - DisposeRecodeApi.exportData([ '2025-01-01', '2025-01-31' ]) +function initExportDate() { + const now = new Date() + const beginOfMonth = times.beginOfMonth(times.parse(now)) + return [ beginOfMonth.toJSDate(), now ] } +const dateValue = ref(initExportDate()) + +function exportHandler() { + DisposeRecodeApi.exportData([ times.format(dateValue.value[0], FMT.date), times.format(dateValue.value[1], FMT.date) ]) +} + +function disabledDate(date: Date) { + return times.parse(date).diffNow().toMillis() > 0 +} const monthValue = ref(new Date()) function renderChart() { @@ -199,10 +216,19 @@ onMounted(() => { - 导出 + + 导出 + + + diff --git a/src/pages/dispose-recode/DisposeRecodeDetail.vue b/src/pages/dispose-recode/DisposeRecodeDetail.vue index fc69777..3119cc8 100644 --- a/src/pages/dispose-recode/DisposeRecodeDetail.vue +++ b/src/pages/dispose-recode/DisposeRecodeDetail.vue @@ -18,6 +18,8 @@ const data = reactive({ inBodyPhoto: '', outFrontPhoto: '', outBodyPhoto: '', + timeOutStatus: '', + timeOutStatusTxt: '' }) const container = ref(undefined) @@ -44,31 +46,45 @@ defineExpose({ :mask="false" :on-before-close="closeHandler" cancel-text="关闭" class="dispose-recode-detail" draggable header="处置详情" maskClosable type="default" width="50rem">
-

来源地:{{ data.origin }}

-

清运公司:{{ data.clearingCompany }}

-

车牌号:{{ data.licensePlate }}

-

联系人:{{ data.contact }}

-

联系电话:{{ data.contactPhone }}

-

进场磅重(吨):{{ data.inWeight }}

-

出场磅重(吨):{{ data.outWeight }}

-

净重(吨):{{ data.suttleWeight }}

-

进场时间:{{ data.inTime }}

-

出场时间:{{ data.outTime }}

-

消纳场名称:{{ data.disposalSite }}

+

来源地:{{ data.origin ?? '-' }}

+

清运公司:{{ data.clearingCompany ?? '-' }}

+

车牌号:{{ data.licensePlate ?? '-' }}

+

联系人:{{ data.contact ?? '-' }}

+

联系电话:{{ data.contactPhone ?? '-' }}

+

进场磅重(吨):{{ data.inWeight ?? '-' }}

+

出场磅重(吨):{{ data.outWeight ?? '-' }}

+

净重(吨):{{ data.suttleWeight ?? '-' }}

+

进场时间:{{ data.inTime ?? '-' }}

+

出场时间:{{ data.outTime ?? '-' }}

+

消纳场名称:{{ data.disposalSite ?? '-' }}

车辆照片
-

进场车头照进场前

-

进场车身照进场后

-

出出场车头照出场前

-

出场车身照出场后

+
+
进场车头照
+ +
+
+
进场车身照
+ +
+
+
出出场车头照
+ +
+
+
出场车身照
+ +
装车照片
-

装车照片

+

+ +