From fb0b523bb106ae87a9508888ee99dc2ae9d1beb1 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 29 Apr 2024 13:40:26 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inspection/inspectionRequest/index.vue | 2 +-
....data.ts => inspectionRequestMain.data.ts} | 22 ++++++++++--
.../samplingProcess/samplingProcess.data.ts | 35 ++++---------------
3 files changed, 28 insertions(+), 31 deletions(-)
rename src/views/qms/inspection/inspectionRequest/{inspectionMain.data.ts => inspectionRequestMain.data.ts} (96%)
diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue
index a25100b0e..be4b972ee 100644
--- a/src/views/qms/inspection/inspectionRequest/index.vue
+++ b/src/views/qms/inspection/inspectionRequest/index.vue
@@ -61,7 +61,7 @@
diff --git a/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts b/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts
new file mode 100644
index 000000000..eaaf4d434
--- /dev/null
+++ b/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts
@@ -0,0 +1,208 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const WorkSchedulingQaformRules = reactive({
+ concurrencyStamp: [required],
+})
+
+export const WorkSchedulingQaform = useCrudSchemas(reactive([
+ {
+ label: '删除时间',
+ field: 'deleteTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ },
+ },
+ {
+ label: '主键',
+ field: 'id',
+ sort: 'custom',
+ isForm: false,
+ },
+ {
+ label: '状态',
+ field: 'status',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ form: {
+ component: 'Radio'
+ },
+ },
+ {
+ label: '并发乐观锁',
+ field: 'concurrencyStamp',
+ sort: 'custom',
+ iisSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: true,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ isForm: false,
+ },
+ {
+ label: '删除用户名',
+ field: 'deleter',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '位置ID',
+ field: 'siteId',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '主计划编号',
+ field: 'planMasterCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '工单编号',
+ field: 'schedulingCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '工序编号',
+ field: 'nodeCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '检验单编号',
+ field: 'qaFormNo',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '检验单名称',
+ field: 'qaFormName',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '检验类型',
+ field: 'qaFormType',
+ sort: 'custom',
+ isSearch: true,
+
+ },
+ {
+ label: '检验时间',
+ field: 'qaTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: true,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ },
+ },
+ {
+ label: '检测数量',
+ field: 'qaCount',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '检测合格数量',
+ field: 'qaCountPassed',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '检测不合格数量',
+ field: 'qaCountNotpassed',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '合格率',
+ field: 'qaPassRate',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))