专家跳转详情页，经纪人查看服务的需求

src/api/dataList/technology-demand.js

@@ -0,0 +1,7 @@
+import request from "@/utils/request";
+
+export const technologyDemandList = (params) => request({
+    url: "/business/technologyDemand/list",
+    method: "GET",
+    params
+})

src/api/dataList/technology-project.js

@@ -39,8 +39,11 @@ export function technologyProjectDetail(id) {
 
 export function technologyProjectDelete(ids) {
     return request({
-        url: `/business/technologyProject/${ids}`,
+        url: `/business/technologyProject`,
         method: "DELETE",
+        data: {
+            ids
+        }
     });
 }
 

src/views/dataAuditList/Enterpriseproducts/index.vue

@@ -22,23 +22,25 @@
 <!--            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList"/>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="6">
-          <el-button
-              type="primary"
-              icon="search"
-              size="default"
-              @click="handleQuery"
-          >搜索
-          </el-button
-          >
-          <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置
-          </el-button
-          >
-        </el-col>
       </el-row>
     </el-form>
-    <el-row>
+<!--    <el-row>-->
+<!--      <el-col :span="6">-->
+<!--        <el-button-->
+<!--            type="primary"-->
+<!--            icon="search"-->
+<!--            size="default"-->
+<!--            @click="handleQuery"-->
+<!--        >搜索-->
+<!--        </el-button-->
+<!--        >-->
+<!--        <el-button icon="refresh" size="default" @click="resetQuery"-->
+<!--        >重置-->
+<!--        </el-button-->
+<!--        >-->
+<!--      </el-col>-->
+<!--    </el-row>-->
+    <el-row class="mb8">
       <el-button
           v-if="queryParams.status == 0"
           size="small"

src/views/dataAuditList/demand/index.vue

@@ -108,7 +108,7 @@
       ></el-table-column>
       <el-table-column
           align="center"
-          label="截至日期"
+          label="截止日期"
           prop="deadline"
       ></el-table-column>
       <el-table-column align="center" label="操作" width="320" v-if="queryParams.status!==4">

src/views/dataList/agent/index.vue

@@ -114,6 +114,13 @@
               @click="handleDelete(row.brokerId)"
           >删除
           </el-button>
+          <el-button
+              icon="view"
+              size="small"
+              type="text"
+              @click="handleViewTechDemand(row.brokerId)"
+          >服务的需求
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -361,8 +368,18 @@ const handleDelete = async (id) => {
         getList();
         ElMessage.success("删除成功");
       })
-    .catch(() => {});
+      .catch(() => {
+      });
 };
 
+const handleViewTechDemand = (id) => {
+  router.push({
+    path: "/agent/serving-tech-demand",
+    query: {
+      id
+    }
+  })
+}
+
 getList();
 </script>

src/views/dataList/agent/serving-tech-demand.vue

@@ -0,0 +1,85 @@
+<script setup>
+import {reactive, ref, toRefs} from "vue";
+import {technologyDemandList} from "@/api/dataList/technology-demand";
+import {useRoute} from "vue-router";
+
+const route = useRoute()
+const total = ref(0)
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    brokerId: undefined
+  }
+})
+const {queryParams} = toRefs(data)
+
+if (route.query.id) {
+  queryParams.value.brokerId = route.query.id
+}
+
+const dataList = ref([])
+
+const getList = () => {
+  technologyDemandList(queryParams.value).then(resp => {
+    dataList.value = resp.rows
+    total.value = resp.total
+  })
+}
+
+getList()
+</script>
+
+<template>
+  <div class="app-container">
+    <el-table :data="dataList">
+      <el-table-column align="center" label="编号" prop="id" width="80"></el-table-column>
+      <el-table-column
+          align="center"
+          label="需求名称"
+          prop="title"
+      ></el-table-column>
+      <el-table-column
+          align="center"
+          label="所属领域"
+          prop="industryStr"
+      ></el-table-column>
+      <el-table-column
+          align="center"
+          label="联系人"
+          prop="name"
+      ></el-table-column>
+      <el-table-column
+          align="center"
+          label="经纪人"
+          prop="brokerName"
+      ></el-table-column>
+      <el-table-column
+          align="center"
+          label="手机"
+          prop="mobile"
+      ></el-table-column>
+      <el-table-column
+          align="center"
+          label="发布时间"
+          prop="createTime"
+      ></el-table-column>
+      <el-table-column
+          align="center"
+          label="截止日期"
+          prop="deadline"
+      ></el-table-column>
+    </el-table>
+    <pagination
+        v-show="total > 0"
+        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNum"
+        :total="total"
+        @pagination="getList"
+    />
+  </div>
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/views/dataList/expert/index.vue

@@ -136,6 +136,13 @@
               @click="openResetPassword(row.id)"
           >重置密码
           </el-button>
+          <el-button
+              icon="edit"
+              size="small"
+              type="text"
+              @click="goToDetail(row.id)"
+          >专家详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -296,6 +303,7 @@ import {ElLoading, ElMessage, ElMessageBox} from "element-plus";
 import dayjs from "dayjs";
 import request from "@/utils/request";
 import {educationOptions} from "@/utils/parameter";
+import {getConfigKey} from "@/api/system/config";
 
 const router = useRouter();
 // const siteList = ref([]);
