From ff45dba49523f12d1979701e984ea7fa9d374c29 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Thu, 23 May 2024 16:05:28 +0800
Subject: [PATCH] =?UTF-8?q?PC=E8=B4=A8=E6=A3=80=E8=A1=A8=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/orderDay/components/schedule.vue      |  4 +-
 src/views/mes/workSchedulingQaform/index.vue  | 10 ++---
 .../workSchedulingQaform.data.ts              | 43 ++++++++++---------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 455883192..31d39754a 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -226,8 +226,6 @@ import {  Graph } from '@antv/x6'
 import * as TeamApi from '@/api/wms/team'
 import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data";
 import {getStrDictOptions} from "@/utils/dict";
-import {Equipment} from "@/views/mes/workstation/workstation.data";
-import * as WorkstationApi from "@/api/mes/workstation";
 import {DeviceInfo, OrderDay} from "@/views/mes/orderDay/orderDay.data";
 //import {TableForm} from '@/components/TableForm/src/TableForm.vue' // 引入TableForm.vue组件
 const graphContainer = ref<HTMLElement | null>(null)
@@ -651,6 +649,7 @@ const handleConfirm = (row)=>{
   // 参数整理
   _searchCondition.isSearch = true
   _searchCondition.filters = filters
+  
   searchTableRef.value.open(
     '添加人员',//弹出层标题
     searchUser.allSchemas,
@@ -662,6 +661,7 @@ const handleConfirm = (row)=>{
     undefined,
     _searchCondition
   )
+  searchTableRef.value.hiddenFilterButton()
 }
 
 
diff --git a/src/views/mes/workSchedulingQaform/index.vue b/src/views/mes/workSchedulingQaform/index.vue
index ac06996b3..b40dddee2 100644
--- a/src/views/mes/workSchedulingQaform/index.vue
+++ b/src/views/mes/workSchedulingQaform/index.vue
@@ -99,8 +99,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'mes:workSchedulingQaform:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:workSchedulingQaform:import'}), // 导入
+  //defaultButtons.defaultAddBtn({hasPermi:'mes:workSchedulingQaform:create'}), // 新增
+ // defaultButtons.defaultImportBtn({hasPermi:'mes:workSchedulingQaform:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'mes:workSchedulingQaform:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -118,7 +118,7 @@ const HeadButttondata = [
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
-    openForm('create')
+    //openForm('create')
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -133,14 +133,14 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:workSchedulingQaform:update'}), // 编辑
+  //defaultButtons.mainListEditBtn({hasPermi:'mes:workSchedulingQaform:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'mes:workSchedulingQaform:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
-    openForm('update', row)
+    //openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
diff --git a/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts b/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts
index eaaf4d434..f2c54eed7 100644
--- a/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts
+++ b/src/views/mes/workSchedulingQaform/workSchedulingQaform.data.ts
@@ -37,6 +37,7 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'id',
     sort: 'custom',
     isForm: false,
+    isTable: false,
   },
   {
     label: '状态',
@@ -63,22 +64,7 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
       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',
@@ -131,6 +117,22 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  {
+    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: 'qaFormType',
@@ -164,7 +166,7 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检测数量',
     field: 'qaCount',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -174,7 +176,7 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检测合格数量',
     field: 'qaCountPassed',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -184,7 +186,7 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
     label: '检测不合格数量',
     field: 'qaCountNotpassed',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -194,12 +196,13 @@ export const WorkSchedulingQaform = useCrudSchemas(reactive<CrudSchema[]>([
     label: '合格率',
     field: 'qaPassRate',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable:false,
     table: {
       width: 150,
       fixed: 'right'