Skip to content

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

提交的提示语去掉 修改修复上传问题

上级 3a3ff076
隐藏空白字符变更
内嵌 并排
正在显示 包含 49 行增加 和 268 行删除
src/api/common/api.ts
浏览文件 @ aa36ceea
......@@ -150,7 +150,7 @@ export const addGkxf = (params) => {
export const delGkxf = (params) => {
return defHttp.post({ url: `/dklc/delGkxf`, params });
}
// 点击评审接口 不评审
// 点击评审接口 不评审 提交
export const psOrZxps = (params) => {
return defHttp.post({ url: `/dklc/psOrZxps`, params });
}
......
src/views/dkgl/DkglList.vue deleted 100644 → 0
浏览文件 @ 3a3ff076
<template>
<div class="dk-list">
<Form @submits="submit" :FormData="FormData" />
<div class="flex justify-end py-5 mr-5">
<a-button type="primary" size="large">
<DownloadOutlined />
导出
</a-button>
</div>
<a-table :columns="columns" :row-selection="rowSelection" :data-source="list" :pagination="pagination"
show-less-items @change="handleTableChange">
<template #bodyCell="{ text, record, index, column }">
<template v-if="column.key === 'index'">
<span>
{{ index + 1 }}
</span>
</template>
<template v-if="column.key === 'action'">
<div>
<a-button type="primary" ghost class="mr-5">办理</a-button>
<a-button type="primary" ghost>流程图</a-button>
</div>
</template>
</template>
</a-table>
</div>
</template>
<script setup lang="ts">
import { ref, reactive } from 'vue';
import Form from '/@/components/FormModel.vue'
import { DownloadOutlined } from '@ant-design/icons-vue';
import { list as getList } from '/@/api/dkgl'
import { getTown, dict } from '/@/api/common/api'
import { transformArray } from '/@/utils/modifFiled'
const pageNo = ref<any>(1)
const pageSize = ref<any>(10)
const pagination = ref<any>({
total: 0,
pageNo: pageNo.value,
pagination: pageSize.value
});
// 获取城镇的
async function tomnData(v: any) {
const res = await getTown(v)
if (v === '440000') {
FormData.value[0].data = res
} else {
FormData.value[1].value = null
FormData.value[1].data = res
}
}
tomnData('440000')
// 获取行业类编
async function getClass(v: any) {
const res = await dict(v)
// 转字段名称，下拉框 用的 name 跟 id字段
FormData.value[2].data = res
}
getClass('org_category')
const FormData = ref<any>(
[
{
name: 'cityCode',
label: '行政区',
type: 'select',
fieldNames: {
label: 'name',
value: 'id'
},
value: null,
select: (v) => {
FormData.value[0].value = v
tomnData(v)
},
data: []
},
{
name: 'countyCode',
label: '区县',
fieldNames: {
label: 'name',
value: 'id'
},
type: 'select',
value: null,
data: [],
select: (v) => {
FormData.value[1].value = v
},
},
{
name: 'hyfl',
label: '行业分类',
type: 'select',
value: '',
data: []
},
{
name: 'category',
label: '行业类别',
type: 'cascader',
value: 'org_category',
show: false,
},
{
name: 'leixing',
label: '地块类型',
type: 'select',
value: 3,
data: [
{
label: '北京',
value: 3
},
{
label: '上海',
value: 4
}
]
},
{
name: 'codde',
label: '地块名称或编码',
type: 'text',
},
{
name: 'username',
label: '登录账号',
type: 'text',
},
]
)
const rowSelection = reactive<any>({
type: 'checkbox',
showCheckedAll: true,
onlyCurrent: false,
});
const columns = ref<any>([
{
title: '地块名称',
dataIndex: 'landname',
},
{
title: '地块编码',
dataIndex: 'codeLand',
},
{
title: '市',
dataIndex: 'cityCode',
},
{
title: '县',
dataIndex: 'countyCode',
},
{
title: '行业类别',
dataIndex: 'tradename',
},
{
title: '政策依据',
dataIndex: 'policy',
ellipsis: true,
},
{
title: '地块类型',
dataIndex: 'nameLandtype',
},
{
title: '更新时间',
dataIndex: 'modifyDate',
},
{
title: '登录账号',
dataIndex: 'username',
},
{
title: '操作',
key: 'action',
},
])
const list = ref<any>([])
const form = ref<any>({})
function submit(val: any) {
form.value = val
// 其中行业类编里面。如果值的长度是1 传'hyml'字段 则代表一类 如果值的长度是2 hydl
// 长度是3 hyzl 长度是4 hyxl
console.log(form.value, 'val')
init()
}
async function init() {
let params: any = {}
params = form.value
if (params?.category) {
if (params?.category.length == 1) {
params.hyml = params.category
} else if (params?.category.length == 2) {
params.hydl = params.category
} else if (params?.category.length == 3) {
params.hyzl = params.category
} else if (params?.category.length == 4) {
params.hyxl = params.category
}
delete params.category
console.log(params, 3)
}
const res = await getList({ ...params, pageNo: pageNo.value, pageSize: pageSize.value })
list.value = res.records
pagination.value.total = res.total
pagination.value.pageSize = res.size
}
init()
function handleTableChange(val: any) {
pageNo.value = val.current
pageSize.value = val.pageSize
init()
}
</script>
<style lang="less" scoped>
.dk-list {
background-color: @white;
}
</style>
\ No newline at end of file
src/views/dkgl/components/dksumitTip.vue 0 → 100644
浏览文件 @ aa36ceea
<template>
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法（试行）》第十五条，土壤污染状况调查、土壤污染风险评估、风险管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工、修复施工、工程监理、土壤和地下水监测的从业单位，应当在项目实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告，以及风险管控与修复方案依据《中华人民共和国土壤污染防治法》提交评审或备案前，在信用记录系统记录单位和个人业绩情况信息。
</div>
</template>
src/views/dkgl/fxgk/DetailList.vue
浏览文件 @ aa36ceea
......@@ -71,9 +71,7 @@
</template>
</BasicTable>
<a-modal v-model:visible="evaluate" :centered="true" okText="我已了解，继续提交" cancelText="取消" title="信息" @ok="handleEvaluate">
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法》第十五条，土壤污染状况调查、土壤污染风险评估.(试行)管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工修复施工、工程监理、土壤和地下水监测的从业单位，应当在项实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告岌凤险管控写修夏方案依据《中举火民共和国生最污梁防治法》提审或备案前，在信用记录系统记录单位和个人业绩情况信息
</div>
<dksumitTip />
</a-modal>
<a-modal v-model:visible="No" cancelText="取消" okText="确定" title="信息">
<template #footer>
......@@ -113,6 +111,7 @@
import Step from '/@/components/customComponent/steps/step.vue';
import { checkZbmgxx } from '@/utils/checkTip';
import { tbzjxx } from '/@/api/common/api';
import dksumitTip from '../components/dksumitTip.vue';
const router = useRouter();
const { createMessage } = useMessage();
......
src/views/dkgl/fxpg/Filling.vue
浏览文件 @ aa36ceea
......@@ -37,12 +37,21 @@
<a-button type="primary" @click="handelStep" v-auth="'fxpg-tbz-lct'">流程图</a-button>
</template>
</BasicTable>
<!-- 流程图 -->
<!-- 点击提交出现的提示弹框 暂时不用-->
<a-modal v-model:visible="Tj" title="信息" centered @ok="submit" :bodyStyle="{ 'padding-left': '30px' }" :width="700">
<template #footer>
<div>
<a-button type="primary" @click="submit">我已了解，继续提交</a-button>
</div>
</template>
<dksumitTip />
</a-modal>
<Step @register="registerlcModal" />
</div>
</template>
<script lang="ts" name="dkgl-fxpg-Filling" setup>
import { ref } from 'vue';
import { BasicTable } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { useModal } from '/@/components/Modal';
......@@ -50,6 +59,7 @@
import { useMessage } from '/@/hooks/web/useMessage';
import { columns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
import { fillingList, getImportUrl, getExportUrl, submitFxpg } from './api';
import dksumitTip from '../components/dksumitTip.vue';
import Step from '/@/components/customComponent/steps/step.vue';
//注册table数据
......@@ -100,7 +110,7 @@
let router = useRouter();
const { createMessage } = useMessage();
let Tj = ref(false);
function filling() {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
......@@ -123,7 +133,9 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
submitFxpg({ wrdkid: selectedRowKeys.value[0] }, handleSuccess);
Tj.value = false;
}
// 点击查看流程图
function handelStep() {
......
src/views/dkgl/gkpg/DetailList.vue
浏览文件 @ aa36ceea
......@@ -77,9 +77,7 @@
</template>
</BasicTable>
<a-modal v-model:visible="evaluate" :centered="true" okText="我已了解，继续提交" cancelText="取消" title="信息" @ok="handleEvaluate">
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法》第十五条，土壤污染状况调查、土壤污染风险评估.(试行)管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工修复施工、工程监理、土壤和地下水监测的从业单位，应当在项实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告岌凤险管控写修夏方案依据《中举火民共和国生最污梁防治法》提审或备案前，在信用记录系统记录单位和个人业绩情况信息
</div>
<dksumitTip />
</a-modal>
<AcceptanceModal @register="registerModal" @success="handleSuccess" />
......@@ -118,6 +116,7 @@
import Upcheckcl from '/@/components/customComponent/Upcheckcl.vue';
import Step from '/@/components/customComponent/steps/step.vue';
import { tbzjxx } from '/@/api/common/api';
import dksumitTip from '../components/dksumitTip.vue';
const router = useRouter();
const { createMessage } = useMessage();
......
src/views/dkgl/gkxf/DetailList.vue
浏览文件 @ aa36ceea
......@@ -70,9 +70,7 @@
</template>
</BasicTable>
<a-modal v-model:visible="evaluate" :centered="true" okText="我已了解，继续提交" cancelText="取消" title="信息" @ok="handleEvaluate">
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法》第十五条，土壤污染状况调查、土壤污染风险评估.(试行)管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工修复施工、工程监理、土壤和地下水监测的从业单位，应当在项实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告岌凤险管控写修夏方案依据《中举火民共和国生最污梁防治法》提审或备案前，在信用记录系统记录单位和个人业绩情况信息
</div>
<dksumitTip />
</a-modal>
<a-modal v-model:visible="No" cancelText="取消" title="信息" okText="确定">
<template #footer>
......@@ -114,6 +112,7 @@
import Step from '/@/components/customComponent/steps/step.vue';
import { spotCheck, oneTip, checkZbmgxx } from '@/utils/checkTip';
import { tbzjxx } from '/@/api/common/api';
import dksumitTip from '../components/dksumitTip.vue';
const router = useRouter();
const { createMessage } = useMessage();
......
src/views/dkgl/gkxfpg/DetailList.vue
浏览文件 @ aa36ceea
......@@ -85,9 +85,7 @@
<Step @register="registerlcModal" />
<a-modal v-model:visible="evaluate" :centered="true" okText="我已了解，继续提交" cancelText="取消" title="信息" @ok="handleEvaluate">
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法》第十五条，土壤污染状况调查、土壤污染风险评估.(试行)管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工修复施工、工程监理、土壤和地下水监测的从业单位，应当在项实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告岌凤险管控写修夏方案依据《中举火民共和国生最污梁防治法》提审或备案前，在信用记录系统记录单位和个人业绩情况信息
</div>
<dksumitTip />
</a-modal>
<a-modal v-model:visible="No" okText="确定">
<template #title>
......@@ -121,6 +119,7 @@
import { spotCheck, oneTip } from '@/utils/checkTip';
import Step from '/@/components/customComponent/steps/step.vue';
import { tbzjxx } from '/@/api/common/api';
import dksumitTip from '../components/dksumitTip.vue';
const router = useRouter();
......
src/views/dkgl/investigate/Filling.vue
浏览文件 @ aa36ceea
......@@ -33,7 +33,7 @@
<a-button type="primary" @click="showLookModal" v-auth="'dkdc-tbz-jbxx'">查看基本信息</a-button>
<a-button type="primary" @click="showDetail" v-auth="'dkdc-tbz-zltb'">资料填报</a-button>
<a-button type="primary" @click="showModal(2)" v-auth="'dkdc-tbz-tbfsbg'">填报方式变更</a-button>
<a-button type="primary" @click="Tj = true" v-auth="'dkdc-tbz-tj'">提交</a-button>
<a-button type="primary" @click="submit" v-auth="'dkdc-tbz-tj'">提交</a-button>
<a-button type="primary" @click="onExportXls" v-auth="'dkdc-tbz-dc'">导出</a-button>
<a-button type="primary" @click="handelStep" v-auth="'dkdc-tbz-lct'">流程图</a-button>
</template>
......@@ -92,13 +92,7 @@
<a-button type="primary" @click="submit">我已了解，继续提交</a-button>
</div>
</template>
<div class="py-10 px-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法(试行)》第十五条，
土壤污染状况调查、土壤污染风险评估、风险管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、
风险管控施工、修复施工、工程监理、土壤和地下水监测的从业单位，应当在项目实施所涉及的土壤污染状况调查报告、
风险评估报告、效果评估报告，以及风险管控与修复方案依据《中华人民共和国土壤污染防治法》提交评审或备案前，
在信用记录系统记录单位和个人业绩情况信息。
</div>
<dksumitTip />
</a-modal>
<!-- 流程图 -->
<Step @register="registerModal" />
......@@ -116,6 +110,7 @@
import Step from '/@/components/customComponent/steps/step.vue';
import { useModal } from '/@/components/Modal';
import { useRouter } from 'vue-router';
import dksumitTip from '../components/dksumitTip.vue';
const { createMessage } = useMessage();
let router = useRouter();
......
src/views/dkgl/repair/DetailList.vue
浏览文件 @ aa36ceea
......@@ -33,7 +33,7 @@
<a-button type="primary" @click="filling" v-auth="'repair-tbz-zltb'">资料填报</a-button>
<a-button type="primary" @click="add" v-auth="'repair-tbz-xzfa'">新增方案</a-button>
<a-button type="primary" v-auth="'repair-tbz-scfa'" @click="del">删除方案</a-button>
<a-button type="primary" @click="evaluate = true" v-auth="'repair-tbz-zxps'">提交</a-button>
<a-button type="primary" @click="handleEvaluate" v-auth="'repair-tbz-zxps'">提交</a-button>
<a-button type="primary" @click="NoEval" v-auth="'repair-tbz-bps'">不评审</a-button>
</template>
<template v-else-if="type == '待受理'">
......@@ -70,9 +70,7 @@
</template>
</BasicTable>
<a-modal v-model:visible="evaluate" :centered="true" okText="我已了解，继续提交" cancelText="取消" title="信息" @ok="handleEvaluate">
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法》第十五条，土壤污染状况调查、土壤污染风险评估.(试行)管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工修复施工、工程监理、土壤和地下水监测的从业单位，应当在项实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告岌凤险管控写修夏方案依据《中举火民共和国生最污梁防治法》提审或备案前，在信用记录系统记录单位和个人业绩情况信息
</div>
<dksumitTip />
</a-modal>
<a-modal v-model:visible="No" cancelText="取消" okText="确定" title="信息">
<template #footer>
......@@ -115,6 +113,7 @@
import { spotCheck, oneTip, checkZbmgxx } from '@/utils/checkTip';
import Step from '/@/components/customComponent/steps/step.vue';
import { tbzjxx } from '/@/api/common/api';
import dksumitTip from '../components/dksumitTip.vue';
const router = useRouter();
const { createMessage } = useMessage();
......@@ -221,7 +220,7 @@
`/dkgl/repair/ViewDetail?wrdkid=${selectedRows.value[0].wrdkid}&id=${selectedRows.value[0].id}&pgtype=${selectedRows.value[0].pgtype}`
);
}
// 点击评审弹框
// 点击提交
async function handleEvaluate() {
if (!selectedRows.value[0].bt) {
No.value = true;
......@@ -287,7 +286,7 @@
});
}
// 退回无需评审
function submit(v) {
async function submit(v) {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
......
src/views/dkgl/repair/FillingInfor.vue
浏览文件 @ aa36ceea
......@@ -61,7 +61,11 @@
<template #extra><a-button type="primary" @click.prevent="saveXfcs($event)">保存</a-button></template>
</a-collapse-panel>
<a-collapse-panel header="修复文件上传" :forceRender="true" key="150000">
<CdUpload labelFirst="修复文件" :objec="[{ name: '公示截图' }, { name: '修复方案' }]" :data="dsInfor.gkxf" />
<CdUpload
labelFirst="修复文件"
:objec="[{ name: '公示截图' }, { name: '修复方案' }]"
:data="{ ...dsInfor.gkxf, scjdbm: 'S5', pgtype: param.pgtype }"
/>
</a-collapse-panel>
<a-collapse-panel header="填报进度" :forceRender="true" key="160000">
<fillProgress :List="dsInfor?.lzjd"></fillProgress>
......
src/views/dkgl/xfpg/DetailList.vue
浏览文件 @ aa36ceea
......@@ -74,9 +74,7 @@
</template>
</BasicTable>
<a-modal v-model:visible="evaluate" :centered="true" okText="我已了解，继续提交" cancelText="取消" title="信息" @ok="handleEvaluate">
<div class="py-4 ml-5">
按照《建设用地土壤污染风险管控和修复从业单位和个人执业情况信用记录管理办法》第十五条，土壤污染状况调查、土壤污染风险评估.(试行)管控方案编制、修复方案编制、风险管控效果评估、修复效果评估、风险管控施工修复施工、工程监理、土壤和地下水监测的从业单位，应当在项实施所涉及的土壤污染状况调查报告、风险评估报告、效果评估报告岌凤险管控写修夏方案依据《中举火民共和国生最污梁防治法》提审或备案前，在信用记录系统记录单位和个人业绩情况信息
</div>
<dksumitTip />
</a-modal>
<a-modal v-model:visible="No" cancelText="取消" okText="确定">
<template #title>
......@@ -121,6 +119,7 @@
import { spotCheck, oneTip } from '@/utils/checkTip';
import Step from '/@/components/customComponent/steps/step.vue';
import { tbzjxx } from '/@/api/common/api';
import dksumitTip from '../components/dksumitTip.vue';
const router = useRouter();
const { createMessage } = useMessage();
......
src/views/tjfx/business/data.ts
浏览文件 @ aa36ceea
......@@ -783,7 +783,7 @@ export const DkpsColumns: BasicColumn[] = [
dataIndex: 'fxgkxgpgs',
},
{
title: '通过率（%',
title: '通过率(%)',
dataIndex: 'xfxgpgs',
},
......@@ -803,7 +803,7 @@ export const DkpsColumns: BasicColumn[] = [
dataIndex: 'fxgkxgpgs',
},
{
title: '通过率（%',
title: '通过率(%)',
dataIndex: 'xfxgpgs',
},
......@@ -823,7 +823,7 @@ export const DkpsColumns: BasicColumn[] = [
dataIndex: 'fxgkxgpgs',
},
{
title: '通过率（%',
title: '通过率(%)',
dataIndex: 'xfxgpgs',
},
......@@ -847,7 +847,7 @@ export const DkpsColumns: BasicColumn[] = [
dataIndex: 'fxgkxgpgs',
},
{
title: '通过率（%',
title: '通过率(%)',
dataIndex: 'xfxgpgs',
},
......
src/views/tjfx/business/dkPs.vue
浏览文件 @ aa36ceea
......@@ -26,8 +26,8 @@
</a-tree-select>
</template>
<template #tableTitle>
<a-button type="primary" preIcon="ant-design:export-outlined" v-auth="'ywkz-kgpsxx-dc'" @click="onExportXls"> 导出</a-button>
<a-button type="primary" @click="view"> 查看</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" v-auth="'ywkz-kgpsxx-dc'" @click="onExportXls"> 导出</a-button>
</template>
</BasicTable>
<!--查看详情 -->
......
src/views/tjfx/units/unitTj.vue
浏览文件 @ aa36ceea
......@@ -17,8 +17,8 @@
</a-tree-select>
</template>
<template #tableTitle>
<a-button type="primary" preIcon="ant-design:export-outlined" v-auth="'hydw-dwxx-dc'" @click="onExportXls"> 导出</a-button>
<a-button type="primary" @click="view"> 查看</a-button>
<a-button type="primary" preIcon="ant-design:export-outlined" v-auth="'hydw-dwxx-dc'" @click="onExportXls"> 导出</a-button>
</template>
</BasicTable>
<!--查看详情 -->
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论