发票列表

src/api/Businessneeds/index.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 // 获取企业需求列表
-export const businessList=(params)=>request({
+export const businessList = (params) => request({
-    url:"/business/dataReview/technologyDemandList",
+    url: "/business/dataReview/technologyDemandList",
-    method:'get',
+    method: 'get',
     params
 })

src/api/dataApproval/enterpriseProduct.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 获取企业产品审核列表
+export const enterpriseProductApprovalList = (params) => request({
+    url: "/business/dataReview/enterpriseProductList",
+    method: 'get',
+    params
+})
+// 获取企业产品审核详情
+export const getProductApprovalInfo = (id) => request({
+    url: `/business/dataReview/getProductInfo/${id}`,
+    method: 'get',
+})
+// 修改企业产品审核状态
+export const updateEnterpriseApprovalProduct = (data) => request({
+    url: `/business/dataReview/updateEnterpriseProduct`,
+    method: 'post',
+    data
+})

src/api/order/index.js

@@ -7,6 +7,14 @@ export function casDealLogList(params) {
         params
     });
 }
+// 获取发票列表
+export function billList(params) {
+    return request({
+        url: `/business/casDealLog/billList`,
+        method: "get",
+        params
+    });
+}
 export function addDealLog(data) {
     return request({
         url: `/business/casDealLog`,

src/components/ImageUpload/index.vue

@@ -68,7 +68,11 @@ const props = defineProps({
   // 是否显示提示
   isShowTip: {
     type: Boolean,
-    default: true
+    default: true,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
   },
 });
 
@@ -86,26 +90,30 @@ const showTip = computed(
   () => props.isShowTip && (props.fileType || props.fileSize)
 );
 
-watch(() => props.modelValue, val => {
+watch(
-  if (val) {
+  () => props.modelValue,
-    // 首先将值转为数组
+  (val) => {
-    const list = Array.isArray(val) ? val : props.modelValue.split(",");
+    if (val) {
-    // 然后将数组转为对象数组
+      // 首先将值转为数组
-    fileList.value = list.map(item => {
+      const list = Array.isArray(val) ? val : props.modelValue.split(",");
-      if (typeof item === "string") {
+      // 然后将数组转为对象数组
-        if (item.indexOf(baseUrl) === -1) {
+      fileList.value = list.map((item) => {
-          item = { name: baseUrl + item, url: baseUrl + item };
+        if (typeof item === "string") {
-        } else {
+          if (item.indexOf(baseUrl) === -1) {
-          item = { name: item, url: item };
+            item = { name: baseUrl + item, url: baseUrl + item };
+          } else {
+            item = { name: item, url: item };
+          }
         }
-      }
+        return item;
-      return item;
+      });
-    });
+    } else {
-  } else {
+      fileList.value = [];
-    fileList.value = [];
+      return [];
-    return [];
+    }
-  }
+  },
-},{ deep: true, immediate: true });
+  { deep: true, immediate: true }
+);
 
 // 删除图片
 function handleRemove(file, files) {
@@ -116,7 +124,9 @@ function handleRemove(file, files) {
 function handleUploadSuccess(res) {
   uploadList.value.push({ name: res.fileName, url: res.url });
   if (uploadList.value.length === number.value) {
-    fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
+    fileList.value = fileList.value
+      .filter((f) => f.url !== undefined)
+      .concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
@@ -132,7 +142,7 @@ function handleBeforeUpload(file) {
     if (file.name.lastIndexOf(".") > -1) {
       fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
     }
-    isImg = props.fileType.some(type => {
+    isImg = props.fileType.some((type) => {
       if (file.type.indexOf(type) > -1) return true;
       if (fileExtension && fileExtension.indexOf(type) > -1) return true;
       return false;
@@ -191,6 +201,6 @@ function listToString(list, separator) {
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 :deep(.hide .el-upload--picture-card) {
-    display: none;
+  display: none;
 }
-</style>
+</style>

src/components/WangEditor/index.vue

@@ -56,7 +56,7 @@ export default {
       type: String,
       default: "default",
     },
-    readonly: {
+    readOnly: {
       type: Boolean,
       default: false,
     },
@@ -95,7 +95,7 @@ export default {
       placeholder: "请输入内容...",
       autoFocus: props.focus,
       maxLength: 140,
-      readOnly: props.readonly,
+      readOnly: props.readOnly,
     };
     onMounted(() => {
       // console.log(editorRef.value.getConfig());

src/views/Enterpriseproducts/approval.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <div style="width: 55%">
+      <el-form
+        ref="formRef"
+        :model="form"
+        :label-width="labelWidth + 'px'"
+        :disabled="true"
+      >
+        <div class="form_title" v-if="showTitle">基本信息</div>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业名称:" prop="title">
+              <el-input
+                v-model="form.title"
+                placeholder="请输入企业名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="联系方式:" prop="title">
+              <el-input
+                v-model="form.title"
+                placeholder="请输入企业名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="产品名称:" prop="title">
+              <el-input
+                v-model="form.title"
+                placeholder="请输入产品名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <FieldOptions
+          v-model="form"
+          :labelWidth="labelWidth"
+          ref="fieldForm"
+          :disabled="true"
+        />
+
+        <InputBoxAdd
+          :labelWidth="labelWidth"
+          v-model="form"
+          title="应用客户"
+          placeholder="请输入应用客户"
+          fieldKey="customer"
+          ref="customerForm"
+          :disabled="true"
+        />
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="成果成熟度:" prop="maturity">
+              <el-select
+                v-model="form.maturity"
+                clearable
+                placeholder="请选择成果成熟度"
+              >
+                <el-option
+                  v-for="item in maturityOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.key"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="成果领先性:" prop="lead_standard">
+              <el-select
+                v-model="form.lead_standard"
+                clearable
+                placeholder="请选择成果领先性"
+              >
+                <el-option
+                  v-for="item in leadOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.key"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="合作模式:">
+              <el-select
+                v-model="form.cooperation_mode"
+                clearable
+                placeholder="请选择合作模式"
+              >
+                <el-option
+                  v-for="item in cooperationOptions"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.key"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <InputBoxAdd
+          :labelWidth="labelWidth"
+          v-model="form"
+          title="关键词"
+          placeholder="请输入关键词"
+          fieldKey="keywords"
+          ref="keywordsForm"
+          :disabled="true"
+        />
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="成果简介:" prop="description">
+              <el-input
+                v-model="form.description"
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 8 }"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="成果来源:">
+              <WangEditor
+                v-model="form.introduce"
+                minHeight="150"
+                :readOnly="true"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="产品图片:" prop="image">
+              <ImageUpload v-model="form.image" :limit="1" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+        <el-form-item label="产品视频:">
+          <VideoUpload
+            v-model="form.video"
+            :limit="1"
+            :fileType="['mp4']"
+            :disabled="isAdd"
+          />
+        </el-form-item>
+      </el-col> -->
+        </el-row>
+        <p>
+          <b>图片材料上传</b>
+        </p>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="成熟度证明材料:">
+              <FileUpload
+                v-model="form.file"
+                :limit="1"
+                :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'jpg']"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div :style="{ marginLeft: labelWidth + 'px' }">
+      <el-button @click="submitForm('2')">审核拒绝</el-button>
+      <el-button type="primary" @click="submitForm('1')">通过审核</el-button>
+    </div>
+  </div>
+</template>
+<script setup>
+import { reactive, toRefs } from "vue";
+import CityOptions from "@/views/components/CityOptions";
+import FieldOptions from "@/views/components/FieldOptions";
+import InputBoxAdd from "@/views/components/InputBoxAdd";
+import {
+  getProductApprovalInfo,
+  updateEnterpriseApprovalProduct,
+} from "../../api/dataApproval/enterpriseProduct";
+import {
+  maturityOptions,
+  leadOptions,
+  cooperationOptions,
+} from "@/utils/parameter";
+import { useRoute, useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
+// import WangEditor from "@/components/WangEditor/index.vue";
+// const isAdd = ref(false);
+const route = useRoute();
+const router = useRouter();
+const labelWidth = ref(120);
+const showTitle = ref(false);
+// const props = defineProps({
+//   labelWidth: {
+//     type: Number,
+//     default: 120,
+//   },
+//   showTitle: {
+//     type: Boolean,
+//     default: false,
+//   },
+// });
+// const {} = toRefs(props);
+
+const data = reactive({
+  form: {},
+});
+const { form } = toRefs(data);
+
+const getDetail = async (id) => {
+  const { data } = await getProductApprovalInfo(id);
+  form.value = data;
+};
+if (route.query.id) {
+  getDetail(route.query.id);
+}
+const submitForm = async (status) => {
+  await updateEnterpriseApprovalProduct({ ...form.value, status });
+  let successMessage;
+  switch (status) {
+    case "1":
+      successMessage = "已通过";
+      break;
+    case "2":
+      successMessage = "已驳回";
+  }
+  ElMessage.success(successMessage);
+  router.back();
+};
+</script>
+<!-- <script>
+  import CityOptions from "@/views/components/CityOptions";
+  import FieldOptions from "@/views/components/FieldOptions";
+  import InputBoxAdd from "@/views/components/InputBoxAdd";
+  export default {
+    components: {
+      CityOptions,
+      FieldOptions,
+      InputBoxAdd,
+    },
+    props: {
+      value: Object,
+      isAdd: {
+        type: Boolean,
+        default: true,
+      },
+      showTitle: {
+        type: Boolean,
+        default: false,
+      },
+      labelWidth: {
+        type: Number,
+        default: 120,
+      },
+    },
+    data() {
+      return {
+        rules: {
+          title: [{ required: true, message: "请输入", trigger: "blur" }],
+          maturity: [{ required: true, message: "请选择", trigger: "change" }],
+          lead_standard: [
+            { required: true, message: "请选择", trigger: "change" },
+          ],
+          description: [{ required: true, message: "请输入", trigger: "blur" }],
+          image: [
+            { required: true, message: "请上传", trigger: ["change", "blur"] },
+          ],
+        },
+      };
+    },
+    methods: {
+      submitForm() {
+        let flag = false;
+        this.$refs["formRef"].validate((valid) => {
+          const fieldForm = this.$refs.fieldForm.submitForm();
+          const customerForm = this.$refs.customerForm.submitForm();
+          console.log();
+          const directionsForm =
+            this.form.mode == 2 ? this.$refs.directionsForm.submitForm() : true;
+          const keywordsForm = this.$refs.keywordsForm.submitForm();
+          if (
+            valid &&
+            fieldForm &&
+            customerForm &&
+            directionsForm &&
+            keywordsForm
+          ) {
+            flag = !flag;
+          }
+        });
+        return flag;
+      },
+    },
+  };
+  </script> -->
+<style lang="scss" scoped>
+.form_title {
+  font-weight: 700;
+  margin-bottom: 30px;
+}
+// 上传图片框限制
+// ::v-deep .el-upload--picture-card {
+//   width: 120px;
+//   height: 120px;
+//   line-height: 120px;
+// }
+.el-select,
+.el-date-editor {
+  display: block;
+  width: 100%;
+}
+</style>

src/views/Enterpriseproducts/index.vue

@@ -1,63 +1,182 @@
-
 <template>
-<div class="app-container">
+  <div class="app-container">
     <!-- 顶部区域 -->
-    <el-form>
+    <el-form inline ref="queryFormRef" :model="queryParams">
-    <el-row type="flex">
+      <el-row>
-      <el-col :span="8">
+        <el-col>
-        <el-button type="primary">待审核</el-button>
+          <el-form-item prop="status">
-        <el-button type="">已驳回</el-button>
+            <el-radio-group
-        <el-button type="">已通过</el-button>
+              v-model="queryParams.status"
-      </el-col>
+              size="small"
-      <el-col :span="4">
+              @change="handleQuery"
-        <el-form-item label="站点">
+            >
-            <el-select  class="m-2" placeholder="请选择">
+              <!-- <el-radio-button :label="1">已发布</el-radio-button> -->
-                <el-option/>
+              <el-radio-button :label="0">待审核</el-radio-button>
-            </el-select>
+              <el-radio-button :label="1">已驳回</el-radio-button>
-        </el-form-item>
+              <el-radio-button :label="2">已通过</el-radio-button>
-      </el-col>
+            </el-radio-group>
-    </el-row>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="所属站点" prop="tenantId">
+            <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-table :data="list">
+    <el-table :data="dataList" :loading="loading">
-      <el-table-column label="产品名称" align="center" prop="name"></el-table-column>
+      <el-table-column
-      <el-table-column label="所属领域" align="center" prop="obj"></el-table-column>
+        label="产品名称"
-      <el-table-column label="所属企业" align="center" prop=""></el-table-column>
+        align="center"
-      <el-table-column label="站点" align="center" prop=""></el-table-column>
+        prop="title"
-      <el-table-column label="申请时间" align="center" prop="time"></el-table-column>
+      ></el-table-column>
+      <el-table-column
+        label="所属领域"
+        align="center"
+        prop="industryStr"
+      ></el-table-column>
+      <el-table-column
+        label="所属企业"
+        align="center"
+        prop="enterprise"
+      ></el-table-column>
+      <el-table-column label="站点" align="center">
+        <template #default="{ row }">
+          {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="申请时间"
+        align="center"
+        prop="createTime"
+      ></el-table-column>
       <el-table-column label="操作" align="center">
-        <template #default="{row}">
+        <template #default="{ row }">
-            <el-button type="text">审批</el-button>
+          <el-button
+            type="primary"
+            round
+            size="small"
+            :disabled="queryParams.status != 0"
+            @click="handleApproval(row.id)"
+            >审批</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <!-- 分页器 -->
+    <pagination
-    <el-row type="flex" justify="end" style="margin-top:10px ;">
+      v-show="total > 0"
-    <el-pagination
+      :total="total"
-      v-model:currentPage="currentPage3"
+      v-model:page="queryParams.pageNum"
-      v-model:page-size="pageSize3"
+      v-model:limit="queryParams.pageSize"
-      :small="small"
+      @pagination="getList"
-      :disabled="disabled"
-      :page-sizes="[10, 20, 30, 40]"
-      :background="true"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="6"
     />
-    </el-row>
+  </div>
-</div>
 </template>
 <script setup>
-import { ref } from 'vue';
+import { reactive, ref, toRefs } from "vue";
+import SiteOptions from "@/views/components/SiteOptions";
+import { tenantSelect } from "@/api/subPlatform/tenant";
+import { enterpriseProductApprovalList } from "@/api/dataApproval/enterpriseProduct";
+import { useRouter } from "vue-router";
+const router = useRouter();
+const dataList = ref([]);
+const siteList = ref([]);
+const total = ref(0);
+const loading = ref(true);
+const queryFormRef = ref();
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    status: 0,
+  },
+});
+const { queryParams } = toRefs(data);
 
-const list=ref([])
+// const statusDic = {
-list.value=[
+//   0: "待审核",
-    {id:'123',name:'新型高功率LED路灯照明市场分析',obj:'电子信息',time:'2015-09-28 08:50:08'},
+//   1: "通过",
-    {id:'123',name:'一种新型的自动调节升降按摩椅',obj:'电子信息',time:'2015-09-28 08:50:08'},
+//   2: "驳回",
-    {id:'123',name:'汽车用先进传感器成果',obj:'电子信息',time:'2015-09-28 08:50:08'},
+//   3: "草稿",
-    {id:'123',name:'微波遥感',obj:'电子信息',time:'2015-09-28 08:50:08'},
+// };
-    {id:'123',name:'一种高压电柜的散热控',obj:'电子信息',time:'2015-09-28 08:50:08'},
+
-    {id:'123',name:'高电压快充技术',obj:'电子信息',time:'2015-09-28 08:50:08'}
+const getList = async () => {
-]
+  loading.value = true;
+  const resp = await enterpriseProductApprovalList(queryParams.value);
+  dataList.value = resp.rows;
+  total.value = resp.total;
+  loading.value = false;
+};
+
+getList();
+// 获取站点列表
+const getSiteList = async () => {
+  const resp = await tenantSelect();
+  siteList.value = resp.rows;
+};
+getSiteList();
+
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  if (queryFormRef.value) {
+    queryFormRef.value.resetFields();
+  }
+  handleQuery();
+};
+// dataList.value = [
+//   {
+//     id: "123",
+//     name: "新型高功率LED路灯照明市场分析",
+//     obj: "电子信息",
+//     time: "2015-09-28 08:50:08",
+//   },
+//   {
+//     id: "123",
+//     name: "一种新型的自动调节升降按摩椅",
+//     obj: "电子信息",
+//     time: "2015-09-28 08:50:08",
+//   },
+//   {
+//     id: "123",
+//     name: "汽车用先进传感器成果",
+//     obj: "电子信息",
+//     time: "2015-09-28 08:50:08",
+//   },
+//   { id: "123", name: "微波遥感", obj: "电子信息", time: "2015-09-28 08:50:08" },
+//   {
+//     id: "123",
+//     name: "一种高压电柜的散热控",
+//     obj: "电子信息",
+//     time: "2015-09-28 08:50:08",
+//   },
+//   {
+//     id: "123",
+//     name: "高电压快充技术",
+//     obj: "电子信息",
+//     time: "2015-09-28 08:50:08",
+//   },
+// ];
+const handleApproval = (id) => {
+  router.push(`/auditing/Enterpriseproducts/approval?id=${id}`);
+};
 </script>
-<style></style>
+<style></style>

src/views/approval/dataList/index.vue

@@ -1,191 +1,198 @@
 <template>
-    <div class="app-container">
+  <div class="app-container">
-        <!-- 顶部搜索区域 -->
+    <!-- 顶部搜索区域 -->
-        <el-form :model="queryData" :inline="true">
+    <el-form :model="queryData" :inline="true">
-          <el-form-item label="企业名称">
+      <el-form-item label="企业名称">
-            <el-input style="width: 150px;" v-model="queryData.name" placeholder="请输入关键字"></el-input>
+        <el-input
-          </el-form-item>
+          style="width: 150px"
-          <el-form-item label="审核状态">
+          v-model="queryData.name"
-            <el-select style="width: 100px;" v-model="queryData.examineStatus" class="m-2" placeholder="请选择" >
+          placeholder="请输入关键字"
-             <el-option
+        ></el-input>
-                label="已审核"
+      </el-form-item>
-                :value="1"
+      <el-form-item label="审核状态">
-                />
+        <el-select
-                <el-option
+          style="width: 100px"
-                label="已拒绝"
+          v-model="queryData.examineStatus"
-                :value="2"
+          class="m-2"
-                />
+          placeholder="请选择"
-             </el-select>
+        >
-          </el-form-item>
+          <el-option label="已审核" :value="1" />
-          <el-form-item label="企业类型">
+          <el-option label="已拒绝" :value="2" />
-            <el-select style="width: 100px;" v-model="queryData.kind" class="m-2" placeholder="请选择" >
+        </el-select>
-             <el-option :value="101" label="上市企业"/>
+      </el-form-item>
-             <el-option :value="102" label="优质企业"/>
+      <el-form-item label="企业类型">
-             <el-option :value="103" label="普通企业"/>
+        <el-select
-             </el-select>
+          style="width: 100px"
-          </el-form-item>
+          v-model="queryData.kind"
-          <el-form-item label="站点">
+          class="m-2"
-            <SiteOptions v-model="queryData.tenantId" :site-list="siteList" style="width:160px;"/>
+          placeholder="请选择"
-          </el-form-item>
+        >
+          <el-option :value="101" label="上市企业" />
+          <el-option :value="102" label="优质企业" />
+          <el-option :value="103" label="普通企业" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="站点">
+        <SiteOptions
+          v-model="queryData.tenantId"
+          :site-list="siteList"
+          style="width: 160px"
+        />
+      </el-form-item>
 
-        <el-form-item style="float: right;">
+      <el-form-item style="float: right">
-          <el-button
+        <el-button
           type="primary"
           icon="search"
           size="default"
           @click="handleQuery"
           >搜索</el-button
-          >
+        >
-         <el-button icon="refresh" size="default"
+        <el-button icon="refresh" size="default" @click="resetQuery"
-         @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
-        </el-form>
+    </el-form>
 
-        <!--表格区域-->
+    <!--表格区域-->
-        <el-table :data="dataList" style="width: 100%" border >
+    <el-table :data="dataList" style="width: 100%" border>
-        <el-table-column prop="name" label="企业名称" align="center"/>
+      <el-table-column prop="name" label="企业名称" align="center" />
-        <el-table-column prop="code" label="统一社会信用代码" align="center"/>
+      <el-table-column prop="code" label="统一社会信用代码" align="center" />
-        <el-table-column label="所属领域" align="center">
+      <el-table-column label="所属领域" align="center">
         <template #default="{ row }">
           <div>{{ row.industrys[row.industrys.length - 1] }}</div>
         </template>
-        </el-table-column>
+      </el-table-column>
-        <el-table-column prop="" label="站点" align="center">
+      <el-table-column prop="" label="站点" align="center">
         <template #default="{ row }">
           {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
         </template>
-        </el-table-column>
+      </el-table-column>
-        <el-table-column prop="address" label="所在地" align="center"/>
+      <el-table-column prop="address" label="所在地" align="center" />
-        <el-table-column prop="examineStatus" label="审核状态" align="center">
+      <el-table-column prop="examineStatus" label="审核状态" align="center">
-        <template #default="{row}">
+        <template #default="{ row }">
-            {{row.examineStatus==='1'?'已通过':'已拒绝'}}
+          {{ examineStatusDict[row.examineStatus] }}
         </template>
-        </el-table-column>
+      </el-table-column>
-        <el-table-column prop="kind" label="企业类型" align="center">
+      <el-table-column prop="kind" label="企业类型" align="center">
         <template #default="{ row }">
           <div>
             {{ enterpriseOptions.find((e) => row.kind == e.key).value }}
           </div>
         </template>
-        </el-table-column>
+      </el-table-column>
-        <el-table-column prop="createdAt" label="申请时间" align="center"/>
+      <el-table-column prop="createdAt" label="申请时间" align="center" />
-        <el-table-column prop="" label="操作" width="200px" align="center">
+      <el-table-column prop="" label="操作" width="200px" align="center">
-            <template #default="{row}">
+        <template #default="{ row }">
-            <el-button
+          <el-button size="small" type="text" @click="handleDetail(row.id)"
-            size="small"
-            type="text"
-            @click="handleDetail(row.id)"
             >审核</el-button
           >
-          <el-button
+          <el-button size="small" type="text" @click="delList(row.id)"
-            size="small"
-            type="text"
-            @click="delList(row.id)"
             >删除</el-button
           >
-          <el-button
+          <el-button size="small" type="text" @click="setType(row)"
-            size="small"
-            type="text"
-            @click="setType(row)"
             >设置企业类型</el-button
           >
-          </template>
+        </template>
-        </el-table-column>
+      </el-table-column>
-        </el-table>
+    </el-table>
 
-        <!-- 分页器 -->
+    <!-- 分页器 -->
-        <pagination
+    <pagination
-        v-show="total > 0"
+      v-show="total > 0"
-        :total="total"
+      :total="total"
-        v-model:page="queryData.pageNum"
+      v-model:page="queryData.pageNum"
-        v-model:limit="queryData.page_size"
+      v-model:limit="queryData.page_size"
-        @pagination="getList"
+      @pagination="getList"
-        />
+    />
 
-        <!-- 设置企业类型弹框 -->
+    <!-- 设置企业类型弹框 -->
-        <el-dialog title="设置企业类型"  v-model="isShow">
+    <el-dialog title="设置企业类型" v-model="isShow">
-          <el-row type="flex" justify="center" style="height: 100px;">
+      <el-row type="flex" justify="center" style="height: 100px">
-          <el-radio-group v-model="radioList">
+        <el-radio-group v-model="radioList">
           <el-radio label="101">上市企业</el-radio>
           <el-radio label="102">优质企业</el-radio>
           <el-radio label="103">普通企业</el-radio>
-         </el-radio-group>
+        </el-radio-group>
-          </el-row>
+      </el-row>
-          <el-row type="flex" justify="end">
+      <el-row type="flex" justify="end">
-            <el-button type="" @click="isShow=false">取消</el-button>
+        <el-button type="" @click="isShow = false">取消</el-button>
-            <el-button type="primary" @click="btnType">确认</el-button>
+        <el-button type="primary" @click="btnType">确认</el-button>
-          </el-row>
+      </el-row>
-        </el-dialog>
+    </el-dialog>
-    </div>
+  </div>
 </template>
 
 <script setup>
 import SiteOptions from "@/views/components/SiteOptions";
-import {enterpriseList,editType,delItem} from '@/api/dataList/list'
+import { enterpriseList, editType, delItem } from "@/api/dataList/list";
 import { tenantSelect } from "@/api/subPlatform/tenant";
 import { enterpriseOptions } from "@/utils/parameter";
-import { reactive, ref } from 'vue';
+import { reactive, ref } from "vue";
-import {ElMessageBox} from 'element-plus'
+import { ElMessageBox } from "element-plus";
 import { useRouter } from "vue-router";
-const data=reactive({
+const data = reactive({
-    queryData:{
+  queryData: {
-        pageNum:1,
+    pageNum: 1,
-        pageSize:10,
+    pageSize: 10,
-        examineStatus:''
+    examineStatus: "",
-    }
+  },
-})
+});
-const router=useRouter()
+const router = useRouter();
 const total = ref(0);
-const dataList=ref([])
+const dataList = ref([]);
 const { queryData } = toRefs(data);
 const siteList = ref([]);
-const isShow=ref(false)
+const isShow = ref(false);
-const radioList=ref('')
+const radioList = ref("");
+const examineStatusDict = {
+  0: "审核中",
+  1: "已通过",
+  2: "已拒绝",
+};
 // 临时id
-const id=ref('')
+const id = ref("");
 // 获取企业列表
-const getList=async ()=>{
+const getList = async () => {
-    const res=await enterpriseList(queryData.value)
+  const res = await enterpriseList(queryData.value);
-    dataList.value=res.rows
+  dataList.value = res.rows;
-    total.value=res.total
+  total.value = res.total;
-}
+};
 // 获取站点列表
 const getSiteList = async () => {
   const resp = await tenantSelect();
   siteList.value = resp.rows;
 };
 // 搜索查询
-const handleQuery=()=>{
+const handleQuery = () => {
   getList(queryData.value);
-}
+};
 // 重置按钮
 const resetQuery = () => {
-  queryData.value={
+  queryData.value = {
-    pageNum:1,
+    pageNum: 1,
-      pageSize:10,
+    pageSize: 10,
-      examineStatus:''
+    examineStatus: "",
-  }
+  };
-  getList()
+  getList();
 };
 // 企业类型弹框
-const setType=(row)=>{
+const setType = (row) => {
-  radioList.value=row.kind
+  radioList.value = row.kind;
-  isShow.value=true
+  isShow.value = true;
-  id.value=row.id
+  id.value = row.id;
-}
+};
 // 发送修改类型请求
-const btnType=async ()=>{
+const btnType = async () => {
   await editType({
-      kind:radioList.value,
+    kind: radioList.value,
-      id:id.value
+    id: id.value,
-  })
+  });
-  getList()
+  getList();
-  isShow.value=false
+  isShow.value = false;
-}
+};
 // 删除按钮
-const delList=async (id)=>{
+const delList = async (id) => {
   ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
     .then(async () => {
       await delItem(id);
@@ -193,8 +200,8 @@ const delList=async (id)=>{
       ElMessage.success("删除成功");
     })
     .catch(() => {});
-  getList()
+  getList();
-}
+};
 // 跳转详情页
 const handleDetail = (id) => {
   router.push({
@@ -202,7 +209,7 @@ const handleDetail = (id) => {
     query: { id },
   });
 };
-getList()
+getList();
-getSiteList()
+getSiteList();
 </script>
-<style></style>
+<style></style>

src/views/components/ExpertForm/index.vue

@@ -154,26 +154,10 @@
       <el-col :span="12">
         <el-form-item label="最高学历:" prop="education">
           <el-select v-model="modelValue.education" placeholder="请选择">
-            <el-option
+            <el-option value="博士" label="博士"> </el-option>
-            value="博士"
+            <el-option value="硕士" label="硕士"> </el-option>
-            label="博士"
+            <el-option value="本科" label="本科"> </el-option>
-            >
+            <el-option value="专科" label="专科"> </el-option>
-            </el-option>
-            <el-option
-            value="硕士"
-            label="硕士"
-            >
-            </el-option>
-            <el-option
-            value="本科"
-            label="本科"
-            >
-            </el-option>
-            <el-option
-            value="专科"
-            label="专科"
-            >
-            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -202,8 +186,9 @@
         <el-form-item label="从业时间:" prop="workTime">
           <el-date-picker
             v-model="modelValue.workTime"
-            type="date"
+            type="month"
-            value-format="YYYY-MM-DD"
+            format="YYYY-MM"
+            value-format="YYYY-MM"
             placeholder="选择日期"
           >
           </el-date-picker>
@@ -211,8 +196,8 @@
       </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="1">男</el-radio>
-          <el-radio v-model="modelValue.gender" :label="2">女</el-radio>
+          <el-radio v-model="modelValue.gender" label="2">女</el-radio>
         </el-form-item>
       </el-col>
     </el-row>
@@ -349,14 +334,14 @@ const data = reactive({
     name: [{ required: true, message: "请输入", trigger: "blur" }],
     kind: [{ required: true, message: "请选择", trigger: "change" }],
     code: [{ required: true, message: "请输入", trigger: "blur" }],
-    mobile: [
+    // mobile: [
-      { required: true, message: "请输入", trigger: "blur" },
+    //   { required: true, message: "请输入", trigger: "blur" },
-      {
+    //   {
-        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+    //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        message: "请输入正确的手机号码",
+    //     message: "请输入正确的手机号码",
-        trigger: "blur",
+    //     trigger: "blur",
-      },
+    //   },
-    ],
+    // ],
     researchId: [{ message: "请选择", trigger: "change" }],
     tenantId: [
       {
@@ -367,8 +352,8 @@ const data = reactive({
     ],
     school: [{ required: true, message: "请输入", trigger: "blur" }],
     education: [{ message: "请选择", trigger: "change" }],
-    major: [{ required: true, message: "请输入", trigger: "blur" }],
+    // major: [{ required: true, message: "请输入", trigger: "blur" }],
-    job: [{ required: true, message: "请输入", trigger: "blur" }],
+    // job: [{ required: true, message: "请输入", trigger: "blur" }],
     title: [{ required: true, message: "请输入", trigger: "blur" }],
     workTime: [
       {
@@ -430,9 +415,7 @@ const validateForm = async () => {
     //个人
     // const researchsFormValid = await researchsFormRef.value.validateForm(); //研究方向验证
     return (
-      formValid &&
+      formValid && cityFormValid && fieldFormValid
-      cityFormValid &&
-      fieldFormValid 
       // researchsFormValid
     );
   } else if (formType.value == 2) {

src/views/dataList/expert/index.vue

@@ -1,9 +1,6 @@
 <template>
-    <div class="app-container">
+  <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" :inline="true">
-      :model="queryParams"
-      :inline="true"
-    >
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -26,8 +23,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="refresh" size="default"
+        <el-button icon="refresh" size="default" @click="resetQuery"
-        @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -76,7 +72,7 @@
       <el-table-column label="专家姓名" align="center" prop="name" />
       <el-table-column label="研究领域" align="center" show-overflow-tooltip>
         <template #default="{ row }">
-          <div>{{row.industryStr}}</div>
+          <div>{{ row.industryStr }}</div>
         </template>
       </el-table-column>
       <el-table-column label="学历" align="center" prop="education" />
@@ -162,12 +158,12 @@
         </div>
       </template>
     </el-dialog>
-    </div>
+  </div>
 </template>
 <script setup>
 import SiteOptions from "@/views/components/SiteOptions";
 import { tenantSelect } from "@/api/subPlatform/tenant";
-import {expertList} from '@/api/expert/expert'
+import { expertList } from "@/api/expert/expert";
 import { useRouter } from "vue-router";
 import { getToken } from "@/utils/auth";
 import { tansParams, blobValidate } from "@/utils/ruoyi";
@@ -175,17 +171,18 @@ import FieldOptions from "@/views/components/FieldOptions";
 import { ElLoading, ElMessageBox } from "element-plus";
 import dayjs from "dayjs";
 import request from "@/utils/request";
-const router=useRouter()
+const router = useRouter();
 const siteList = ref([]);
 const dataList = ref([]);
 const total = ref(0);
 const showSearch = ref(true);
-const data=reactive({
+const data = reactive({
-    queryParams:{
+  queryParams: {
-        pageNum:1,
+    pageNum: 1,
-        pageSize:10,
+    pageSize: 10,
-    }
+  },
-})
+});
+const loading = ref(true);
 /*** 用户导入参数 */
 const upload = reactive({
   // 是否显示弹出层（用户导入）
@@ -210,9 +207,11 @@ const getSiteList = async () => {
 };
 /** 查询专家列表 */
 const getList = async () => {
+  loading.value = true;
   const resp = await expertList(queryParams.value);
   dataList.value = resp.rows;
   total.value = resp.total;
+  loading.value = false;
 };
 // 新增页面跳转
 const handleAdd = () => {
@@ -228,12 +227,12 @@ const handleDetail = (id) => {
   });
 };
 // 认领专利
-const handleClaim=(id)=>{
+const handleClaim = (id) => {
   router.push({
     path: "/dataList/expert/claim",
-    query:{id}
+    query: { id },
   });
-}
+};
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -241,9 +240,9 @@ const handleQuery = () => {
 };
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryParams.value.name=''
+  queryParams.value.name = "";
-  queryParams.value.tenantId=''
+  queryParams.value.tenantId = "";
-  handleQuery()
+  handleQuery();
 };
 const uploadRef = ref(null);
 /** 导入按钮操作 */
@@ -336,6 +335,6 @@ const handleExport = () => {
     );
   });
 };
-getSiteList()
+getSiteList();
-getList()
+getList();
-</script>
+</script>

src/views/demand/index.vue

@@ -1,78 +1,151 @@
-
 <template>
-<div class="app-container">
+  <div class="app-container">
     <!-- 顶部区域 -->
-    <el-form>
+    <el-form inline ref="queryFormRef" :model="queryParams">
-    <el-row type="flex">
+      <el-row>
-      <el-col :span="8">
+        <el-col>
-        <el-button type="primary">待审核</el-button>
+          <el-form-item prop="status">
-        <el-button type="">已驳回</el-button>
+            <el-radio-group
-        <el-button type="">已通过</el-button>
+              v-model="queryParams.status"
-      </el-col>
+              size="small"
-      <el-col :span="4">
+              @change="handleQuery"
-        <el-form-item label="站点">
+            >
-            <el-select  class="m-2" placeholder="请选择">
+              <!-- <el-radio-button :label="1">已发布</el-radio-button> -->
-                <el-option/>
+              <el-radio-button :label="0">待审核</el-radio-button>
-            </el-select>
+              <el-radio-button :label="1">已驳回</el-radio-button>
-        </el-form-item>
+              <el-radio-button :label="2">已通过</el-radio-button>
-      </el-col>
+            </el-radio-group>
-    </el-row>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="所属站点" prop="tenantId">
+            <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-table :data="list">
+    <el-table :data="dataList">
       <el-table-column label="编号" align="center" prop="id"></el-table-column>
-      <el-table-column label="需求名称" align="center" prop="title"></el-table-column>
+      <el-table-column
-      <el-table-column label="所属领域" align="center" prop="industry"></el-table-column>
+        label="需求名称"
-      <el-table-column label="联系人" align="center" prop="name"></el-table-column>
+        align="center"
-      <el-table-column label="手机" align="center" prop="mobile"></el-table-column>
+        prop="title"
-      <el-table-column label="所属经纪人" align="center" prop=""></el-table-column>
+      ></el-table-column>
-      <el-table-column label="经纪人电话" align="center" prop=""></el-table-column>
+      <el-table-column
+        label="所属领域"
+        align="center"
+        prop="industryStr"
+      ></el-table-column>
+      <el-table-column
+        label="联系人"
+        align="center"
+        prop="name"
+      ></el-table-column>
+      <el-table-column
+        label="手机"
+        align="center"
+        prop="mobile"
+      ></el-table-column>
+      <el-table-column
+        label="所属经纪人"
+        align="center"
+        prop=""
+      ></el-table-column>
+      <el-table-column
+        label="经纪人电话"
+        align="center"
+        prop=""
+      ></el-table-column>
       <el-table-column label="站点" align="center" prop=""></el-table-column>
-      <el-table-column label="发布时间" align="center" prop="createTime"></el-table-column>
+      <el-table-column
-      <el-table-column label="截至日期" align="center" prop="deadline"></el-table-column>
+        label="发布时间"
+        align="center"
+        prop="createTime"
+      ></el-table-column>
+      <el-table-column
+        label="截至日期"
+        align="center"
+        prop="deadline"
+      ></el-table-column>
       <el-table-column label="操作" align="center">
-        <template #default="{row}">
+        <template #default="{ row }">
-            <el-button type="text" @click="shenpi(row.id)">审批</el-button>
+          <el-button type="text" @click="shenpi(row.id)">审批</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <!-- 分页器 -->
+    <pagination
-    <el-row type="flex" justify="end" style="margin-top:10px ;">
+      v-show="total > 0"
-    <el-pagination
+      :total="total"
-      v-model:currentPage="currentPage3"
+      v-model:page="queryParams.pageNum"
-      v-model:page-size="pageSize3"
+      v-model:limit="queryParams.pageSize"
-      :small="small"
+      @pagination="getList"
-      :disabled="disabled"
-      :page-sizes="[10, 20, 30, 40]"
-      :background="true"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="6"
     />
-    </el-row>
 
     <!-- 审批详情 -->
     <Edialog :is-show="isShow"></Edialog>
-</div>
+  </div>
 </template>
 <script setup>
-import {businessList} from '@/api/Businessneeds/index.js'
+import { businessList } from "@/api/Businessneeds/index.js";
-import Edialog from '../../views/components/Businessneeds/Approvaldetails.vue'
+import Edialog from "../../views/components/Businessneeds/Approvaldetails.vue";
-import { ref,toRefs,defineComponent } from 'vue';
+import SiteOptions from "@/views/components/SiteOptions";
-const data=reactive({
+import { tenantSelect } from "@/api/subPlatform/tenant";
-    queryData:{
+import { ref, toRefs, defineComponent } from "vue";
-        pageNum:1,
+const data = reactive({
-        pageSize:10
+  queryParams: {
-    }
+    pageNum: 1,
-})
+    pageSize: 10,
-const isShow=ref(false)
+    status: 0,
-const {queryData}=toRefs(data)
+  },
-const getList=async ()=>{
+});
-const res= await businessList(queryData.value)
+const siteList = ref([]);
-}
+const dataList = ref([]);
-const shenpi=()=>{
+const total = ref(0);
-  isShow.value=true
+const isShow = ref(false);
-}
+const { queryParams } = toRefs(data);
-getList()
+const getList = async () => {
+  const resp = await businessList(queryParams.value);
+  dataList.value = resp.rows;
+  total.value = resp.total;
+};
+const shenpi = () => {
+  isShow.value = true;
+};
+
+// 获取站点列表
+const getSiteList = async () => {
+  const resp = await tenantSelect();
+  siteList.value = resp.rows;
+};
+
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  if (queryFormRef.value) {
+    queryFormRef.value.resetFields();
+  }
+  handleQuery();
+};
+
+getSiteList();
+getList();
 </script>
-<style></style>
+<style></style>

src/views/expert/dataList/approval.vue

@@ -17,11 +17,7 @@
 <script setup name="EnterpriseAdd">
 import ExpertForm from "@/views/components/ExpertForm";
 import tab from "@/plugins/tab";
-import {
+import { companyAdd, companyDetail, companyEdit } from "@/api/expert/expert";
-  companyAdd,
-  companyDetail,
-  companyEdit,
-} from "@/api/expert/expert";
 import { reactive, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
@@ -59,7 +55,7 @@ const submitForm = async (state) => {
   const valid = await expertFormRef.value.validateForm();
   if (valid) {
     if (form.value.id != undefined) {
-      form.value.examineStatus=state
+      form.value.examineStatus = state;
       await companyEdit(form.value);
       cancel();
       ElMessage.success("修改成功");
@@ -77,6 +73,7 @@ const getDetailById = async () => {
   if (route.query.id) {
     const { data } = await companyDetail(route.query.id);
     form.value = data;
+    form.value.district = data.area;
   }
 };
 getDetailById();

src/views/expert/dataList/index.vue

@@ -1,137 +1,145 @@
 <template>
   <div class="app-container">
-      <!-- 顶部搜索区域 -->
+    <!-- 顶部搜索区域 -->
-      <el-form :model="queryData" :inline="true">
+    <el-form :model="queryData" :inline="true">
-        <el-form-item label="专家姓名">
+      <el-form-item label="专家姓名">
-          <el-input style="width: 150px;" v-model="queryData.name" placeholder="请输入关键字"></el-input>
+        <el-input
-        </el-form-item>
+          style="width: 150px"
-        <el-form-item label="审核状态">
+          v-model="queryData.name"
-          <el-select style="width: 100px;" v-model="queryData.examineStatus" class="m-2" placeholder="请选择" >
+          placeholder="请输入关键字"
-           <el-option
+        ></el-input>
-              label="已审核"
+      </el-form-item>
-              :value="1"
+      <el-form-item label="审核状态">
-              />
+        <el-select
-              <el-option
+          style="width: 100px"
-              label="已拒绝"
+          v-model="queryData.examineStatus"
-              :value="2"
+          class="m-2"
-              />
+          placeholder="请选择"
-           </el-select>
+        >
-        </el-form-item>
+          <el-option label="已审核" :value="1" />
-        <el-form-item label="站点">
+          <el-option label="已拒绝" :value="2" />
-          <SiteOptions v-model="queryData.tenantId" :site-list="siteList" style="width:160px;"/>
+        </el-select>
-        </el-form-item>
+      </el-form-item>
+      <el-form-item label="站点">
+        <SiteOptions
+          v-model="queryData.tenantId"
+          :site-list="siteList"
+          style="width: 160px"
+        />
+      </el-form-item>
 
-      <el-form-item style="float: right;">
+      <el-form-item style="float: right">
         <el-button
-        type="primary"
+          type="primary"
-        icon="search"
+          icon="search"
-        size="default"
+          size="default"
-        @click="handleQuery"
+          @click="handleQuery"
-        >搜索</el-button
+          >搜索</el-button
         >
-       <el-button icon="refresh" size="default"
+        <el-button icon="refresh" size="default" @click="resetQuery"
-       @click="resetQuery"
+          >重置</el-button
-        >重置</el-button
+        >
-      >
+      </el-form-item>
-    </el-form-item>
+    </el-form>
-      </el-form>
 
-      <!--表格区域-->
+    <!--表格区域-->
-      <el-table :data="dataList" style="width: 100%"  >
+    <el-table :data="dataList" style="width: 100%">
-      <el-table-column prop="name" label="专家姓名" align="center"/>
+      <el-table-column prop="name" label="专家姓名" align="center" />
       <el-table-column label="研究领域" align="center">
-      <template #default="{ row }">
+        <template #default="{ row }">
-        <div>{{row.industryStr}}</div>
+          <div>{{ row.industryStr }}</div>
-      </template>
-      </el-table-column>
-      <el-table-column prop="education" label="学历" align="center"/>
-      <el-table-column prop="introduce" label="个人备注" align="center"/>
-      <el-table-column prop="school" label="毕业院校" align="center"/>
-      <el-table-column prop="job" label="职务" align="center"/>
-      <el-table-column prop="" label="站点" align="center">
-      <template #default="{ row }">
-        {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
-      </template>
-      </el-table-column>
-      <el-table-column prop="address" label="所在地" align="center"/>
-      <el-table-column prop="examineStatus" label="审核状态" align="center">
-      <template #default="{row}">
-          {{row.examineStatus==='1'?'已通过':'已拒绝'}}
-      </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="申请时间" align="center"/>
-      <el-table-column prop="" label="操作" align="center">
-          <template #default="{row}">
-          <el-button
-          size="small"
-          type="text"
-          @click="btnAudit(row.id)"
-          >审核</el-button
-        >
         </template>
       </el-table-column>
-      </el-table>
+      <el-table-column prop="education" label="学历" align="center" />
+      <el-table-column prop="introduce" label="个人备注" align="center" />
+      <el-table-column prop="school" label="毕业院校" align="center" />
+      <el-table-column prop="job" label="职务" align="center" />
+      <el-table-column prop="" label="站点" align="center">
+        <template #default="{ row }">
+          {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="所在地" align="center" />
+      <el-table-column prop="examineStatus" label="审核状态" align="center">
+        <template #default="{ row }">
+          {{ examineStatusDict[row.examineStatus] }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="申请时间" align="center" />
+      <el-table-column prop="" label="操作" align="center">
+        <template #default="{ row }">
+          <el-button size="small" type="text" @click="btnAudit(row.id)"
+            >审核</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-      <!-- 分页器 -->
+    <!-- 分页器 -->
-      <pagination
+    <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryData.pageNum"
       v-model:limit="queryData.page_size"
       @pagination="getList"
-      />
+    />
   </div>
 </template>
 
 <script setup>
 import SiteOptions from "@/views/components/SiteOptions";
 import { tenantSelect } from "@/api/subPlatform/tenant";
-import {expertList} from '@/api/expert/expert'
+import { expertList } from "@/api/expert/expert";
-import {useRouter} from 'vue-router'
+import { useRouter } from "vue-router";
-const router=useRouter()
+const router = useRouter();
-const data=reactive({
+const data = reactive({
-  queryData:{
+  queryData: {
-      pageNum:1,
+    pageNum: 1,
-      pageSize:10,
+    pageSize: 10,
-      examineStatus:''
+    examineStatus: "",
-  }
+  },
-})
+});
 const total = ref(0);
-const dataList=ref([])
+const dataList = ref([]);
 const siteList = ref([]);
 const { queryData } = toRefs(data);
+const examineStatusDict = {
+  0: "审核中",
+  1: "已通过",
+  2: "已拒绝",
+};
 // 获取专家列表
-const getList=async ()=>{
+const getList = async () => {
-  const res=await expertList(queryData.value)
+  const res = await expertList(queryData.value);
-  dataList.value=res.rows
+  dataList.value = res.rows;
-  total.value=res.total
+  total.value = res.total;
-}
+};
 // 获取站点列表
 const getSiteList = async () => {
   const resp = await tenantSelect();
   siteList.value = resp.rows;
 };
 // 搜索查询
-const handleQuery=()=>{
+const handleQuery = () => {
   getList(queryData.value);
-}
+};
 // 重置按钮
 const resetQuery = () => {
-  queryData.value={
+  queryData.value = {
-    pageNum:1,
+    pageNum: 1,
-      pageSize:10,
+    pageSize: 10,
-      examineStatus:''
+    examineStatus: "",
-  }
+  };
-  getList()
+  getList();
 };
 // 审核按钮
-const btnAudit=(id)=>{
+const btnAudit = (id) => {
   router.push({
     path: "/approval/dataList/expert",
     query: { id },
   });
-}
+};
-getList()
+getList();
-getSiteList()
+getSiteList();
 </script>
-<style></style>
+<style></style>

src/views/order/invoice/index.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <el-form
+      v-show="showSearch"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status">
+          <el-option label="已开票" :value="1"></el-option>
+          <el-option label="未开票" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="search"
+          size="default"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="refresh" size="default" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="dataList">
+      <!-- <el-table-column label="订单号" align="center" prop="id" /> -->
+      <el-table-column label="订单号" align="center" prop="orderNumber" />
+      <el-table-column label="公司名称" align="center" prop="companyName" />
+      <el-table-column label="税号" align="center" prop="taxNumber" />
+      <el-table-column label="订单类型" align="center">
+        <template #default="{ row }">
+          {{ orderTypeDic[row.orderType] }}
+        </template>
+      </el-table-column>
+      <el-table-column label="金额" align="center" prop="amount" />
+      <el-table-column label="数量" align="center" prop="total" />
+      <el-table-column label="支付时间" align="center" prop="payTime" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="{ row }">
+          <el-tag v-if="row.status == 0" type="warning">未开票</el-tag>
+          <el-tag v-else-if="row.status == 1" type="success">已开票</el-tag>
+          <el-tag v-else>未知</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" prop="status">
+        <template #default="{ row }">
+          <el-button
+            type="primary"
+            round
+            @click="confirmInvoice(row.id)"
+            size="small"
+            :disabled="row.status == 1"
+            >确认开票</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+<script setup name="Invoice">
+import { reactive } from "vue";
+import { billList, updateDealLog, DealLogDetail } from "@/api/order";
+import { ElMessage } from "element-plus";
+
+const orderTypeDic = {
+  1: "创新币充值",
+  2: "活动报名",
+};
+const statusDic = {
+  0: "未开票",
+  1: "已开票",
+};
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+const { queryParams } = toRefs(data);
+
+const dataList = ref([]);
+const loading = ref(true);
+const queryFormRef = ref();
+const showSearch = ref(true);
+const total = ref(0);
+
+const getList = async () => {
+  loading.value = true;
+  const resp = await billList(queryParams.value);
+  dataList.value = resp.rows;
+  total.value = resp.total;
+  loading.value = false;
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  if (queryFormRef.value) {
+    queryFormRef.value.resetFields();
+  }
+  handleQuery();
+};
+// 确认开票
+const confirmInvoice = async (id) => {
+  const { data } = await DealLogDetail(id);
+  await updateDealLog({ ...data, status: 1 });
+  ElMessage.success("确认开票成功");
+  getList();
+};
+getList();
+</script>

src/views/order/order-list/index.vue

@@ -73,7 +73,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="订单号" align="center" prop="id" />
+      <el-table-column label="订单号" align="center" prop="orderNumber" />
       <el-table-column label="公司名称" align="center" prop="enterpriseName" />
       <el-table-column label="订单类型" align="center">
         <template #default="{ row }">

vite.config.js

@@ -25,9 +25,9 @@ export default defineConfig(({ mode, command }) => {
     },
     // vite 相关配置
     server: {
-      port: 80,
+      port: 5173,
       host: true,
-      open: true,
+      // open: true,
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {