From e885322b4d8a18ea5090a01466b0015abf8e39bc Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Thu, 12 Oct 2023 10:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue |  32 +-
 src/views/wms/itembasic/index.vue    | 463 +++------------------------
 2 files changed, 45 insertions(+), 450 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index bb80073d3..1f29a55ed 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -1,5 +1,6 @@
 <template>
   <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
+    <div class="custom-class">
     <ContentWrap>
       <div class="font-size-18px">
         {{ detailData.code }} <span class="ml-20px font-size-16px">{{ detailData.name }}</span>
@@ -28,6 +29,7 @@
           total: tableObject.total
         }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" />
     </ContentWrap>
+    </div>
   </el-drawer>
 </template>
 
@@ -41,7 +43,6 @@ import Tabs from '@/components/Tabs/src/Tabs.vue'
 import { ItemBasic } from '@/utils/disposition/tableColumns.ts'
 import { ItemBasicTabsList } from '@/utils/disposition/tabsList.ts'
 import { getItembasic } from '@/api/wms/itembasic'
-const { query } = useRoute() // 路由的查询
 import * as ItembasicApi from '@/api/wms/itembasic'
 
 import * as UserApi from '@/api/system/user'
@@ -53,16 +54,7 @@ tabsList.value.unshift({
   label: '详情',
   prop: 'Detail'
 })
-// 搜索参数
-const queryParams = reactive({
-  title: '',
-  name: undefined,
-  status: undefined,
-  pageNo: 1,
-  pageSize: 100
-})
-const queryFormRef = ref() // 搜索的表单
-// const formLabel = ref(ItemBasic)//form表单label列表
+
 // 附件默认数据
 const annexData = reactive({
   annexList: [{
@@ -114,16 +106,6 @@ const changeRecordData = reactive({
   }]
 })
 const detailData = ref("")//详情数据
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '导入模版99.xls'
-})
-onMounted(async () => {
-  // 获取详情
-  detailData.value = await getItembasic(query.id)
-  importTemplateData.templateUrl = await UserApi.importUserTemplate()
-})
 
 // 导入成功之后
 const importSuccess = () => {
@@ -178,7 +160,7 @@ const change = (item, index) => {
 }
 
 // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+const { getList } = tableMethods
 getList()
 
 /** 打开弹窗 */
@@ -188,8 +170,6 @@ const openDetail = async (id?: number) => {
     detailLoading.value = true
     try {
        detailData.value = await ItembasicApi.getItembasic(id)
-      // detailRef.value.setValues(data)
-
     } finally {
       detailLoading.value = false
     }
@@ -198,7 +178,9 @@ const openDetail = async (id?: number) => {
 defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
 </script>
 <style scoped lang="scss">
-    ::v-deep(.el-drawer__body){
+    .custom-class{
       background: #f5f5f5!important;
+      margin: -20px;
+      padding: 20px;
     }
 </style>
diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index 27ad333ca..0781f1803 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -3,422 +3,35 @@
     <!-- 搜索工作栏 -->
     <Search :schema="ItemBasic.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
       <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata" 
-    @buttonBaseClick="buttonBaseClick"
-  />
-
-    <!-- <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="代码" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          placeholder="请输入代码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="描述1" prop="desc1">
-        <el-input
-          v-model="queryParams.desc1"
-          placeholder="请输入描述1"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="描述2" prop="desc2">
-        <el-input
-          v-model="queryParams.desc2"
-          placeholder="请输入描述2"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ITEM_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="计量单位" prop="uom">
-        <el-select v-model="queryParams.uom" placeholder="请选择计量单位" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="替代计量单位" prop="altUom">
-        <el-select
-          v-model="queryParams.altUom"
-          placeholder="请选择替代计量单位"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否标包" prop="isStdPack">
-        <el-select
-          v-model="queryParams.isStdPack"
-          placeholder="请选择是否标包"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="可采购" prop="enableBuy">
-        <el-select
-          v-model="queryParams.enableBuy"
-          placeholder="请选择可采购"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="可制造" prop="enableMake">
-        <el-select
-          v-model="queryParams.enableMake"
-          placeholder="请选择可制造"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="可委外加工" prop="enableOutsourcing">
-        <el-select
-          v-model="queryParams.enableOutsourcing"
-          placeholder="请选择可委外加工"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="回收件" prop="isRecycled">
-        <el-select
-          v-model="queryParams.isRecycled"
-          placeholder="请选择回收件"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="虚零件" prop="isPhantom">
-        <el-select
-          v-model="queryParams.isPhantom"
-          placeholder="请选择虚零件"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="ABC类" prop="abcClass">
-        <el-select
-          v-model="queryParams.abcClass"
-          placeholder="请选择ABC类"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="种类" prop="category">
-        <el-select
-          v-model="queryParams.category"
-          placeholder="请选择种类"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ITEM_CATEGORY)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="分组" prop="itemGroup">
-        <el-select
-          v-model="queryParams.itemGroup"
-          placeholder="请选择分组"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ITEM_GROUP)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="颜色" prop="color">
-        <el-select v-model="queryParams.color" placeholder="请选择颜色" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ITEM_COLOR)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="配置" prop="configuration">
-        <el-select
-          v-model="queryParams.configuration"
-          placeholder="请选择配置"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.ITEM_CONFIGURATION)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="项目" prop="project">
-        <el-input
-          v-model="queryParams.project"
-          placeholder="请输入项目"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="质量等级" prop="eqLevel">
-        <el-select
-          v-model="queryParams.eqLevel"
-          placeholder="请选择质量等级"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.EQ_LEVEL)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="有效天数" prop="validityDays">
-        <el-input
-          v-model="queryParams.validityDays"
-          placeholder="请输入有效天数"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否可用" prop="available">
-        <el-input
-          v-model="queryParams.available"
-          placeholder="请输入是否可用"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="生效时间" prop="activeTime">
-        <el-date-picker
-          v-model="queryParams.activeTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="失效时间" prop="expireTime">
-        <el-date-picker
-          v-model="queryParams.expireTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['wms:itembasic:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['wms:itembasic:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form> -->
+    <TableHead :HeadButttondata="HeadButttondata" @buttonBaseClick="buttonBaseClick" />
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="ItemBasic.allSchemas.tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
+    <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"
-    >
+      }" 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 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 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']"
-        >
+        <el-button link type="danger" @click="handleDelete(row.id)" v-hasPermi="['wms:itembasic:delete']">
           删除
         </el-button>
       </template>
     </Table>
   </ContentWrap>
 
