From b6e55b8f2dde073b05f091ad16474b26c00e057c Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Wed, 7 May 2025 14:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8A=E4=BE=9B=E5=BA=94=E5=95=86=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF=E6=AC=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E3=80=8B=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=88=A0=E9=99=A4=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E3=80=8A=E9=80=81=E8=B4=A7=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E3=80=8B=E5=92=8C=E3=80=8A=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BE=BF=E6=AC=A1=E9=85=8D=E7=BD=AE=E8=A1=A8=E3=80=8B=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD=E8=A6=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplierAddrDeliTime/index.ts     |   5 +
 .../supplierAddrDeliTime/index.vue            |  20 ++-
 .../supplierAddressModelDeli/index.vue        | 138 +++++++++++-------
 3 files changed, 107 insertions(+), 56 deletions(-)

diff --git a/src/api/wms/supplierAddrDeliTime/index.ts b/src/api/wms/supplierAddrDeliTime/index.ts
index d8858c127..bde1d0442 100644
--- a/src/api/wms/supplierAddrDeliTime/index.ts
+++ b/src/api/wms/supplierAddrDeliTime/index.ts
@@ -39,6 +39,11 @@ export const updateSupplierAddrDeliTimeDetail = async (data: SupplierAddrDeliTim
   return await request.put({ url: `/wms/supplier-addr-deli-time-main/update`, data })
 }
 
+// 删除供应商地点便次时间配置主
+export const deleteSupplierAddrDeliTimeMain = async (id: number) => {
+  return await request.delete({ url: `/wms/supplier-addr-deli-time-main/delete?id=` + id })
+}
+
 // 删除供应商地点便次时间配置明细
 export const deleteSupplierAddrDeliTimeDetail = async (id: number) => {
   return await request.delete({ url: `/wms/supplier-addr-deli-time-detail/delete?id=` + id })
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddrDeliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierAddrDeliTime/index.vue
index 187b786ce..d5fc7b71c 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierAddrDeliTime/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierAddrDeliTime/index.vue
@@ -99,6 +99,7 @@
 import download from '@/utils/download'
 import { SupplierAddrDeliTime, SupplierAddrDeliTimeDetail, SupplierAddrDeliTimeDetailRules } from './supplierAddrDeliTimeDetail.data'
 import * as SupplierAddrDeliTimeDetailApi from '@/api/wms/supplierAddrDeliTime'
+import * as SupplierAddrDeliTimeMainApi from '@/api/wms/supplierAddrDeliTime'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -288,7 +289,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleMainDelete(row.masterId)
   }
 }
 
@@ -367,6 +368,23 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierAddrDeliTimeDetail')
 }
 
+/** 删除主按钮操作 */
+const handleMainDelete = async (masterId: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await SupplierAddrDeliTimeMainApi.deleteSupplierAddrDeliTimeMain(masterId)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}finally{
+    tableObject.loading = false
+  }
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
index f7a084b22..55e36957a 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SupplierAddressModelDeli.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="SupplierAddressModelDeli.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SupplierAddressModelDeli.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SupplierAddressModelDeli.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,17 +31,17 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #code="{ row }">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
         </el-button>
       </template>