@@ -376,9 +384,15 @@ const openResetPassword = async (id) => {
     resetPasswordForm.id = userId;
     showResetPassword.value = true;
   } else {
-    ElMessageBox.alert(`尚未分配账号，请先分配账号`, "尚未分配账号");
+    void ElMessageBox.alert(`尚未分配账号，请先分配账号`, "尚未分配账号");
   }
 };
+const goToDetail = (id) => {
+  getConfigKey("website.link").then(resp => {
+    const websiteLink = resp.msg
+    open(`${websiteLink}/searchList/expert/detail/${id}`, "_blank")
+  })
+}
 const resetForm = () => {
   if (resetPasswordFormRef.value) {
     resetPasswordFormRef.value.resetFields();

src/views/dataList/technology-project/index.vue

@@ -1,17 +1,25 @@
 <script setup>
 import {reactive, ref, toRefs} from "vue";
-import {technologyProjectList} from "@/api/dataList/technology-project";
+import modal from '@/plugins/modal'
+import {
+  technologyProjectDelete,
+  technologyProjectDetail,
+  technologyProjectList
+} from "@/api/dataList/technology-project";
 import Pagination from "@/components/Pagination/index.vue";
 
 const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10
-  }
+  },
+  form: {}
 })
-const {queryParams} = toRefs(data)
+const {queryParams, form} = toRefs(data)
 const dataList = ref([])
 const total = ref(0)
+const title = ref("科研项目详情")
+const showEditDialog = ref(false)
 const getList = () => {
   technologyProjectList(queryParams.value).then(resp => {
     dataList.value = resp.rows
@@ -29,6 +37,22 @@ const resetQuery = () => {
   }
   getList()
 }
+
+const handleDetail = (id) => {
+  technologyProjectDetail(id).then(resp => {
+    form.value = resp.data
+    showEditDialog.value = true
+  })
+}
+
+const handleDelete = (id) => {
+  modal.confirm("是否确认删除").then(() => {
+    technologyProjectDelete([id]).then(() => {
+      modal.msgSuccess("删除成功")
+      getList()
+    })
+  })
+}
 getList()
 </script>
 
@@ -68,6 +92,12 @@ getList()
       </el-table-column>
       <el-table-column label="课题负责人" prop="director"/>
       <el-table-column label="发布时间" prop="createTime"/>
+      <el-table-column label="操作" width="120">
+        <template #default="{row}">
+          <el-button size="small" icon="view" type="text" @click="handleDetail(row.id)">详情</el-button>
+          <el-button size="small" icon="delete" type="text" @click="handleDelete(row.id)">删除</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination
         v-show="total > 0"
@@ -76,6 +106,133 @@ getList()
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
     />
+    <el-dialog
+        :title="title"
+        v-model="showEditDialog"
+        width="820px"
+        append-to-body
+    >
+      <el-form
+          disabled
+          ref="researchRef"
+          :model="form"
+          label-width="120px"
+      >
+        <el-form-item
+            label="科研项目名称"
+            prop="title"
+        >
+          <el-input
+              v-model="form.title"
+              placeholder="请输入科研项目名称"
+          />
+        </el-form-item>
+        <el-form-item label="课题角色" prop="role">
+          <el-radio v-model="form.role" label="1"
+          ><!--承担单位-->
+            承担单位
+          </el-radio>
+          <el-radio v-model="form.role" label="2"
+          ><!--参与单位-->
+            参与单位
+          </el-radio>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="资助经费" prop="amount">
+              <el-input
+                  v-model="form.amount"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                  placeholder="请输入资助经费"
+              >
+                <template #append
+                >万元
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="资助来源" prop="source">
+              <el-input
+                  v-model="form.source"
+                  placeholder="请输入资助来源"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开始日期" prop="beginTime">
+              <el-date-picker
+                  v-model="form.beginTime"
+                  type="date"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请输入开始日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结束日期" prop="finishTime">
+              <el-date-picker
+                  v-model="form.finishTime"
+                  type="date"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请输入结束日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目类型" prop="kind">
+              <el-input
+                  v-model="form.kind"
+                  placeholder="请输入项目类型"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="课题负责人" prop="director">
+              <el-input
+                  v-model="form.director"
+                  placeholder="请输入课题负责人"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- //TODO:添加项目简介字段 -->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item
+                label="项目简介"
+                prop="introduce"
+            >
+              <!--              <WangEditor-->
+              <!--                v-model="form.introduce"-->
+              <!--                width="100%"-->
+              <!--                min-height="150px"-->
+              <!--                @blur="researchRef.validateField(`introduce`)"-->
+              <!--              ></WangEditor>-->
+              <el-input
+                  type="textarea"
+                  v-model="form.introduce"
+                  placeholder="请输入项目简介"
+                  :autosize="{ minRows: 8, maxRows: 16 }"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="showEditDialog=false">关闭</el-button>
+          <!--          <el-button type="primary" @click="submitForm"-->
+          <!--          >{{ t("admin.common.confirm") }}-->
+          <!--          </el-button>-->
+          <!--          <el-button @click="cancel">{{ t("admin.common.cancel") }}</el-button>-->
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 

src/views/website/solution/serviceCase/index.vue

@@ -208,7 +208,7 @@ const data = reactive({
   form: {},
   rules: {
     title: [{required: true, message: "案例标题不能为空", trigger: "blur"}],
-    description: [{required: true, message: "描述不能为空", trigger: "blur"}],
+    // description: [{required: true, message: "描述不能为空", trigger: "blur"}],
     image: [
       {
         required: true,