- <!-- 表单弹窗：添加/修改 -->
-    <ItembasicForm ref="formRef" @success="getList" />
-    <ImportForm ref="importFormRef" :url="ItembasicApi.importUrl" :importTemplateData="importTemplateData" @success="importSuccess" />
-    <!-- 详情 -->
-      <Detail ref="detailRef"/>
+  <!-- 表单弹窗：添加/修改 -->
+  <ItembasicForm ref="formRef" @success="getList" />
+  <ImportForm ref="importFormRef" :url="ItembasicApi.importUrl" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
+  <!-- 详情 -->
+  <Detail ref="detailRef" />
 </template>
 
 <script setup lang="ts">
@@ -442,7 +55,7 @@ const { tableObject, tableMethods } = useTable({
   getListApi: ItembasicApi.getItembasicPage // 分页接口
 })
 
-const importFormRef=ref()
+const importFormRef = ref()
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
@@ -504,33 +117,33 @@ const exportLoading = ref(false) // 导出的加载中
 
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
-    // 新增
-    if (val == 'add') {
-      console.log(417, item)
-    }
-    // 导入
-    else if (val == 'import') {
-      handleImport()
-    }
-    // 导出
-    else if (val == 'export') {
-      handleExport()
-    }
-    // 刷新
-    else if (val == 'refresh') {
-      getList()
-    } 
-    // 筛选
-    else if (val == 'filtrate') {
+  // 新增
+  if (val == 'add') {
+    openForm('creat')
+  }
+  // 导入
+  else if (val == 'import') {
+    handleImport()
+  }
+  // 导出
+  else if (val == 'export') {
+    handleExport()
+  }
+  // 刷新
+  else if (val == 'refresh') {
+    getList()
+  }
+  // 筛选
+  else if (val == 'filtrate') {
 
-    }
-    // 其他按钮 
-    else {
+  }
+  // 其他按钮 
+  else {
 
-    }
   }
+}
 
-  onMounted(async () => {
+onMounted(async () => {
   importTemplateData.templateUrl = await ItembasicApi.importTemplate()
 })
 
@@ -538,7 +151,7 @@ const handleImport = () => {
   importFormRef.value.open()
 }
 
-  // 导入附件弹窗所需的参数
+// 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
   templateTitle: '导入模版99.xls'