eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

master
添砖-JAVA\Administrator 8 months ago
parent
de95c9db08
commit
b72840d40f
4 changed files with 210 additions and 217 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/views/eam/basic/location/index.vue
  2. 21
      src/views/eam/basic/locationArea/index.vue
  3. 344
      src/views/eam/basic/supplier/index.vue
  4. 42
      src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

20
src/views/eam/basic/location/index.vue
View File

@ -151,15 +151,19 @@
} }
if (data.activeTime == 0) data.activeTime = null; if (data.activeTime == 0) data.activeTime = null;
if (data.expireTime == 0) data.expireTime = null; if (data.expireTime == 0) data.expireTime = null;
if (formType === 'create') { try {
await LocationApi.createLocation(data) if (formType === 'create') {
message.success(t('common.createSuccess')) await LocationApi.createLocation(data)
} else { message.success(t('common.createSuccess'))
await LocationApi.updateLocation(data) } else {
message.success(t('common.updateSuccess')) await LocationApi.updateLocation(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
} finally {
basicFormRef.value.formLoading = false
} }
basicFormRef.value.dialogVisible = false
getList()
} }
/** 详情操作 */ /** 详情操作 */

21
src/views/eam/basic/locationArea/index.vue
View File

@ -143,15 +143,20 @@
} }
if (data.activeTime == 0) data.activeTime = null; if (data.activeTime == 0) data.activeTime = null;
if (data.expireTime == 0) data.expireTime = null; if (data.expireTime == 0) data.expireTime = null;
if (formType === 'create') { try {
await LocationAreaApi.createLocationArea(data) if (formType === 'create') {
message.success(t('common.createSuccess')) await LocationAreaApi.createLocationArea(data)
} else { message.success(t('common.createSuccess'))
await LocationAreaApi.updateLocationArea(data) } else {
message.success(t('common.updateSuccess')) await LocationAreaApi.updateLocationArea(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
} finally {
basicFormRef.value.formLoading = false
} }
basicFormRef.value.dialogVisible = false
getList()
} }
// 查询页面返回 // 查询页面返回

344
src/views/eam/basic/supplier/index.vue
View File

