diff --git a/apps/web-antd/src/api/license/project/index.ts b/apps/web-antd/src/api/license/project/index.ts index 0a2b165..54b284b 100644 --- a/apps/web-antd/src/api/license/project/index.ts +++ b/apps/web-antd/src/api/license/project/index.ts @@ -25,6 +25,7 @@ export namespace ProjectApi { operatingSystem: number; // 操作系统 softwareVersion: number; // 软件版本信息 remark: string; // 备注 + serialNo?: string; // 序列号 } } diff --git a/apps/web-antd/src/locales/langs/zh-CN/comment.json b/apps/web-antd/src/locales/langs/zh-CN/comment.json index 7913a48..7954b76 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/comment.json +++ b/apps/web-antd/src/locales/langs/zh-CN/comment.json @@ -1,7 +1,7 @@ { "postComment": "发表评论", "replyComment": "回复评论", - "hotComment": "全部评论", + "hotComment": "进展记录", "reply": "回复", "cancelReply": "取消回复", "delete": "删除", diff --git a/apps/web-antd/src/locales/langs/zh-CN/project.json b/apps/web-antd/src/locales/langs/zh-CN/project.json index bb095c0..1d9452e 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/project.json +++ b/apps/web-antd/src/locales/langs/zh-CN/project.json @@ -22,7 +22,7 @@ "list": "项目列表", "progress": "进展", "updateTime": "最后修改时间", - "commentNum": "评论数", + "commentNum": "进展记录数", "softwareVersion": "软件版本", "operatingSystem": "操作系统平台" } diff --git a/apps/web-antd/src/views/license/license/data.ts b/apps/web-antd/src/views/license/license/data.ts index 194b1e4..3297dde 100644 --- a/apps/web-antd/src/views/license/license/data.ts +++ b/apps/web-antd/src/views/license/license/data.ts @@ -112,15 +112,15 @@ export function useFormSchema(): VbenFormSchema[] { if (values.id) { return; } - const projectCode = projectList.value.find((project) => { + const project = projectList.value.find((project) => { return project.id === values.projectId; - })?.code; + }); const customerCode = customerList.value.find((customer) => { return customer.id === values.customerId; })?.code; form.setFieldValue( 'serialNo', - `${customerCode || ''}${projectCode || ''}`, + project?.serialNo ?? `${customerCode || ''}${project?.code || ''}`, ); }, // 只有指定的字段改变时,才会触发 diff --git a/apps/web-antd/src/views/license/project/data.ts b/apps/web-antd/src/views/license/project/data.ts index 1b5751b..11cb285 100644 --- a/apps/web-antd/src/views/license/project/data.ts +++ b/apps/web-antd/src/views/license/project/data.ts @@ -525,7 +525,7 @@ export function useGridColumns( { field: 'commentNum', title: $t('project.commentNum'), - minWidth: 70, + minWidth: 90, }, { field: 'applyCount',