From a39df748a8a53d22047e78d05649dd11e2aa473d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 7 Jan 2025 14:02:35 +0800
Subject: [PATCH] =?UTF-8?q?FWHL-145=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=82=B9=E5=87=BB=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BC=B9=E7=AA=97=E8=BE=93=E5=85=A5=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=EF=BC=8C=E9=9D=9E=E5=BF=85=E5=A1=AB=E3=80=82=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E8=AE=B0=E5=BD=95=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=AD=A4=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/countadjustRequestMain/index.ts   |  4 +-
 .../countadjustRecordMain.data.ts             | 16 +++----
 .../countadjustRequestMain.data.ts            | 21 +++++++++
 .../countadjustRequestMain/index.vue          | 43 +++++++++++--------
 4 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts
index d1612bd5e..903e29a00 100644
--- a/src/api/wms/countadjustRequestMain/index.ts
+++ b/src/api/wms/countadjustRequestMain/index.ts
@@ -94,6 +94,6 @@ export const refused = async (id) => {
 }
 
 // 处理盘点申请主 Excel
-export const handle = async (id) => {
-  return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id })
+export const handle = async ({id,remark}) => {
+  return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id + '&remark='+remark })
 }
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index d1f6cd14c..554eda0b0 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -175,14 +175,6 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -248,6 +240,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
 ]))
 
 //表单校验
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index b8a8b0e8b..ef8cbceb1 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -679,3 +679,24 @@ export const CountadjustRequestDetailRules = reactive({
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
 })
+
+export const CountadjustHandle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable:false,
+    form: {
+      component: 'Input',
+      componentProps:{
+        type: 'textarea'
+      }
+    },
+  },
+]))
+
+export const CountadjustHandleRules = reactive({
+  // remark:  [
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
+})
\ No newline at end of file
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index cf39ad414..0d3b3dbad 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
@@ -78,6 +78,16 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
+  <!-- 处理填写备注窗口 finance_mainPlanSub -->
+  <BasicForm
+    ref="handleFormRef"
+    :rules="CountadjustHandleRules"
+    :formAllSchemas="CountadjustHandle.allSchemas"
+    :isBusiness="false"
+    :footButttondata="undefined"
+    @success="submitFormHandle"
+  />
+
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/countadjust-request-main/import" :importTemplateData="importTemplateData"
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@@ -86,7 +96,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules } from './countadjustRequestMain.data'
+import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDetail,CountadjustRequestDetailRules,CountadjustHandle,CountadjustHandleRules } from './countadjustRequestMain.data'
 import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
 import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -200,7 +210,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), // 提交审批
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), // 驳回
     defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), // 审批通过
-    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:countadjust-request-main:handle'}), // 处理
+    defaultButtons.mainListHandleBtn({hide:false,hasPermi:'wms:countadjust-request-main:handle'}), // 处理
     ]
 }
 // 列表-操作按钮事件
@@ -261,27 +271,26 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainHandle') { // 处理
-    await message.confirm('确认要处理吗？')
-    let getLoading = ElLoading.service({
-      lock: true,
-      text: 'loading...',
-      background: 'rgba(0, 0, 0, 0.7)'
-    })
-
-    CountadjustRequestMainApi.handle(row.id).then(() => {
-      message.success(t('处理成功'))
-      getLoading?.close()
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      getLoading?.close()
-      console.log(err)
-    })
+    handleRow.value = row
+    handleFormRef.value.open('update', row, null, '盘点调整申请-处理', '盘点调整申请-处理')
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
+const handleRow = ref({})
+const handleFormRef = ref()
+const submitFormHandle = async (formType, data) => {
+  handleFormRef.value.formLoading = true
+  try {
+    await CountadjustRequestMainApi.handle({id:handleRow?.value?.id,remark:data.remark})
+    message.success(t('处理成功'))
+    buttonBaseClick('refresh',null)
+  } finally {
+    handleFormRef.value.formLoading = false
+  }
+}
 
 
 /** 添加/修改操作 */