@ -4,29 +4,16 @@
<Search :schema="Supplier.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="Supplier.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
:HeadButttondata="HeadButttondata" @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Supplier.allSchemas" />
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Supplier.allSchemas"
/>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total total: tableObject.total
}" }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:pageSize="tableObject.pageSize" v-model:sort="tableObject.sort">
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}"> <template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)"> <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span> <span>{{ row.code }}</span>
@ -39,187 +26,184 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<BasicForm <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="SupplierRules" :formAllSchemas="Supplier.allSchemas"
ref="basicFormRef" :apiUpdate="SupplierApi.updateSupplier" :apiCreate="SupplierApi.createSupplier"
@success="formsSuccess" @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
:rules="SupplierRules"
:formAllSchemas="Supplier.allSchemas"
:apiUpdate="SupplierApi.updateSupplier"
:apiCreate="SupplierApi.createSupplier"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 --> <!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Supplier.allSchemas" /> <Detail ref="detailRef" :isBasic="true" :allSchemas="Supplier.allSchemas" />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/supplier/import" :importTemplateData="importTemplateData" @success="importSuccess" /> <ImportForm ref="importFormRef" url="/eam/supplier/import" :importTemplateData="importTemplateData"
@success="importSuccess" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { Supplier,SupplierRules } from './supplier.data' import { Supplier, SupplierRules } from './supplier.data'
import * as SupplierApi from '@/api/eam/basic/supplier' import * as SupplierApi from '@/api/eam/basic/supplier'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'Supplier' }) defineOptions({ name: 'Supplier' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息 const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(Supplier.allSchemas.tableColumns) const tableColumns = ref(Supplier.allSchemas.tableColumns)
// 查询页面返回 // 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) formRef.setValues(setV)
})
}
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: SupplierApi.getSupplierPage // 分页接口
}) })
}
// 获得表格的各种操作
// 字段设置 更新主列表字段 const { getList, setSearchParams } = tableMethods
const updataTableColumns = (val) => {
tableColumns.value = val // 列表头部按钮
} const HeadButttondata = [
defaultButtons.defaultAddBtn(null), // 新增
const { tableObject, tableMethods } = useTable({ defaultButtons.defaultExportBtn(null), // 导出
getListApi: SupplierApi.getSupplierPage // 分页接口 defaultButtons.defaultFreshBtn(null), // 刷新
}) defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
// 获得表格的各种操作 // {
const { getList, setSearchParams } = tableMethods // label: '自定义扩展按钮',
// name: 'zdy',
// 列表头部按钮 // hide: false,
const HeadButttondata = [ // type: 'primary',
defaultButtons.defaultAddBtn(null), // 新增 // icon: 'Select',
defaultButtons.defaultExportBtn(null), // 导出 // color: ''
defaultButtons.defaultFreshBtn(null), // 刷新 // },
defaultButtons.defaultFilterBtn(null), // 筛选 ]
defaultButtons.defaultSetBtn(null), // 设置
// { // 头部按钮事件
// label: '自定义扩展按钮', const buttonBaseClick = (val, item) => {
// name: 'zdy', if (val == 'add') { // 新增
// hide: false, openForm('create')
// type: 'primary', } else if (val == 'export') { // 导出
// icon: 'Select', handleExport()
// color: '' } else if (val == 'refresh') { // 刷新
// }, getList()
] } else if (val == 'filtrate') { // 筛选
} else { // 其他按钮
// 头部按钮事件 console.log('其他按钮', item)
const buttonBaseClick = (val, item) => { }
if (val == 'add') { // 新增
openForm('create')
} else if (val == 'export') { // 导出
handleExport()
} else if (val == 'refresh') { // 刷新
getList()
} else if (val == 'filtrate') { // 筛选
} else { // 其他按钮
console.log('其他按钮', item)
} }
}
// 列表-操作按钮 // 列表-操作按钮
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn(null), // 编辑 defaultButtons.mainListEditBtn(null), // 编辑
defaultButtons.mainListDeleteBtn(null), // 删除 defaultButtons.mainListDeleteBtn(null), // 删除
] ]
// 列表-操作按钮事件 // 列表-操作按钮事件
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑 if (val == 'edit') { // 编辑
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.id) handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type : string, row ?: any) => {
basicFormRef.value.open(type, row)
} }
}
// form表单提交
/** 添加/修改操作 */ const formsSuccess = async (formType, data) => {
const basicFormRef = ref() var isHave = Supplier.allSchemas.formSchema.some(function (item) {
const openForm = (type: string, row?: any) => { return item.field === 'activeTime' || item.field === 'expireTime';
basicFormRef.value.open(type, row) });
} if (isHave) {
if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
// form表单提交 message.error('失效时间要大于生效时间')
const formsSuccess = async (formType,data) => { return;
var isHave =Supplier.allSchemas.formSchema.some(function (item) { }
return item.field === 'activeTime' || item.field === 'expireTime'; }
}); if (data.activeTime == 0) data.activeTime = null;
if(isHave){ if (data.expireTime == 0) data.expireTime = null;
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){ try {
message.error('失效时间要大于生效时间') if (formType === 'create') {
return; await SupplierApi.createSupplier(data)
message.success(t('common.createSuccess'))
} else {
await SupplierApi.updateSupplier(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
} finally {
basicFormRef.value.formLoading = false
} }
} }
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null; /** 详情操作 */
if (formType === 'create') { const detailRef = ref()
await SupplierApi.createSupplier(data) const openDetail = (row : any, titleName : any, titleValue : any) => {
message.success(t('common.createSuccess')) detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
} else {
await SupplierApi.updateSupplier(data)
message.success(t('common.updateSuccess'))
} }
basicFormRef.value.dialogVisible = false
getList() /** 删除按钮操作 */
} const handleDelete = async (id : number) => {
try {
/** 详情操作 */ // 删除的二次确认
const detailRef = ref() await message.delConfirm()
const openDetail = (row: any, titleName: any, titleValue: any) => { // 发起删除
detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier') await SupplierApi.deleteSupplier(id)
} message.success(t('common.delSuccess'))
// 刷新列表
/** 删除按钮操作 */ await getList()
const handleDelete = async (id: number) => { } catch { }
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await SupplierApi.deleteSupplier(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 SupplierApi.exportSupplier(tableObject.params)
download.excel(data, '供应商.xlsx')
} catch {
} finally {
exportLoading.value = false
} }
}
// 筛选提交 /** 导出按钮操作 */
const searchFormClick = (searchData) => { const exportLoading = ref(false) // 导出的加载中
tableObject.params = { const handleExport = async () => {
isSearch: true, try {
filters: searchData.filters // 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await SupplierApi.exportSupplier(tableObject.params)
download.excel(data, '供应商.xlsx')
} catch {
} finally {
exportLoading.value = false
}
} }
getList() // 刷新当前列表
}
/** 初始化 **/ // 筛选提交
onMounted(async () => { const searchFormClick = (searchData) => {
getList() tableObject.params = {
}) isSearch: true,
filters: searchData.filters
}
getList() // 刷新当前列表
}
/** 初始化 **/
onMounted(async () => {
getList()
})
</script> </script>

42
src/views/eam/item/itemApplyMain/itemApplyMain.data.ts
View File

@ -258,27 +258,27 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
precision: 2 precision: 2
} }
}, },
{ // {
label: '是否账内库', // label: '是否账内库',
field: 'isInAccount', // field: 'isInAccount',
sort: 'custom', // sort: 'custom',
dictType: DICT_TYPE.TRUE_FALSE, // dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', // dictClass: 'string',
isSearch: true, // isSearch: true,
isTable: true, // isTable: true,
table: { // table: {
width: 150 // width: 150
}, // },
tableForm: { // tableForm: {
type: 'Select', // type: 'Select',
disabled: true // disabled: true
}, // },
form: { // form: {
componentProps: { // componentProps: {
disabled: true, // disabled: true,
} // }
}, // },
}, // },
{ {
label: '是否可用', label: '是否可用',
field: 'available', field: 'available',

Write Preview
Loading…
Cancel
Save