解决冲突

src/api/eam/item/transaction/index.ts

@@ -0,0 +1,53 @@
+import request from '@/config/axios'
+
+export interface TransactionVO {
+  itemNumber: string
+  locationNumber: string
+  transactionType: string
+  inventoryAction: string
+  businessType: string
+  inventoryStatus: string
+  uom: string
+  qty: number
+}
+
+// 查询库存事务列表
+export const getTransactionPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/transaction/senior', data })
+  } else {
+    return await request.get({ url: `/eam/transaction/page`, params })
+  }
+}
+
+// 查询库存事务详情
+export const getTransaction = async (id: number) => {
+  return await request.get({ url: `/eam/transaction/get?id=` + id })
+}
+
+// 新增库存事务
+export const createTransaction = async (data: TransactionVO) => {
+  return await request.post({ url: `/eam/transaction/create`, data })
+}
+
+// 修改库存事务
+export const updateTransaction = async (data: TransactionVO) => {
+  return await request.put({ url: `/eam/transaction/update`, data })
+}
+
+// 删除库存事务
+export const deleteTransaction = async (id: number) => {
+  return await request.delete({ url: `/eam/transaction/delete?id=` + id })
+}
+
+// 导出库存事务 Excel
+export const exportTransaction = async (params) => {
+  return await request.download({ url: `/eam/transaction/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/transaction/get-import-template' })
+}

src/utils/dict.ts

@@ -226,7 +226,6 @@ export enum DICT_TYPE {
   BARCODE_PREFIX = 'barcode_prefix', // 条码前缀
   SETTLEMENT_TYPE = 'settlement_type', // 结算类型
   FROZEN_REASON = 'frozen_reason', // 冻结原因
-  INVENTORY_ACTION = 'inventory_action', // 库存动作
   CONTAINER_TYPE = 'container_type', // 器具类型
   CONTAINER_CONTENT_TYPE = 'container_content_type', // 器具内容类型
   RESET_PERIOD = 'reset_period', // 重置周期
@@ -277,9 +276,9 @@ export enum DICT_TYPE {
   DEVICE_MOLD_TYPE = 'device_mold_type', // 设备/模具类型
   TRANSACTION_TYPE = 'transaction_Type', // 事务类型
   RESULT = 'result', // 维修结果
-  REQUEST_APPLY = 'class_type', // 班组类型
   FAULT_TYPE = 'fault_type',//故障类型
   WEI_XIU_ORDER_STATUS = 'wei_xiu_order_status',//维修单状态
   BASIC_STATUS = 'basic_status',//设备模具状态
-
+  CLASS_TYPE = 'class_type', // 班组类型
+  INVENTORY_ACTION = 'inventory_action'  //库存动作
 }

src/views/eam/item/transaction/index.vue

@@ -0,0 +1,241 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Transaction.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Transaction.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      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="Rules"
+    :formAllSchemas="Transaction.allSchemas"
+    :apiUpdate="TransactionApi.updateTransaction"
+    :apiCreate="TransactionApi.createTransaction"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Transaction.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Transaction,Rules } from './transaction.data'
+import * as TransactionApi from '@/api/eam/item/transaction'
+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: 'Transaction' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Transaction.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: TransactionApi.getTransactionPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam::create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam::import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam::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:'eam::update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam::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 =Transaction.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 TransactionApi.createTransaction(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await TransactionApi.updateTransaction(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, 'basic')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TransactionApi.deleteTransaction(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 TransactionApi.exportTransaction(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()
+})
+
+</script>

src/views/eam/item/transaction/transaction.data.ts

@@ -0,0 +1,102 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+
+// 表单校验
+export const Rules = reactive({
+  itemNumber: [required],
+  locationNumber: [required],
+  inventoryAction: [required],
+  businessType: [required],
+  uom: [required],
+})
+
+export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+    label: '事务编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+  },
+
+  {
+    label: '备件编号',
+    field: 'itemNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '库位编码',
+    field: 'locationNumber',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '事务类型',
+    field: 'transactionType',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSACTION_TYPE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '库存动作',
+    field: 'inventoryAction',
+    sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_ACTION,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/system/dept/DeptForm.vue

@@ -51,9 +51,9 @@
         </el-select>
       </el-form-item>
       
-      <el-form-item label="班组类型" prop="classType">
        <el-select v-model="formData.classType" clearable placeholder="请选择班组类型">
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.REQUEST_APPLY)"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
+      <el-form-item label="班组类型" prop="classType">
        <el-select v-model="formData.classType" clearable placeholder="请选择班组类型">
          <el-option
            v-for="dict in getStrDictOptions(DICT_TYPE.CLASS_TYPE)"
       :key="dict.value"
-      
+       :label="dict.label"
-      
+       :value="dict.value"
          />
        </el-select>
      </el-form-item>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -62,7 +62,7 @@
   </Dialog>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions,getStrDictOptions } from '@/utils/dict'
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
@@ -103,6 +103,16 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+
+
+
+
+console.log(getIntDictOptions(DICT_TYPE.DEVICE_MOLD_TYPE))
+
+
+
+
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {