bugfix

src/views/admin/laboratory/research/expert/index.vue

@@ -9,10 +9,10 @@
     >
       <el-form-item
           :label="t('admin.form.name', { type: t('admin.common.expert') })"
-        prop="title"
+          prop="name"
       >
         <el-input
-          v-model="queryParams.title"
+            v-model="queryParams.name"
             clearable
             :placeholder="
             t('admin.form.placeholder', {
@@ -60,7 +60,7 @@
     <el-dialog
         v-model="showExpertDialog"
         :title="t('admin.table.relatedExperts')"
-      @close="resetQuery"
+        @close="resetNotBindExpertQuery"
     >
       <el-form
           ref="notBindExpertQueryRef"
@@ -70,10 +70,10 @@
       >
         <el-form-item
             :label="t('admin.form.name', { type: t('admin.common.expert') })"
-          prop="name"
+            prop="expertName"
         >
           <el-input
-            v-model="notBindExpertQueryParams.name"
+              v-model="notBindExpertQueryParams.expertName"
               clearable
               :placeholder="
               t('admin.form.placeholder', {
@@ -105,13 +105,13 @@
         </el-form-item>
       </el-form>
       <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
             :show-overflow-tooltip="true"
             :label="t('admin.form.name', { type: t('admin.common.expert') })"
             prop="name"
         />
-        <el-table-column :label="t('webContact.phone')" prop="mobile" />
+        <el-table-column :label="t('webContact.phone')" prop="mobile"/>
         <el-table-column
             :label="t('admin.table.researchIndustry')"
             prop="industryStr"
@@ -150,13 +150,13 @@
 
     <!-- 表格数据 -->
     <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
           :show-overflow-tooltip="true"
           :label="t('admin.form.name', { type: t('admin.common.expert') })"
           prop="name"
       />
-      <el-table-column :label="t('webContact.phone')" prop="mobile" />
+      <el-table-column :label="t('webContact.phone')" prop="mobile"/>
       <el-table-column
           :label="t('admin.table.researchIndustry')"
           prop="industryStr"
@@ -266,9 +266,9 @@
 </template>
 
 <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 {
   bindExpert,
@@ -277,12 +277,12 @@ import {
   selectNotBindLaboratory,
 } from "@/api/admin/laboratory/expert";
 import Pagination from "@/components/Pagination/index.vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 import dayjs from "dayjs";
 import modal from "@/plugins/modal";
 
 const router = useRouter();
-const { t } = useI18n();
+const {t} = useI18n();
 const dataList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -296,13 +296,13 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    inventor: undefined,
+    name: undefined,
   },
   form: {},
   rules: {},
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 const queryRef = ref();
 
@@ -329,6 +329,11 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 function resetQuery() {
   queryRef.value.resetFields();
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    name: undefined,
+  }
   handleQuery();
 }
 
@@ -387,7 +392,7 @@ const notBindExpertTotal = ref(0);
 const notBindExpertQueryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
+  expertName: undefined,
 });
 
 const notBindExpertQueryRef = ref();
@@ -410,7 +415,7 @@ const handleAddBind = () => {
 const resetNotBindExpertQuery = () => {
   notBindExpertQueryParams.pageNum = 1;
   notBindExpertQueryParams.pageSize = 10;
-  notBindExpertQueryParams.name = undefined;
+  notBindExpertQueryParams.expertName = undefined;
   notBindExpertQueryRef.value.resetFields();
   getNotBindExpertList();
 };

src/views/admin/research/research/expert/index.vue

@@ -9,10 +9,10 @@
     >
       <el-form-item
           :label="t('admin.form.name', { type: t('admin.common.achievement') })"
-          prop="title"
+          prop="name"
       >
         <el-input
-            v-model="queryParams.title"
+            v-model="queryParams.name"
             clearable
             :placeholder="
             t('admin.form.placeholder', { type: t('admin.common.patent') })
@@ -52,7 +52,7 @@
     <el-dialog
         v-model="showExpertDialog"
         :title="t('admin.table.relatedExperts')"
-        @close="resetQuery"
+        @close="resetNotBindExpertQuery"
     >
       <el-form
           ref="notBindExpertQueryRef"
@@ -62,10 +62,10 @@
       >
         <el-form-item
             :label="t('admin.form.name', { type: t('admin.common.expert') })"
-            prop="name"
+            prop="expertName"
         >
           <el-input
-              v-model="notBindExpertQueryParams.name"
+              v-model="notBindExpertQueryParams.expertName"
               clearable
               :placeholder="
               t('admin.form.placeholder', {
@@ -284,7 +284,7 @@ const notBindExpertTotal = ref(0);
 const notBindExpertQueryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
+  expertName: undefined,
 });
 const data = reactive({
   queryParams: {
@@ -427,7 +427,7 @@ const handleAddBind = () => {
 const resetNotBindExpertQuery = () => {
   notBindExpertQueryParams.pageNum = 1;
   notBindExpertQueryParams.pageSize = 10;
-  notBindExpertQueryParams.name = undefined;
+  notBindExpertQueryParams.expertName = undefined;
   notBindExpertQueryRef.value.resetFields();
   getNotBindExpertList();
 };

src/views/admin/research/research/laboratory/index.vue

@@ -209,16 +209,16 @@
           @submit.prevent
       >
         <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"
         >
           <el-input
-              v-model="notBindExpertQueryParams.name"
+              v-model="notBindExpertQueryParams.laboratoryName"
               clearable
               :placeholder="
               t('admin.form.placeholder', {
                 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({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
+  laboratoryName: undefined,
 });
 
 const data = reactive({
@@ -529,7 +529,7 @@ const handleAddBind = () => {
 const resetNotBindExpertQuery = () => {
   notBindExpertQueryParams.pageNum = 1;
   notBindExpertQueryParams.pageSize = 10;
-  notBindExpertQueryParams.name = undefined;
+  notBindExpertQueryParams.laboratoryName = undefined;
   notBindExpertQueryRef.value.resetFields();
   getNotBindExpertList();
 };

src/views/website/searchList/components/expertItem.vue

@@ -51,7 +51,7 @@
         </div>
         <div class="line">
           {{ t("webSearch.researchInstitute") }}：
-          <span>{{ data.organization }}</span>
+          <span>{{ data.researchName }}</span>
         </div>
         <!-- <div
           v-if="data.patent_title"