From d80b316a1897f0150207b58e0a999e7300757b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 13 Oct 2023 11:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=8F=8A?=
 =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E7=A1=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/itembasic/index.vue             | 123 ++++++------------
 .../wms/itempackaging/ItempackagingDetail.vue | 122 -----------------
 src/views/wms/itempackaging/index.vue         |  42 +++---
 3 files changed, 60 insertions(+), 227 deletions(-)
 delete mode 100644 src/views/wms/itempackaging/ItempackagingDetail.vue

diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index 612e74c92..0eda8d850 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -2,36 +2,38 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search :schema="ItemBasic.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-      <!-- 列表头部 -->
-    <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
   </ContentWrap>
 
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
+
   <!-- 列表 -->
   <ContentWrap>
     <Table :columns="ItemBasic.allSchemas.tableColumns" :data="tableObject.tableList" :loading="tableObject.loading"
       :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage">
-      <template #action="{ row }">
-        <el-button link type="primary" @click="openForm('update', row.id)" v-hasPermi="['wms:itembasic:update']">
-          编辑
-        </el-button>
-        <el-button link type="primary" @click="openDetail(row.id)" v-hasPermi="['wms:itembasic:update']">
-          详情
-        </el-button>
-        <el-button link type="danger" @click="handleDelete(row.id)" v-hasPermi="['wms:itembasic:delete']">
-          删除
+      <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>
 
   <!-- 表单弹窗：添加/修改 -->
   <ItembasicForm ref="formRef" @success="getList" />
+  <!-- 导入 -->
   <ImportForm ref="importFormRef" :url="ItembasicApi.importUrl" :importTemplateData="importTemplateData"
     @success="importSuccess" />
   <!-- 详情 -->
-  <Detail ref="detailRef" />
+  <Detail ref="detailRef" :tabs="ItemBasicTabsList" :isBasic="true" :allSchemas="ItemBasic.allSchemas" />
 </template>
 
 <script setup lang="ts">
@@ -39,14 +41,13 @@ import download from '@/utils/download'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import ItembasicForm from './ItembasicForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-import ItembasicDetail from './ItembasicDetail.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import { ItemBasic } from '@/utils/disposition/tableColumns'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-const router = useRouter() // 路由
-// tableObject：表格的属性对象，可获得分页大小、条数等属性
-// tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
-// 详细可见：https://doc.iocoder.cn/vue3/crud-schema/
+import { ItemBasicTabsList } from '@/utils/disposition/tabsList'
+
+defineOptions({ name: 'Itembasic' })
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ItembasicApi.getItembasicPage // 分页接口
 })
@@ -72,70 +73,39 @@ const HeadButttondata = [
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
-defineOptions({ name: 'Itembasic' })
-
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  code: null,
-  name: null,
-  desc1: null,
-  desc2: null,
-  status: null,
-  uom: null,
-  altUom: null,
-  isStdPack: null,
-  enableBuy: null,
-  enableMake: null,
-  enableOutsourcing: null,
-  isRecycled: null,
-  isPhantom: null,
-  abcClass: null,
-  type: null,
-  category: null,
-  itemGroup: null,
-  color: null,
-  configuration: null,
-  project: null,
-  eqLevel: null,
-  validityDays: null,
-  available: null,
-  activeTime: [],
-  expireTime: [],
-  remark: null,
-  createTime: [],
-  creator: null
-})
 const exportLoading = ref(false) // 导出的加载中
 
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
-  // 新增
-  if (val == 'add') {
-    openForm('creat')
-  }
-  // 导入
-  else if (val == 'import') {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } 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 { // 其他按钮 
+    console.log('其他按钮', item)
   }
-  // 筛选
-  else if (val == 'filtrate') {
+}
 
-  }
-  // 其他按钮 
-  else {
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:itembasic:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itembasic:delete'}), // 删除
+]
 
+// 列表-操作按钮事件 
+const buttonTableClick = (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row.id)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
   }
 }
 
@@ -150,7 +120,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '导入模版99.xls'
+  templateTitle: '物品基础信息导入模版.xls'
 })
 
 // 导入成功之后
