diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts deleted file mode 100644 index e69de29..0000000 --- a/src/api/business/order/order.ts +++ /dev/null diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts deleted file mode 100644 index e69de29..0000000 --- a/src/api/business/order/order.ts +++ /dev/null diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/business/schedule/order.ts diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts deleted file mode 100644 index e69de29..0000000 --- a/src/api/business/order/order.ts +++ /dev/null diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/business/schedule/order.ts diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index fb50c25..3ac7392 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -3,7 +3,7 @@ */ import request from '../index' import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' -const prefix = '/meter' +const prefix = '/customer' // 列表查询 export function getSampleList(data: ISampleListQuery) { diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts deleted file mode 100644 index e69de29..0000000 --- a/src/api/business/order/order.ts +++ /dev/null diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/business/schedule/order.ts diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index fb50c25..3ac7392 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -3,7 +3,7 @@ */ import request from '../index' import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' -const prefix = '/meter' +const prefix = '/customer' // 列表查询 export function getSampleList(data: ISampleListQuery) { diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue index ade67f5..fd09c75 100644 --- a/src/views/business/schedule/order/orderList.vue +++ b/src/views/business/schedule/order/orderList.vue @@ -6,7 +6,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' -import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order' +// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order' const { proxy } = getCurrentInstance() as any const $router = useRouter() diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts deleted file mode 100644 index e69de29..0000000 --- a/src/api/business/order/order.ts +++ /dev/null diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/business/schedule/order.ts diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index fb50c25..3ac7392 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -3,7 +3,7 @@ */ import request from '../index' import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' -const prefix = '/meter' +const prefix = '/customer' // 列表查询 export function getSampleList(data: ISampleListQuery) { diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue index ade67f5..fd09c75 100644 --- a/src/views/business/schedule/order/orderList.vue +++ b/src/views/business/schedule/order/orderList.vue @@ -6,7 +6,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' -import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order' +// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order' const { proxy } = getCurrentInstance() as any const $router = useRouter() diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue new file mode 100644 index 0000000..2e49511 --- /dev/null +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -0,0 +1,5 @@ + + + diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts deleted file mode 100644 index e69de29..0000000 --- a/src/api/business/order/order.ts +++ /dev/null diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/api/business/schedule/order.ts diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts index fb50c25..3ac7392 100644 --- a/src/api/customer/sampleList.ts +++ b/src/api/customer/sampleList.ts @@ -3,7 +3,7 @@ */ import request from '../index' import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' -const prefix = '/meter' +const prefix = '/customer' // 列表查询 export function getSampleList(data: ISampleListQuery) { diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue index ade67f5..fd09c75 100644 --- a/src/views/business/schedule/order/orderList.vue +++ b/src/views/business/schedule/order/orderList.vue @@ -6,7 +6,7 @@ import type { TableColumn } from '@/components/NormalTable/table_interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' -import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order' +// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order' const { proxy } = getCurrentInstance() as any const $router = useRouter() diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue new file mode 100644 index 0000000..2e49511 --- /dev/null +++ b/src/views/business/schedule/order/orderListEdit.vue @@ -0,0 +1,5 @@ + + + diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue index ac83279..d4a4c0f 100644 --- a/src/views/customer/sample/list/list.vue +++ b/src/views/customer/sample/list/list.vue @@ -15,7 +15,7 @@ sampleNo: '', // 样品编号 sampleName: '', // 样品名称 sampleModel: '', // 型号 - customerId: '', // 委托方代码 + customerNo: '', // 委托方代码 customerName: '', // 委托方名称 startTime: '1', // 检定开始时间 endTime: '1', // 检定结束时间 @@ -29,7 +29,7 @@ { text: '样品名称', value: 'sampleName', width: '120', align: 'center' }, { text: '型号', value: 'sampleModel', align: 'center' }, { text: '出厂编号', value: 'evaluationName', align: 'center' }, - { text: '委托方代码', value: 'customerId', align: 'center' }, + { text: '委托方代码', value: 'customerNo', align: 'center' }, { text: '委托方名称', value: 'customerName', align: 'center' }, { text: '检定周期', value: 'mesurePeriod', align: 'center' }, { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' }, @@ -47,46 +47,18 @@ const fileRef = ref() // 数据查询 function fetchData(isNowPage = false) { - // loadingTable.value = true + loadingTable.value = true if (!isNowPage) { // 是否显示当前页，否则跳转第一页 listQuery.value.offset = 1 } listQuery.value.startTime = timeRange.value[0] as string || '' listQuery.value.endTime = timeRange.value[1] as string || '' - // getSampleList(listQuery.value).then((response) => { - // 模拟数据 - - // response.data.rows = [ - // { - // id: '1597579843411234817', - // sampleNo: '1', // 样品编号 - // sampleName: '1', // 样品名称 - // sampleModel: '1', // 型号 - // evaluationName: '1', // 出厂编号 - // customerId: '1', // 委托方代码 - // customerName: '1', // 委托方名称 - // mesurePeriod: '1', // 检定周期 - // effectiveDate: '1', // 上次检定时间 - // remark: '备注', // 备注 - // }] - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // loadingTable.value = false - // }) - list.value = [ - { - id: '1597579843411234817', - sampleNo: '1', // 样品编号 - sampleName: '1', // 样品名称 - sampleModel: '1', // 型号 - evaluationName: '1', // 出厂编号 - customerId: '1', // 委托方代码 - customerName: '1', // 委托方名称 - mesurePeriod: '1', // 检定周期 - effectiveDate: '1', // 上次检定时间 - remark: '备注', // 备注 - }] + getSampleList(listQuery.value).then((response) => { + list.value = response.data.rows + total.value = parseInt(response.data.total) + loadingTable.value = false + }) } // 多选发生改变时 function handleSelectionChange(e: any) { @@ -130,7 +102,7 @@ sampleNo: '', // 样品编号 sampleName: '', // 样品名称 sampleModel: '', // 型号 - customerId: '', // 委托方代码 + customerNo: '', // 委托方代码 customerName: '', // 委托方名称 startTime: '', // 检定开始时间 endTime: '', // 检定结束时间 @@ -138,6 +110,7 @@ limit: 20, } timeRange.value = ['', ''] + fetchData(true) } // 上传文件/批量导入 @@ -197,7 +170,7 @@ sampleNo: listQuery.value.sampleNo, // 样品编号 sampleName: listQuery.value.sampleName, // 样品名称 sampleModel: listQuery.value.sampleModel, // 型号 - customerId: listQuery.value.customerId, // 委托方代码 + customerNo: listQuery.value.customerNo, // 委托方代码 customerName: listQuery.value.customerName, // 委托方名称 startTime: listQuery.value.startTime, // 投诉开始时间 endTime: listQuery.value.endTime, // 投诉结束时间 @@ -267,7 +240,7 @@ @@ -286,7 +259,7 @@ type="datetimerange" range-separator="到" format="YYYY/MM/DD HH:mm:ss" - value-format="YYYY-MM-DD h:m:s" + value-format="YYYY-MM-DD HH:mm:ss" start-placeholder="上次检定开始时间" end-placeholder="上次检定结束时间" /> @@ -307,7 +280,7 @@ :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange" >