From d584aa2889976d3c97baf28e6e2edf459575e458 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Thu, 14 Sep 2023 16:44:13 +0800
Subject: [PATCH] bugfix

---
 src/api/admin/laboratory/paper.js             |  2 +-
 src/views/admin/components/enterpriseItem.vue |  2 +-
 .../admin/enterprise/demand/serviceDemand.vue | 27 +++++++--------
 .../admin/enterprise/demand/technology.vue    | 33 ++++++++++---------
 .../admin/expert/demand/serviceDemand.vue     | 15 +++++----
 .../laboratory/research/expert/index.vue      |  1 +
 .../admin/research/research/expert/index.vue  | 22 ++++++-------
 7 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/src/api/admin/laboratory/paper.js b/src/api/admin/laboratory/paper.js
index e50e4e2..6eaae4e 100644
--- a/src/api/admin/laboratory/paper.js
+++ b/src/api/admin/laboratory/paper.js
@@ -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",
   });
 };
diff --git a/src/views/admin/components/enterpriseItem.vue b/src/views/admin/components/enterpriseItem.vue
index c90c96d..96ea84e 100644
--- a/src/views/admin/components/enterpriseItem.vue
+++ b/src/views/admin/components/enterpriseItem.vue
@@ -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>
diff --git a/src/views/admin/enterprise/demand/serviceDemand.vue b/src/views/admin/enterprise/demand/serviceDemand.vue
index 4ae2cb8..34da007 100644
--- a/src/views/admin/enterprise/demand/serviceDemand.vue
+++ b/src/views/admin/enterprise/demand/serviceDemand.vue
@@ -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();
diff --git a/src/views/admin/enterprise/demand/technology.vue b/src/views/admin/enterprise/demand/technology.vue
index 55bb5fa..a60fa4d 100644
--- a/src/views/admin/enterprise/demand/technology.vue
+++ b/src/views/admin/enterprise/demand/technology.vue
@@ -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
diff --git a/src/views/admin/expert/demand/serviceDemand.vue b/src/views/admin/expert/demand/serviceDemand.vue
index d592790..1028fd5 100644
--- a/src/views/admin/expert/demand/serviceDemand.vue
+++ b/src/views/admin/expert/demand/serviceDemand.vue
@@ -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"));
     })
diff --git a/src/views/admin/laboratory/research/expert/index.vue b/src/views/admin/laboratory/research/expert/index.vue
index 4322174..d9357e0 100644
--- a/src/views/admin/laboratory/research/expert/index.vue
+++ b/src/views/admin/laboratory/research/expert/index.vue
@@ -60,6 +60,7 @@
     <el-dialog
       v-model="showExpertDialog"
       :title="t('admin.table.relatedExperts')"
+      @close="resetQuery"
     >
       <el-form
         ref="notBindExpertQueryRef"
diff --git a/src/views/admin/research/research/expert/index.vue b/src/views/admin/research/research/expert/index.vue
index 6ee19c9..7b60e73 100644
--- a/src/views/admin/research/research/expert/index.vue
+++ b/src/views/admin/research/research/expert/index.vue
@@ -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">