Merge remote-tracking branch 'origin/master'

jeecgboot-vue3/src/router/helper/mainOut.ts

@@ -131,7 +131,16 @@ export const mainOutRoutes: AppRouteModule[] = [
         name: 'InnovationVouchers',
         component: () => import('/@/views/demo/main-home/components/innovationVouchers/index.vue'),
         meta: {
-          title: '创新券',
+          title: '创新券申请',
+          ignoreAuth: true,
+        },
+      },
+      {
+        path: '/main-home/useInnovationVouchers',
+        name: 'UseInnovationVouchers',
+        component: () => import('/@/views/demo/main-home/components/useInnovationVouchers/index.vue'),
+        meta: {
+          title: '创新券使用',
           ignoreAuth: true,
         },
       },

jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue

@@ -22,14 +22,15 @@
     },
     {
       title: '申报类别',
-      dataIndex: 'state_dictText',
-      key: 'state_dictText',
+      dataIndex: 'proType_dictText',
+      key: 'proType_dictText',
     },
     {
       title: '申请金额',
       dataIndex: 'proMoney',
       key: 'proMoney',
     },
+ 
     {
       title: '创新券编码',
       dataIndex: 'cxqCode',

jeecgboot-vue3/src/views/demo/main-home/components/useInnovationVouchers/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="container">
+    <a-table :dataSource="indexaward" :columns="columns" :pagination="pagination">
+      <!-- <template  #bodyCell="{ column }">
+        <div v-if="column.key === 'setting'">
+            <a-button type="text" primary>查看详情</a-button>
+        </div>
+      </template> -->
+    </a-table>
+  </div>
+</template>
+
+<script setup>
+  import axios from 'axios';
+  import { ref } from 'vue';
+
+  const columns = [
+    {
+      title: '申报项目名称',
+      dataIndex: 'proName',
+      key: 'proName',
+    },
+    {
+      title: '申报类别',
+      dataIndex: 'proType_dictText',
+      key: 'proType_dictText',
+    },
+    {
+      title: '申请金额',
+      dataIndex: 'proMoney',
+      key: 'proMoney',
+    },
+    {
+      title: '使用状态',
+      dataIndex: 'useState_dictText',
+      key: 'useState_dictText',
+    },
+    {
+      title: '是否同意',
+      dataIndex: 'sfState_dictText',
+      key: 'sfState_dictText',
+    },
+    {
+      title: '是否申请兑现',
+      dataIndex: 'sfSqdxSta_dictText',
+      key: 'sfSqdxSta_dictText',
+    },
+    {
+      title: '兑现审核',
+      dataIndex: 'dxshSta_dictText',
+      key: 'dxshSta_dictText',
+    },
+    {
+      title: '创新券编码',
+      dataIndex: 'cxqCode',
+      key: 'cxqCode',
+    },
+    {
+      title: '申请单位',
+      dataIndex: 'proDept_dictText',
+      key: 'proDept_dictText',
+    },
+  ];
+  const handlePageChange = (page, pageSize) => {
+    // 页码改变时的处理函数
+    console.log(page, pageSize);
+    pagination.value.current = page;
+    getindexawardEvent()
+
+  };
+  const pagination = ref({
+    // 分页配置
+    pageSize: 10, // 每页显示的条数
+
+    showTotal: (total) => `共 ${total} 条`, // 显示总条数和当前数据范围
+    current: 1, // 当前页数
+    total: 0, // 总条数
+    onChange: handlePageChange, // 页码改变时的回调函数
+  });
+  const indexaward = ref([]);
+  const getindexawardEvent = async () => {
+    console.log(111);
+    const data = {
+      pageNo: pagination.value.current,
+      pageSize: pagination.value.pageSize,
+    };
+    //   fetch(import.meta.env.VITE_GLOB_API_URL_CXQ + '/innovationvoucher/innovationVoucher/listcms',data)
+    //     .then((res) => res.json())
+    //     .then((res) => (indexaward.value = res.result.records));
+    // };
+    const res = await axios.get(import.meta.env.VITE_GLOB_API_URL_CXQ + '/innovationvoucher/innovationVoucher/listcmssy', { params: data });
+    console.log(res);
+
+    indexaward.value = res.data.result.records;
+    pagination.value.total = res.data.result.total;
+  };
+  getindexawardEvent();
+</script>
+
+<style scoped lang="less">
+  .container {
+    width: 1200px;
+    margin: 0 auto;
+  }
+</style>