From b7386df49b24c0642e7e7ffdbf8d79fd7d7125e5 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 29 Oct 2024 17:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InnovationVoucher.api.ts                  |  26 ++
 .../InnovationVoucherList2.vue                | 296 ++++++++++++++++
 .../InnovationVoucherList3.vue                | 328 ++++++++++++++++++
 .../components/InnovationVoucherForm2.vue     | 179 ++++++++++
 .../components/InnovationVoucherModal2.vue    |  77 ++++
 5 files changed, 906 insertions(+)
 create mode 100644 jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue
 create mode 100644 jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue
 create mode 100644 jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue
 create mode 100644 jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal2.vue

diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
index f1a9229..8fde77e 100644
--- a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
@@ -6,14 +6,19 @@ const { createConfirm } = useMessage();
 enum Api {
   list = '/innovationvoucher/innovationVoucher/list',
   list1 = '/innovationvoucher/innovationVoucher/list1',
+  list2 = '/innovationvoucher/innovationVoucher/list2',
+  list3 = '/innovationvoucher/innovationVoucher/list3',
   save='/innovationvoucher/innovationVoucher/add',
   edit='/innovationvoucher/innovationVoucher/edit',
   edit1='/innovationvoucher/innovationVoucher/edit1',
+  edit2='/innovationvoucher/innovationVoucher/edit2',
   deleteOne = '/innovationvoucher/innovationVoucher/delete',
   deleteBatch = '/innovationvoucher/innovationVoucher/deleteBatch',
   importExcel = '/innovationvoucher/innovationVoucher/importExcel',
   exportXls = '/innovationvoucher/innovationVoucher/exportXls',
   tjsh = '/innovationvoucher/innovationVoucher/tjsh',
+  tysy = '/innovationvoucher/innovationVoucher/tysy',
+  jjsy = '/innovationvoucher/innovationVoucher/jjsy',
   shtg = '/innovationvoucher/innovationVoucher/shtg',
 }
 export const tjsh = (params,handleSuccess) => {
@@ -22,11 +27,28 @@ export const tjsh = (params,handleSuccess) => {
   });
 }
 
