From 48fd5be0f25c2e39c0d75f3878756e05796aac35 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:26:50 +0800
Subject: [PATCH] bug fix and performance improvements
---
src/i18n/message/admin/table/ru.js | 11 +++++++++++
src/i18n/message/admin/table/zh.js | 10 ++++++++++
.../enterprise/technology-demand-release.vue | 2 +-
src/views/admin/enterprise/account/bill.vue | 17 ++++++++++-------
.../admin/enterprise/demand/releaseService.vue | 6 +++++-
.../enterprise/demand/releaseTechnology.vue | 2 +-
.../expert/components/ReleaseForm/index.vue | 10 +++++++---
src/views/admin/expert/demand/already.vue | 10 +++++++---
.../laboratory/research/paper/unit-info.vue | 6 +++++-
.../footprint/browsing-history/index.vue | 6 +++++-
10 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/src/i18n/message/admin/table/ru.js b/src/i18n/message/admin/table/ru.js
index 956ce34..f557eac 100644
--- a/src/i18n/message/admin/table/ru.js
+++ b/src/i18n/message/admin/table/ru.js
@@ -64,6 +64,17 @@ const table = {
unbind: "Отвязать",
// 承接需求
undertakeDemand: "Принять требование",
+ // 发票申请
+ invoiceApplication: "Заявка на выставление счета",
+ // 申请成功
+ applicationSuccess: "Заявка успешно подана",
+ // 应用场景
+ applicationScenario: "Сценарий применения",
+ // 合作开发、委托研发、技术转让、技术入股、技术许可
+ cooperationType:
+ "Совместная разработка, доверенные исследования и разработки, передача технологий, владение технологиями, лицензирование технологий",
+ // 创新币
+ innovationCoin: "Инновационная валюта",
};
export default table;
diff --git a/src/i18n/message/admin/table/zh.js b/src/i18n/message/admin/table/zh.js
index 8b56ed9..0983605 100644
--- a/src/i18n/message/admin/table/zh.js
+++ b/src/i18n/message/admin/table/zh.js
@@ -64,5 +64,15 @@ const table = {
unbind: "解绑",
// 承接需求
undertakeDemand: "承接需求",
+ // 发票申请
+ invoiceApplication: "发票申请",
+ // 申请成功
+ applicationSuccess: "申请成功",
+ // 应用场景
+ applicationScenario: "应用场景",
+ // 合作开发、委托研发、技术转让、技术入股、技术许可
+ cooperationType: "合作开发、委托研发、技术转让、技术入股、技术许可",
+ // 创新币
+ innovationCoin: "创新币",
};
export default table;
diff --git a/src/views/admin/agent/service/enterprise/technology-demand-release.vue b/src/views/admin/agent/service/enterprise/technology-demand-release.vue
index 49136ed..deb2776 100644
--- a/src/views/admin/agent/service/enterprise/technology-demand-release.vue
+++ b/src/views/admin/agent/service/enterprise/technology-demand-release.vue
@@ -211,7 +211,7 @@
:labelWidth="labelWidth"
class="cooperation-mode"
fieldKey="wants"
- placeholder="合作开发、委托研发、技术转让、技术入股、技术许可"
+ :placeholder="t('admin.table.cooperationType')"
:title="t('webSearch.cooperationMode')"
/>
diff --git a/src/views/admin/enterprise/account/bill.vue b/src/views/admin/enterprise/account/bill.vue
index 04bf4db..da7081b 100644
--- a/src/views/admin/enterprise/account/bill.vue
+++ b/src/views/admin/enterprise/account/bill.vue
@@ -72,7 +72,7 @@
{{
t(
`dict.${
- orderTypeDict.find((item) => item.value === row.orderType).label
+ orderTypeDict.find((item) => item.value === row.orderType).i18n
}`
)
}}
@@ -282,10 +282,10 @@ const multiple = ref(true);
const total = ref(0);
const title = ref("");
const dateRange = ref([]);
-const orderTypeDic = reactive({
- 1: "创新币充值",
- 2: "活动报名",
-});
+// const orderTypeDic = reactive({
+// 1: "创新币充值",
+// 2: "活动报名",
+// });
const queryRef = ref();
const formRef = ref();
const data = reactive({
@@ -464,19 +464,21 @@ const handleUpdate = async (id) => {
const resp = await casDealLogDetail(id);
form.value = resp.data;
showEditDialog.value = true;
- title.value = "发票申请";
+ title.value = t("admin.table.invoiceApplication");
};
+
/** 提交按钮 */
const submitForm = async () => {
await formRef.value.validate();
if (form.value.id) {
await updateCasDealLog(form.value);
- ElMessage.success("申请成功");
+ ElMessage.success(t("admin.common.applicationSuccess"));
showEditDialog.value = false;
getList();
} else {
}
};
+
/** 删除按钮操作 */
const handleDelete = (id) => {
const orderIds = id || ids.value;
@@ -494,6 +496,7 @@ const handleDelete = (id) => {
ElMessage.success(t("admin.common.deleteSuccess"));
});
};
+
/** 导出按钮操作 */
// function handleExport() {
// proxy.download(
diff --git a/src/views/admin/enterprise/demand/releaseService.vue b/src/views/admin/enterprise/demand/releaseService.vue
index 472e89b..5e34b66 100644
--- a/src/views/admin/enterprise/demand/releaseService.vue
+++ b/src/views/admin/enterprise/demand/releaseService.vue
@@ -310,7 +310,11 @@ function addCheck() {
onMounted(() => {
formRef.value.resetFields();
if (route.query.id) {
- const obj = Object.assign({}, route, { title: "修改服务需求" });
+ const obj = Object.assign({}, route, {
+ title: t("admin.form.edit", {
+ type: t("webSearch.serviceDemand"),
+ }),
+ });
tab.updatePage(obj);
getDemand({ id: route.query.id }).then((resp) => {
// const nameField = locale === "zh" ? "name" : "nameRu";
diff --git a/src/views/admin/enterprise/demand/releaseTechnology.vue b/src/views/admin/enterprise/demand/releaseTechnology.vue
index 5e3c87c..ce65615 100644
--- a/src/views/admin/enterprise/demand/releaseTechnology.vue
+++ b/src/views/admin/enterprise/demand/releaseTechnology.vue
@@ -197,7 +197,7 @@
:labelWidth="labelWidth"
v-model="form"
:title="t('webSearch.cooperationMode')"
- placeholder="合作开发、委托研发、技术转让、技术入股、技术许可"
+ :placeholder="t('admin.table.cooperationType')"
fieldKey="wants"
ref="directionsFormRef"
/>
diff --git a/src/views/admin/expert/components/ReleaseForm/index.vue b/src/views/admin/expert/components/ReleaseForm/index.vue
index 43a3803..d02956f 100644
--- a/src/views/admin/expert/components/ReleaseForm/index.vue
+++ b/src/views/admin/expert/components/ReleaseForm/index.vue
@@ -33,7 +33,7 @@
- 创新币
+ {{ t("admin.table.innovationCoin") }}
@@ -198,8 +198,12 @@
v-model="modelValue"
:labelWidth="labelWidth"
fieldKey="kws"
- placeholder="请输入应用场景"
- title="应用场景"
+ :placeholder="
+ t('admin.form.placeholder', {
+ type: t('admin.table.applicationScenario'),
+ })
+ "
+ :title="t('admin.table.applicationScenario')"
/>
-->
-
+
{{ dayjs(row.created_at).format("YYYY-MM-DD HH:mm:ss") }}
@@ -183,14 +187,14 @@