diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a40e715..e2f50af 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -17,6 +17,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a40e715..e2f50af 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -17,6 +17,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] diff --git a/src/components/BarCodeBind/index.vue b/src/components/BarCodeBind/index.vue new file mode 100644 index 0000000..0b7d7e8 --- /dev/null +++ b/src/components/BarCodeBind/index.vue @@ -0,0 +1,134 @@ + + + + + + + + 请使用扫码枪扫描待绑定标签 + + + + + + 扫描到 {{ list.length }} 个条码{{ list.length > 1 ? ',请选择要绑定的条码。' : '' }} + + + + + + + + + + 重新扫描 + + + 取 消 + + + 确 定 + + + + + + + diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a40e715..e2f50af 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -17,6 +17,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] diff --git a/src/components/BarCodeBind/index.vue b/src/components/BarCodeBind/index.vue new file mode 100644 index 0000000..0b7d7e8 --- /dev/null +++ b/src/components/BarCodeBind/index.vue @@ -0,0 +1,134 @@ + + + + + + + + 请使用扫码枪扫描待绑定标签 + + + + + + 扫描到 {{ list.length }} 个条码{{ list.length > 1 ? ',请选择要绑定的条码。' : '' }} + + + + + + + + + + 重新扫描 + + + 取 消 + + + 确 定 + + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 5c85016..f73a3a0 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -52,7 +52,7 @@ { path: 'order/:type/:id?', name: 'OrderDetail', - component: () => import('@/views/business/schedule/bench/bench.vue'), + component: () => import('@/views/business/schedule/order/orderList.vue'), meta: { title: '委托书详情', icon: 'ep:key', @@ -96,7 +96,7 @@ { path: 'receipt/:type/:id?', name: 'InterchangeReceiptDetail', - component: () => import('@/views/business/schedule/interchangeRecepit/receiptEdit.vue'), + component: () => import('@/views/business/schedule/interchangeReceipt/receiptEdit.vue'), meta: { title: '设备交接单详情', icon: 'ep:key', diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a40e715..e2f50af 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -17,6 +17,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] diff --git a/src/components/BarCodeBind/index.vue b/src/components/BarCodeBind/index.vue new file mode 100644 index 0000000..0b7d7e8 --- /dev/null +++ b/src/components/BarCodeBind/index.vue @@ -0,0 +1,134 @@ + + + + + + + + 请使用扫码枪扫描待绑定标签 + + + + + + 扫描到 {{ list.length }} 个条码{{ list.length > 1 ? ',请选择要绑定的条码。' : '' }} + + + + + + + + + + 重新扫描 + + + 取 消 + + + 确 定 + + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 5c85016..f73a3a0 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -52,7 +52,7 @@ { path: 'order/:type/:id?', name: 'OrderDetail', - component: () => import('@/views/business/schedule/bench/bench.vue'), + component: () => import('@/views/business/schedule/order/orderList.vue'), meta: { title: '委托书详情', icon: 'ep:key', @@ -96,7 +96,7 @@ { path: 'receipt/:type/:id?', name: 'InterchangeReceiptDetail', - component: () => import('@/views/business/schedule/interchangeRecepit/receiptEdit.vue'), + component: () => import('@/views/business/schedule/interchangeReceipt/receiptEdit.vue'), meta: { title: '设备交接单详情', icon: 'ep:key', diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts index c9b3d63..5c1f143 100644 --- a/src/views/business/schedule/task/task-interface.ts +++ b/src/views/business/schedule/task/task-interface.ts @@ -61,4 +61,5 @@ // 样品检测信息 export interface ISampleMeasure extends ISampleEdit { orderId: string // 委托单id + certifications: string // 证书类别 } diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a40e715..e2f50af 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -17,6 +17,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] diff --git a/src/components/BarCodeBind/index.vue b/src/components/BarCodeBind/index.vue new file mode 100644 index 0000000..0b7d7e8 --- /dev/null +++ b/src/components/BarCodeBind/index.vue @@ -0,0 +1,134 @@ + + + + + + + + 请使用扫码枪扫描待绑定标签 + + + + + + 扫描到 {{ list.length }} 个条码{{ list.length > 1 ? ',请选择要绑定的条码。' : '' }} + + + + + + + + + + 重新扫描 + + + 取 消 + + + 确 定 + + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 5c85016..f73a3a0 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -52,7 +52,7 @@ { path: 'order/:type/:id?', name: 'OrderDetail', - component: () => import('@/views/business/schedule/bench/bench.vue'), + component: () => import('@/views/business/schedule/order/orderList.vue'), meta: { title: '委托书详情', icon: 'ep:key', @@ -96,7 +96,7 @@ { path: 'receipt/:type/:id?', name: 'InterchangeReceiptDetail', - component: () => import('@/views/business/schedule/interchangeRecepit/receiptEdit.vue'), + component: () => import('@/views/business/schedule/interchangeReceipt/receiptEdit.vue'), meta: { title: '设备交接单详情', icon: 'ep:key', diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts index c9b3d63..5c1f143 100644 --- a/src/views/business/schedule/task/task-interface.ts +++ b/src/views/business/schedule/task/task-interface.ts @@ -61,4 +61,5 @@ // 样品检测信息 export interface ISampleMeasure extends ISampleEdit { orderId: string // 委托单id + certifications: string // 证书类别 } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index c8331c1..38ff127 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -64,6 +64,7 @@ minioFileName: '', // 说明书 labelBind: '', // 标签绑定 mesureType: '', // 检定方式 + certifications: '', }) const ruleFormRef = ref() @@ -224,6 +225,7 @@ measureResultCode: 'bhg', deliverer: '张三', delivererTel: '156254577545', + certifications: '1', } // for (const item of menu) { // item.searchFunc() diff --git a/src/assets/images/scan.png b/src/assets/images/scan.png new file mode 100644 index 0000000..a56bf3e --- /dev/null +++ b/src/assets/images/scan.png Binary files differ diff --git a/src/components.d.ts b/src/components.d.ts index a40e715..e2f50af 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -17,6 +17,7 @@ AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BarChartHorizontal: typeof import('./components/Echart/BarChartHorizontal.vue')['default'] BarChartVertical: typeof import('./components/Echart/BarChartVertical.vue')['default'] + BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] BenchCol: typeof import('./components/benchCol/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] diff --git a/src/components/BarCodeBind/index.vue b/src/components/BarCodeBind/index.vue new file mode 100644 index 0000000..0b7d7e8 --- /dev/null +++ b/src/components/BarCodeBind/index.vue @@ -0,0 +1,134 @@ + + + + + + + + 请使用扫码枪扫描待绑定标签 + + + + + + 扫描到 {{ list.length }} 个条码{{ list.length > 1 ? ',请选择要绑定的条码。' : '' }} + + + + + + + + + + 重新扫描 + + + 取 消 + + + 确 定 + + + + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 5c85016..f73a3a0 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -52,7 +52,7 @@ { path: 'order/:type/:id?', name: 'OrderDetail', - component: () => import('@/views/business/schedule/bench/bench.vue'), + component: () => import('@/views/business/schedule/order/orderList.vue'), meta: { title: '委托书详情', icon: 'ep:key', @@ -96,7 +96,7 @@ { path: 'receipt/:type/:id?', name: 'InterchangeReceiptDetail', - component: () => import('@/views/business/schedule/interchangeRecepit/receiptEdit.vue'), + component: () => import('@/views/business/schedule/interchangeReceipt/receiptEdit.vue'), meta: { title: '设备交接单详情', icon: 'ep:key', diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts index c9b3d63..5c1f143 100644 --- a/src/views/business/schedule/task/task-interface.ts +++ b/src/views/business/schedule/task/task-interface.ts @@ -61,4 +61,5 @@ // 样品检测信息 export interface ISampleMeasure extends ISampleEdit { orderId: string // 委托单id + certifications: string // 证书类别 } diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue index c8331c1..38ff127 100644 --- a/src/views/business/schedule/task/taskEdit.vue +++ b/src/views/business/schedule/task/taskEdit.vue @@ -64,6 +64,7 @@ minioFileName: '', // 说明书 labelBind: '', // 标签绑定 mesureType: '', // 检定方式 + certifications: '', }) const ruleFormRef = ref() @@ -224,6 +225,7 @@ measureResultCode: 'bhg', deliverer: '张三', delivererTel: '156254577545', + certifications: '1', } // for (const item of menu) { // item.searchFunc() diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue index 663b571..6abbb17 100644 --- a/src/views/business/schedule/task/taskList.vue +++ b/src/views/business/schedule/task/taskList.vue @@ -5,6 +5,7 @@ import { ElLoading, ElMessage } from 'element-plus' import type { ITaskList, ITaskQuery } from './task-interface' import DistributeDialog from './components/distributeDialog.vue' +import BarCodeBind from '@/components/BarCodeBind/index.vue' import type { TableColumn } from '@/components/NormalTable/table_interface' import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' @@ -89,17 +90,6 @@ checkoutList.value = e.map((item: { id: string }) => item.id) } -// 点击详情 -const handleDetail = (row: ITaskList) => { - $router.push(`/schedule/task/distribute/${row.sampleId}`) -} - -// 点击分发, 弹窗 -const distributeDialogRef = ref() -const handleDistribute = (row: ITaskList) => { - distributeDialogRef.value.initDialog(row.orderId, row.sampleId) -} - // 点击搜索 const searchList = () => { fetchData(true) @@ -119,7 +109,25 @@ limit: 20, } } +// 点击详情 +const handleDetail = (row: ITaskList) => { + $router.push(`/schedule/task/distribute/${row.sampleId}`) +} +// 点击分发, 弹窗 +const distributeDialogRef = ref() +const handleDistribute = (row: ITaskList) => { + distributeDialogRef.value.initDialog(row.orderId, row.sampleId) +} +// 点击标签绑定 +const barCodeBind = ref() +const bindLabel = (row: ITaskList) => { + barCodeBind.value.initDialog(row.sampleId) +} +// 标签绑定完成 +const bindLabelOver = () => { + searchList() +} // 页数发生变化后的操作,可能是页码变化,可能是每页容量变化,此函数必写 const changePage = (val: { size?: number; page?: number }) => { if (val && val.size) { @@ -258,7 +266,7 @@ 详情 - + 标签绑定 @@ -268,7 +276,10 @@ + + +