diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 2047ff7..b799c6c 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -59,7 +59,7 @@ const props = defineProps({ updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL), upData: propTypes.object.def(), fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg'] - fileSize: propTypes.number.def(5), // 大小限制(MB) + fileSize: propTypes.number.def(50), // 大小限制(MB) limit: propTypes.number.def(5), // 数量限制 autoUpload: propTypes.bool.def(true), // 自动上传 drag: propTypes.bool.def(false), // 拖拽上传 diff --git a/src/components/UploadFile/src/UploadImg.vue b/src/components/UploadFile/src/UploadImg.vue index 11b71a9..fb8903f 100644 --- a/src/components/UploadFile/src/UploadImg.vue +++ b/src/components/UploadFile/src/UploadImg.vue @@ -78,7 +78,7 @@ const props = defineProps({ upData: propTypes.object.def(), drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传(默认为 true) disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传(默认为 false) - fileSize: propTypes.number.def(5), // 图片大小限制 ==> 非必传(默认为 5M) + fileSize: propTypes.number.def(50), // 图片大小限制 ==> 非必传(默认为 5M) fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传(默认为 ["image/jpeg", "image/png", "image/gif"]) height: propTypes.string.def('150px'), // 组件高度 ==> 非必传(默认为 150px) width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传(默认为 150px) diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue index 064e6e8..cdf053d 100644 --- a/src/components/UploadFile/src/UploadImgs.vue +++ b/src/components/UploadFile/src/UploadImgs.vue @@ -79,7 +79,7 @@ const props = defineProps({ drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传(默认为 true) disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传(默认为 false) limit: propTypes.number.def(5), // 最大图片上传数 ==> 非必传(默认为 5张) - fileSize: propTypes.number.def(5), // 图片大小限制 ==> 非必传(默认为 5M) + fileSize: propTypes.number.def(50), // 图片大小限制 ==> 非必传(默认为 5M) fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传(默认为 ["image/jpeg", "image/png", "image/gif"]) height: propTypes.string.def('150px'), // 组件高度 ==> 非必传(默认为 150px) width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传(默认为 150px) diff --git a/src/views/eam/item/itemAccounts/itemAccounts.data.ts b/src/views/eam/item/itemAccounts/itemAccounts.data.ts index 51c2cdd..3e49af6 100644 --- a/src/views/eam/item/itemAccounts/itemAccounts.data.ts +++ b/src/views/eam/item/itemAccounts/itemAccounts.data.ts @@ -21,7 +21,7 @@ export const ItemAccounts = useCrudSchemas(reactive([ }, { label: '备件名称', - field: 'itemDO.name', + field: 'name', sort: 'custom', table: { width: 110 @@ -78,21 +78,21 @@ export const ItemAccounts = useCrudSchemas(reactive([ } } }, - { label: '规格', - field: 'itemDO.specifications', + field: 'specifications', sort: 'custom', }, { - label: '是否存储', - field: 'itemDO.isConstant', + label: '是否常储', + field: 'isConstant', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', + isSearch: false, isTable: true, sort: 'custom', table: { - width: 110 + width: 110, }, tableForm: { type: 'Select', @@ -109,57 +109,84 @@ export const ItemAccounts = useCrudSchemas(reactive([ } }, { - label: '是否存储', - field: 'itemDO.isRadeIn', - dictType: DICT_TYPE.TRUE_FALSE, + label: '科目', + field: 'subject', + sort: 'custom', + dictType: DICT_TYPE.ITEM_SUBJECT, dictClass: 'string', + isSearch: false, isTable: true, - sort: 'custom', - table: { - width: 110 - }, tableForm: { - type: 'Select', - inactiveValue: 'FALSE', - disabled: true - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } + type: 'Select' } }, + { - label: '科目', - field: 'itemDO.subject', + label: '科目代码', + field: 'subjectCode', sort: 'custom', + isTable: true, }, { label: '单位', - field: 'itemDO.uom', + field: 'uom', sort: 'custom', dictType: DICT_TYPE.UOM, dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } + }, + { + label: '类别', + field: 'category', + sort: 'custom', + dictType: DICT_TYPE.ITEM_CATEGORY, + dictClass: 'string', + isSearch: false, isTable: true, - table: { - width: 150 - }, tableForm: { type: 'Select' } }, { - label: '单价', - field: 'itemDO.singlePrice', + label: '备件分类', + field: 'classification', sort: 'custom', + dictType: DICT_TYPE.CLASSIFICATION, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } + }, + { + label: '区域', + field: 'region', + sort: 'custom', + dictType: DICT_TYPE.ITEM_REGION, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } }, + // { + // label: '单价', + // field: 'singlePrice', + // sort: 'custom', + // }, { - label: '重点采购', - field: 'itemDO.reprocurement', + label: '重采购点', + field: 'reprocurement', sort: 'custom', + table: { + width: 110, + }, form: { component: 'InputNumber', value: 0 @@ -167,8 +194,11 @@ export const ItemAccounts = useCrudSchemas(reactive([ }, { label: '安全库存', - field: 'itemDO.safetyStock', + field: 'safetyStock', sort: 'custom', + table: { + width: 110, + }, form: { component: 'InputNumber', value: 0 @@ -176,44 +206,75 @@ export const ItemAccounts = useCrudSchemas(reactive([ }, { label: '成本中心', - field: 'itemDO.cost', + field: 'cost', sort: 'custom', + table: { + width: 110, + }, }, { label: '采购员', - field: 'itemDO.purchaser', + field: 'purchaser', sort: 'custom', + table: { + width: 100, + }, }, { label: '财务', - field: 'itemDO.financer', - sort: 'custom', - }, - // { - // label: '是否以旧换新', - // field: 'itemDO.isRadeIn', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isSearch: false, - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm: { - // type: 'Select', - // inactiveValue: 'FALSE', - // disabled: true - // }, - // form: { - // component: 'Switch', - // value: 'TRUE', - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE' - // } - // } - // }, + field: 'financer', + sort: 'custom', + }, + { + label: '是否以旧换新', + field: 'isRadeIn', + 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: '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',