+export const tysy = (params,handleSuccess) => {
+  return defHttp.get({url: Api.tysy, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+export const jjsy = (params,handleSuccess) => {
+  return defHttp.get({url: Api.jjsy, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
 export const saveOrUpdate1 = (params, isUpdate) => {
   let url = isUpdate ? Api.edit1 : Api.save;
   return defHttp.post({ url: url, params }, { isTransformResponse: false });
 }
 
+export const saveOrUpdate2 = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit2 : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
 
 /**
  * 导出api
@@ -47,6 +69,10 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
 
 export const list1 = (params) => defHttp.get({ url: Api.list1, params });
 
+export const list2 = (params) => defHttp.get({ url: Api.list2, params });
+
+export const list3 = (params) => defHttp.get({ url: Api.list3, params });
+
 export const shtg = (params,handleSuccess) => {
   return defHttp.get({url: Api.shtg, params}, {joinParamsToUrl: true}).then(() => {
     handleSuccess();
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue
new file mode 100644
index 0000000..3d25294
--- /dev/null
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList2.vue
@@ -0,0 +1,296 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="cxqCode">
+              <template #label><span title="创新券编码">创新券编</span></template>
+              <a-input placeholder="请输入创新券编码" v-model:value="queryParam.cxqCode" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="proName">
+              <template #label><span title="申报项目名称">申报项目</span></template>
+              <a-input placeholder="请输入申报项目名称" v-model:value="queryParam.proName" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="proType">
+                <template #label><span title="申报类别">申报类别</span></template>
+                <j-select-multiple placeholder="请选择申报类别" v-model:value="queryParam.proType" dictCode="cxq_type" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="proDept">
+                <template #label><span title="申领单位">申领单位</span></template>
+                <j-select-dept placeholder="请选择申领单位" v-model:value="queryParam.proDept" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="applyDept">
+                <template #label><span title="使用单位">使用单位</span></template>
+                <j-select-dept placeholder="请选择使用单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary"   @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary"   preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex==='attachment'">
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <InnovationVoucherModal2 ref="registerModal" @success="handleSuccess"></InnovationVoucherModal2>
+  </div>
+</template>
+
+<script lang="ts" name="innovationvoucher-innovationVoucher" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, superQuerySchema } from './InnovationVoucher.data';
+  import { list2, deleteOne, batchDelete, getImportUrl, getExportUrl } from './InnovationVoucher.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import InnovationVoucherModal2 from './components/InnovationVoucherModal2.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '创新券表',
+      api: list2,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "创新券表",
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    const actions = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }
+    ];
+    if(record.useState==="0"){
+      actions.unshift({
+        label: '使用',
+        popConfirm: {
+          title: '是否确认使用',
+          confirm: handleEdit.bind(null, record),
+        }
+      });
+    }
+    return actions;
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue
new file mode 100644
index 0000000..e228117
--- /dev/null
+++ b/jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList3.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="cxqCode">
+              <template #label><span title="创新券编码">创新券编</span></template>
+              <a-input placeholder="请输入创新券编码" v-model:value="queryParam.cxqCode" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="proName">
+              <template #label><span title="申报项目名称">申报项目</span></template>
+              <a-input placeholder="请输入申报项目名称" v-model:value="queryParam.proName" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="proType">
+                <template #label><span title="申报类别">申报类别</span></template>
+                <j-select-multiple placeholder="请选择申报类别" v-model:value="queryParam.proType" dictCode="cxq_type" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="proDept">
+                <template #label><span title="申领单位">申领单位</span></template>
+                <j-select-dept placeholder="请选择申领单位" v-model:value="queryParam.proDept" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="applyDept">
+                <template #label><span title="使用单位">使用单位</span></template>
+                <j-select-dept placeholder="请选择使用单位" v-model:value="queryParam.applyDept" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary"   @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary"   preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex==='attachment'">
+          <!--文件字段回显插槽-->
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+        </template>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <InnovationVoucherModal ref="registerModal" @success="handleSuccess"></InnovationVoucherModal>
+  </div>
+</template>
+
+<script lang="ts" name="innovationvoucher-innovationVoucher" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, superQuerySchema } from './InnovationVoucher.data';
+  import {
+    list3,
+    deleteOne,
+    batchDelete,
+    getImportUrl,
+    getExportUrl,
+    tysy,
+    jjsy
+  } from './InnovationVoucher.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import InnovationVoucherModal from './components/InnovationVoucherModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '创新券表',
+      api: list3,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 130,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "创新券表",
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess
+    },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 同意事件
+   */
+  async function tysycxq(record) {
+    await tysy({id: record.id}, handleSuccess);
+  }
+
+  /**
+   * 拒绝事件
+   */
+  async function jjsycxq(record) {
+    await jjsy({id: record.id}, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    const actions = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }
+
+    ];
+
+    if(record.sfState!=="0"&&record.sfState!=="1"){
+
+      actions.unshift({
+        label: '拒绝',
+        popConfirm: {
+          title: '是否确认拒绝',
+          confirm: jjsycxq.bind(null, record),
+        }
+      });
+      actions.unshift({
+        label: '同意',
+        popConfirm: {
+          title: '是否确认同意',
+          confirm: tysycxq.bind(null, record),
+        }
+      });
+    }
+    return actions;
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue
new file mode 100644
index 0000000..99303a7
--- /dev/null
+++ b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm2.vue
@@ -0,0 +1,179 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="InnovationVoucherForm">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item label="创新券编码" v-bind="validateInfos.cxqCode" id="InnovationVoucherForm-cxqCode" name="cxqCode">
+                <a-input v-model:value="formData.cxqCode" placeholder="请输入创新券编码"  allow-clear :disabled="true"></a-input>
+              </a-form-item>
+            </a-col>
+						<a-col :span="24">
+							<a-form-item label="申报项目名称" v-bind="validateInfos.proName" id="InnovationVoucherForm-proName" name="proName">
+								<a-input v-model:value="formData.proName" placeholder="请输入申报项目名称"  allow-clear :disabled="true"></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="申报类别" v-bind="validateInfos.proType" id="InnovationVoucherForm-proType" name="proType">
+								<j-dict-select-tag v-model:value="formData.proType" dictCode="cxq_type" placeholder="请选择申报类别"  allow-clear :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="申领金额" v-bind="validateInfos.proMoney" id="InnovationVoucherForm-proMoney" name="proMoney">
+								<a-input-number v-model:value="formData.proMoney" placeholder="请输入申领金额" style="width: 100%" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="附件" v-bind="validateInfos.attachment" id="InnovationVoucherForm-attachment" name="attachment">
+								<j-upload v-model:value="formData.attachment"   :disabled="true"></j-upload>
+							</a-form-item>
+						</a-col>
+            <a-col :span="24">
+              <a-form-item label="使用单位" v-bind="validateInfos.applyDept" id="InnovationVoucherForm-applyDept" name="applyDept">
+                <j-select-dept v-model:value="formData.applyDept"   :multiple="false" checkStrictly  allow-clear />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate2 } from '../InnovationVoucher.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    cxqCode: '',
+    proName: '',
+    proType: '',
+    proMoney: undefined,
+    attachment: '',
+    applyDept: '',
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    applyDept: [{ required: true, message: '请选择使用单位!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate2(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>
diff --git a/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal2.vue b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal2.vue
new file mode 100644
index 0000000..f8191ed
--- /dev/null
+++ b/jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal2.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <InnovationVoucherForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></InnovationVoucherForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import InnovationVoucherForm from './InnovationVoucherForm2.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '使用';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>