bugfix
This commit is contained in:
@ -9,10 +9,10 @@
|
|||||||
>
|
>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
||||||
prop="title"
|
prop="name"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.title"
|
v-model="queryParams.name"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="
|
:placeholder="
|
||||||
t('admin.form.placeholder', {
|
t('admin.form.placeholder', {
|
||||||
@ -60,7 +60,7 @@
|
|||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="showExpertDialog"
|
v-model="showExpertDialog"
|
||||||
:title="t('admin.table.relatedExperts')"
|
:title="t('admin.table.relatedExperts')"
|
||||||
@close="resetQuery"
|
@close="resetNotBindExpertQuery"
|
||||||
>
|
>
|
||||||
<el-form
|
<el-form
|
||||||
ref="notBindExpertQueryRef"
|
ref="notBindExpertQueryRef"
|
||||||
@ -70,10 +70,10 @@
|
|||||||
>
|
>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
||||||
prop="name"
|
prop="expertName"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="notBindExpertQueryParams.name"
|
v-model="notBindExpertQueryParams.expertName"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="
|
:placeholder="
|
||||||
t('admin.form.placeholder', {
|
t('admin.form.placeholder', {
|
||||||
@ -105,13 +105,13 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-table :data="notBindExpertList">
|
<el-table :data="notBindExpertList">
|
||||||
<el-table-column :label="t('admin.common.dataNumber')" prop="id" />
|
<el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
||||||
prop="name"
|
prop="name"
|
||||||
/>
|
/>
|
||||||
<el-table-column :label="t('webContact.phone')" prop="mobile" />
|
<el-table-column :label="t('webContact.phone')" prop="mobile"/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
:label="t('admin.table.researchIndustry')"
|
:label="t('admin.table.researchIndustry')"
|
||||||
prop="industryStr"
|
prop="industryStr"
|
||||||
@ -150,13 +150,13 @@
|
|||||||
|
|
||||||
<!-- 表格数据 -->
|
<!-- 表格数据 -->
|
||||||
<el-table v-loading="loading" :data="dataList">
|
<el-table v-loading="loading" :data="dataList">
|
||||||
<el-table-column :label="t('admin.common.dataNumber')" prop="id" />
|
<el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
:show-overflow-tooltip="true"
|
:show-overflow-tooltip="true"
|
||||||
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
||||||
prop="name"
|
prop="name"
|
||||||
/>
|
/>
|
||||||
<el-table-column :label="t('webContact.phone')" prop="mobile" />
|
<el-table-column :label="t('webContact.phone')" prop="mobile"/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
:label="t('admin.table.researchIndustry')"
|
:label="t('admin.table.researchIndustry')"
|
||||||
prop="industryStr"
|
prop="industryStr"
|
||||||
@ -266,9 +266,9 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ElMessage, ElMessageBox } from "element-plus";
|
import {ElMessage, ElMessageBox} from "element-plus";
|
||||||
import { useRouter } from "vue-router";
|
import {useRouter} from "vue-router";
|
||||||
import { reactive, ref, toRefs } from "vue";
|
import {reactive, ref, toRefs} from "vue";
|
||||||
import InputBoxAdd from "@/views/components/InputBoxAdd/index.vue";
|
import InputBoxAdd from "@/views/components/InputBoxAdd/index.vue";
|
||||||
import {
|
import {
|
||||||
bindExpert,
|
bindExpert,
|
||||||
@ -277,12 +277,12 @@ import {
|
|||||||
selectNotBindLaboratory,
|
selectNotBindLaboratory,
|
||||||
} from "@/api/admin/laboratory/expert";
|
} from "@/api/admin/laboratory/expert";
|
||||||
import Pagination from "@/components/Pagination/index.vue";
|
import Pagination from "@/components/Pagination/index.vue";
|
||||||
import { useI18n } from "vue-i18n";
|
import {useI18n} from "vue-i18n";
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import modal from "@/plugins/modal";
|
import modal from "@/plugins/modal";
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { t } = useI18n();
|
const {t} = useI18n();
|
||||||
const dataList = ref([]);
|
const dataList = ref([]);
|
||||||
const open = ref(false);
|
const open = ref(false);
|
||||||
const loading = ref(true);
|
const loading = ref(true);
|
||||||
@ -296,13 +296,13 @@ const data = reactive({
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
inventor: undefined,
|
name: undefined,
|
||||||
},
|
},
|
||||||
form: {},
|
form: {},
|
||||||
rules: {},
|
rules: {},
|
||||||
});
|
});
|
||||||
|
|
||||||
const { queryParams, form, rules } = toRefs(data);
|
const {queryParams, form, rules} = toRefs(data);
|
||||||
|
|
||||||
const queryRef = ref();
|
const queryRef = ref();
|
||||||
|
|
||||||
@ -329,6 +329,11 @@ const handleQuery = () => {
|
|||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
function resetQuery() {
|
function resetQuery() {
|
||||||
queryRef.value.resetFields();
|
queryRef.value.resetFields();
|
||||||
|
queryParams.value = {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 10,
|
||||||
|
name: undefined,
|
||||||
|
}
|
||||||
handleQuery();
|
handleQuery();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -387,7 +392,7 @@ const notBindExpertTotal = ref(0);
|
|||||||
const notBindExpertQueryParams = reactive({
|
const notBindExpertQueryParams = reactive({
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
name: undefined,
|
expertName: undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
const notBindExpertQueryRef = ref();
|
const notBindExpertQueryRef = ref();
|
||||||
@ -410,7 +415,7 @@ const handleAddBind = () => {
|
|||||||
const resetNotBindExpertQuery = () => {
|
const resetNotBindExpertQuery = () => {
|
||||||
notBindExpertQueryParams.pageNum = 1;
|
notBindExpertQueryParams.pageNum = 1;
|
||||||
notBindExpertQueryParams.pageSize = 10;
|
notBindExpertQueryParams.pageSize = 10;
|
||||||
notBindExpertQueryParams.name = undefined;
|
notBindExpertQueryParams.expertName = undefined;
|
||||||
notBindExpertQueryRef.value.resetFields();
|
notBindExpertQueryRef.value.resetFields();
|
||||||
getNotBindExpertList();
|
getNotBindExpertList();
|
||||||
};
|
};
|
||||||
|
@ -9,10 +9,10 @@
|
|||||||
>
|
>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="t('admin.form.name', { type: t('admin.common.achievement') })"
|
:label="t('admin.form.name', { type: t('admin.common.achievement') })"
|
||||||
prop="title"
|
prop="name"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.title"
|
v-model="queryParams.name"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="
|
:placeholder="
|
||||||
t('admin.form.placeholder', { type: t('admin.common.patent') })
|
t('admin.form.placeholder', { type: t('admin.common.patent') })
|
||||||
@ -52,7 +52,7 @@
|
|||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="showExpertDialog"
|
v-model="showExpertDialog"
|
||||||
:title="t('admin.table.relatedExperts')"
|
:title="t('admin.table.relatedExperts')"
|
||||||
@close="resetQuery"
|
@close="resetNotBindExpertQuery"
|
||||||
>
|
>
|
||||||
<el-form
|
<el-form
|
||||||
ref="notBindExpertQueryRef"
|
ref="notBindExpertQueryRef"
|
||||||
@ -62,10 +62,10 @@
|
|||||||
>
|
>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
||||||
prop="name"
|
prop="expertName"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="notBindExpertQueryParams.name"
|
v-model="notBindExpertQueryParams.expertName"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="
|
:placeholder="
|
||||||
t('admin.form.placeholder', {
|
t('admin.form.placeholder', {
|
||||||
@ -284,7 +284,7 @@ const notBindExpertTotal = ref(0);
|
|||||||
const notBindExpertQueryParams = reactive({
|
const notBindExpertQueryParams = reactive({
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
name: undefined,
|
expertName: undefined,
|
||||||
});
|
});
|
||||||
const data = reactive({
|
const data = reactive({
|
||||||
queryParams: {
|
queryParams: {
|
||||||
@ -427,7 +427,7 @@ const handleAddBind = () => {
|
|||||||
const resetNotBindExpertQuery = () => {
|
const resetNotBindExpertQuery = () => {
|
||||||
notBindExpertQueryParams.pageNum = 1;
|
notBindExpertQueryParams.pageNum = 1;
|
||||||
notBindExpertQueryParams.pageSize = 10;
|
notBindExpertQueryParams.pageSize = 10;
|
||||||
notBindExpertQueryParams.name = undefined;
|
notBindExpertQueryParams.expertName = undefined;
|
||||||
notBindExpertQueryRef.value.resetFields();
|
notBindExpertQueryRef.value.resetFields();
|
||||||
getNotBindExpertList();
|
getNotBindExpertList();
|
||||||
};
|
};
|
||||||
|
@ -209,16 +209,16 @@
|
|||||||
@submit.prevent
|
@submit.prevent
|
||||||
>
|
>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="t('admin.form.name', { type: t('admin.common.expert') })"
|
:label="t('admin.form.name', { type: t('admin.common.lab') })"
|
||||||
prop="name"
|
prop="name"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="notBindExpertQueryParams.name"
|
v-model="notBindExpertQueryParams.laboratoryName"
|
||||||
clearable
|
clearable
|
||||||
:placeholder="
|
:placeholder="
|
||||||
t('admin.form.placeholder', {
|
t('admin.form.placeholder', {
|
||||||
type: t('admin.form.name', {
|
type: t('admin.form.name', {
|
||||||
type: t('admin.common.expert'),
|
type: t('admin.common.lab'),
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
"
|
"
|
||||||
@ -331,7 +331,7 @@ const notBindExpertTotal = ref(0);
|
|||||||
const notBindExpertQueryParams = reactive({
|
const notBindExpertQueryParams = reactive({
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
name: undefined,
|
laboratoryName: undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
const data = reactive({
|
const data = reactive({
|
||||||
@ -529,7 +529,7 @@ const handleAddBind = () => {
|
|||||||
const resetNotBindExpertQuery = () => {
|
const resetNotBindExpertQuery = () => {
|
||||||
notBindExpertQueryParams.pageNum = 1;
|
notBindExpertQueryParams.pageNum = 1;
|
||||||
notBindExpertQueryParams.pageSize = 10;
|
notBindExpertQueryParams.pageSize = 10;
|
||||||
notBindExpertQueryParams.name = undefined;
|
notBindExpertQueryParams.laboratoryName = undefined;
|
||||||
notBindExpertQueryRef.value.resetFields();
|
notBindExpertQueryRef.value.resetFields();
|
||||||
getNotBindExpertList();
|
getNotBindExpertList();
|
||||||
};
|
};
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="line">
|
<div class="line">
|
||||||
{{ t("webSearch.researchInstitute") }}:
|
{{ t("webSearch.researchInstitute") }}:
|
||||||
<span>{{ data.organization }}</span>
|
<span>{{ data.researchName }}</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div
|
<!-- <div
|
||||||
v-if="data.patent_title"
|
v-if="data.patent_title"
|
||||||
|
Reference in New Issue
Block a user