From 45bbf636bbf8b934f2442f2ba7c5bdf038dc1e6d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 21 Feb 2025 09:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=BB=93=E7=AE=97=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../onlinesettlementInfo/index.vue            |  16 +-
 .../onlinesettlementInfo.data.ts              |   1 +
 .../onlinesettlementInfoDetail/index.vue      | 221 ++----------------
 3 files changed, 32 insertions(+), 206 deletions(-)

diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue
index 0c9d119f8..42aa324d1 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -51,8 +51,8 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="OnlinesettlementInfo.allSchemas" />
-
+  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="OnlinesettlementInfo.allSchemas" /> -->
+  <InfoDetail ref="infoDetailRef"/>
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/onlinesettlement-info/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -65,7 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+import InfoDetail from '../onlinesettlementInfoDetail/index.vue'
 defineOptions({ name: 'OnlinesettlementInfo' })
 
 const message = useMessage() // 消息弹窗
@@ -178,8 +178,10 @@ const formsSuccess = async (formType,data) => {
 
 /** 详情操作 */
 const detailRef = ref()
+const infoDetailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicOnlinesettlementInfo')
+  // detailRef.value.openDetail(row, titleName, titleValue, 'basicOnlinesettlementInfo')
+  infoDetailRef.value.openDetail(row)
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts
index 4070e8dba..2caf11af5 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfo/onlinesettlementInfo.data.ts
@@ -24,6 +24,7 @@ export const OnlinesettlementInfo = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
+      fixed: 'left',
       width: 180
     },
   },
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue
index 3866c1439..30964e2ad 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementInfoDetail/index.vue
@@ -1,20 +1,12 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search :schema="OnlinesettlementInfoDetail.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-  </ContentWrap>
-
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="OnlinesettlementInfoDetail.allSchemas"
-    />
-
   <!-- 列表 -->
+  <Dialog
+    title="结算明细"
+    v-model="dialogVisible"
+    width="80%"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+  >
   <ContentWrap>
     <Table
       :columns="tableColumns"
@@ -27,34 +19,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
-        </el-button>
-      </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
-      </template>
-    </Table>
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="OnlinesettlementInfoDetailRules"
-    :formAllSchemas="OnlinesettlementInfoDetail.allSchemas"
-    :apiUpdate="OnlinesettlementInfoDetailApi.updateOnlinesettlementInfoDetail"
-    :apiCreate="OnlinesettlementInfoDetailApi.createOnlinesettlementInfoDetail"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
+    </Table></ContentWrap>
+  </Dialog>
 
-  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="OnlinesettlementInfoDetail.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/onlinesettlement-info-detail/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -62,12 +29,10 @@ import download from '@/utils/download'
 import { OnlinesettlementInfoDetail,OnlinesettlementInfoDetailRules } from './onlinesettlementInfoDetail.data'
 import * as OnlinesettlementInfoDetailApi from '@/api/wms/onlinesettlementInfoDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
 
 defineOptions({ name: 'OnlinesettlementInfoDetail' })
 
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -76,18 +41,16 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(OnlinesettlementInfoDetail.allSchemas.tableColumns)
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+const dialogVisible = ref(false)
+const formLoading = ref(false)
+const openDetail = async ({number,id})=>{
+  dialogVisible.value = true
+  formLoading.value = true
+  await setSearchParams({
+    number,
+    masterId:id
   })
-}
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
+  formLoading.value = false
 }
 
 const { tableObject, tableMethods } = useTable({
@@ -97,148 +60,8 @@ const { tableObject, tableMethods } = useTable({
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:onlinesettlementInfoDetail:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:onlinesettlementInfoDetail:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlementInfoDetail:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
-    handleExport()
-  } else if (val == 'refresh') { // 刷新
-    getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-// 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:onlinesettlementInfoDetail:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:onlinesettlementInfoDetail:delete'}), // 删除
-]
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
-    openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
-  }
-}
-
-/** 添加/修改操作 */
-const basicFormRef = ref()
-const openForm = (type: string, row?: any) => {
-  basicFormRef.value.open(type, row)
-}
-
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =OnlinesettlementInfoDetail.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await OnlinesettlementInfoDetailApi.createOnlinesettlementInfoDetail(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await OnlinesettlementInfoDetailApi.updateOnlinesettlementInfoDetail(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicOnlinesettlementInfoDetail')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await OnlinesettlementInfoDetailApi.deleteOnlinesettlementInfoDetail(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await OnlinesettlementInfoDetailApi.exportOnlinesettlementInfoDetail(tableObject.params)
-    download.excel(data, '上线结算记录信息新子表.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '上线结算记录信息新子表导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await OnlinesettlementInfoDetailApi.importTemplate()
-})
 
+defineExpose({
+  openDetail
+}) // 提供 open 方法，用于打开弹窗
 </script>