diff --git a/.env.development b/.env.development index a7217da..d11d038 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/.env.development b/.env.development index a7217da..d11d038 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 8fcecda..1830364 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -70,9 +70,9 @@ } // 选择样品列表 -export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string }) { +export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string; offset: number; limit: number }) { return request({ - url: '/customer/sample/listPageByOrder', + url: `/customer/sample/listPageByOrder?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) diff --git a/.env.development b/.env.development index a7217da..d11d038 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 8fcecda..1830364 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -70,9 +70,9 @@ } // 选择样品列表 -export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string }) { +export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string; offset: number; limit: number }) { return request({ - url: '/customer/sample/listPageByOrder', + url: `/customer/sample/listPageByOrder?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index aadc0f2..4adf506 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -378,6 +378,7 @@ // 点击保存 const saveForm = (formEl: FormInstance | undefined) => { + console.log('委托单类型', orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '') if (!list.value.length) { ElMessage.warning('要求样品清单不能为空') return diff --git a/.env.development b/.env.development index a7217da..d11d038 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 8fcecda..1830364 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -70,9 +70,9 @@ } // 选择样品列表 -export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string }) { +export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string; offset: number; limit: number }) { return request({ - url: '/customer/sample/listPageByOrder', + url: `/customer/sample/listPageByOrder?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index aadc0f2..4adf506 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -378,6 +378,7 @@ // 点击保存 const saveForm = (formEl: FormInstance | undefined) => { + console.log('委托单类型', orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '') if (!list.value.length) { ElMessage.warning('要求样品清单不能为空') return diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue index fb5bb15..5dffb34 100644 --- a/src/views/business/schedule/order/orderList.vue +++ b/src/views/business/schedule/order/orderList.vue @@ -114,6 +114,7 @@ ...item, isUrgentName: item.isUrgent == 1 ? '是' : '否', orderTypeName: `${item.orderType}` === '1' ? '检测委托单' : `${item.orderType}` === '2' ? '检定或校准委托单' : item.orderType, + statusName: item.statusName === '已取消' ? '已退回' : item.statusName, } }) diff --git a/.env.development b/.env.development index a7217da..d11d038 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,9 @@ # 页面标题 VITE_APP_TITLE = 华东计量综合系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -# VITE_APP_API_BASEURL = http://111.198.10.15:21609 +VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.2.96:8085 // 徐州 -VITE_APP_API_BASEURL = http://222.187.140.114:8896 +# VITE_APP_API_BASEURL = http://222.187.140.114:8896 #房可鑫测试 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts index 8fcecda..1830364 100644 --- a/src/api/business/schedule/order.ts +++ b/src/api/business/schedule/order.ts @@ -70,9 +70,9 @@ } // 选择样品列表 -export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string }) { +export function getOrderSampleList(data: { customerId?: string; customerNo: string; orderId?: string; offset: number; limit: number }) { return request({ - url: '/customer/sample/listPageByOrder', + url: `/customer/sample/listPageByOrder?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) diff --git a/src/views/business/schedule/order/orderEdit.vue b/src/views/business/schedule/order/orderEdit.vue index aadc0f2..4adf506 100644 --- a/src/views/business/schedule/order/orderEdit.vue +++ b/src/views/business/schedule/order/orderEdit.vue @@ -378,6 +378,7 @@ // 点击保存 const saveForm = (formEl: FormInstance | undefined) => { + console.log('委托单类型', orderType.value === 'measure' ? '1' : orderType.value === 'calibration' ? '2' : '') if (!list.value.length) { ElMessage.warning('要求样品清单不能为空') return diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue index fb5bb15..5dffb34 100644 --- a/src/views/business/schedule/order/orderList.vue +++ b/src/views/business/schedule/order/orderList.vue @@ -114,6 +114,7 @@ ...item, isUrgentName: item.isUrgent == 1 ? '是' : '否', orderTypeName: `${item.orderType}` === '1' ? '检测委托单' : `${item.orderType}` === '2' ? '检定或校准委托单' : item.orderType, + statusName: item.statusName === '已取消' ? '已退回' : item.statusName, } }) diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue index 94eebe7..d610a38 100644 --- a/src/views/business/schedule/order/selectSample.vue +++ b/src/views/business/schedule/order/selectSample.vue @@ -136,6 +136,7 @@ watch(() => props.visible, (newValue) => { if (newValue) { + listQuery.value.offset = 1 fetchData(true) } })