diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 4230ad9..6bba054 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -58,7 +58,7 @@ const props = defineProps({ // 大小限制(MB) fileSize: propTypes.number.def(5), // 文件类型, 例如['png', 'jpg', 'jpeg'] - fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']), + fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf', 'zip', 'rar']), // 是否显示提示 isShowTip: propTypes.bool.def(true), // 禁用组件(仅查看文件) diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue index c7d3bc6..ccb9943 100644 --- a/src/views/oa/erp/contractInfo/edit.vue +++ b/src/views/oa/erp/contractInfo/edit.vue @@ -170,7 +170,7 @@ - + >({ ...(route.query as Record) }); -// 路由参数 -const routeParams = ref>({}); const { contract_category, business_direction, @@ -1040,7 +1039,7 @@ const submitForm = (status: string, mode: boolean) => { 快递&新零售 默认审批人:张东辉,默认抄送陈海军 制造大集成 默认审批人:祁海波,默认抄送陈海军、张东辉 工厂数字化 默认审批人:尹治丰,默认抄送陈海军、张东辉*/ - const recipientUserId = form.value.businessDirection == '3' ? '1985254723705556993,1985251968270127105' : '1985254723705556993'; + const recipientUserId = form.value.businessDirection == '3' ? '1985254723705556993' : '1985254723705556993,1985251968270127105'; form.value.variables = { contractName: form.value.contractName, diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue index f5966d7..35c2c76 100644 --- a/src/views/system/oss/index.vue +++ b/src/views/system/oss/index.vue @@ -158,7 +158,7 @@ const dialog = reactive({ }); // 默认排序 -const defaultSort = ref({ prop: 'createTime', order: 'ascending' }); +const defaultSort = ref({ prop: 'createTime', order: 'descending' }); const ossFormRef = ref(); const queryFormRef = ref();