badge

.gitignore

@@ -18,6 +18,8 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+*.zip
+*.7z
 
 package-lock.json
 yarn.lock

src/api/dataList/laboratory.js

@@ -32,12 +32,12 @@ export function casLaboratoryDetail(id) {
   });
 }
 // 删除
-export function casLaboratoryDelete(id) {
+export function casLaboratoryDelete(ids) {
   return request({
     url: `/business/casLaboratory`,
     method: "DELETE",
     data: {
-      ids: [id],
+      ids,
     },
   });
 }

src/api/thesis/index.js

@@ -1,34 +1,38 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 // 获取论文列表
 export function expertList(params) {
-    return request({
+  return request({
-      url:"/business/casPaper/list",
+    url: "/business/casPaper/list",
-      method:"get",
+    method: "get",
-      params
+    params,
-    });
+  });
-  }
+}
 // 删除逻辑
-export const delItem=(ids)=>request({
+export const delItem = (ids) =>
-    url:`/business/casPaper/${ids}`,
+  request({
-    method:'DELETE'
+    url: `/business/casPaper/${ids}`,
-})
+    method: "DELETE",
+  });
 
 // 新增接口
-export const addItem=(data)=>request({
+export const addItem = (data) =>
-    url:'/business/casPaper',
+  request({
-    method:'post',
+    url: "/business/casPaper",
-    data
+    method: "post",
-})
+    data,
+  });
 
 // 获取详情
-export const editItem=(id)=>request({
+export const editItem = (id) =>
-    url:`/business/casPaper/${id}`,
+  request({
-    method:'GET'
+    url: `/business/casPaper/${id}`,
-})
+    method: "GET",
+  });
 
 // 修改论文
-export const rebtnItem=(data)=>request({
+export const rebtnItem = (data) =>
-    url:'/business/casPaper',
+  request({
-    method:'PUT',
+    url: "/business/casPaper",
-    data
+    method: "PUT",
-})
+    data,
+  });

src/layout/components/Sidebar/SidebarItem.vue

@@ -2,7 +2,14 @@
   <el-badge
     v-if="!item.hidden"
     :hidden="
-      ![`/approval/list`, `/approval/dataList/approval`].includes(basePath)
+      ![
+        `/approval/list`,
+        `/approval/dataList/approval`,
+        `/auditing/achievement`,
+        `/auditing/demand`,
+        `/auditing/serviceDemand`,
+        `/auditing/Enterpriseproducts`,
+      ].includes(basePath)
     "
     :value="getCount(basePath)"
     class="count-badge"
@@ -37,7 +44,7 @@
                 :title="hasTitle(onlyOneChild.meta.title)"
                 >{{
                   ["/auditing/serviceDemand"].includes(basePath)
-                    ? `${onlyOneChild.meta.title} (${getCount(basePath)})`
+                    ? `${onlyOneChild.meta.title} (${userStore.serviceDemandTotal})`
                     : onlyOneChild.meta.title
                 }}</span
               ></template
@@ -103,8 +110,14 @@ const getCount = (basePath) => {
     return userStore.unApprovedBusiness;
   } else if (props.basePath == "/approval/dataList/approval") {
     return userStore.unApprovedExpert;
+  } else if (props.basePath == "/auditing/achievement") {
+    return userStore.unApprovedAchivement;
+  } else if (props.basePath == "/auditing/demand") {
+    return userStore.unApprovedTechnology;
+  } else if (props.basePath == "/auditing/Enterpriseproducts") {
+    return userStore.unApprovedProduct;
   } else if (props.basePath == "/auditing/serviceDemand") {
-    return userStore.serviceDemandTotal;
+    return userStore.unApprovedService;
   } else {
     return 0;
   }

src/store/modules/user.js

@@ -5,6 +5,9 @@ import md5 from "js-md5";
 import { companyList } from "@/api/dataList/enterprise";
 import { expertList } from "@/api/expert/expert";
 import { listCasDemand } from "../../api/dataApproval/enterpriseServiceDemand";
