williamet/cas_cloud_web_i18n
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
quantulr
2023-09-14 16:44:13 +08:00
parent ee59562402
commit d584aa2889
7 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/admin/laboratory/paper.js
View File

@ -33,7 +33,7 @@ export const updateLabPatent = (data) => {
export const deletePaper = (ids) => {
return request({
url: `/app/laboratory/deletePaper/{ids}`,
url: `/app/laboratory/deletePaper/${ids}`,
method: "DELETE",
});
};

2
src/views/admin/components/enterpriseItem.vue
View File

@ -8,7 +8,7 @@
<div class="text" style="flex: 1">{{ data.name }}</div>
</div>
<div class="line">
{{ "webSearch.companySize" }}：
{{ t("webSearch.companySize") }}：
<span>{{
data.kind_title || t("webSearch.noDataFromBackground")
}}</span>

27
src/views/admin/enterprise/demand/serviceDemand.vue
View File

@ -27,7 +27,7 @@
><!--已受理-->
{{ t("dict.accepted") }}
</el-radio-button>
<el-radio-button :label="2">{{ t("dict.rejected") }} </el-radio-button>
<el-radio-button :label="2">{{ t("dict.rejected") }}</el-radio-button>
<el-radio-button :label="4">{{ t("dict.finished") }}</el-radio-button>
</el-radio-group>
@ -191,19 +191,20 @@ function handleEdit(id) {
// 修改为完成状态
const complete = (id) => {
modal.confirm(
t("admin.common.confirmAction", {
action: t("common.finish"),
type: t("admin.common.item"),
number: id,
})
.then(async () => {
await updateDemand({ id, status: 4 });
getList();
ElMessage.success(t("admin.common.deleteSuccess"));
modal
.confirm(
t("admin.common.confirmAction", {
action: t("common.finish"),
type: t("admin.common.item"),
number: id,
})
.catch(() => {})
);
)
.then(async () => {
await updateDemand({ id, status: 4 });
getList();
ElMessage.success(t("admin.common.deleteSuccess"));
})
.catch(() => {});
};
getList();

33
src/views/admin/enterprise/demand/technology.vue
View File

@ -240,23 +240,24 @@ function handleResults(row) {
// 修改为完成状态
const complete = (id) => {
modal.confirm(
t("admin.common.confirmAction", {
action: t("common.finish"),
type: t("admin.common.item"),
number: id,
})
.then(async () => {
await updateTechnologyDemand({ id, status: 4 });
getList();
ElMessage.success(
t("admin.common.success", {
action: t("common.finish"),
})
);
modal
.confirm(
t("admin.common.confirmAction", {
action: t("common.finish"),
type: t("admin.common.item"),
number: id,
})
.catch(() => {})
);
)
.then(async () => {
await updateTechnologyDemand({ id, status: 4 });
getList();
ElMessage.success(
t("admin.common.success", {
action: t("common.finish"),
})
);
})
.catch(() => {});
};
const cancelPub = (id) => {
modal

15
src/views/admin/expert/demand/serviceDemand.vue
View File

@ -69,8 +69,9 @@
:label="t('admin.common.operation')"
>
<template #default="{ row }">
<!-- TODO:-->
<el-button
v-if="queryParams.type == 3"
v-if="queryParams.type == 3 && false"
icon="Delete"
size="small"
type="text"
@ -78,8 +79,9 @@
>
{{ t("admin.common.delete") }}
</el-button>
<!-- TODO:-->
<el-button
v-if="queryParams.type == 1"
v-if="queryParams.type == 1 && false"
icon="Close"
size="small"
type="text"
@ -112,7 +114,7 @@
</template>
<script setup>
import { demandList } from "@/api/admin/expert/demand";
import { demandList, updateDemand } from "@/api/admin/expert/demand";
import { getCurrentInstance, onActivated, reactive, ref, toRefs } from "vue";
import { useRouter } from "vue-router";
import DictTag from "@/components/DictTag/index.vue";
@ -120,6 +122,7 @@ import { serviceDemandStatusDict } from "@/constant/dict";
import { useI18n } from "vue-i18n";
import { parseTime } from "@/utils/ruoyi";
import { ElMessage } from "element-plus";
import modal from "@/plugins/modal";
const { t } = useI18n();
const { proxy } = getCurrentInstance();
@ -165,7 +168,7 @@ function resetQuery() {
/** 删除按钮操作 */
function handleDelete(id) {
proxy.$modal
modal
.confirm(
t("admin.common.confirmAction", {
action: t("admin.common.delete"),
@ -178,7 +181,7 @@ function handleDelete(id) {
})
.then(() => {
getList();
proxy.$modal.msgSuccess(t("admin.common.deleteSuccess"));
modal.msgSuccess(t("admin.common.deleteSuccess"));
})
.catch(() => {});
}
@ -199,7 +202,7 @@ const complete = (id) => {
})
)
.then(async () => {
await updateCasDemand({ id, status: 4 });
await updateDemand({ id, status: 4 });
getList();
ElMessage.success(t("admin.common.deleteSuccess"));
})

1
src/views/admin/laboratory/research/expert/index.vue
View File

@ -60,6 +60,7 @@
<el-dialog
v-model="showExpertDialog"
:title="t('admin.table.relatedExperts')"
@close="resetQuery"
>
<el-form
ref="notBindExpertQueryRef"

22
src/views/admin/research/research/expert/index.vue
View File

@ -36,17 +36,17 @@
</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button icon="plus" size="small" type="primary">
{{ t("admin.common.add") }}
</el-button>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="1.5">-->
<!-- <el-button icon="plus" size="small" type="primary">-->
<!-- {{ t("admin.common.add") }}-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar-->
<!-- v-model:showSearch="showSearch"-->
<!-- @queryTable="getList"-->
<!-- ></right-toolbar>-->
<!-- </el-row>-->
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList">