master
Gitea 3 weeks ago
parent 1762ed53ec
commit 9b20f6e4ad
  1. 152
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/innovationvoucher/controller/InnovationVoucherController.java
  2. 4
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
  3. 26
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucher.api.ts
  4. 304
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList4.vue
  5. 332
      jeecgboot-vue3/src/views/innovationvoucher/InnovationVoucherList5.vue
  6. 1
      jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm1.vue
  7. 152
      jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherForm3.vue
  8. 77
      jeecgboot-vue3/src/views/innovationvoucher/components/InnovationVoucherModal3.vue
  9. 1
      jeecgboot-vue3/src/views/instrument/components/InstrumentForm2.vue

@ -172,6 +172,74 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
* 分页列表查询
*
* @param innovationVoucher
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "创新券表-分页列表查询")
@ApiOperation(value="创新券表-分页列表查询", notes="创新券表-分页列表查询")
@GetMapping(value = "/list4")
public Result<IPage<InnovationVoucher>> queryPageList4(InnovationVoucher innovationVoucher,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<InnovationVoucher> queryWrapper = QueryGenerator.initQueryWrapper(innovationVoucher, req.getParameterMap());
queryWrapper.eq("apply_dept",loginUser.getOrgId());
queryWrapper.eq("state","3");
queryWrapper.eq("use_state","1");
queryWrapper.eq("sf_state","0");
Page<InnovationVoucher> page = new Page<InnovationVoucher>(pageNo, pageSize);
IPage<InnovationVoucher> pageList = innovationVoucherService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param innovationVoucher
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "创新券表-分页列表查询")
@ApiOperation(value="创新券表-分页列表查询", notes="创新券表-分页列表查询")
@GetMapping(value = "/list5")
public Result<IPage<InnovationVoucher>> queryPageList5(InnovationVoucher innovationVoucher,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<InnovationVoucher> queryWrapper = QueryGenerator.initQueryWrapper(innovationVoucher, req.getParameterMap());
if(loginUser.getRoleCode().indexOf("quxian_admin")!= -1){
//县区管理员角色
queryWrapper.eq("sf_state","0");
queryWrapper.eq("sf_sqdx_sta","1");
queryWrapper.in("dxsh_sta",1,2,3);
queryWrapper.in("dxsh_flag",1,2);
Page<InnovationVoucher> page = new Page<InnovationVoucher>(pageNo, pageSize);
IPage<InnovationVoucher> pageList = innovationVoucherService.page(page, queryWrapper);
return Result.OK(pageList);
}
if(loginUser.getRoleCode().indexOf("kejiju_admin")!= -1){
//市科技局管理员角色
queryWrapper.eq("sf_state","0");
queryWrapper.eq("sf_sqdx_sta","1");
queryWrapper.in("dxsh_sta",2,3);
queryWrapper.in("dxsh_flag",0,2);
Page<InnovationVoucher> page = new Page<InnovationVoucher>(pageNo, pageSize);
IPage<InnovationVoucher> pageList = innovationVoucherService.page(page, queryWrapper);
return Result.OK(pageList);
}
return Result.OK(null);
}
/** /**
* 添加 * 添加
* *
@ -227,8 +295,8 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
//@RequiresPermissions("instrument:instrument:edit") //@RequiresPermissions("instrument:instrument:edit")
@RequestMapping(value = "/edit1", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit1", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit1(@RequestBody InnovationVoucher innovationVoucher) { public Result<String> edit1(@RequestBody InnovationVoucher innovationVoucher) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(sysDepartService.getById(loginUser.getOrgId()).getOrgCategory().equals("3")){ if(sysDepartService.getById(innovationVoucher.getProDept()).getOrgCategory().equals("3")){
innovationVoucher.setFlag("1"); innovationVoucher.setFlag("1");
}else{ }else{
innovationVoucher.setFlag("0"); innovationVoucher.setFlag("0");
@ -238,6 +306,28 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
return Result.OK("驳回成功!"); return Result.OK("驳回成功!");
} }
/**
* 编辑
*
* @param innovationVoucher
* @return
*/
@AutoLog(value = "仪器信息表-编辑")
@ApiOperation(value="仪器信息表-编辑", notes="仪器信息表-编辑")
//@RequiresPermissions("instrument:instrument:edit")
@RequestMapping(value = "/edit3", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit3(@RequestBody InnovationVoucher innovationVoucher) {
if(sysDepartService.getById(innovationVoucher.getApplyDept()).getOrgCategory().equals("3")){
innovationVoucher.setDxshFlag("1");
}else{
innovationVoucher.setDxshFlag("0");
}
innovationVoucher.setDxshSta("4");
innovationVoucherService.updateById(innovationVoucher);
return Result.OK("驳回成功!");
}
/** /**
* 编辑 * 编辑
* *
@ -326,6 +416,30 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
return Result.OK("提交审核成功!"); return Result.OK("提交审核成功!");
} }
/**
* 提交兑现审核
*
* @param id
* @return
*/
@ApiOperation(value="提交兑现审核", notes="提交兑现审核")
@GetMapping(value = "/tjdxsh")
public Result<InnovationVoucher> tjdxsh(@RequestParam(name="id",required=true) String id) {
InnovationVoucher innovationVoucher = innovationVoucherService.getById(id);
if(innovationVoucher==null) {
return Result.error("未找到对应数据");
}
if(innovationVoucher.getDxshFlag().equals("0")){
innovationVoucher.setDxshSta("2");
}else {
innovationVoucher.setDxshSta("1");
}
innovationVoucher.setSfSqdxSta("1");
innovationVoucher.setDxReject("");
innovationVoucherService.updateById(innovationVoucher);
return Result.OK("提交兑现审核成功!");
}
/** /**
* 审核通过 * 审核通过
* *
@ -355,6 +469,35 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
return Result.OK("审核通过成功!"); return Result.OK("审核通过成功!");
} }
/**
* 兑现审核通过
*
* @param id
* @return
*/
//@AutoLog(value = "审核通过")
@ApiOperation(value="兑现审核通过", notes="兑现审核通过")
@GetMapping(value = "/dxshtg")
public Result<InnovationVoucher> dxshtg(@RequestParam(name="id",required=true) String id) {
InnovationVoucher innovationVoucher = innovationVoucherService.getById(id);
if(innovationVoucher==null) {
return Result.error("未找到对应数据");
}
if(innovationVoucher.getDxshFlag().equals("0")){
innovationVoucher.setDxshSta("3");
}
if(innovationVoucher.getDxshFlag().equals("1")){
innovationVoucher.setDxshSta("2");
innovationVoucher.setDxshFlag("2");
}
if(innovationVoucher.getDxshFlag().equals("2")&&innovationVoucher.getDxshSta().equals("2")){
innovationVoucher.setDxshSta("3");
}
//instrument.setFlag("2");
innovationVoucherService.updateById(innovationVoucher);
return Result.OK("兑现审核通过成功!");
}
/** /**
* 同意使用 * 同意使用
* *
@ -369,6 +512,11 @@ public class InnovationVoucherController extends JeecgController<InnovationVouch
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
innovationVoucher.setSfState("0"); innovationVoucher.setSfState("0");
if(sysDepartService.getById(innovationVoucher.getApplyDept()).getOrgCategory().equals("3")){
innovationVoucher.setDxshFlag("1");
}else {
innovationVoucher.setDxshFlag("0");
}
innovationVoucherService.updateById(innovationVoucher); innovationVoucherService.updateById(innovationVoucher);
return Result.OK("同意使用成功!"); return Result.OK("同意使用成功!");
} }

@ -215,8 +215,8 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
//@RequiresPermissions("instrument:instrument:edit") //@RequiresPermissions("instrument:instrument:edit")
@RequestMapping(value = "/edit2", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit2", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit2(@RequestBody Instrument instrument) { public Result<String> edit2(@RequestBody Instrument instrument) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(sysDepartService.getById(loginUser.getOrgId()).getOrgCategory().equals("3")){ if(sysDepartService.getById(instrument.getDeclarationUnit()).getOrgCategory().equals("3")){
instrument.setFlag("1"); instrument.setFlag("1");
}else{ }else{
instrument.setFlag("0"); instrument.setFlag("0");

@ -8,18 +8,23 @@ enum Api {
list1 = '/innovationvoucher/innovationVoucher/list1', list1 = '/innovationvoucher/innovationVoucher/list1',
list2 = '/innovationvoucher/innovationVoucher/list2', list2 = '/innovationvoucher/innovationVoucher/list2',
list3 = '/innovationvoucher/innovationVoucher/list3', list3 = '/innovationvoucher/innovationVoucher/list3',
list4 = '/innovationvoucher/innovationVoucher/list4',
list5 = '/innovationvoucher/innovationVoucher/list5',
save='/innovationvoucher/innovationVoucher/add', save='/innovationvoucher/innovationVoucher/add',
edit='/innovationvoucher/innovationVoucher/edit', edit='/innovationvoucher/innovationVoucher/edit',
edit1='/innovationvoucher/innovationVoucher/edit1', edit1='/innovationvoucher/innovationVoucher/edit1',
edit2='/innovationvoucher/innovationVoucher/edit2', edit2='/innovationvoucher/innovationVoucher/edit2',
edit3='/innovationvoucher/innovationVoucher/edit3',
deleteOne = '/innovationvoucher/innovationVoucher/delete', deleteOne = '/innovationvoucher/innovationVoucher/delete',
deleteBatch = '/innovationvoucher/innovationVoucher/deleteBatch', deleteBatch = '/innovationvoucher/innovationVoucher/deleteBatch',
importExcel = '/innovationvoucher/innovationVoucher/importExcel', importExcel = '/innovationvoucher/innovationVoucher/importExcel',
exportXls = '/innovationvoucher/innovationVoucher/exportXls', exportXls = '/innovationvoucher/innovationVoucher/exportXls',
tjsh = '/innovationvoucher/innovationVoucher/tjsh', tjsh = '/innovationvoucher/innovationVoucher/tjsh',
tjdxsh = '/innovationvoucher/innovationVoucher/tjdxsh',
tysy = '/innovationvoucher/innovationVoucher/tysy', tysy = '/innovationvoucher/innovationVoucher/tysy',
jjsy = '/innovationvoucher/innovationVoucher/jjsy', jjsy = '/innovationvoucher/innovationVoucher/jjsy',
shtg = '/innovationvoucher/innovationVoucher/shtg', shtg = '/innovationvoucher/innovationVoucher/shtg',
dxshtg = '/innovationvoucher/innovationVoucher/dxshtg',
} }
export const tjsh = (params,handleSuccess) => { export const tjsh = (params,handleSuccess) => {
return defHttp.get({url: Api.tjsh, params}, {joinParamsToUrl: true}).then(() => { return defHttp.get({url: Api.tjsh, params}, {joinParamsToUrl: true}).then(() => {
@ -27,6 +32,12 @@ export const tjsh = (params,handleSuccess) => {
}); });
} }
export const tjdxsh = (params,handleSuccess) => {
return defHttp.get({url: Api.tjdxsh, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
export const tysy = (params,handleSuccess) => { export const tysy = (params,handleSuccess) => {
return defHttp.get({url: Api.tysy, params}, {joinParamsToUrl: true}).then(() => { return defHttp.get({url: Api.tysy, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess(); handleSuccess();
@ -49,6 +60,11 @@ export const saveOrUpdate2 = (params, isUpdate) => {
return defHttp.post({ url: url, params }, { isTransformResponse: false }); return defHttp.post({ url: url, params }, { isTransformResponse: false });
} }
export const saveOrUpdate3 = (params, isUpdate) => {
let url = isUpdate ? Api.edit3 : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}
/** /**
* 导出api * 导出api
@ -73,12 +89,22 @@ export const list2 = (params) => defHttp.get({ url: Api.list2, params });
export const list3 = (params) => defHttp.get({ url: Api.list3, params }); export const list3 = (params) => defHttp.get({ url: Api.list3, params });
export const list4 = (params) => defHttp.get({ url: Api.list4, params });
export const list5 = (params) => defHttp.get({ url: Api.list5, params });
export const shtg = (params,handleSuccess) => { export const shtg = (params,handleSuccess) => {
return defHttp.get({url: Api.shtg, params}, {joinParamsToUrl: true}).then(() => { return defHttp.get({url: Api.shtg, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess(); handleSuccess();
}); });
} }
export const dxshtg = (params,handleSuccess) => {
return defHttp.get({url: Api.dxshtg, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/** /**
* 删除单个 * 删除单个
* @param params * @param params

@ -0,0 +1,304 @@
<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 { list4, deleteOne, batchDelete, getImportUrl, getExportUrl,tjdxsh } 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: list4,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 140,
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 tjdxshcz(record) {
await tjdxsh({id: record.id}, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
const actions = [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}
];
if(record.dxshSta==="0"||record.dxshSta==="4"){
actions.unshift({
label: '提交兑现审核',
popConfirm: {
title: '是否确认提交兑现审核',
confirm: tjdxshcz.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>

@ -0,0 +1,332 @@
<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>
<InnovationVoucherModal3 ref="registerModal3" @success="handleSuccess"></InnovationVoucherModal3>
</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 {
list5,
deleteOne,
batchDelete,
getImportUrl,
getExportUrl,
dxshtg
} from './InnovationVoucher.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import InnovationVoucherModal from './components/InnovationVoucherModal.vue'
import InnovationVoucherModal3 from './components/InnovationVoucherModal3.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 registerModal3 = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '创新券表',
api: list5,
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 dxshtgcz(record) {
await dxshtg({id: record.id}, handleSuccess);
}
/**
* 驳回
*/
function handleReject(record: Recordable) {
registerModal3.value.disableSubmit = false;
registerModal3.value.edit(record);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
const actions = [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}
];
if(record.dxshSta==="1"||record.dxshSta==="2"){
actions.unshift({
label: '通过',
popConfirm: {
title: '是否确认审核通过',
confirm: dxshtgcz.bind(null, record),
}
});
}
if(record.dxshSta==="1"||record.dxshSta==="2"){
actions.unshift({
label: '驳回',
popConfirm: {
title: '是否确认驳回',
confirm: handleReject.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>

@ -40,6 +40,7 @@
proType: '', proType: '',
proMoney: undefined, proMoney: undefined,
attachment: '', attachment: '',
proDept:'',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

@ -0,0 +1,152 @@
<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.dxReject">
<a-textarea v-model:value="formData.dxReject" rows="8" placeholder="请输入驳回原因" />
</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 JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate3 } 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: '',
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({
dxReject: [{ 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 saveOrUpdate3(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>

@ -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 './InnovationVoucherForm3.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>

@ -39,6 +39,7 @@
const formData = reactive<Record<string, any>>({ const formData = reactive<Record<string, any>>({
id: '', id: '',
reject: '', reject: '',
declarationUnit:'',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

Loading…
Cancel
Save