+import { expertAchievementList } from "../../api/dataApproval/achivement";
+import { businessList } from "../../api/Businessneeds";
+import { enterpriseProductApprovalList } from "../../api/dataApproval/enterpriseProduct";
 
 const useUserStore = defineStore("user", {
   state: () => ({
@@ -13,8 +16,12 @@ const useUserStore = defineStore("user", {
     avatar: "",
     roles: [],
     permissions: [],
-    unApprovedBusiness: 10,
+    unApprovedBusiness: 0,
-    unApprovedExpert: 20,
+    unApprovedExpert: 0,
+    unApprovedAchivement: 0,
+    unApprovedTechnology: 0,
+    unApprovedService: 0,
+    unApprovedProduct: 0,
     serviceDemandTotal: 0,
   }),
   actions: {
@@ -66,25 +73,63 @@ const useUserStore = defineStore("user", {
     },
 
     async getApprovalCount() {
-      const resps = await Promise.all([
+      this.getUnApprovedBusiness();
-        companyList({
+      this.getUnApprovedExpert();
-          examineStatus: 0,
+      this.getUnApprovedAchivement();
-          pageSize: 1,
+      this.getUnApprovedTechnology();
-          pageNum: 10,
+      this.getUnApprovedService();
-        }),
+      this.getUnApprovedProduct();
-        expertList({
+      this.getServiceDemandTotal();
-          examineStatus: 0,
-          pageSize: 1,
-          pageNum: 10,
-        }),
-        listCasDemand(),
-      ]);
-      this.unApprovedBusiness = resps[0].total;
-      this.unApprovedExpert = resps[1].total;
-      this.serviceDemandTotal = resps[2].total;
     },
-    unApprovedBusinessPlus() {
+
-      this.unApprovedBusiness++;
+    async getUnApprovedBusiness() {
+      const resp = await companyList({
+        examineStatus: 0,
+        pageSize: 1,
+        pageNum: 10,
+      });
+      this.unApprovedBusiness = resp.total;
+    },
+    async getUnApprovedExpert() {
+      const resp = await expertList({
+        examineStatus: 0,
+        pageSize: 1,
+        pageNum: 10,
+      });
+      this.unApprovedExpert = resp.total;
+    },
+    async getUnApprovedAchivement() {
+      const resp = await expertAchievementList({
+        status: 0,
+        pageNum: 1,
+        pageSize: 10,
+      });
+      this.unApprovedAchivement = resp.total;
+    },
+    async getUnApprovedTechnology() {
+      const resp = await businessList({ status: 0, pageNum: 1, pageSize: 10 });
+      this.unApprovedTechnology = resp.total;
+    },
+    async getUnApprovedService() {
+      const resp = await listCasDemand({
+        pageNum: 1,
+        pageSize: 10,
+        status: 0,
+      });
+      this.unApprovedService = resp.total;
+    },
+    async getUnApprovedProduct() {
+      const resp = await enterpriseProductApprovalList({
+        pageNum: 1,
+        pageSize: 10,
+        status: 0,
+      });
+      this.unApprovedProduct = resp.total;
+    },
+
+    async getServiceDemandTotal() {
+      const resp = await listCasDemand();
+      this.serviceDemandTotal = resp.total;
     },
     // 退出系统
     logOut() {

src/views/approval/dataList/add.vue

@@ -14,6 +14,7 @@
     <div :style="{ marginLeft: 140 + 'px' }">
       <el-button @click="submitForm('2')">审核拒绝</el-button>
       <el-button type="primary" @click="submitForm('1')">通过审核</el-button>
+      <!-- <el-button type="primary" @click="submitForm('0')">cancel审核</el-button> -->
     </div>
   </div>
 </template>
@@ -74,7 +75,7 @@ const submitForm = async (state) => {
   // if (form.value.id != undefined) {
   form.value.examineStatus = state;
   await companyEdit(form.value);
-  useUserStore().getApprovalCount();
+  useUserStore().getUnApprovedBusiness();
   cancel();
   ElMessage.success("已审核");
   // } else {

src/views/approval/dataList/index.vue

@@ -138,6 +138,8 @@ import { reactive, ref } from "vue";
 import { ElMessageBox } from "element-plus";
 import { cloneDeep } from "lodash";
 import { useRouter } from "vue-router";
+import useUserStore from "@/store/modules/user";
+
 const data = reactive({
   queryData: {
     pageNum: 1,
@@ -218,5 +220,6 @@ const handleDetail = (id) => {
 };
 getList();
 // getSiteList();
+useUserStore().getUnApprovedBusiness();
 </script>
 <style></style>

src/views/components/Businessneeds/Approvaldetails.vue

@@ -169,6 +169,8 @@ import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import { ElMessage } from "element-plus";
 import { ref, toRefs } from "vue";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
 const emit = defineEmits(["update-list"]);
 const props = defineProps({
   isShow: {
@@ -186,6 +188,7 @@ const checkList = reactive(demandCategoryList);
 const approve = async (status) => {
   let title = status == 1 ? "通过" : "驳回";
   await updateTechnologyDemand({ id: modelValue.value.id, status });
+  userStore.getUnApprovedTechnology();
   ElMessage.success(`已${title}需求`);
   emit("update:isShow", false);
   emit("update-list");

src/views/components/ExpertForm/index.vue

@@ -267,7 +267,7 @@
       ref="keywordsFormRef"
     />
 
-    <!-- <InputBoxAdd
+    <InputBoxAdd
       v-if="formType != 2"
       :labelWidth="labelWidth"
       v-model="modelValue"
@@ -275,7 +275,7 @@
       placeholder="请输入研究方向"
       fieldKey="researchs"
       ref="researchsFormRef"
-    /> -->
+    />
 
     <!-- <InputBoxAdd
       v-if="formType == 2"
@@ -467,14 +467,10 @@ const validateForm = async () => {
   }
   const cityFormValid = await cityFormRef.value.validateForm();
   const fieldFormValid = await fieldFormRef.value.validateForm();
-  // const keywordsFormValid = await keywordsFormRef.value.validateForm();
   if (formType.value == 1) {
     //个人
-    // const researchsFormValid = await researchsFormRef.value.validateForm(); //研究方向验证
+    const researchsFormValid = await researchsFormRef.value.validateForm(); //研究方向验证
-    return (
+    return formValid && cityFormValid && fieldFormValid && researchsFormValid;
-      formValid && cityFormValid && fieldFormValid
-      // researchsFormValid
-    );
   } else if (formType.value == 2) {
     //企业
     // const directionsFormValid = await directionsFormRef.value.validateForm(); //生产方向验证

src/views/components/ExpertForm/indexcopy.vue

@@ -1,502 +0,0 @@
-<template>
-  <el-form
-    ref="formRef"
-    :model="modelValue"
-    :rules="rules"
-    :label-width="labelWidth + 'px'"
-  >
-    <div class="form_title" v-if="showTitle">基本信息</div>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item :label="imageName" prop="image">
-          <ImageUpload v-model="modelValue.image" :fileSize="2" :limit="1" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 2">
-      <el-col :span="24">
-        <el-form-item :label="nameName" prop="name">
-          <el-input
-            v-model="modelValue.name"
-            :disabled="isAdd ? false : true"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 2">
-      <el-col :span="24">
-        <el-form-item label="组织机构代码:" prop="code">
-          <el-row type="flex" justify="space-between">
-            <el-col :span="20">
-              <el-input v-model="modelValue.code" :disabled="!isAdd"></el-input>
-            </el-col>
-            <el-col :span="3">
-              <el-button type="primary" @click="" :disabled="!isAdd"
-                >查找</el-button
-              >
-            </el-col>
-          </el-row>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 2">
-      <el-col :span="24">
-        <el-form-item label="企业类型:" prop="kind">
-          <el-select v-model="modelValue.kind" placeholder="请选择">
-            <el-option
-              v-for="item in enterpriseOptions"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="核心成果核心产品:" prop="product">
-          <el-input v-model="modelValue.product"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 1">
-      <el-col :span="12">
-        <el-form-item label="姓名:" prop="name">
-          <el-input
-            v-model="modelValue.name"
-            :disabled="isAdd ? false : true"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="手机号:" prop="mobile">
-          <el-input
-            v-model="modelValue.mobile"
-            :disabled="isAdd ? false : true"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="所属站点:" prop="tenantId">
-          <SiteOptions v-model="modelValue.tenantId" :site-list="siteList" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 1">
-      <el-col :span="12">
-        <el-form-item label="所属单位:" prop="researchId">
-          <el-select
-            v-model="modelValue.researchId"
-            filterable
-            placeholder="请选择"
-            @change="setLaboratory"
-          >
-            <el-option
-              v-for="item in researchOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="所属实验室:">
-          <el-select
-            v-model="modelValue.laboratory_id"
-            filterable
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <CityOptions
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      ref="cityFormRef"
-    />
-
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="详细地址:">
-          <el-input v-model="modelValue.address"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 1">
-      <el-col :span="24">
-        <el-form-item label="毕业院校:" prop="school">
-          <el-input v-model="modelValue.school"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 1">
-      <el-col :span="12">
-        <el-form-item label="最高学历:" prop="education">
-          <el-select v-model="modelValue.education" placeholder="请选择">
-            <el-option
-              v-for="item in educationOptions"
-              :key="item.text"
-              :label="item.text"
-              :value="item.text"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="主修专业:" prop="major">
-          <el-input v-model="modelValue.major"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 1">
-      <el-col :span="12">
-        <el-form-item label="职务:" prop="job">
-          <el-input v-model="modelValue.job"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="职称:" prop="title">
-          <el-input v-model="modelValue.title"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 1">
-      <el-col :span="12">
-        <el-form-item label="从业时间:" prop="workAt">
-          <el-date-picker
-            v-model="modelValue.workAt"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="性别:" prop="gender">
-          <el-radio v-model="modelValue.gender" :label="1">男</el-radio>
-          <el-radio v-model="modelValue.gender" :label="2">女</el-radio>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <FieldOptions
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      ref="fieldFormRef"
-    />
-
-    <InputBoxAdd
-      :labelWidth="labelWidth"
-      v-model="modelValue"
-      title="关键词"
-      placeholder="应用场景关键词+技术产品关键词"
-      fieldKey="keywords"
-      ref="keywordsFormRef"
-    />
-
-    <InputBoxAdd
-      v-if="formType != 2"
-      :labelWidth="labelWidth"
-      v-model="modelValue"
-      title="研究方向"
-      placeholder="请输入研究方向"
-      fieldKey="researchs"
-      ref="researchsFormRef"
-    />
-
-    <InputBoxAdd
-      v-if="formType == 2"
-      :labelWidth="labelWidth"
-      v-model="modelValue"
-      title="生产方向"
-      placeholder="请输入生产方向"
-      fieldKey="directions"
-      ref="directionsFormRef"
-    />
-
-    <el-row v-if="formType == 2">
-      <el-col :span="24">
-        <el-form-item label="邀请码:">
-          <el-input
-            v-model="modelValue.inviterCode"
-            :disabled="!isAdd"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="企业网站:">
-          <el-input v-model="modelValue.url"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-if="formType == 2">
-      <el-col :span="24">
-        <el-form-item label="营业执照:" prop="license">
-          <ImageUpload
-            v-model="modelValue.license"
-            :isShowTip="false"
-            :limit="1"
-          />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">
-        <el-form-item :label="introduceName" prop="introduce">
-          <el-input
-            v-if="formType == 1"
-            v-model="modelValue.introduce"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 6 }"
-          />
-          <WangEditor v-else v-model="modelValue.introduce" minHeight="150px" />
-          <!-- <Editor
-            v-else
-            v-model="modelValue.introduce"
-            :minHeight="150"
-            ref="introduceRef"
-            @click.native="handleEditAble"
-          /> -->
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script setup name="ExpertForm">
-import CityOptions from "@/views/components/CityOptions";
-// import FieldOptions from "@/views/components/FieldOptions";
-import InputBoxAdd from "@/views/components/InputBoxAdd";
-// import { researchSelect } from "@/api/dataList/research";
-// import { laboratorySelect } from "@/api/dataList/laboratory";
-import { tenantSelect } from "@/api/subPlatform/tenant";
-import { enterpriseOptions } from "@/utils/parameter";
-import { reactive, ref, toRefs } from "vue";
-import WangEditor from "../../../components/WangEditor/index.vue";
-import SiteOptions from "@/views/components/SiteOptions";
-import FieldOptions from "@/views/components/FieldOptions";
-
-const props = defineProps({
-  modelValue: { type: Object },
-  isAdd: {
-    type: Boolean,
-    default: true,
-  },
-  showTitle: {
-    type: Boolean,
-    default: false,
-  },
-  formType: {
-    type: Number,
-    default: 1,
-  },
-  labelWidth: {
-    type: Number,
-    default: 120,
-  },
-});
-const { formType, modelValue, labelWidth, showTitle, isAdd } = toRefs(props);
-const cityFormRef = ref(null);
-const formRef = ref(null);
-const keywordsFormRef = ref(null);
-const researchsFormRef = ref(null);
-const fieldFormRef = ref(null);
-const directionsFormRef = ref([]);
-const researchOptions = ref([]);
-const options = ref([]);
-const siteList = ref([]);
-const data = reactive({
-  rules: {
-    product: [{ required: true, message: "请输入", trigger: "blur" }],
-    name: [{ required: true, message: "请输入", trigger: "blur" }],
-    kind: [{ required: true, message: "请选择", trigger: "change" }],
-    code: [{ required: true, message: "请输入", trigger: "blur" }],
-    mobile: [
-      { required: true, message: "请输入", trigger: "blur" },
-      {
-        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        message: "请输入正确的手机号码",
-        trigger: "blur",
-      },
-    ],
-    researchId: [{ required: true, message: "请选择", trigger: "change" }],
-    tenantId: [
-      {
-        required: true,
-        message: "请选择",
-        trigger: ["blur", "change"],
-      },
-    ],
-    school: [{ required: true, message: "请输入", trigger: "blur" }],
-    education: [{ required: true, message: "请选择", trigger: "change" }],
-    major: [{ required: true, message: "请输入", trigger: "blur" }],
-    job: [{ required: true, message: "请输入", trigger: "blur" }],
-    title: [{ required: true, message: "请输入", trigger: "blur" }],
-    workAt: [
-      {
-        required: true,
-        message: "从业时间不能为空",
-        trigger: ["change", "blur"],
-      },
-    ],
-    license: [
-      {
-        required: true,
-        message: "请上传",
-        trigger: ["blur", "change"],
-      },
-    ],
-    introduce: [{ required: true, message: "请输入", trigger: "blur" }],
-  },
-});
-const { rules } = toRefs(data);
-const introduceName = computed(() => {
-  if (formType.value === 1) {
-    return "个人简介:";
-  } else if (formType.value === 2) {
-    return "单位简介:";
-  } else {
-    return "";
-  }
-});
-
-const imageName = computed(() => {
-  if (formType.value === 1) {
-    return "专家头像:";
-  } else if (formType.value === 2) {
-    return "企业logo:";
-  } else {
-    return "";
-  }
-});
-
-const nameName = computed(() => {
-  if (formType.value === 2) {
-    return "单位名称:";
-  } else {
-    return "";
-  }
-});
-
-const validateForm = async () => {
-  let formValid;
-  try {
-    formValid = await formRef.value.validate();
-  } catch (error) {
-    formValid = false;
-  }
-  const cityFormValid = await cityFormRef.value.validateForm();
-  const fieldFormValid = await fieldFormRef.value.validateForm();
-  const keywordsFormValid = await keywordsFormRef.value.validateForm();
-  if (formType.value == 1) {
-    //个人
-    const researchsFormValid = await researchsFormRef.value.validateForm(); // 研究方向验证
-    return (
-      formValid &&
-      cityFormValid &&
-      fieldFormValid &&
-      keywordsFormValid &&
-      researchsFormValid
-    );
-  } else if (formType.value == 2) {
-    //企业
-    const directionsFormValid = await directionsFormRef.value.validateForm(); //生产方向验证
-    return (
-      formValid &&
-      cityFormValid &&
-      fieldFormValid &&
-      keywordsFormValid &&
-      directionsFormValid
-    );
-  } else {
-    throw "未知的formType";
-  }
-};
-
-// 获取站点列表
-const getSiteList = async () => {
-  const resp = await tenantSelect();
-  siteList.value = resp.rows;
-};
-getSiteList();
-defineExpose({
-  validateForm,
-});
-</script>
-
-<!-- <script>
-export default {
-  data() {
-    return {};
-  },
-  watch: {
-    "modelmodelValue.tenantId"(newOld) {
-      console.log(newOld);
-      if (newOld) {
-        if (this.formType == 1) {
-          // this.formType == 1 专家表单
-          // 获取所属单位-研究机构options
-          researchSelect({ tenantId: newOld }).then(({ data }) => {
-            this.researchOptions = data;
-          });
-        }
-      } else {
-        this.researchOptions = [];
-        if (this.modelmodelValue.researchId) this.modelmodelValue.researchId = undefined;
-      }
-    },
-  },
-  mounted() {
-    console.log(this.formType);
-    if (this.formType != 1) {
-      // 取消富文本自动聚焦
-      this.$nextTick(() => {
-        this.$refs.introduceRef.Quill.enable(false);
-      });
-    }
-  },
-  methods: {
-    // 富文本聚焦
-    handleEditAble() {
-      this.$refs.introduceRef.Quill.enable(true);
-      this.$refs.introduceRef.Quill.focus();
-    },
-    setLaboratory(e) {
-      laboratorySelect({ researchId: e }).then((res) => {
-        console.log(res);
-      });
-    },
-  },
-};
-</script> -->
-<style lang="scss" scoped>
-.form_title {
-  font-weight: 700;
-  margin-bottom: 30px;
-}
-</style>

src/views/components/InputBoxAdd/index.vue

@@ -12,6 +12,7 @@
           :prop="fieldKey"
           :rules="[
             {
+              required: true,
               type: 'array',
               message: '请输入并添加',
               trigger: 'change',

src/views/components/LaboratoryForm/index.vue

@@ -141,14 +141,14 @@
             placeholder="请输入联系电话"
           ></el-input> </el-form-item></el-col
     ></el-row>
-    <el-row>
+    <!-- <el-row>
       <el-col :span="24">
         <el-form-item label="网址" prop="url">
           <el-input
             placeholder="请输入网址"
             v-model="modelValue.url"
           ></el-input> </el-form-item></el-col
-    ></el-row>
+    ></el-row> -->
     <el-row>
       <el-col :span="24">
         <el-form-item label="实验室简介" prop="introduction">

src/views/dataAuditList/Enterpriseproducts/approval.vue

@@ -242,6 +242,8 @@ import { useRoute, useRouter } from "vue-router";
 import saveAs from "file-saver";
 import { ElMessage } from "element-plus";
 import { customDownload, downloadFile } from "@/utils/request";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
 // import WangEditor from "@/components/WangEditor/index.vue";
 // const isAdd = ref(false);
 const route = useRoute();
@@ -300,6 +302,7 @@ const submitForm = async (status) => {
     case "2":
       successMessage = "已驳回";
   }
+  userStore.getUnApprovedProduct();
   ElMessage.success(successMessage);
   router.back();
 };

src/views/dataAuditList/Enterpriseproducts/index.vue

@@ -194,7 +194,7 @@ const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
     .then(async () => {
       await deleteEnterpriseProduct(ids);
-      userStore.getApprovalCount();
+      userStore.getUnApprovedProduct();
       getList();
       ElMessage.success("删除成功");
     })
@@ -207,11 +207,12 @@ const handleBatchApproval = async () => {
   )
     .then(async () => {
       await batchEnterpriseProduct(selectedIds.value);
-      userStore.getApprovalCount();
+      userStore.getUnApprovedProduct();
       getList();
       ElMessage.success("批量审核成功");
     })
     .catch(() => {});
 };
+userStore.getUnApprovedProduct();
 </script>
 <style></style>

src/views/dataAuditList/achievement/approval.vue

@@ -183,6 +183,8 @@ import {
   cooperationOptions,
 } from "@/utils/parameter";
 import { downloadFile } from "../../../utils/request";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
 const data = reactive({
@@ -216,6 +218,7 @@ const submitForm = async (status) => {
     case "2":
       successMessage = "已驳回";
   }
+  userStore.getUnApprovedAchivement();
   ElMessage.success(successMessage);
   router.back();
 };

src/views/dataAuditList/achievement/index.vue

@@ -186,7 +186,8 @@ const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
     .then(async () => {
       await deleteAchievementByIds(ids);
-      userStore.getApprovalCount();
+      // userStore.getApprovalCount();
+      userStore.getUnApprovedAchivement();
       getList();
       ElMessage.success("删除成功");
     })
@@ -199,11 +200,12 @@ const handleBatchApproval = async () => {
   )
     .then(async () => {
       await batchAchievement(selectedIds.value);
-      userStore.getApprovalCount();
+      userStore.getUnApprovedAchivement();
       getList();
       ElMessage.success("批量审核成功");
     })
     .catch(() => {});
 };
+userStore.getUnApprovedAchivement();
 </script>
 <style></style>

src/views/dataAuditList/demand/approval.vue

@@ -161,6 +161,8 @@ import InputBoxAdd from "@/views/components/InputBoxAdd";
 import { ElMessage } from "element-plus";
 import { ref, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
 const labelWidth = ref(120);
 const router = useRouter();
 const route = useRoute();
@@ -175,9 +177,10 @@ const submitForm = async (status) => {
     case "2":
       successMessage = "已驳回";
   }
+
   ElMessage.success(successMessage);
   router.back();
 };
 
-const getDemandInfo = async () => {};
+// const getDemandInfo = async () => {};
 </script>

src/views/dataAuditList/demand/index.vue

@@ -192,6 +192,7 @@ const getSiteList = async () => {
 };
 
 const handleQuery = () => {
+  // userStore.getUnApprovedTechnology();
   queryParams.value.pageNum = 1;
   getList();
 };
@@ -213,7 +214,7 @@ const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
     .then(async () => {
       await deleteTechnologyDemand(ids);
-      userStore.getApprovalCount();
+      userStore.getUnApprovedTechnology();
       getList();
       ElMessage.success("删除成功");
     })
@@ -225,7 +226,7 @@ const handleBatchApproval = async () => {
   )
     .then(async () => {
       await batchTechnologyDemand(selectedIds.value);
-      userStore.getApprovalCount();
+      userStore.getUnApprovedTechnology();
       getList();
       ElMessage.success("批量审核成功");
     })
@@ -237,7 +238,7 @@ const complete = (id) => {
   ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
     .then(async () => {
       await updateTechnologyDemand({ id, status: 4 });
-      userStore.getApprovalCount();
+      userStore.getUnApprovedTechnology();
       getList();
       ElMessage.success("删除成功");
     })
@@ -245,5 +246,6 @@ const complete = (id) => {
 };
 getSiteList();
 getList();
+userStore.getUnApprovedTechnology();
 </script>
 <style></style>

src/views/dataAuditList/serviceDemand/approval.vue

@@ -121,6 +121,8 @@ import { uniqueId } from "lodash";
 import { ElMessage } from "element-plus";
 import { useRoute, useRouter } from "vue-router";
 import { demandCategoryList } from "@/utils/parameter";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
 const data = reactive({
@@ -166,6 +168,7 @@ const submitForm = async (status) => {
     case "2":
       successMessage = "已驳回";
   }
+  userStore.getUnApprovedService();
   ElMessage.success(successMessage);
   router.back();
 };

src/views/dataAuditList/serviceDemand/index.vue

@@ -236,7 +236,8 @@ const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
     .then(async () => {
       await deleteCasDemand(ids);
-      userStore.getApprovalCount();
+      userStore.getServiceDemandTotal();
+      userStore.getUnApprovedService();
       getList();
       ElMessage.success("删除成功");
     })
@@ -248,7 +249,8 @@ const handleBatchApproval = async () => {
   )
     .then(async () => {
       await batchCasDemand(selectedIds.value);
-      userStore.getApprovalCount();
+      userStore.getServiceDemandTotal();
+      userStore.getUnApprovedService();
       getList();
       ElMessage.success("批量审核成功");
     })
@@ -259,7 +261,8 @@ const complete = (id) => {
   ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
     .then(async () => {
       await updateCasDemand({ id, status: 4 });
-      userStore.getApprovalCount();
+      userStore.getServiceDemandTotal();
+      userStore.getUnApprovedService();
       getList();
       ElMessage.success("删除成功");
     })
@@ -267,5 +270,7 @@ const complete = (id) => {
 };
 getSiteList();
 getList();
+userStore.getServiceDemandTotal();
+userStore.getUnApprovedService();
 </script>
 <style></style>

src/views/dataList/enterprise/index.vue

@@ -66,13 +66,27 @@
           >导出</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          :disabled="!ids.length"
+          type="danger"
+          icon="delete"
+          @click="handleDelete()"
+          >批量删除</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
       <el-table-column label="数据编号" align="center" prop="id" />
       <el-table-column label="企业名称" align="center" prop="name" />
       <!-- <el-table-column label="统一社会信用代码" align="center" prop="code" /> -->
@@ -365,6 +379,11 @@ const loading = ref(true);
 const total = ref(0);
 const dataList = ref([]);
 
+const ids = ref([]);
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((el) => el.id);
+};
+
 /** 查询企业列表 */
 const getList = async () => {
   loading.value = true;
@@ -569,9 +588,10 @@ function submitFileForm() {
   uploadRef.value.submit();
 }
 const handleDelete = async (id) => {
-  ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
+  const delIds = id || ids.value.join(",");
+  ElMessageBox.confirm(`是否确认删除编号为${delIds}的数据项？`)
     .then(async () => {
-      await companyDelete(id);
+      await companyDelete(delIds);
       getList();
       ElMessage.success("删除成功");
     })

src/views/dataList/expert/add.vue

@@ -76,32 +76,10 @@ const getDetailById = async () => {
     const { data } = await companyDetail(route.query.id);
     form.value = data;
     form.value.keywords = data.keyword ? data.keyword.split(",") : [];
+    form.value.researchs = data.research ? data.research.split(",") : [];
     console.log(form.value);
     form.value.district = data.area;
   }
 };
 getDetailById();
 </script>
-
-<!-- <script>
-export default {
-  components: {
-    ExpertForm,
-  },
-  data() {
-    return {
-      // formType: 2,
-      // labelWidth: 140,
-    };
-  },
-  methods: {},
-  created() {
-    const { id } = this.$route.query;
-    if (id) {
-      companyDetail({ id }).then((res) => {
-        form.value = res.data;
-      });
-    }
-  },
-};
-</script> -->

src/views/dataList/expert/index.vue

@@ -50,16 +50,15 @@
           >导入</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
-          type="warning"
+          :disabled="!ids.length"
-          plain
+          type="danger"
-          icon="download"
+          icon="delete"
-          size="default"
+          @click="handleDelete()"
-          @click="handleExport"
+          >批量删除</el-button
-          >导出</el-button
         >
-      </el-col> -->
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -67,7 +66,12 @@
     </el-row>
 
     <!-- 表格区域 -->
-    <el-table v-loading="loading" :data="dataList">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
       <el-table-column label="数据编号" align="center" prop="id" />
       <el-table-column label="专家姓名" align="center" prop="name" />
       <el-table-column label="研究领域" align="center" show-overflow-tooltip>
@@ -273,6 +277,10 @@ const data = reactive({
   },
 });
 const loading = ref(true);
+const ids = ref([]);
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((el) => el.id);
+};
 /*** 用户导入参数 */
 const upload = reactive({
   // 是否显示弹出层（用户导入）
@@ -450,10 +458,10 @@ function submitFileForm() {
   uploadRef.value.submit();
 }
 const handleDelete = async (id) => {
-  ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
+  const delIds = id || ids.value.join(",");
+  ElMessageBox.confirm(`是否确认删除编号为${delIds}的数据项？`)
     .then(async () => {
-      console.log(id);
+      await expertDelete(delIds);
-      await expertDelete(id);
       getList();
       ElMessage.success("删除成功");
     })

src/views/dataList/laboratory/index.vue

@@ -50,16 +50,15 @@
           >导入</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
-          <el-button
+        <el-button
-            type="warning"
+          :disabled="!ids.length"
-            plain
+          type="danger"
-            icon="download"
+          icon="delete"
-            size="default"
+          @click="handleDelete()"
-            @click="handleExport"
+          >批量删除</el-button
-            >导出</el-button
+        >
-          >
+      </el-col>
-        </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -67,7 +66,12 @@
     </el-row>
 
     <!-- 表格区域 -->
-    <el-table v-loading="loading" :data="dataList">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
       <el-table-column label="数据编号" align="center" prop="id" />
       <el-table-column label="实验室全称" align="center" prop="name" />
       <el-table-column label="所属院所或高校" align="center" prop="school" />
@@ -390,6 +394,10 @@ const { queryParams } = toRefs(data);
 //   ElMessage.success("密码重置成功");
 //   showResetPassword.value = false;
 // };
+const ids = ref([]);
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((el) => el.id);
+};
 
 // 获取站点列表
 const getSiteList = async () => {
@@ -472,9 +480,15 @@ function submitFileForm() {
   uploadRef.value.submit();
 }
 const handleDelete = async (id) => {
-  ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
+  let delIds;
+  if (id) {
+    delIds = [id];
+  } else {
+    delIds = ids.value;
+  }
+  ElMessageBox.confirm(`是否确认删除编号为${delIds.join(",")}的数据项？`)
     .then(async () => {
-      await casLaboratoryDelete(id);
+      await casLaboratoryDelete(delIds);
       getList();
       ElMessage.success("删除成功");
     })

src/views/dataList/patent/index.vue

@@ -42,23 +42,27 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
-          type="primary"
+          :disabled="!ids.length"
-          plain
+          type="danger"
-          icon="plus"
+          icon="delete"
-          size="default"
+          @click="handleDelete()"
-          @click="openDialog = true"
+          >批量删除</el-button
-          >认领</el-button
         >
-      </el-col> -->
+      </el-col>
       <right-toolbar
         v-model:showSearch="showSearch"
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataList">
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
       <el-table-column label="数据编号" prop="id" align="center" />
       <el-table-column label="专利名称" prop="title" align="center" />
       <el-table-column label="申请号" prop="applyCode" align="center" />
@@ -97,7 +101,7 @@
             size="small"
             type="text"
             icon="delete"
-            @click="handleDelete(row)"
+            @click="handleDelete(row.id)"
             >删除</el-button
           >
         </template>
@@ -399,10 +403,11 @@ const submitForm = async () => {
   }
 };
 /** 删除按钮操作 */
-const handleDelete = (row) => {
+const handleDelete = (id) => {
-  ElMessageBox.confirm(`是否确认删除编号为${row.id}的数据项？`)
+  const delIds = id || ids.value.join(",");
+  ElMessageBox.confirm(`是否确认删除编号为${delIds}的数据项？`)
     .then(async () => {
-      await patentDelete(row.id);
+      await patentDelete(delIds);
       getList();
       ElMessage.success("删除成功");
     })
@@ -410,147 +415,3 @@ const handleDelete = (row) => {
 };
 getList();
 </script>
-
-<!-- <script>
-export default {
-
-  methods: {
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    // 查找专利条件...  不用了
-    handleQueryClaim() {
-      if (!this.claimQueryParams.applyName.length)
-        return this.$modal.msgError("请输入申请（专利权）人");
-      if (!this.claimQueryParams.inventor.length)
-        return this.$modal.msgError("请输入发明人");
-      this.claimQueryParams.pageNum = 1;
-      this.getClaimList();
-    },
-    // 查找专利...  不用了
-    getClaimList() {
-      this.claimLoading = true;
-      // patentList 临时方法 需修改... 不用了
-      patentList(this.claimQueryParams).then((res) => {
-        this.claimList = res.data.data;
-        this.claimLoading = false;
-        this.claimList.forEach((item) => {
-          if (item.id == "XN0wBrbAZwQl") {
-            this.$nextTick(() => {
-              this.$refs.claimTable.toggleRowSelection(item);
-            });
-          }
-        });
-      });
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-    },
-    getList() {
-      this.loading = true;
-      patentList(this.queryParams).then((res) => {
-        this.dataList = res.data.data;
-        this.total = res.data.count;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        applyName: undefined,
-        applyAddress: undefined,
-        inventor: undefined,
-        title: undefined,
-        applyCode: undefined,
-        openCode: undefined,
-        openAt: undefined,
-        applyAt: undefined,
-        kind: undefined,
-        ipcCode: undefined,
-        description: undefined,
-        // shelf_status: 1,
-        principalClaim: undefined,
-      };
-      this.resetForm("form");
-    },
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增专利";
-    },
-    handleUpdate(row) {
-      this.reset();
-      patentDetail({ id: row.id }).then((res) => {
-        this.form = res.data;
-        this.open = true;
-        this.title = "修改专利";
-      });
-    },
-    submitClaimForm() {},
-    // 状态修改
-    // handleStatusChange(row) {
-    //   let text = row.shelf_status === 1 ? "启用" : "停用";
-    //   this.$modal
-    //     .confirm('确认要"' + text + '""' + row.id + '"数据吗？')
-    //     .then(function () {
-    //       return patentShelf({ id: row.id });
-    //     })
-    //     .then(() => {
-    //       this.$modal.msgSuccess(text + "成功");
-    //     })
-    //     .catch(function () {
-    //       row.shelf_status = row.shelf_status === 1 ? 2 : 1;
-    //     });
-    // },
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.form.inventor = this.form.inventor.replace(/，/g, ",");
-          this.form.applyName = this.form.applyName.replace(/，/g, ",");
-          if (this.form.id != undefined) {
-            patentEdit(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            patentAdd(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal
-        .confirm('是否确认删除编号为"' + row.id + '"的数据项？')
-        .then(function () {
-          return patentDelete({ id: row.id });
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-  },
-  created() {
-    this.getList();
-  },
-};
-</script> -->

src/views/dataList/thesis/index.vue

@@ -22,13 +22,17 @@
           >重置</el-button
         >
       </el-form-item>
-      <el-form-item style="float: right">
+      <!-- <el-form-item style="float: right"> </el-form-item> -->
-        <el-button type="primary" @click="btnAdd">新增论文</el-button>
-      </el-form-item>
     </el-form>
-
+    <el-row>
+      <el-button type="primary" @click="btnAdd">新增论文</el-button>
+      <el-button :disabled="!ids.length" type="danger" @click="delList()"
+        >批量删除</el-button
+      >
+    </el-row>
     <!-- 表格区域 -->
-    <el-table :data="dataList">
+    <el-table :data="dataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
       <el-table-column prop="title" label="论文题目" align="center" />
       <el-table-column prop="ext" label="期刊名称" align="center" />
       <el-table-column prop="author" label="作者" align="center" />
@@ -175,6 +179,7 @@ const { formData } = toRefs(form);
 const dataList = ref([]);
 const total = ref(0);
 const isShow = ref(false);
+const ids = ref([]);
 const { queryData } = toRefs(data);
 // const tags = ref([]);
 // 获取论文列表
@@ -183,6 +188,10 @@ const getList = async () => {
   dataList.value = res.rows;
   total.value = res.total;
 };
+
+const handleSelectionChange = (selection) => {
+  ids.value = selection.map((el) => el.id);
+};
 // 搜索查询
 const handleQuery = () => {
   getList(queryData.value);
@@ -198,9 +207,10 @@ const resetQuery = () => {
 };
 // 删除按钮
 const delList = async (id) => {
-  ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
+  const delIds = id || ids.value.join(",");
+  ElMessageBox.confirm(`是否确认删除编号为${delIds}的数据项？`)
     .then(async () => {
-      await delItem(id);
+      await delItem(delIds);
       getList();
       ElMessage.success("删除成功");
     })

src/views/expert/dataList/approval.vue

@@ -13,6 +13,7 @@
     <div :style="{ marginLeft: labelWidth + 'px' }">
       <el-button @click="submitForm('2')">审核拒绝</el-button>
       <el-button type="primary" @click="submitForm('1')">通过审核</el-button>
+      <!-- <el-button type="primary" @click="submitForm('0')">test审核</el-button> -->
     </div>
   </div>
 </template>
@@ -62,11 +63,11 @@ const submitForm = async (state) => {
   //   if (form.value.id != undefined) {
   form.value.examineStatus = state;
   await companyEdit(form.value);
+  useUserStore().getUnApprovedExpert();
   cancel();
   ElMessage.success("已审核");
   //   } else {
   //     await companyAdd(form.value);
-  //     useUserStore().getApprovalCount();
   //     cancel();
   //     ElMessage.success("新增成功");
   //   }

src/views/expert/dataList/index.vue

@@ -51,12 +51,11 @@
         </template>
       </el-table-column>
       <el-table-column prop="education" label="学历" align="center" />
-      <el-table-column
+      <el-table-column show-overflow-tooltip label="个人备注" align="center">
-        prop="introduce"
+        <template #default="{ row }">
-        show-overflow-tooltip
+          <div v-html="row.introduce"></div>
-        label="个人备注"
+        </template>
-        align="center"
+      </el-table-column>
-      />
       <el-table-column prop="school" label="毕业院校" align="center" />
       <el-table-column prop="post" label="职务" align="center" />
       <!-- <el-table-column label="站点" align="center">
@@ -96,6 +95,7 @@ import SiteOptions from "@/views/components/SiteOptions";
 import { tenantSelect } from "@/api/subPlatform/tenant";
 import { expertList } from "@/api/expert/expert";
 import { useRouter } from "vue-router";
+import useUserStore from "@/store/modules/user";
 const router = useRouter();
 const data = reactive({
   queryData: {
@@ -145,6 +145,8 @@ const btnAudit = (id) => {
   });
 };
 getList();
+
+useUserStore().getUnApprovedExpert();
 // getSiteList();
 </script>
 <style></style>

src/views/userAuditList/enterprise/add.vue

@@ -14,7 +14,7 @@
     <div :style="{ marginLeft: 140 + 'px' }">
       <el-button @click="submitForm('2')">审核拒绝</el-button>
       <el-button type="primary" @click="submitForm('1')">通过审核</el-button>
-      <el-button type="primary" @click="testCount">通过审核</el-button>
+      <!-- <el-button type="primary" @click="testCount">通过审核</el-button> -->
     </div>
   </div>
 </template>
@@ -32,10 +32,6 @@ import { useRoute, useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import useUserStore from "@/store/modules/user";
 
-const testCount = () => {
-  useUserStore().unApprovedBusinessPlus();
-};
-
 const router = useRouter();
 const route = useRoute();
 const formType = ref(2);

src/views/userAuditList/expert/index.vue

@@ -51,12 +51,12 @@
         </template>
       </el-table-column>
       <el-table-column prop="education" label="学历" align="center" />
-      <el-table-column
+      <!-- prop="introduce" -->
-        prop="introduce"
+      <!-- <el-table-column show-overflow-tooltip label="个人备注" align="center">
-        show-overflow-tooltip
+        <template #default="{ row }">
-        label="个人备注"
+          <div v-html="row.introduce"></div>
-        align="center"
+        </template>
-      />
+      </el-table-column> -->
       <el-table-column prop="school" label="毕业院校" align="center" />
       <el-table-column prop="post" label="职务" align="center" />
       <el-table-column label="站点" align="center">

src/views/website/activity/active/FieldOptions/index.vue

@@ -1,301 +0,0 @@
-<template>
-  <el-form
-    ref="formRef"
-    :model="modelValue"
-    :rules="rules"
-    :label-width="labelWidth + 'px'"
-    :disabled="disabled"
-  >
-    <el-row>
-      <el-col :span="24">
-        <el-form-item label="所属领域:" prop="industrys" :show-message="false">
-          <el-row type="flex" justify="space-between">
-            <el-col :span="6">
-              <el-form-item>
-                <el-select
-                  v-model="fields[0]"
-                  value-key="id"
-                  placeholder="请选择"
-                  @change="levelIChange"
-                >
-                  <el-option
-                    v-for="item in levelI"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-select
-                v-model="fields[1]"
-                value-key="id"
-                placeholder="请选择"
-                :disabled="levelII.length === 0"
-                @change="levelIIChange"
-              >
-                <el-option
-                  v-for="item in levelII"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                >
-                </el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="6">
-              <el-select
-                v-model="fields[2]"
-                value-key="id"
-                :disabled="levelIII.length === 0"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in levelIII"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                >
-                </el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="3">
-              <el-button type="primary" @click="fieldAdd">添加</el-button>
-              <!-- <el-button type="primary" @click="check">验证</el-button> -->
-            </el-col>
-          </el-row>
-          <div class="e_tag">
-            <el-tag
-              v-for="(tag, index) in industrysTags"
-              :key="index"
-              closable
-              @close="handleFieldClose(index)"
-            >
-              {{ tag }}
-              <!-- <template v-if="Array.isArray(tag)">
-                <span v-for="(item, i) in tag" :key="item">
-                  {{ item.name }}
-                  <span v-if="tag.length != i + 1">></span>
-                </span>
-              </template>
-              <template v-else>
-                <span>{{ tag }}</span>
-              </template> -->
-            </el-tag>
-          </div>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script setup name="FieldOptions">
-// import { industry } from "@/api/config";
-import { listSysIndustry } from "@/api/platform/industry";
-import { ElMessage } from "element-plus";
-import { toRefs, watch, reactive } from "vue";
-
-const props = defineProps({
-  modelValue: Object,
-  labelWidth: {
-    type: Number,
-    default: 120,
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
-const { modelValue, labelWidth, disabled } = toRefs(props);
-const formRef = ref(null);
-const levelI = ref([]); // I级数据
-const levelII = ref([]); // II级数据
-const levelIII = ref([]); // III级数据
-const fields = ref([]); // 当前下拉框选中的集合
-const industrysTags = ref([]); // 点击添加按钮后临时存储的数据集合
-const data = reactive({
-  rules: {
-    industrys: [
-      {
-        type: "array",
-        required: true,
-        message: "请选择并添加",
-        trigger: "change",
-      },
-    ],
-  },
-});
-const { rules } = toRefs(data);
-
-// 获取领域树形列表
-const getIndustryTreeData = async () => {
-  const { data } = await listSysIndustry();
-  levelI.value = data;
-};
-
-const levelIChange = async (item) => {
-  delete fields.value[1];
-  delete fields.value[2];
-  levelII.value = levelI.value.find((el) => {
-    return el.id === item;
-  }).children;
-};
-
-const levelIIChange = async (item) => {
-  delete fields.value[2];
-  levelIII.value = levelII.value.find((el) => el.id === item).children;
-};
-
-// 根据id获取领域名称
-// TODO:如果领域已经被删除，则显示未知领域
-const getFieldNameById = (ids) => {
-  if (levelI.value.length === 0) {
-    return;
-  }
-  let fieldNameList = [];
-  let subFieldList = [];
-  for (let i = 0; i < ids.length; i++) {
-    const id = ids[i];
-    if (fieldNameList.length === 0) {
-      subFieldList = levelI.value.find((el) => el.id == id)?.children;
-      fieldNameList.push(levelI.value.find((el) => id === el.id)?.name);
-    } else {
-      fieldNameList.push(subFieldList.find((el) => id === el.id)?.name);
-      subFieldList = subFieldList.find((el) => el.id == id)?.children;
-    }
-  }
-  return fieldNameList.join(">");
-};
-
-// 所属领域添加按钮
-const fieldAdd = () => {
-  if (!fields.value.length) return ElMessage.error("请选择领域类型");
-  // 移除校验
-  formRef.value.clearValidate();
-  industrysTags.value.push(fields.value);
-  modelValue.value.industrys.push(fields.value.join("-"));
-  fields.value = [];
-  levelII.value = [];
-  levelIII.value = [];
-  // for (let i = 0; i < industrysTags.value.length; i++) {
-  //   modelValue.value.industrys.push("");
-  //   const item = industrysTags.value[i];
-  //   for (let j = 0; j < item.length; j++) {
-  //     const item2 = item[j];
-  //     if (modelValue.value.industrys[i] == "") {
-  //       modelValue.value.industrys[i] = item2.id;
-  //     } else {
-  //       modelValue.value.industrys[i] =
-  //         modelValue.value.industrys[i] + "-" + item2.id;
-  //     }
-  //   }
-  // }
-  // fields.value = [];
-  // levelII.value = [];
-  // levelIII.value = [];
-};
-
-const handleFieldClose = (index) => {
-  industrysTags.value.splice(index, 1);
-  modelValue.value.industrys.splice(index, 1);
-  formRef.value.validate();
-};
-
-const validateForm = async () => {
-  try {
-    return await formRef.value.validate();
-  } catch (error) {
-    return false;
-  }
-};
-
-getIndustryTreeData();
-
-watch(
-  modelValue,
-  (newVal) => {
-    modelValue.value.industrys = [];
-    // console.log(modelValue.value.industry ? 1 : 0);
-    let industrysList = modelValue.value.industryName
-      ? modelValue.value.industryName.split(",")
-      : [];
-    modelValue.value.industrys.push(...industrysList);
-    for (const field of industrysList) {
-      industrysTags.value.push(field);
-    }
-    // let _key = [];
-    // let _value = [];
-    // for (let i = 0; i < newVal.industrys.length; i++) {
-    //   const item = newVal.industrys[i];
-    //   _key.push(item.key);
-    //   _value.push(item.value);
-    // }
-    // newVal.industrys = _key;
-    // let keyObj = [];
-    // for (let i = 0; i < _key.length; i++) {
-    //   keyObj.push([]);
-    //   let array = _key[i].split("-");
-    //   for (let j = 0; j < array.length; j++) {
-    //     keyObj[i].push({
-    //       id: array[j],
-    //     });
-    //   }
-    // }
-    // for (let i = 0; i < _value.length; i++) {
-    //   let array = _value[i].split(">");
-    //   for (let j = 0; j < array.length; j++) {
-    //     keyObj[i][j]["name"] = array[j];
-    //   }
-    // }
-    // industrysTags.value = keyObj;
-  },
-  { immediate: true }
-);
-
-defineExpose({
-  validateForm,
-});
-</script>
-
-<!-- <script>
-export default {
-  watch: {
-    value(newVal, oldVal) {
-      let _key = [];
-      let _value = [];
-      for (let i = 0; i < newVal.industrys.length; i++) {
-        const item = newVal.industrys[i];
-        _key.push(item.key);
-        _value.push(item.value);
-      }
-      newVal.industrys = _key;
-
-      let keyObj = [];
-      for (let i = 0; i < _key.length; i++) {
-        keyObj.push([]);
-        let array = _key[i].split("-");
-        for (let j = 0; j < array.length; j++) {
-          keyObj[i].push({
-            id: array[j],
-          });
-        }
-      }
-      for (let i = 0; i < _value.length; i++) {
-        let array = _value[i].split(">");
-        for (let j = 0; j < array.length; j++) {
-          keyObj[i][j]["name"] = array[j];
-        }
-      }
-      industrysTags.value = keyObj;
-    },
-  },
-};
-</script> -->
-<style lang="scss" scoped>
-.e_tag {
-  .el-tag {
-    margin-right: 10px;
-  }
-}
-</style>

src/views/website/activity/active/index.vue

@@ -386,8 +386,8 @@
 </template>
 
 <script setup name="Active">
-// import SiteOptions from "@/views/components/SiteOptions";
+import SiteOptions from "@/views/components/SiteOptions";
-import CityOptions from "../../../components/CityOptions";
+// import CityOptions from "../../../components/CityOptions";
 import {
   activityList,
   activityAdd,
@@ -404,13 +404,13 @@ import {
   cityList,
   districtList,
 } from "@/api/config";
-import FieldOptions from "./FieldOptions";
+import FieldOptions from "@/views/components/FieldOptions";
 // import { cloneDeep } from "lodash";
 import { reactive, toRefs } from "vue";
 // import { constants } from "buffer";
 import { ElMessage, ElMessageBox } from "element-plus";
 import WangEditor from "@/components/WangEditor/index.vue";
-import SiteOptions from "@/views/components/SiteOptions";
+// import SiteOptions from "@/views/components/SiteOptions";
 import { useRouter } from "vue-router";
 const router = useRouter();
 const dataList = ref([]);