From c15afe163ef43f4079d6115e00bd1a8fc8e9b76f Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 10 Oct 2023 15:04:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=89=8D=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/itembasic/ItembasicImportForm.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/itembasic/ItembasicImportForm.vue b/src/views/wms/itembasic/ItembasicImportForm.vue
index 41c2c69a5..c164b21e5 100644
--- a/src/views/wms/itembasic/ItembasicImportForm.vue
+++ b/src/views/wms/itembasic/ItembasicImportForm.vue
@@ -41,11 +41,11 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import * as UserApi from '@/api/system/user'
+import * as ItembasicApi from '@/api/wms/itembasic'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
 
-defineOptions({ name: 'SystemUserImportForm' })
+defineOptions({ name: 'WmsItembasicImportForm' })
 
 const message = useMessage() // 消息弹窗
 
@@ -53,7 +53,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const uploadRef = ref()
 const importUrl =
-  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/wms/itembasic/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
 const updateSupport = ref(0) // 是否更新已经存在的物品基本信息数据
@@ -127,7 +127,5 @@ const handleExceed = (): void => {
 
 /** 下载模板操作 */
 const importTemplate = async () => {
-  const res = await UserApi.importUserTemplate()
+  const res = await ItembasicApi.importUserTemplate()
   download.excel(res, '物品基本信息导入模版.xls')
-}
-</script>

From 60bbac6b4b293b73cf69671b2988ab22ecfd580d Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 10 Oct 2023 15:06:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=89=8D=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/itembasic/index.ts    |   5 +
 src/views/wms/itembasic/index.vue | 214 ++++++++++++++++++++++++------
 2 files changed, 176 insertions(+), 43 deletions(-)

diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts
index a39a6a8fc..6b32829f6 100644
--- a/src/api/wms/itembasic/index.ts
+++ b/src/api/wms/itembasic/index.ts
@@ -58,3 +58,8 @@ export const deleteItembasic = async (id: number) => {
 export const exportItembasic = async (params) => {
   return await request.download({ url: `/wms/itembasic/export-excel`, params })
 }
+
+// 下载用户导入模板
+export const importUserTemplate = () => {
+  return request.download({ url: '/wms/itembasic/get-import-template' })
+}
diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index bc03da6ed..0414093bf 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -1,8 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="ItemBasic.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-    <!-- <el-form
+    <el-form
       class="-mb-15px"
       :model="queryParams"
       ref="queryFormRef"
@@ -364,40 +363,150 @@
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
-    </el-form> -->
+    </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <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="danger"
-          @click="handleDelete(row.id)"
-          v-hasPermi="['wms:itembasic:delete']"
-        >
-          删除
-        </el-button>
-      </template>
-    </Table>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="代码" align="center" prop="code" width="150px" />
+      <el-table-column label="名称" align="center" prop="name" width="150px" />
+      <el-table-column label="描述1" align="center" prop="desc1" width="150px" />
+      <el-table-column label="描述2" align="center" prop="desc2" width="150px" />
+      <el-table-column label="状态" align="center" prop="status" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="计量单位" align="center" prop="uom" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.UOM" :value="scope.row.uom" />
+        </template>
+      </el-table-column>
+      <el-table-column label="替代计量单位" align="center" prop="altUom" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.UOM" :value="scope.row.altUom" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否标包" align="center" prop="isStdPack" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRUE_FALSE" :value="scope.row.isStdPack" />
+        </template>
+      </el-table-column>
+      <el-table-column label="可采购" align="center" prop="enableBuy" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRUE_FALSE" :value="scope.row.enableBuy" />
+        </template>
+      </el-table-column>
+      <el-table-column label="可制造" align="center" prop="enableMake" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRUE_FALSE" :value="scope.row.enableMake" />
+        </template>
+      </el-table-column>
+      <el-table-column label="可委外加工" align="center" prop="enableOutsourcing" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRUE_FALSE" :value="scope.row.enableOutsourcing" />
+        </template>
+      </el-table-column>
+      <el-table-column label="回收件" align="center" prop="isRecycled" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRUE_FALSE" :value="scope.row.isRecycled" />
+        </template>
+      </el-table-column>
+      <el-table-column label="虚零件" align="center" prop="isPhantom" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRUE_FALSE" :value="scope.row.isPhantom" />
+        </template>
+      </el-table-column>
+      <el-table-column label="ABC类" align="center" prop="abcClass" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ABC_CLASS" :value="scope.row.abcClass" />
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" align="center" prop="type" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="种类" align="center" prop="category" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_CATEGORY" :value="scope.row.category" />
+        </template>
+      </el-table-column>
+      <el-table-column label="分组" align="center" prop="itemGroup" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_GROUP" :value="scope.row.itemGroup" />
+        </template>
+      </el-table-column>
+      <el-table-column label="颜色" align="center" prop="color" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_COLOR" :value="scope.row.color" />
+        </template>
+      </el-table-column>
+      <el-table-column label="配置" align="center" prop="configuration" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.ITEM_CONFIGURATION" :value="scope.row.configuration" />
+        </template>
+      </el-table-column>
+      <el-table-column label="项目" align="center" prop="project" width="150px" />
+      <el-table-column label="质量等级" align="center" prop="eqLevel" width="150px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.EQ_LEVEL" :value="scope.row.eqLevel" />
+        </template>
+      </el-table-column>
+      <el-table-column label="有效天数" align="center" prop="validityDays" width="150px" />
+      <el-table-column label="是否可用" align="center" prop="available" width="150px" />
+      <el-table-column
+        label="生效时间"
+        align="center"
+        prop="activeTime"
+        :formatter="dateFormatter"
+        width="150px"
+      />
+      <el-table-column
+        label="失效时间"
+        align="center"
+        prop="expireTime"
+        :formatter="dateFormatter"
+        width="150px"
+      />
+      <el-table-column label="备注" align="center" prop="remark" width="150px" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="150px"
+      />
+      <el-table-column label="创建者ID" align="center" prop="creator" width="150px" />
+      <el-table-column label="操作" align="center" width="150px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['wms:itembasic:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['wms:itembasic:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -405,26 +514,20 @@
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import ItembasicForm from './ItembasicForm.vue'
-import { ItemBasic } from '@/utils/disposition/tableColumns'
-
-// tableObject：表格的属性对象，可获得分页大小、条数等属性
-// tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
-// 详细可见：https://doc.iocoder.cn/vue3/crud-schema/
-const { tableObject, tableMethods } = useTable({
-  getListApi: ItembasicApi.getItembasicPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
 
 defineOptions({ name: 'Itembasic' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -457,8 +560,33 @@ const queryParams = reactive({
   createTime: [],
   creator: null
 })
+const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ItembasicApi.getItembasicPage(queryParams)
+
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
 
 /** 添加/修改操作 */
 const formRef = ref()

From bfd0d0059879ff72e9cba5f65c79f9c22d28e045 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 10 Oct 2023 15:10:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=89=8D=E7=AB=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/itembasic/ItembasicImportForm.vue |  2 ++
 src/views/wms/itembasic/index.vue               | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/views/wms/itembasic/ItembasicImportForm.vue b/src/views/wms/itembasic/ItembasicImportForm.vue
index c164b21e5..839687fa5 100644
--- a/src/views/wms/itembasic/ItembasicImportForm.vue
+++ b/src/views/wms/itembasic/ItembasicImportForm.vue
@@ -129,3 +129,5 @@ const handleExceed = (): void => {
 const importTemplate = async () => {
   const res = await ItembasicApi.importUserTemplate()
   download.excel(res, '物品基本信息导入模版.xls')
+}
+</script>
diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index 0414093bf..28e6bee51 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -353,6 +353,12 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
+          <el-button
+          type="warning" 
+          @click="handleImport" 
+          v-hasPermi="['wms:itembasic:import']">
+              <Icon icon="ep:upload" /> 导入
+            </el-button>
         <el-button
           type="success"
           plain
@@ -511,6 +517,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ItembasicForm ref="formRef" @success="getList" />
+<!-- 用户导入对话框 -->
+  <ItembasicImportForm ref="importFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -519,6 +527,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import ItembasicForm from './ItembasicForm.vue'
+import ItembasicImportForm from './ItembasicImportForm.vue'
 
 defineOptions({ name: 'Itembasic' })
 
@@ -594,6 +603,12 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
+/** 用户导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {