From 84609509edac0ba80d05467ddbc1091015c47f59 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 6 Sep 2024 13:07:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=80=97QAD=E5=9B=9E=E4=BC=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backflushDetailbQad.data.ts               | 53 +++++++++++++++----
 .../agvManage/backflushDetailbQad/index.vue   |  7 ++-
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
index 8cf4a2e33..01ee0aa4e 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@@ -39,7 +39,6 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -50,20 +49,52 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  // {
+  //   label: '创建者Id',
+  //   field: 'creator',
+  //   sort: 'custom',
+  //   isForm: false,
+  // },
   {
-    label: '创建者Id',
-    field: 'creator',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '执行状态0未执行1成功2失败',
+    label: '执行状态',
     field: 'status',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: [{
+          value: 0,
+          label: '未执行'
+        },
+        {
+          value: 1,
+          label: '成功'
+        },
+        {
+          value: 2,
+          label: '失败'
+        }]
+      },
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: [{
+          value: 0,
+          label: '未执行'
+        },
+        {
+          value: 1,
+          label: '成功'
+        },
+        {
+          value: 2,
+          label: '失败'
+        }]
+      },
+    },
+
   },
   {
     label: '操作',
diff --git a/src/views/wms/agvManage/backflushDetailbQad/index.vue b/src/views/wms/agvManage/backflushDetailbQad/index.vue
index 38c711b8d..748ff3607 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/index.vue
+++ b/src/views/wms/agvManage/backflushDetailbQad/index.vue
@@ -27,6 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      <template #status="{row}">
+        <span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span>
+      </template>
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -133,8 +136,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:backflushDetailbQad:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:backflushDetailbQad:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'wms:backflush-detailb-qad:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:backflush-detailb-qad:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件