diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 21a9c9e..214ab71 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -60,7 +60,7 @@ } // 查询检定记录 -export function getMesureRecords(data: { id: string }) { +export function getMesureRecords(data: { customerId?: string; sampleId?: string }) { return request({ url: `${prefix}/sample/mesureRecordsBySampleId`, method: 'post', diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 21a9c9e..214ab71 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -60,7 +60,7 @@ } // 查询检定记录 -export function getMesureRecords(data: { id: string }) { +export function getMesureRecords(data: { customerId?: string; sampleId?: string }) { return request({ url: `${prefix}/sample/mesureRecordsBySampleId`, method: 'post', diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue index c9679cb..6e0ecd2 100644 --- a/src/views/customer/advice/adviceList.vue +++ b/src/views/customer/advice/adviceList.vue @@ -30,7 +30,6 @@ { text: '投诉/建议内容', value: 'content', align: 'center' }, { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' }, { text: '联系方式', value: 'personPhone', align: 'center', width: '120' }, - { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' }, ]) // 表格数据 const list = ref([]) @@ -59,6 +58,17 @@ loadingTable.value = false }) } + +watch(timeRange, (val) => { + if (val) { + listQuery.value.startTime = val[0] as string || '' + listQuery.value.endTime = val[1] as string || '' + } + else { + listQuery.value.startTime = '' + listQuery.value.endTime = '' + } +}) // 多选发生改变时 function handleSelectionChange(e: any) { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -106,6 +116,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -208,7 +219,7 @@ > @@ -223,7 +234,7 @@ diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 21a9c9e..214ab71 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -60,7 +60,7 @@ } // 查询检定记录 -export function getMesureRecords(data: { id: string }) { +export function getMesureRecords(data: { customerId?: string; sampleId?: string }) { return request({ url: `${prefix}/sample/mesureRecordsBySampleId`, method: 'post', diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue index c9679cb..6e0ecd2 100644 --- a/src/views/customer/advice/adviceList.vue +++ b/src/views/customer/advice/adviceList.vue @@ -30,7 +30,6 @@ { text: '投诉/建议内容', value: 'content', align: 'center' }, { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' }, { text: '联系方式', value: 'personPhone', align: 'center', width: '120' }, - { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' }, ]) // 表格数据 const list = ref([]) @@ -59,6 +58,17 @@ loadingTable.value = false }) } + +watch(timeRange, (val) => { + if (val) { + listQuery.value.startTime = val[0] as string || '' + listQuery.value.endTime = val[1] as string || '' + } + else { + listQuery.value.startTime = '' + listQuery.value.endTime = '' + } +}) // 多选发生改变时 function handleSelectionChange(e: any) { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -106,6 +116,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -208,7 +219,7 @@ > @@ -223,7 +234,7 @@ diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue index 5e9b72c..d5093d7 100644 --- a/src/views/customer/customerInfo/customerEdit.vue +++ b/src/views/customer/customerInfo/customerEdit.vue @@ -508,7 +508,7 @@ diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 21a9c9e..214ab71 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -60,7 +60,7 @@ } // 查询检定记录 -export function getMesureRecords(data: { id: string }) { +export function getMesureRecords(data: { customerId?: string; sampleId?: string }) { return request({ url: `${prefix}/sample/mesureRecordsBySampleId`, method: 'post', diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue index c9679cb..6e0ecd2 100644 --- a/src/views/customer/advice/adviceList.vue +++ b/src/views/customer/advice/adviceList.vue @@ -30,7 +30,6 @@ { text: '投诉/建议内容', value: 'content', align: 'center' }, { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' }, { text: '联系方式', value: 'personPhone', align: 'center', width: '120' }, - { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' }, ]) // 表格数据 const list = ref([]) @@ -59,6 +58,17 @@ loadingTable.value = false }) } + +watch(timeRange, (val) => { + if (val) { + listQuery.value.startTime = val[0] as string || '' + listQuery.value.endTime = val[1] as string || '' + } + else { + listQuery.value.startTime = '' + listQuery.value.endTime = '' + } +}) // 多选发生改变时 function handleSelectionChange(e: any) { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -106,6 +116,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -208,7 +219,7 @@ > @@ -223,7 +234,7 @@ diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue index 5e9b72c..d5093d7 100644 --- a/src/views/customer/customerInfo/customerEdit.vue +++ b/src/views/customer/customerInfo/customerEdit.vue @@ -508,7 +508,7 @@ diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue index 6150a05..ef1ceca 100644 --- a/src/views/customer/customerInfo/customerList.vue +++ b/src/views/customer/customerInfo/customerList.vue @@ -56,7 +56,6 @@ { text: '履约评级', value: 'gradeName', width: '90', align: 'center' }, { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' }, { text: '公司地址', value: 'fullAddress', align: 'center' }, - { text: '创建时间', value: 'createTime', align: 'center', width: '180px' }, { text: '备注', value: 'remark', align: 'center' }, ]) // 表格数据 diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index 21a9c9e..214ab71 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -60,7 +60,7 @@ } // 查询检定记录 -export function getMesureRecords(data: { id: string }) { +export function getMesureRecords(data: { customerId?: string; sampleId?: string }) { return request({ url: `${prefix}/sample/mesureRecordsBySampleId`, method: 'post', diff --git a/src/views/customer/advice/adviceList.vue b/src/views/customer/advice/adviceList.vue index c9679cb..6e0ecd2 100644 --- a/src/views/customer/advice/adviceList.vue +++ b/src/views/customer/advice/adviceList.vue @@ -30,7 +30,6 @@ { text: '投诉/建议内容', value: 'content', align: 'center' }, { text: '投诉人', value: 'advicePerson', align: 'center', width: '90' }, { text: '联系方式', value: 'personPhone', align: 'center', width: '120' }, - { text: '投诉时间', value: 'createTime', align: 'center', width: '165px' }, ]) // 表格数据 const list = ref([]) @@ -59,6 +58,17 @@ loadingTable.value = false }) } + +watch(timeRange, (val) => { + if (val) { + listQuery.value.startTime = val[0] as string || '' + listQuery.value.endTime = val[1] as string || '' + } + else { + listQuery.value.startTime = '' + listQuery.value.endTime = '' + } +}) // 多选发生改变时 function handleSelectionChange(e: any) { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -106,6 +116,7 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] } // 上传文件/批量导入 @@ -208,7 +219,7 @@ > @@ -223,7 +234,7 @@ diff --git a/src/views/customer/customerInfo/customerEdit.vue b/src/views/customer/customerInfo/customerEdit.vue index 5e9b72c..d5093d7 100644 --- a/src/views/customer/customerInfo/customerEdit.vue +++ b/src/views/customer/customerInfo/customerEdit.vue @@ -508,7 +508,7 @@ diff --git a/src/views/customer/customerInfo/customerList.vue b/src/views/customer/customerInfo/customerList.vue index 6150a05..ef1ceca 100644 --- a/src/views/customer/customerInfo/customerList.vue +++ b/src/views/customer/customerInfo/customerList.vue @@ -56,7 +56,6 @@ { text: '履约评级', value: 'gradeName', width: '90', align: 'center' }, { text: '整体评价', value: 'evaluationName', width: '110', align: 'center' }, { text: '公司地址', value: 'fullAddress', align: 'center' }, - { text: '创建时间', value: 'createTime', align: 'center', width: '180px' }, { text: '备注', value: 'remark', align: 'center' }, ]) // 表格数据 diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue index 4893c4f..1cc8334 100644 --- a/src/views/customer/sample/list/edit.vue +++ b/src/views/customer/sample/list/edit.vue @@ -111,7 +111,7 @@ // 获取检定记录 const fetchMeasureRecords = (query = null) => { - getMesureRecords({ id: infoId.value }).then((res) => { + getMesureRecords({ sampleId: infoId.value, customerId: '' }).then((res) => { dataList.value.measureRecords = res.data.rows }) } @@ -479,7 +479,7 @@ - +