Browse Source

BUG修改

master
parent
commit
45483533a8
  1. 5
      src/utils/dict.ts
  2. 47
      src/views/eam/basic/item/item.data.ts
  3. 188
      src/views/eam/basic/location/index.vue
  4. 6
      src/views/eam/basic/location/location.data.ts
  5. 6
      src/views/eam/basic/supplier/supplier.data.ts

5
src/utils/dict.ts

@ -298,7 +298,6 @@ export enum DICT_TYPE {
POWER_RANGE = 'power_range', //功率范围
ADJUST_STATUS = 'adjust_status', //盘点调整状态
APP_DEVICE_MOLD_TYPE = 'app_device_mold_type', //设备/模具/工艺:类型
ITEM_SUBJECT = 'item_subject', //备件的科目
ITEM_CATEGOR = 'item_categor', //备件的类别
}

47
src/views/eam/basic/item/item.data.ts

@ -35,7 +35,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
},
{
label: '是否储',
label: '是否储',
field: 'isConstant',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
@ -64,6 +64,12 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
field: 'subject',
sort: 'custom',
},
{
label: '科目代码',
field: 'subjectCode',
sort: 'custom',
isTable: true,
},
{
label: '单位',
field: 'uom',
@ -76,6 +82,18 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
type: 'Select'
}
},
{
label: '类别',
field: 'category',
sort: 'custom',
dictType: DICT_TYPE.ITEM_CATEGOR,
dictClass: 'string',
isSearch: false,
isTable: true,
tableForm: {
type: 'Select'
}
},
{
label: '备件分类',
field: 'classification',
@ -94,7 +112,7 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
},
{
label: '重采购',
label: '重采购',
field: 'reprocurement',
sort: 'custom',
table: {
@ -163,6 +181,31 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '是否框架协议',
field: 'isFramework',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: false,
isTable: true,
sort: 'custom',
table: {
width: 140
},
tableForm: {
type: 'Select',
inactiveValue: 'FALSE',
disabled: true
},
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
}
},
{
label: '是否可用',
field: 'available',

188
src/views/eam/basic/location/index.vue

@ -5,28 +5,15 @@
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="Location.allSchemas"
/>
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="Location.allSchemas" />
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
<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"
>
}" 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>
@ -39,66 +26,68 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="LocationRules"
:formAllSchemas="Location.allSchemas"
:apiUpdate="LocationApi.updateLocation"
:apiCreate="LocationApi.createLocation"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<BasicForm ref="basicFormRef" @success="formsSuccess" :rules="LocationRules" :formAllSchemas="Location.allSchemas"
:apiUpdate="LocationApi.updateLocation" :apiCreate="LocationApi.createLocation"
@searchTableSuccess="searchTableSuccess" :isBusiness="false" />
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="Location.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/location/import" :importTemplateData="importTemplateData" @success="importSuccess" />
<ImportForm ref="importFormRef" url="/eam/location/import" :importTemplateData="importTemplateData"
@success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { Location,LocationRules } from './location.data'
import * as LocationApi from '@/api/eam/basic/location'
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: 'Location' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Location.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
import download from '@/utils/download'
import { Location, LocationRules } from './location.data'
import * as LocationApi from '@/api/eam/basic/location'
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: 'Location' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Location.allSchemas.tableColumns)
//
const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(() => {
if (formField == 'areaNumber') {
const setV = {}
setV[formField] = val[0][searchField]
setV['areaNumber'] = val[0]['number']
setV['type'] = val[0]['type']
formRef.setValues(setV)
} else {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
})
}
}
//
const updataTableColumns = (val) => {
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
}
const { tableObject, tableMethods } = useTable({
const { tableObject, tableMethods } = useTable({
getListApi: LocationApi.getLocationPage //
})
})
//
const { getList, setSearchParams } = tableMethods
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
//
const HeadButttondata = [
defaultButtons.defaultAddBtn(null), //
defaultButtons.defaultExportBtn(null), //
defaultButtons.defaultFreshBtn(null), //
@ -112,10 +101,10 @@ const HeadButttondata = [
// icon: 'Select',
// color: ''
// },
]
]
//
const buttonBaseClick = (val, item) => {
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'export') { //
@ -126,42 +115,42 @@ const buttonBaseClick = (val, item) => {
} else { //
console.log('其他按钮', item)
}
}
}
// -
const butttondata = [
// -
const butttondata = [
defaultButtons.mainListEditBtn(null), //
defaultButtons.mainListDeleteBtn(null), //
]
]
// -
const buttonTableClick = async (val, row) => {
// -
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) => {
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type : string, row ?: any) => {
basicFormRef.value.open(type, row)
}
}
// form
const formsSuccess = async (formType,data) => {
var isHave =Location.allSchemas.formSchema.some(function (item) {
// form
const formsSuccess = async (formType, data) => {
var isHave = Location.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.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 (data.activeTime == 0) data.activeTime = null;
if (data.expireTime == 0) data.expireTime = null;
if (formType === 'create') {
await LocationApi.createLocation(data)
message.success(t('common.createSuccess'))
@ -171,16 +160,16 @@ const formsSuccess = async (formType,data) => {
}
basicFormRef.value.dialogVisible = false
getList()
}
}
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
/** 详情操作 */
const detailRef = ref()
const openDetail = (row : any, titleName : any, titleValue : any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicLocation')
}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
/** 删除按钮操作 */
const handleDelete = async (id : number) => {
try {
//
await message.delConfirm()
@ -189,12 +178,12 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
} catch { }
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
@ -206,20 +195,19 @@ const handleExport = async () => {
} finally {
exportLoading.value = false
}
}
}
//
const searchFormClick = (searchData) => {
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
}
/** 初始化 **/
onMounted(async () => {
/** 初始化 **/
onMounted(async () => {
getList()
})
})
</script>

6
src/views/eam/basic/location/location.data.ts

@ -5,6 +5,10 @@ import { LocationArea } from '../locationArea/locationArea.data'
// 表单校验
export const LocationRules = reactive({
number: [
{ required: true, message: '请输入库位编号', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
name: [
{ required: true, message: '请输入库位名称', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
@ -21,7 +25,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number',
sort: 'custom',
isSearch: true,
isForm: false,
isForm: true,
table: {
width: 180,
fixed: 'left'

6
src/views/eam/basic/supplier/supplier.data.ts

@ -3,6 +3,10 @@ import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/va
// 表单校验
export const SupplierRules = reactive({
number: [
{ required: true, message: '请输入供应商编号', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
name: [
{ required: true, message: '请输入供应商名称', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
@ -19,7 +23,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number',
sort: 'custom',
isSearch: true,
isForm: false,
isForm: true,
table: {
width: 180,
fixed: 'left'

Loading…
Cancel
Save