From d59596b46939fb1eb8a3b7d25f373763f0a39331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 15 Nov 2023 10:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionplan/workMain/index.vue         | 24 ++------
 .../productionplan/workMain/workMain.data.ts  | 61 ++++++++++---------
 2 files changed, 36 insertions(+), 49 deletions(-)

diff --git a/src/views/wms/productionManage/productionplan/workMain/index.vue b/src/views/wms/productionManage/productionplan/workMain/index.vue
index 3b65fe806..4421c375e 100644
--- a/src/views/wms/productionManage/productionplan/workMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/workMain/index.vue
@@ -71,7 +71,7 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/work-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/work-main/import" :importTemplateData="importTemplateData" @success="importSuccess" :is-show-out="true"/>
 </template>
 
 <script setup lang="ts">
@@ -135,7 +135,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:work-main:create'}), // 新增——需要手动修改下权限
+  defaultButtons.defaultAddBtn({hasPermi:'wms:work-main:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:work-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:work-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
@@ -167,25 +167,11 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
 // 列表-操作按钮
 const butttondata = (row) => {
-    return [
-        defaultButtons.mainListOrderCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-        defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['1'])}), // 发布
-        defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['3'])}), // 打开
-        defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['2'])}), // 下架
-        defaultButtons.mainListEditBtn({hasPermi:'wms:work-main:update',hide:isShowMainButton(row,['1'])}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:work-main:delete',hide:isShowMainButton(row,['1'])}), // 删除
-    ]
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'wms:work-main:update'}), // 编辑
+  ]
 }
 
 
diff --git a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
index 1a593714a..a246b7ed4 100644
--- a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
@@ -104,23 +104,34 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 160,
       fixed: 'left'
     },
     isForm: false,
     isSearch: true
   },
   {
-    label: '业务类型',
-    field: 'businessType',
+    label: '当前阶段',
+    field: 'currentStage',
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     form: {
-      value: 'ProductReceipt',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        disabled: true
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
@@ -133,6 +144,21 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      value: 'ProductReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -193,31 +219,6 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '当前阶段',
-    field: 'currentStage',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
-  },
   {
     label: '操作',
     field: 'action',