diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
new file mode 100644
index 0000000..a694ce6
--- /dev/null
+++ b/src/components/Sample/certificationRecords.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
new file mode 100644
index 0000000..a694ce6
--- /dev/null
+++ b/src/components/Sample/certificationRecords.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
new file mode 100644
index 0000000..b88e552
--- /dev/null
+++ b/src/components/Sample/measureRecords.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
new file mode 100644
index 0000000..a694ce6
--- /dev/null
+++ b/src/components/Sample/certificationRecords.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
new file mode 100644
index 0000000..b88e552
--- /dev/null
+++ b/src/components/Sample/measureRecords.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
new file mode 100644
index 0000000..be9415b
--- /dev/null
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+ 确 定
+
+
+
+
+
+
+
+
+
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
new file mode 100644
index 0000000..a694ce6
--- /dev/null
+++ b/src/components/Sample/certificationRecords.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
new file mode 100644
index 0000000..b88e552
--- /dev/null
+++ b/src/components/Sample/measureRecords.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
new file mode 100644
index 0000000..be9415b
--- /dev/null
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+ 确 定
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 75b4d0c..4d1b5c0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -5,6 +5,7 @@
import type { DateModelType } from 'element-plus'
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import RollbackDialog from './../components/rollbackDialog.vue'
+import DistributeDialog from './../components/distributeDialog.vue'
import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import { printJSON } from '@/utils/printUtils'
@@ -20,7 +21,7 @@
{ name: '检测中', value: '3' },
{ name: '检测完', value: '4' },
]
-const currentMenu = ref('2') // 当前选中状态
+const currentMenu = ref('1') // 当前选中状态
// 查询条件
const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
const listQuery: Ref = ref({
@@ -33,7 +34,7 @@
sampleAttr: '', // 样品属性
startTime: '', // 应检完时间-开始
endTime: '', // 应检完时间-结束
- sendState: '2', // 分发状态
+ sendState: '1', // 分发状态
outState: '', // 超期状态
formId: 'jlglsygfsp', // 任务分发formId
offset: 1,
@@ -113,7 +114,7 @@
isUrgent: '', // 是否加急
sampleAttr: '', // 样品属性
formId: 'jlglsygfsp',
- sendState: '2', // 分发状态
+ sendState: '1', // 分发状态
outState: '', // 超期状态
offset: 1,
limit: 20,
@@ -196,29 +197,6 @@
}
}
-// 点击批量收入
-const scanSampleRef = ref()
-const batchScan = () => {
- scanSampleRef.value.initDialog()
-}
-// 对列表中样品批量收入
-const scanOver = function (list: { sampleId: string; orderId: string }) {
- // TODO:批量收入
- scanSampleRef.value.closeDialog()
- fetchData()
-}
-
-// 收入
-const takeIn = function (row: ITaskList) {
- ElMessageBox.confirm(
- '确认收入该样品吗?',
- '提示',
- { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
- ).then(() => {
- // 收入样品
- })
-}
-
// 退回
const rollbackRef = ref()
const rollback = function (row: ITaskList) {
@@ -329,6 +307,7 @@
+
@@ -342,10 +321,10 @@
详情
-
+
任务分发
-
+
退回
@@ -354,8 +333,8 @@
-
-
+
+
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
new file mode 100644
index 0000000..a694ce6
--- /dev/null
+++ b/src/components/Sample/certificationRecords.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
new file mode 100644
index 0000000..b88e552
--- /dev/null
+++ b/src/components/Sample/measureRecords.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
new file mode 100644
index 0000000..be9415b
--- /dev/null
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+ 确 定
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 75b4d0c..4d1b5c0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -5,6 +5,7 @@
import type { DateModelType } from 'element-plus'
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import RollbackDialog from './../components/rollbackDialog.vue'
+import DistributeDialog from './../components/distributeDialog.vue'
import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import { printJSON } from '@/utils/printUtils'
@@ -20,7 +21,7 @@
{ name: '检测中', value: '3' },
{ name: '检测完', value: '4' },
]
-const currentMenu = ref('2') // 当前选中状态
+const currentMenu = ref('1') // 当前选中状态
// 查询条件
const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
const listQuery: Ref = ref({
@@ -33,7 +34,7 @@
sampleAttr: '', // 样品属性
startTime: '', // 应检完时间-开始
endTime: '', // 应检完时间-结束
- sendState: '2', // 分发状态
+ sendState: '1', // 分发状态
outState: '', // 超期状态
formId: 'jlglsygfsp', // 任务分发formId
offset: 1,
@@ -113,7 +114,7 @@
isUrgent: '', // 是否加急
sampleAttr: '', // 样品属性
formId: 'jlglsygfsp',
- sendState: '2', // 分发状态
+ sendState: '1', // 分发状态
outState: '', // 超期状态
offset: 1,
limit: 20,
@@ -196,29 +197,6 @@
}
}
-// 点击批量收入
-const scanSampleRef = ref()
-const batchScan = () => {
- scanSampleRef.value.initDialog()
-}
-// 对列表中样品批量收入
-const scanOver = function (list: { sampleId: string; orderId: string }) {
- // TODO:批量收入
- scanSampleRef.value.closeDialog()
- fetchData()
-}
-
-// 收入
-const takeIn = function (row: ITaskList) {
- ElMessageBox.confirm(
- '确认收入该样品吗?',
- '提示',
- { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
- ).then(() => {
- // 收入样品
- })
-}
-
// 退回
const rollbackRef = ref()
const rollback = function (row: ITaskList) {
@@ -329,6 +307,7 @@
+
@@ -342,10 +321,10 @@
详情
-
+
任务分发
-
+
退回
@@ -354,8 +333,8 @@
-
-
+
+
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 39817f4..6cbdf10 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -149,7 +149,7 @@
-
+
diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts
index 8bfe87e..50cf032 100644
--- a/src/api/measure/person.ts
+++ b/src/api/measure/person.ts
@@ -9,6 +9,14 @@
data,
})
}
+// 计量人员列表-不分页
+export function getStaffListAll(data: { deptId: string; name: string }) {
+ return request({
+ url: '/staff/getUserList',
+ method: 'post',
+ data,
+ })
+}
// 人员详细信息
export function getStaffDetail(data: object) {
return request({
diff --git a/src/components.d.ts b/src/components.d.ts
index 5fbbde7..abe6b8d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -20,6 +20,8 @@
BarCodeBind: typeof import('./components/BarCodeBind/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
BenchCol: typeof import('./components/benchCol/index.vue')['default']
+ CertificationMonitor: typeof import('./components/Sample/certificationMonitor.vue')['default']
+ CertificationRecords: typeof import('./components/Sample/certificationRecords.vue')['default']
ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default']
CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
@@ -36,6 +38,7 @@
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
LineChart: typeof import('./components/Echart/LineChart.vue')['default']
+ MeasureRecords: typeof import('./components/Sample/measureRecords.vue')['default']
NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
@@ -51,10 +54,9 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
- SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
+ SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/components/Sample/certificationMonitor.vue b/src/components/Sample/certificationMonitor.vue
new file mode 100644
index 0000000..16c1311
--- /dev/null
+++ b/src/components/Sample/certificationMonitor.vue
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
new file mode 100644
index 0000000..a694ce6
--- /dev/null
+++ b/src/components/Sample/certificationRecords.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/Sample/measureRecords.vue b/src/components/Sample/measureRecords.vue
new file mode 100644
index 0000000..b88e552
--- /dev/null
+++ b/src/components/Sample/measureRecords.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/selectStaffDialog.vue b/src/components/dialog/selectStaffDialog.vue
new file mode 100644
index 0000000..be9415b
--- /dev/null
+++ b/src/components/dialog/selectStaffDialog.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+ 确 定
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index 75b4d0c..4d1b5c0 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -5,6 +5,7 @@
import type { DateModelType } from 'element-plus'
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
import RollbackDialog from './../components/rollbackDialog.vue'
+import DistributeDialog from './../components/distributeDialog.vue'
import type { ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
import type { TableColumn } from '@/components/NormalTable/table_interface'
import { printJSON } from '@/utils/printUtils'
@@ -20,7 +21,7 @@
{ name: '检测中', value: '3' },
{ name: '检测完', value: '4' },
]
-const currentMenu = ref('2') // 当前选中状态
+const currentMenu = ref('1') // 当前选中状态
// 查询条件
const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
const listQuery: Ref = ref({
@@ -33,7 +34,7 @@
sampleAttr: '', // 样品属性
startTime: '', // 应检完时间-开始
endTime: '', // 应检完时间-结束
- sendState: '2', // 分发状态
+ sendState: '1', // 分发状态
outState: '', // 超期状态
formId: 'jlglsygfsp', // 任务分发formId
offset: 1,
@@ -113,7 +114,7 @@
isUrgent: '', // 是否加急
sampleAttr: '', // 样品属性
formId: 'jlglsygfsp',
- sendState: '2', // 分发状态
+ sendState: '1', // 分发状态
outState: '', // 超期状态
offset: 1,
limit: 20,
@@ -196,29 +197,6 @@
}
}
-// 点击批量收入
-const scanSampleRef = ref()
-const batchScan = () => {
- scanSampleRef.value.initDialog()
-}
-// 对列表中样品批量收入
-const scanOver = function (list: { sampleId: string; orderId: string }) {
- // TODO:批量收入
- scanSampleRef.value.closeDialog()
- fetchData()
-}
-
-// 收入
-const takeIn = function (row: ITaskList) {
- ElMessageBox.confirm(
- '确认收入该样品吗?',
- '提示',
- { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' },
- ).then(() => {
- // 收入样品
- })
-}
-
// 退回
const rollbackRef = ref()
const rollback = function (row: ITaskList) {
@@ -329,6 +307,7 @@
+
@@ -342,10 +321,10 @@
详情
-
+
任务分发
-
+
退回
@@ -354,8 +333,8 @@
-
-
+
+
diff --git a/src/views/business/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index 39817f4..6cbdf10 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -149,7 +149,7 @@
-
+
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index 38ff127..465b2e7 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -138,7 +138,7 @@
},
]
-const currentMenu = ref('检定记录')
+const currentMenu = ref('证书监控')
const currentMenuObj = computed(() => {
return menu.find(item => item.name === currentMenu.value)
})
@@ -589,15 +589,26 @@
-
+
-
- {{ item.name }}
+
+ 证书监控
+
+
+ 检定记录
+
+
+ 检定证书
-
+
+
+
+
+
+