-      <template #shift="{row}">
+      <template #shift="{ row }">
         <el-tag type="primary" v-if="row.isDay == 'TRUE'">白班</el-tag>
         <el-tag type="primary" v-if="row.isNight == 'TRUE'">夜班</el-tag>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -58,12 +62,23 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierAddressModelDeli.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplier-address-model-deli/import" :importTemplateData="importTemplateData" @success="importSuccess" :updateIsShow="false" :coverIsShow="false" :mode="2"/>
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/supplier-address-model-deli/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsShow="false"
+    :coverIsShow="false"
+    :mode="2"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SupplierAddressModelDeli,SupplierAddressModelDeliRules } from './supplierAddressModelDeli.data'
+import {
+  SupplierAddressModelDeli,
+  SupplierAddressModelDeliRules
+} from './supplierAddressModelDeli.data'
 import * as SupplierAddressModelDeliApi from '@/api/wms/supplierAddressModelDeli'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -82,7 +97,7 @@ const tableColumns = ref(SupplierAddressModelDeli.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(async() => {
+  nextTick(async () => {
     const setV = {}
     setV[formField] = val[0][searchField]
     if (formField == 'supplierCode') {
@@ -92,15 +107,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
       setV['yearAndMonth'] = val[0]['yearAndMonth']
       const params = {
         supplierCode: val[0]['supplierCode'],
-        supplierAddress: val[0]['supplierAddress'],
-    }
+        supplierAddress: val[0]['supplierAddress']
+      }
       const options = await SupplierAddressModelDeliApi.getSupplierModelList(params)
-      SupplierAddressModelDeli.allSchemas.formSchema.forEach(item => {
-        if(item.field == 'modelShow'){
-          item.componentProps.options = options.map(item=> {
+      SupplierAddressModelDeli.allSchemas.formSchema.forEach((item) => {
+        if (item.field == 'modelShow') {
+          item.componentProps.options = options.map((item) => {
             return {
               label: item,
-              value:item
+              value: item
             }
           })
         }
@@ -124,12 +139,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:supplier-address-model-deli:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:supplier-address-model-deli:import'}), // 导入
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplier-address-model-deli:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplier-address-model-deli:import' }), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -142,31 +157,39 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-address-model-deli:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-address-model-deli:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplier-address-model-deli:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplier-address-model-deli:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -191,42 +214,42 @@ const openForm = (type: string, row?: any) => {
       // if(item.field == 'supplierName'){
       //   item.componentProps.disabled = true
       // }
-      if(item.field == 'supplierAddress'){
+      if (item.field == 'supplierAddress') {
         item.componentProps.disabled = true
       }
-      if(item.field == 'modelShow'){
+      if (item.field == 'modelShow') {
         item.componentProps.disabled = true
       }
     })
   } else {
-     SupplierAddressModelDeli.allSchemas.formSchema.forEach(item => {
-        if(item.field == 'modelShow'){
-          item.componentProps.options =[]
-       }
-         if(item.field == 'supplierCode'){
-          item.componentProps.isSearchList = true
+    SupplierAddressModelDeli.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'modelShow') {
+        item.componentProps.options = []
+      }
+      if (item.field == 'supplierCode') {
+        item.componentProps.isSearchList = true
         item.componentProps.disabled = false
       }
-      if(item.field == 'supplierName'){
+      if (item.field == 'supplierName') {
         item.componentProps.disabled = true
       }
-      if(item.field == 'supplierAddress'){
+      if (item.field == 'supplierAddress') {
         item.componentProps.disabled = true
       }
-      if(item.field == 'modelShow'){
+      if (item.field == 'modelShow') {
         item.componentProps.disabled = false
       }
-      })
+    })
   }
-    console.log(row)
+  console.log(row)
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
 const formsSuccess = async (formType, dataParams) => {
-  const data = {...dataParams}
-  data.isDay = data.shift.some(item=>item === 'day') ? 'TRUE' :'FALSE'
-  data.isNight = data.shift.some(item => item === 'night') ? 'TRUE' :'FALSE'
+  const data = { ...dataParams }
+  data.isDay = data.shift.some((item) => item === 'day') ? 'TRUE' : 'FALSE'
+  data.isNight = data.shift.some((item) => item === 'night') ? 'TRUE' : 'FALSE'
   data.model = data.modelShow.join(',')
   delete data.shift
   basicFormRef.value.formLoading = true
@@ -243,7 +266,6 @@ const formsSuccess = async (formType, dataParams) => {
   } finally {
     basicFormRef.value.formLoading = false
   }
-  
 }
 
 /** 详情操作 */
@@ -257,12 +279,17 @@ const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
+    tableObject.loading = true
     // 发起删除
     await SupplierAddressModelDeliApi.deleteSupplierAddressModelDeli(id)
+    tableObject.loading = false
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch {
+  } finally{
+    tableObject.loading = false
+  }
 }
 
 /** 导出按钮操作 */
@@ -273,7 +300,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await SupplierAddressModelDeliApi.exportSupplierAddressModelDeli(tableObject.params)
+    const data = await SupplierAddressModelDeliApi.exportSupplierAddressModelDeli(
+      tableObject.params
+    )
     download.excel(data, '供应商地点受入号便次配置.xlsx')
   } catch {
   } finally {
@@ -310,5 +339,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await SupplierAddressModelDeliApi.importTemplate()
 })
-
 </script>