Skip to content

广
广东建设用地-前端
提交 56c6e8de authored 作者: gjx's avatar gjx
浏览文件
操作

添加待处理功能

上级 27447f49
显示空白字符变更
内嵌 并排
正在显示 包含 388 行增加 和 2 行删除
.env.development
浏览文件 @ 56c6e8de
......@@ -8,7 +8,7 @@ VITE_PUBLIC_PATH = /
# VITE_PROXY = [["/Soil","http://36.40.79.205:8069/Soil/"],["/upload","http://localhost:3300/upload"]]
VITE_PROXY = [["/Soil","http://36.40.79.205:8069/Soil/"],["/upload","http://36.40.79.205:8069/upload"]]
VITE_PROXY = [["/Soil","http://192.168.0.105:8069/Soil/"],["/upload","http://192.168.0.105:8069/upload"]]
......@@ -16,7 +16,7 @@ VITE_PROXY = [["/Soil","http://36.40.79.205:8069/Soil/"],["/upload","http://36.4
VITE_GLOB_API_URL=/Soil
#后台接口全路径地址(必填)
VITE_GLOB_DOMAIN_URL=http://36.40.79.205:8069/Soil/
VITE_GLOB_DOMAIN_URL=http://192.168.0.105:8069/Soil/
# 接口前缀
......
src/api/common/api.ts
浏览文件 @ 56c6e8de
......@@ -176,7 +176,15 @@ export const back = (params) => {
export const backHis = (params) => {
return defHttp.post({ url: `/dklc/backHis`, params });
};
// 待确认
export const submiDqr = (params) => {
return defHttp.post({ url: `/dklc/submiDqr`, params });
};
// 确认里面的历史
export const fhHis = (params) => {
return defHttp.post({ url: `/dklc/fhHis`, params });
};
......
src/components/customComponent/ConfirmedModal.vue 0 → 100644
浏览文件 @ 56c6e8de
<template>
<BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit" width="50%">
<BasicForm @register="registerForm"> </BasicForm>
<a-table :dataSource="dataSource" :columns="columns" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, unref } from 'vue';
import { FormSchema } from '/@/components/Table';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
import { submiDqr, fhHis } from '@/api/common/api';
const emit = defineEmits(['register', 'success']);
const ishow = ref(false);
const isUpdate = ref(true);
const AdviceFormSchema: FormSchema[] = [
{ label: '污染地块ID', field: 'wrdkid', required: true, component: 'Input', show: false },
{ label: '所处阶段编码', field: 'scjdbm', component: 'Input', show: false },
{ label: 'pgtype', field: 'pgtype', component: 'Input', show: false },
{ label: '填报阶段编码', field: 'jdnzt', component: 'Input', show: false },
{
label: '复核报告是否通过 ',
field: 'nodeType',
component: 'Select',
required: true,
defaultValue: 1,
componentProps: {
options: [
{ label: '复核通过', value: 1 },
{ label: '复核需继续修改', value: 2 },
],
onChange: (v) => {
if (v == 2) {
updateSchema({
label: '退回意见',
required: true,
field: 'clyj',
component: 'InputTextArea',
show: true,
});
} else {
updateSchema({
label: '退回意见',
required: false,
field: 'clyj',
component: 'InputTextArea',
show: false,
});
}
},
},
},
{
label: '退回意见',
required: true,
field: 'clyj',
component: 'InputTextArea',
show: false,
},
];
//表单配置
const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
labelWidth: 220,
schemas: AdviceFormSchema,
showActionButtonGroup: false,
});
const datas = ref();
//表单赋值
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
//重置表单
await resetFields();
setModalProps({ confirmLoading: false, showCancelBtn: data?.showFooter, showOkBtn: data?.showFooter });
isUpdate.value = !!data?.isUpdate;
//表单赋值
datas.value = data.record;
getfhHis({ wrdkid: datas.value.wrdkid, scjdbm: datas.value.scjdbm, jdnzt: datas.value.jdnzt, pgtype: datas.value.pgtype });
await setFieldsValue({
...data.record,
});
});
//设置标题
const title = ref('符合评审信息');
const dataSource = ref<any>();
const columns = [
{
title: '记录生成时间',
dataIndex: 'clsj',
key: 'clsj',
},
{
title: '复核是否通过',
dataIndex: 'notyType',
key: 'notyType',
customRender: ({ record }: any) => {
if (record.notyType == 1) {
return '是';
} else if (record.tcwr == '2') return '否';
},
},
{
title: '退回意见',
dataIndex: 'clyj',
key: 'clyj',
},
];
// 获取历史评审
async function getfhHis(v) {
console.log(v, 'v');
dataSource.value = await fhHis(v);
}
//表单提交事件
async function handleSubmit() {
try {
let values = await validate();
setModalProps({ confirmLoading: true });
//提交表单
await submiDqr(values);
//关闭弹窗
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>
<style lang="less" scoped></style>
src/views/dkgl/fxpg/Confirmed.vue 0 → 100644
浏览文件 @ 56c6e8de
<!-- 待确认 -->
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!-- 行业分类 -->
<template #form-suspect="{ model, field }">
<a-select
v-model:value="model[field]"
placeholder="请选择行业分类"
:fieldNames="{ label: 'text', value: 'value' }"
:options="isSuspectOptions"
@change="changeSuspect"
></a-select>
</template>
<template #form-category="{ model, field }">
<a-tree-select
v-model:value="model[field]"
show-search
placeholder="请选择二级"
allow-clear
tree-default-expand-all
:field-names="{ label: 'name', value: 'id', children: 'children' }"
:tree-data="treeData"
tree-node-filter-prop="label"
>
<template #suffixIcon>
<SmileOutlined />
</template>
</a-tree-select>
</template>
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="view" v-auth="'fxpg-tbz-jbxx'">查看基本信息</a-button>
<a-button type="primary" @click="handleComint" v-auth="'fxpg-dqr-dqr'">待确认</a-button>
</template>
</BasicTable>
<ConfirmedModal @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" name="dkgl-investigate-Acceptance" setup>
import { BasicTable } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useMessage } from '/@/hooks/web/useMessage';
import { useListPage } from '/@/hooks/system/useListPage';
import { useRouter } from 'vue-router';
import ConfirmedModal from '@/components/customComponent/ConfirmedModal.vue';
import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
import { confirmed, getImportUrl, getExportUrl } from './api';
let router = useRouter();
//注册model
const [registerModal, { openModal }] = useModal();
//注册table数据
const { tableContext } = useListPage({
tableProps: {
title: '地块管理-待受理',
api: confirmed,
columns,
canResize: false,
//定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
rowKey: 'wrdkid',
clickToRowSelect: true,
rowSelection: { type: 'radio' },
showActionColumn: false,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: false,
},
actionColumn: {
width: 120,
fixed: 'right',
},
},
exportConfig: {
name: '地块管理-待确认',
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
},
});
const isSuspectOptions = useSuspectsData().data; // 行业分类
const useCategory = useCategoryData();
const treeData = useCategory.data; // 行业类别-数据
const changeSuspect = useCategory.changeIsSuspect; // 行业类别-方法
const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
const { createMessage } = useMessage();
function handleComint() {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
openModal(true, {
record: selectedRows.value[0],
isUpdate: true,
showFooter: true,
});
}
// 点击查看详情
function view() {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
router.push(`/dkgl/fxpg/ViewData?wrdkid=${selectedRowKeys.value[0]}`);
}
/**
* 成功回调
*/
function handleSuccess() {
selectedRows.value = [];
selectedRowKeys.value = [];
reload();
}
</script>
<style scoped></style>
src/views/dkgl/fxpg/api.ts
浏览文件 @ 56c6e8de
......@@ -35,8 +35,10 @@ export const getImportUrl = Api.importExcel;
* DKDTC 地块待退出
* DKYTC 地块已退出
*/
export const fillingList = (params) => defHttp.get({ url: Api.list + '?jdnzt=T1', params }); // 填报中
export const acceptanceList = (params) => defHttp.get({ url: Api.list + '?jdnzt=DSL', params }); // 待受理
export const confirmed = (params) => defHttp.get({ url: Api.list + '?jdnzt=DQR', params }); // 待受理
export const reviewList = (params) => defHttp.get({ url: Api.list + '?jdnzt=T2', params }); // 待评审
export const approvedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SH', params }); // 评审通过
export const failedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SHBTG', params }); // 评审不通过
......
src/views/dkgl/investigate/Confirmed.vue 0 → 100644
浏览文件 @ 56c6e8de
<!-- 待确认 -->
<template>
<div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!-- 行业分类 -->
<template #form-suspect="{ model, field }">
<a-select
v-model:value="model[field]"
placeholder="请选择行业分类"
:fieldNames="{ label: 'text', value: 'value' }"
:options="isSuspectOptions"
@change="changeSuspect"
></a-select>
</template>
<template #form-category="{ model, field }">
<a-tree-select
v-model:value="model[field]"
show-search
placeholder="请选择二级"
allow-clear
tree-default-expand-all
:field-names="{ label: 'name', value: 'id', children: 'children' }"
:tree-data="treeData"
tree-node-filter-prop="label"
>
<template #suffixIcon>
<SmileOutlined />
</template>
</a-tree-select>
</template>
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="view" v-auth="'dkdc-dsl-jbxx'">查看基本信息</a-button>
<a-button type="primary" @click="handleComint" v-auth="'dkdc-dqr-dqr'">待确认</a-button>
</template>
</BasicTable>
<ConfirmedModal @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" name="dkgl-investigate-Acceptance" setup>
import { BasicTable } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useMessage } from '/@/hooks/web/useMessage';
import { useListPage } from '/@/hooks/system/useListPage';
import { useRouter } from 'vue-router';
import ConfirmedModal from '@/components/customComponent/ConfirmedModal.vue';
import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
import { confirmed, getImportUrl, getExportUrl } from './api';
let router = useRouter();
//注册model
const [registerModal, { openModal }] = useModal();
//注册table数据
const { tableContext } = useListPage({
tableProps: {
title: '地块管理-待受理',
api: confirmed,
columns,
canResize: false,
//定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
rowKey: 'wrdkid',
clickToRowSelect: true,
rowSelection: { type: 'radio' },
showActionColumn: false,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: false,
},
actionColumn: {
width: 120,
fixed: 'right',
},
},
exportConfig: {
name: '地块管理-待确认',
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
},
});
const isSuspectOptions = useSuspectsData().data; // 行业分类
const useCategory = useCategoryData();
const treeData = useCategory.data; // 行业类别-数据
const changeSuspect = useCategory.changeIsSuspect; // 行业类别-方法
const [registerTable, { reload }, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
const { createMessage } = useMessage();
function handleComint() {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
openModal(true, {
record: selectedRows.value[0],
isUpdate: true,
showFooter: true,
});
}
// 点击查看详情
function view() {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
router.push(`/dkgl/investigate/modal/ViewData?wrdkid=${selectedRowKeys.value[0]}`);
}
/**
* 成功回调
*/
function handleSuccess() {
selectedRows.value = [];
selectedRowKeys.value = [];
reload();
}
</script>
<style scoped></style>
src/views/dkgl/investigate/api.ts
浏览文件 @ 56c6e8de
......@@ -37,6 +37,7 @@ export const getImportUrl = Api.importExcel;
*/
export const fillingList = (params) => defHttp.get({ url: Api.list + '?jdnzt=T1', params }); // 填报中
export const acceptanceList = (params) => defHttp.get({ url: Api.list + '?jdnzt=DSL', params }); // 待受理
export const confirmed = (params) => defHttp.get({ url: Api.list + '?jdnzt=DQR', params }); // 待确认
export const reviewList = (params) => defHttp.get({ url: Api.list + '?jdnzt=T2', params }); // 待评审
export const approvedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SH', params }); // 评审通过
export const failedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SHBTG', params }); // 评审不通过
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论