From 12f817be0a6f4d3ece8a69e229938704653d79e5 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 12 Mar 2024 19:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productionMain/index.ts           |  6 +--
 .../productionplan/productionMain/index.vue   | 48 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts
index a2e2fb76e..e7e471cf4 100644
--- a/src/api/wms/productionMain/index.ts
+++ b/src/api/wms/productionMain/index.ts
@@ -109,9 +109,9 @@ export const resetting = (id) => {
 }
 
 // 创建备料计划/制品收货申请
-export const generateRequest = (number) => {
-  return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
-}
+// export const generateRequest = (number) => {
+//   return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
+// }
 
 
 
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 639abbfd9..1e3f5d373 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -215,16 +215,16 @@ const butttondata = (row) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
-    {
-      label: '生成备料计划/收货申请',
-      name: 'scbljh',
-      hide: isShowMainButton(row,['6']),
-      type: 'primary',
-      icon: 'Select',
-      hasPermi:'wms:production-main:publish',
-      link: true, // 文本展现按钮
-      color: ''
-    },
+    // {
+    //   label: '生成备料计划/收货申请',
+    //   name: 'scbljh',
+    //   hide: isShowMainButton(row,['6']),
+    //   type: 'primary',
+    //   icon: 'Select',
+    //   hasPermi:'wms:production-main:publish',
+    //   link: true, // 文本展现按钮
+    //   color: ''
+    // },
   ]
 }
 
@@ -325,19 +325,21 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
-  } else if(val == 'scbljh') {
-    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成备料计划/收货申请吗？')
-    tableObject.loading = true
-    await ProductionMainApi.generateRequest(row.number).then(() => {
-      message.success(t('common.createSuccess'))
-      tableObject.loading = false
-      getList()
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  } else if (val == 'edit') { // 编辑
+  } 
+  // else if(val == 'scbljh') {
+  //   if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+  //   await message.confirm('确认要生成备料计划/收货申请吗？')
+  //   tableObject.loading = true
+  //   await ProductionMainApi.generateRequest(row.number).then(() => {
+  //     message.success(t('common.createSuccess'))
+  //     tableObject.loading = false
+  //     getList()
+  //   }).catch(err => {
+  //     tableObject.loading = false
+  //     console.log(err)
+  //   })
+  // } 
+  else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)