@@ -163,18 +133,9 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 const detailRef = ref()
-const openDetail = (id?: number) => {
-  detailRef.value.openDetail(id)
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
-// const openDetail = (id?: number) => {
-//   // detailRef.value.open(id)
-//   router.push({ 
-//     path: '/wms/itembasic-manage/itembasic-detail',
-//     query:{
-//       id
-//     }
-//  })
-// }
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -196,7 +157,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ItembasicApi.exportItembasic(queryParams)
+    const data = await ItembasicApi.exportItembasic(setSearchParams)
     download.excel(data, '物品基本信息.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/itempackaging/ItempackagingDetail.vue b/src/views/wms/itempackaging/ItempackagingDetail.vue
deleted file mode 100644
index 306d7ff58..000000000
--- a/src/views/wms/itempackaging/ItempackagingDetail.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <!-- <ContentWrap>
-    <div class="font-size-18px">
-      {{ detailData.itemCode }} 
-      <span class="ml-20px font-size-16px">{{ detailData.uom }}</span>
-    </div>
-  </ContentWrap> -->
-  <div class="flex" v-if="current == 0">
-    <!-- 详情 -->
-    <ContentWrap class="w-[73%]">
-      <Descriptions :data="detailData" :schema="Itempackaging.allSchemas.detailSchema" :columns="2" />
-    </ContentWrap>
-    <ContentWrap class="w-[27%] ml-16px">
-      <!-- 附件组件 -->
-      <Annex :data="annexData" @handleImport="handleImport" @deleteAnnex="deleteAnnexSuccess" />
-      <!-- 备注组件 -->
-      <Remarks :data="remarksData" class="mt-20px" @submitSucss="remarksSubmitSucss" />
-      <!-- 变更记录组件 -->
-      <ChangeRecord :data="changeRecordData" class="mt-20px" />
-    </ContentWrap>
-    <!-- 用户导入对话框 -->
-    <ImportForm ref="importFormRef" :importTemplateData="importTemplateData" @success="importSuccess" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineOptions({ name: 'ItempackagingDetail' })
-import Annex from '@/components/Annex/src/Annex.vue'
-import Remarks from '@/components/Remarks/src/Remarks.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
-import { Itempackaging } from '@/utils/disposition/tableColumns'
-import { getItempackaging } from '@/api/wms/itempackaging'
-import * as UserApi from '@/api/system/user'
-
-const { query } = useRoute() // 路由的查询
-
-// 附件默认数据
-const annexData = reactive({
-  annexList: [{
-    title: '文件名文件名2023-12-12.docx',
-    size: '150.02KB',
-    people: '贾先生',
-    time: '2023年5月6日 17:16:00',
-  }, {
-    title: '文件名文件名2023-12-15.docx',
-    size: '242KB',
-    people: '张张',
-    time: '2022年12月12日 17:16:00',
-  }]
-})
-// 备注默认数据
-const remarksData = reactive({
-  remarksList: [{
-    name: '诸葛亮',
-    text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。',
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '刘备',
-    text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。',
-    time: '2022年12月12日 17:16:00',
-  }]
-})
-
-// 变更记录默认数据
-const changeRecordData = reactive({
-  changeRecordList: [{
-    name: '诸葛亮',
-    type: 1,
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '刘备',
-    type: 2,
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '曹操',
-    type: 3,
-    time: '2023年5月6日 17:16:00',
-    file: [{
-      name: '这是个附件的名字.docx',
-      url: 'http://localhost:12080/admin-api/system/user/get-import-template'
-    }, {
-      name: '这是个附件的名字.docx',
-      url: 'http://localhost:12080/admin-api/system/user/get-import-template'
-    }]
-  }]
-})
-const detailData = ref("")//详情数据
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '导入模版99.xls'
-})
-onMounted(async () => {
-  // 获取详情
-  detailData.value = await getItempackaging(query.id)
-  console.log(97,detailData.value)
-  importTemplateData.templateUrl = await UserApi.importUserTemplate()
-})
-
-// 导入成功之后
-const importSuccess = () => {
-
-}
-
-/** 用户导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 删除附件成功之后所走的方法
-const deleteAnnexSuccess = async () => {
-  console.log('删除成功');
-}
-// 备注提交成功之后
-const remarksSubmitSucss = () => {
-  console.log('提交成功');
-}
-
-const current = ref(0)
-
-</script>
diff --git a/src/views/wms/itempackaging/index.vue b/src/views/wms/itempackaging/index.vue
index 0f7b3bb55..c5c5ab5bf 100644
--- a/src/views/wms/itempackaging/index.vue
+++ b/src/views/wms/itempackaging/index.vue
@@ -24,7 +24,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row.id)">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
@@ -40,8 +40,11 @@
   <!-- 表单弹窗：添加/修改 -->
   <ItempackagingForm ref="formRef" @success="getList" />
 
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Itempackaging.allSchemas" />
+
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/itempackaging/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -52,10 +55,14 @@ import { Itempackaging } from '@/utils/disposition/tableColumns'
 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: 'Itempackaging' })
 
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
 const { tableObject, tableMethods } = useTable({
   getListApi: ItempackagingApi.getItempackagingPage // 分页接口
 })
@@ -82,8 +89,7 @@ const HeadButttondata = [
 
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
-  // 新增
-  if (val == 'add') {
+  if (val == 'add') { // 新增
     openForm('create')
   } else if (val == 'import') { // 导入
     handleImport()
@@ -99,26 +105,19 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  // defaultButtons.mainListDetailBtn(null), // 详情
   defaultButtons.mainListEditBtn({hasPermi:'wms:itempackaging:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'wms:itempackaging:delete'}), // 删除
 ]
 
-// 头部按钮事件 
+// 列表-操作按钮事件 
 const buttonTableClick = (val, row) => {
-  if (val == 'detail') { // 详情
-    openDetail(row.id)
-  } else if (val == 'edit') { // 编辑
+  if (val == 'edit') { // 编辑
     openForm('update', row.id)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
 }
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const router = useRouter() // 路由
-
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
@@ -126,14 +125,9 @@ const openForm = (type: string, id?: number) => {
 }
 
 /** 详情操作 */
-const openDetail = (id?: number) => {
-  // detailRef.value.open(id)
-  router.push({ 
-    path: '/wms/itempackaging-manage/itempackaging-detail',
-    query:{
-      id
-    }
- })
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,12 +166,12 @@ const handleImport = () => {
 }
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
-  templateUrl: 'test/sss',
-  templateTitle: '导入模版99.xls'
+  templateUrl: '',
+  templateTitle: '物品包装信息导入模版.xls'
 })
 // 导入成功之后
 const importSuccess = () => {
-
+  getList()
 }
 
 /** 初始化 **/