Skip to content

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

后期管理接口添加，清单名录

上级 56b1a353
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 387 行增加 和 187 行删除
src/views/directory/components/GWrdkjbxxb.data.ts
浏览文件 @ b919d6ec
......@@ -150,8 +150,8 @@ export const searchFormSchema: FormSchema[] = [
label: '政策依据二级',
field: 'faliYijuerji',
component: 'ApiSelect',
ifShow: ({ values }) => {
return values?.faliYiju == 1
show: ({ values }) => {
return values?.faliYiju == 1?true:false
},
componentProps: {
api: dict,
......@@ -291,69 +291,16 @@ export const formSchema: FormSchema[] = [
required: true,
componentProps: ({ formModel, formActionType }) => {
handeFlyj(formModel.faliYiju,formActionType)
return {
api: dict,
params: { key: 'dk_zcyj' },
labelField: 'text',
valueField: 'value',
onChange: (val: any) => {
const { updateSchema } = formActionType;
formModel.faliErji = null;
formModel.faliErji1 = null;
if (val == 1) {
updateSchema({
field: 'faliErji',
component: 'CheckboxGroup',
show: true,
componentProps: {
options: zc.value,
labelField: 'text',
valueField: 'value',
},
},
);
updateSchema({
field: 'faliErji1',
component: 'Input',
show: false,
});
}
else if (val == 3) {
updateSchema({
field: 'faliErji',
component: 'CheckboxGroup',
show: false,
componentProps: {
options: zc.value,
labelField: 'text',
valueField: 'value',
},
},
);
updateSchema({
field: 'faliErji1',
component: 'Input',
show: true,
});
} else {
updateSchema({
field: 'faliErji',
show: false,
},
);
updateSchema({
field: 'faliErji1',
show: false,
});
}
handeFlyj(val,formActionType)
},
};
},
......@@ -362,13 +309,13 @@ export const formSchema: FormSchema[] = [
label: '',
field: 'faliErji',
component: 'CheckboxGroup',
show: ({ values }) => { return values.faliErji == 1 },
show: ({ values }) => { return values.faliErji == 1?true:false },
},
{
label: '',
field: 'faliErji1',
component: 'Input',
show: ({ values }) => { return values.faliErji == 3 }
show: ({ values }) => { return values.faliErji == 3?true:false }
},
{
label: '行业分类',
......@@ -597,7 +544,6 @@ export const formSchema: FormSchema[] = [
// slot: 'form-hyxl'
},
{
label: '涉及的专项工作',
field: 'gzlx',
......@@ -874,4 +820,61 @@ async function gethyfl() {
const res = await categoryList()
allCategory.value = transformArray(res, 'name', 'id', 'label', 'value')
}
gethyfl()
\ No newline at end of file
gethyfl()
// 法理依据回显处理
function handeFlyj(val, formActionType) {
const { updateSchema } = formActionType;
if (val == 1) {
updateSchema({
field: 'faliErji',
component: 'CheckboxGroup',
show: true,
componentProps: {
options: zc.value,
labelField: 'text',
valueField: 'value',
},
},
);
updateSchema({
field: 'faliErji1',
component: 'Input',
show: false,
});
}
else if (val == 3) {
updateSchema({
field: 'faliErji',
component: 'CheckboxGroup',
show: false,
componentProps: {
options: zc.value,
labelField: 'text',
valueField: 'value',
},
},
);
updateSchema({
field: 'faliErji1',
component: 'Input',
show: true,
});
} else {
updateSchema({
field: 'faliErji',
show: false,
},
);
updateSchema({
field: 'faliErji1',
show: false,
});
}
}
\ No newline at end of file
src/views/directory/components/GWrdkjbxxbModal.vue
浏览文件 @ b919d6ec
......@@ -117,7 +117,7 @@
const countrys = ref([]);
const citys = ref([]);
async function getcity() {
citys.value = await getTown('440000');
citys.value = await getTown({ id: '440000' });
}
getcity();
// 获取城镇
......
src/views/directory/gzml/gzml.vue
浏览文件 @ b919d6ec
......@@ -110,7 +110,7 @@
//注册model
const [registerMoveModal, { openModal: openMoveModal }] = useModal();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
const { tableContext } = useListPage({
tableProps: {
title: '清单名录-预关注地块清单',
api: BahygzList,
......
src/views/directory/mlzk/land/GWrdkjbxxb.api.ts
浏览文件 @ b919d6ec
......@@ -15,7 +15,7 @@ enum Api {
movie = '/qdml/yrygz',
deleteBatch = '/dkgl/gWrdkjbxxb/deleteBatch',
importExcel = '/dkgl/gWrdkjbxxb/importExcel',
exportXls = '/dkgl/gWrdkjbxxb/exportXls',
exportXls = '/qdml/qbdkExcel',
}
/**
* 导出api
......
src/views/dkgl/fxgk/DetailList.vue
浏览文件 @ b919d6ec
......@@ -33,9 +33,8 @@
<a-button type="primary" @click="filling" v-auth="'fxgk-tbz-zltb'">资料填报</a-button>
<a-button type="primary" @click="add" v-auth="'fxgk-tbz-xzfa'">新增方案</a-button>
<a-popconfirm title="确定要删除此方案？" ok-text="确定" cancel-text="取消" @confirm="del">
<a-button type="primary" v-auth="'fxgk-tbz-scfa'">删除方案</a-button>
</a-popconfirm>
<a-button type="primary" v-auth="'fxgk-tbz-scfa'" @click="del">删除方案</a-button>
<a-button type="primary" @click="handleEvaluate" v-auth="'fxgk-tbz-tj'">提交</a-button>
<a-button type="primary" @click="NoEval" v-auth="'gkxf-tbz-bps'">不评审</a-button>
</template>
......@@ -83,6 +82,7 @@
import { useMessage } from '/@/hooks/web/useMessage';
import { usePermission } from '/@/hooks/web/usePermission';
import { useListPage } from '/@/hooks/system/useListPage';
import { Modal } from 'ant-design-vue';
import AcceptanceModal from './modal/AcceptanceModal.vue';
import backModal from '@/components/customComponent/backModal.vue';
import SendBack from '/@/components/customComponent/SendBack.vue';
......@@ -110,7 +110,7 @@
api: faList,
beforeFetch(params) {
params.wrdkid = wrdkid.value;
params.scjdbm = 'S6';
params.scjdbm = 'S4';
params.jdnzt = jdnzt.value;
},
columns: Fxcolumns,
......@@ -151,8 +151,17 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
await delGkxf({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
centered: true,
okText: '确认',
cancelText: '取消',
onOk: async () => {
await delGkxf({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
},
});
}
// 查看基本信息
function view() {
......@@ -258,7 +267,7 @@
isUpdate: true,
showFooter: true,
});
}else{
} else {
createMessage.info('数据还未提交，请提交后再进行操作');
}
}
......
src/views/dkgl/gkpg/DetailList.vue
浏览文件 @ b919d6ec
......@@ -72,6 +72,7 @@
import { useModal } from '/@/components/Modal';
import { useRouter } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
import { Modal } from 'ant-design-vue';
import { usePermission } from '/@/hooks/web/usePermission';
import { useListPage } from '/@/hooks/system/useListPage';
import AcceptanceModal from './modal/AcceptanceModal.vue';
......@@ -141,8 +142,17 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
await delXgpg({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
centered: true,
okText: '确认',
cancelText: '取消',
onOk: async () => {
await delXgpg({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
},
});
}
// 查看基本信息
function view() {
......
src/views/dkgl/gkxf/DetailList.vue
浏览文件 @ b919d6ec
......@@ -32,10 +32,7 @@
<template v-if="type == '填报中'">
<a-button type="primary" @click="filling" v-auth="'gkxf-tbz-zltb'">资料填报</a-button>
<a-button type="primary" @click="add" v-auth="'gkxf-tbz-xzfa'">新增方案</a-button>
<a-popconfirm title="确定要删除此方案？" ok-text="确定" cancel-text="取消" @confirm="del">
<a-button type="primary" v-auth="'gkxf-tbz-scfa'">删除方案</a-button>
</a-popconfirm>
<a-button type="primary" v-auth="'gkxf-tbz-scfa'" @click="del">删除方案</a-button>
<a-button type="primary" @click="handleEvaluate" v-auth="'gkxf-tbz-tj'">提交</a-button>
<a-button type="primary" @click="NoEval" v-auth="'gkxf-tbz-bps'">不评审</a-button>
</template>
......@@ -76,6 +73,7 @@
</template>
<script lang="ts" name="dkgl-gkxf-DetailList" setup>
import { ref } from 'vue';
import { Modal } from 'ant-design-vue';
import { BasicTable } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useRouter } from 'vue-router';
......@@ -93,7 +91,7 @@
const { createMessage } = useMessage();
const { hasPermission } = usePermission();
const [registerModal, { openModal }] = useModal();
const [registerConfirmedModal, { openModal:openConfirmedModal }] = useModal();
const [registerConfirmedModal, { openModal: openConfirmedModal }] = useModal();
const [registerBackModal, { openModal: openBackModal }] = useModal();
const [registerNoModal, { openModal: openNoModal }] = useModal();
......@@ -150,8 +148,17 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
await delGkxf({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
centered: true,
okText: '确认',
cancelText: '取消',
onOk: async () => {
await delGkxf({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
},
});
}
// 查看基本信息
function view() {
......@@ -257,7 +264,7 @@
isUpdate: true,
showFooter: true,
});
}else{
} else {
createMessage.info('数据还未提交，请提交后再进行操作');
}
}
......
src/views/dkgl/gkxfpg/DetailList.vue
浏览文件 @ b919d6ec
......@@ -32,9 +32,7 @@
<template v-if="type == '填报中'">
<a-button type="primary" @click="add" v-auth="'gkxfxg-tbz-xzfa'">新增方案</a-button>
<a-button type="primary" @click="filling" v-auth="'gkxfpg-tbz-zltb'">资料填报</a-button>
<a-popconfirm title="确定要删除此方案？" ok-text="确定" cancel-text="取消" @confirm="del">
<a-button type="primary" v-auth="'gkxfpg-tbz-scfa'">删除方案</a-button>
</a-popconfirm>
<a-button type="primary" v-auth="'gkxfpg-tbz-scfa'" @click="del">删除方案</a-button>
<a-button type="primary" @click="submit('tj')" v-auth="'gkxfpg-tbz-tj'">提交</a-button>
</template>
<template v-else-if="type == '待受理'">
......@@ -75,6 +73,7 @@
<script lang="ts" name="dkgl-fxgk-Filling" setup>
import { ref } from 'vue';
import { Modal } from 'ant-design-vue';
import { BasicTable } from '/@/components/Table';
import { useRouter } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
......@@ -94,7 +93,7 @@
const { hasPermission } = usePermission();
const [registerModal, { openModal }] = useModal();
const [registerConfirmedModal, { openModal:openConfirmedModal }] = useModal();
const [registerConfirmedModal, { openModal: openConfirmedModal }] = useModal();
const [registerBackModal, { openModal: openBackModal }] = useModal();
const [registerNoModal, { openModal: openNoModal }] = useModal();
......@@ -151,8 +150,17 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
await delXgpg({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
centered: true,
okText: '确认',
cancelText: '取消',
onOk: async () => {
await delXgpg({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
},
});
}
// 查看基本信息
function view() {
......@@ -271,7 +279,7 @@
isUpdate: true,
showFooter: true,
});
}else{
} else {
createMessage.info('数据还未提交，请提交后再进行操作');
}
}
......
src/views/dkgl/hqgl/ViewList.vue
浏览文件 @ b919d6ec
<template>
<div>
<div class="bg-[#fff]">
<a-page-header style="border: 1px solid rgb(235, 237, 240)" @back="router.go(-1)">
<template #backIcon>
<div><a-button type="primary">返回</a-button></div>
......@@ -14,34 +14,45 @@
</template>
<script lang="ts" name="dkgl-investigate-Acceptance" setup>
import { ref } from 'vue';
import { BasicTable } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columnsH } from './data';
import { hqglList, getImportUrl, getExportUrl } from './api';
import { findGljl, getImportUrl, getExportUrl } from './api';
import { useMessage } from '/@/hooks/web/useMessage';
import { useRouter } from 'vue-router';
const { createMessage } = useMessage();
let router = useRouter();
const params = ref(router.currentRoute.value.query);
//注册table数据
const { tableContext } = useListPage({
tableProps: {
title: '后期管理',
api: hqglList,
title: '',
api: findGljl,
beforeFetch(param) {
param.wrdkid = params.value.wrdkid;
},
afterFetch(param) {
param.forEach((v) => {
v.wrdkmc = params.value.wrdkmc;
v.wrdkbm = params.value.wrdkbm;
});
},
columns: columnsH,
useSearchForm: false,
canResize: false,
//定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
rowKey: 'wrdkid',
rowKey: 'id',
clickToRowSelect: true,
showActionColumn: false,
rowSelection: { type: 'radio' },
actionColumn: {
width: 120,
},
},
exportConfig: {
name: '待受理',
name: '查看后期管理记录',
url: getExportUrl,
},
importConfig: {
......@@ -49,14 +60,15 @@
},
});
const [registerTable, {}, { rowSelection, selectedRowKeys }] = tableContext;
const [registerTable, {}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
function handle() {
if (selectedRowKeys.value.length == 0) {
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
router.push(`/dkgl/hqgl/add?wrdkid=${selectedRowKeys.value[0]}`);
sessionStorage.setItem('data', JSON.stringify(selectedRows.value[0]));
router.push(`/dkgl/hqgl/add?wrdkid=${selectedRowKeys.value[0]}&type=view`);
}
</script>
<style scoped></style>
src/views/dkgl/hqgl/add.vue
浏览文件 @ b919d6ec
......@@ -9,15 +9,14 @@
</a-page-header>
<a-collapse v-model:activeKey="activeKey">
<a-collapse-panel key="1" header="环境监测基本信息">
<Environment ref="mgst" />
<template #extra><a-button type="primary" @click.prevent="saveMgst($event)">保存</a-button></template>
<Environment ref="mgst" :type="type" :data="data" :isRead="type == 'view'" />
<template #extra><a-button type="primary" v-if="type != 'view'" @click.prevent="saveMgst($event)">保存</a-button></template>
</a-collapse-panel>
<a-collapse-panel header="检测单位信息" v-for="(item, index) in unitList" :key="2 + index">
<TestingUnit :ref="(el) => testUnit(el, index)" :data="item" @click.prevent="saveJc($event, index)" />
<template #extra>
<TestingUnit :ref="(el) => testUnit(el, index)" :data="item" :isRead="type == 'view'" />
<template #extra v-if="type != 'view'">
<a-button type="primary" @click.prevent="addUnit($event)">添加</a-button>
<a-button type="primary" class="ml-5" v-if="index != 0" @click.prevent="del($event, index)">删除</a-button>
<a-button type="primary" @click.prevent="saveJc($event, index)" style="margin-left: 10px">保存</a-button>
</template>
</a-collapse-panel>
</a-collapse>
......@@ -28,18 +27,38 @@
import Environment from './components/environment.vue';
import TestingUnit from './components/TestingUnit.vue';
import { useRouter } from 'vue-router';
const activeKey = ref(['1', '2']);
import { addGljl } from './api';
const activeKey = ref(['1', '2', '3', '4', '5']);
let router = useRouter();
const wrdkid = ref(router.currentRoute.value.query.wrdkid);
const data = ref<any>({});
const type = ref(router.currentRoute.value.query.type);
const unitList = ref([{ id: null }]);
if (type.value == 'view') {
data.value = JSON.parse(sessionStorage.getItem('data') || {});
unitList.value = data.value.jcdwList || [{ id: null }];
}
// 保存环境检测的
const mgst = ref<any>(null);
async function saveMgst(e) {
e.stopPropagation();
const res = await mgst?.value.getFormValue();
res.wrdkid = wrdkid.value;
res.jcdwList = [];
// 循环获取监测单位的值
unitS.value.forEach(async (v, index) => {
const resJcdw: any = await unitS.value[index].getFormValue();
res.jcdwList.push(resJcdw);
});
setTimeout(async () => {
await addGljl(res);
router.go(-1);
}, Math.random() * 1000);
// 走接口
}
const unitList = ref([{ id: null }]);
// 保存检测单位
const unitS = ref<any>([]);
const testUnit = (el, index) => {
......@@ -57,15 +76,8 @@
}
async function del(event, index) {
event.stopPropagation();
if (unitList.value[index].id) {
// await delBzdw({ id: unitList.value[index].id });
}
nextTick();
unitList.value.splice(index, 1);
unitS.value.splice(index, 1);
}
async function saveJc(e, index) {
e.stopPropagation();
const res = await unitS.value[index].getFormValue();
// 走接口
}
</script>
src/views/dkgl/hqgl/api.ts
浏览文件 @ b919d6ec
......@@ -12,6 +12,8 @@ enum Api {
submiSlyj = '/submiSlyj',
submitFxpg = '/dklc/submitXgpg',
back = '/dklc/back',
addGljl = '/dklc/addGljl', //添加后期管理
findGljl='/dklc/findGljl'
}
/**
* 导出api
......@@ -36,15 +38,13 @@ export const getImportUrl = Api.importExcel;
* DKYTC 地块已退出
*/
export const hqglList = (params) => defHttp.get({ url: Api.list, params }); // 填报中
export const acceptanceList = (params) => defHttp.get({ url: Api.list + '?jdnzt=DSL', 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 }); // 评审不通过
export const noImprovedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=BPS', params }); // 不评审
export const improvedList = (params) => defHttp.get({ url: Api.list + '?jdnzt=SHHDWS', params }); // 评审中不待完善
export const stayQuit = (params) => defHttp.get({ url: Api.list + '?jdnzt=DKDTC', params }); // 地块待退出
export const finishQuit = (params) => defHttp.get({ url: Api.list + '?jdnzt=DKYTC', params }); // 地块已退出
export const findGljl = (params) => defHttp.get({ url: Api.findGljl, params }); // 待受理
// 添加后期管理
// addGljl
export const addGljl = (params) => {
return defHttp.post({ url: Api.addGljl, params });
};
/**
* 删除单个
* @param params
......
src/views/dkgl/hqgl/components/TestingUnit.vue
浏览文件 @ b919d6ec
......@@ -17,32 +17,13 @@
type: Boolean,
default: false,
},
upload: {
type: Number,
default: '',
},
dkxx: {
type: Object,
},
});
//自定义表单字段
const formSchemas: FormSchema[] = [
{
label: '污染地块Id',
field: 'wrdkid',
component: 'Input',
show: false,
},
{
label: 'id',
field: 'id',
component: 'Input',
show: false,
},
{
label: '单位名称',
field: 'syqdwmc',
field: 'dwmc',
component: 'Input',
required: true,
componentProps: {
......@@ -54,6 +35,9 @@
field: 'gsyyzzh',
required: true,
component: 'Input',
dynamicRules: () => {
return [{ pattern: /^[\u4e00-\u9fa5]{1}[A-Za-z0-9]{17}$/, message: '电话格式有误', required: true }];
},
componentProps: {
disabled: props.isRead,
},
......@@ -61,7 +45,7 @@
{
label: '住所',
field: 'wrdkdz',
field: 'zs',
component: 'Input',
required: true,
componentProps: {
......@@ -82,6 +66,9 @@
field: 'lxdh',
component: 'InputNumber',
required: true,
dynamicRules: () => {
return [{ pattern: /^(\d{3}-\d{8}|\d{4}-\d{7}|\d{11})$/, message: '电话格式有误', required: true }];
},
componentProps: {
disabled: props.isRead,
},
......@@ -134,9 +121,8 @@
function handleChange(val) {
updateSchema({
label: '单位名称',
field: 'syqdwmc',
field: 'dwmc',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
......@@ -144,7 +130,6 @@
updateSchema({
label: '工商营业执照号',
field: 'gsyyzzh',
required: true,
component: 'Input',
componentProps: {
disabled: val,
......@@ -153,9 +138,8 @@
updateSchema({
label: '住所',
field: 'wrdkdz',
field: 'zs',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
......@@ -164,7 +148,7 @@
label: '联系人',
field: 'lxr',
component: 'Input',
required: true,
componentProps: {
disabled: val,
},
......@@ -173,7 +157,7 @@
label: '联系电话',
field: 'lxdh',
component: 'InputNumber',
required: true,
componentProps: {
disabled: val,
},
......
src/views/dkgl/hqgl/components/environment.vue
浏览文件 @ b919d6ec
......@@ -3,6 +3,16 @@
</template>
<script setup lang="ts">
import { useForm, BasicForm, FormSchema } from '/@/components/Form';
import { watch, nextTick } from 'vue';
const props = defineProps({
data: {
type: Object,
},
isRead: {
type: Boolean,
default: false,
},
});
const formSchemas: FormSchema[] = [
{
label: '污染地块id',
......@@ -13,10 +23,11 @@
{
label: '监测时间',
field: 'gswz',
field: 'jcsj',
required: true,
component: 'DatePicker',
componentProps: {
disabled: props.isRead,
//日期格式化，页面上显示的值
format: 'YYYY-MM-DD',
//返回值格式化（绑定值的格式）
......@@ -27,10 +38,11 @@
},
{
label: '土壤环境监测结论',
field: 'qt',
field: 'trhjjcjl',
required: true,
component: 'Select',
componentProps: {
disabled: props.isRead,
options: [
{ label: '不达标', value: '不达标' },
{ label: '达标', value: '达标' },
......@@ -40,10 +52,11 @@
},
{
label: '地下水环境监测结论',
field: 'qt',
field: 'dxshjjcjl',
required: true,
component: 'Select',
componentProps: {
disabled: props.isRead,
options: [
{ label: '不达标', value: '不达标' },
{ label: '达标', value: '达标' },
......@@ -53,10 +66,11 @@
},
{
label: '地表水环境监测结论',
field: 'qt',
field: 'dbshjjcjl',
required: true,
component: 'Select',
componentProps: {
disabled: props.isRead,
options: [
{ label: '不达标', value: '不达标' },
{ label: '达标', value: '达标' },
......@@ -66,10 +80,11 @@
},
{
label: '空气环境监测结论',
field: 'qt',
field: 'kqhjjcjl',
required: true,
component: 'Select',
componentProps: {
disabled: props.isRead,
options: [
{ label: '不达标', value: '不达标' },
{ label: '达标', value: '达标' },
......@@ -78,22 +93,39 @@
},
},
{
label: '检测报告',
field: 'qt',
label: '监测方案',
field: 'jcfa',
required: true,
component: 'JUpload',
componentProps: () => {
return {
disabled: props.isRead,
showUploadList: false,
returnUrl: true,
fileName: '检测报告',
fileName: '监测方案',
accept: '.pdf,.zip',
};
},
},
{
label: '监测报告',
field: 'jcbg',
required: true,
component: 'JUpload',
componentProps: () => {
return {
disabled: props.isRead,
showUploadList: false,
returnUrl: true,
fileName: '监测报告',
accept: '.pdf,.zip',
};
},
},
];
const [registerForm, { getFieldsValue, setFieldsValue, updateSchema, validate }] = useForm({
const [registerForm, { getFieldsValue, setFieldsValue, resetFields, validate, updateSchema }] = useForm({
//注册表单列
schemas: formSchemas,
//不显示查询和重置按钮
......@@ -109,6 +141,98 @@
//表单布局属性，支持（vertical,horizontal），默认为horizontal
layout: 'horizontal',
});
watch(
() => props?.data,
async (val: any) => {
if (val) {
await nextTick();
await setFieldsValue({
...props.data,
});
} else {
await nextTick();
await resetFields();
}
},
{ deep: true, immediate: true }
);
watch(
() => props?.isRead,
async (val: any) => {
if (val == 'view') {
await nextTick();
handleChange(val);
}
},
{ deep: true, immediate: true }
);
function handleChange(val) {
console.log(val, 'val');
updateSchema({
label: '监测时间',
field: 'jcsj',
required: false,
component: 'Input',
componentProps: {
disabled: val,
},
});
updateSchema({
label: '土壤环境监测结论',
field: 'trhjjcjl',
component: 'Input',
required: false,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '地下水环境监测结论',
field: 'dxshjjcjl',
component: 'Input',
required: false,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '地表水环境监测结论',
field: 'dbshjjcjl',
component: 'Input',
required: false,
componentProps: {
disabled: val,
},
});
updateSchema({
label: '空气环境监测结论',
field: 'kqhjjcjl',
required: false,
component: 'Input',
componentProps: {
disabled: val,
},
});
updateSchema({
label: '监测方案',
field: 'jcfa',
required: false,
component: 'JUpload',
componentProps: {
disabled: val,
},
});
updateSchema({
label: '监测报告',
field: 'jcbg',
required: false,
component: 'JUpload',
componentProps: {
disabled: val,
},
});
}
async function getFormValue() {
console.log('子组件执行');
......
src/views/dkgl/hqgl/data.ts
浏览文件 @ b919d6ec
......@@ -78,11 +78,11 @@ export const columns: BasicColumn[] = [
},
{
title: '监测单位',
dataIndex: 'monitorunit',
dataIndex: 'jcdw',
},
{
title: '监测时间',
dataIndex: 'monitortime',
dataIndex: 'jcsj',
},
{
title: '创建地块时间',
......@@ -187,22 +187,35 @@ export const searchFormSchema: FormSchema[] = [
export const columnsH: BasicColumn[] = [
{
title: '地块名称',
dataIndex: 'cityName',
dataIndex: 'wrdkmc',
},
{
title: '地块编码',
dataIndex: 'cityName',
dataIndex: 'wrdkbm',
},
{
title: '监测单位',
dataIndex: 'cityName',
title: '监测时间',
dataIndex: 'jcsj',
},
{
title: '监测时间',
dataIndex: 'cityName',
title: '检测单位',
dataIndex: 'jcdwName',
},
{
title: '监测结论',
dataIndex: 'cityName',
title: '地表水环境监测结论',
dataIndex: 'dbshjjcjl',
},
{
title: '地下水环境监测结论',
dataIndex: 'dxshjjcjl',
},
{
title: '空气环境监测结论',
dataIndex: 'kqhjjcjl',
},
{
title: '土壤环境监测结论',
dataIndex: 'trhjjcjl',
},
]
\ No newline at end of file
src/views/dkgl/hqgl/index.vue
浏览文件 @ b919d6ec
......@@ -30,7 +30,7 @@
</template>
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="handle('ckglxx')" v-auth="'hqgl-ckglxx'">查看管理信息</a-button>
<a-button type="primary" @click="handle('ckglxx')" v-auth="'hqgl-ckglxx'">查看管理记录</a-button>
<a-button type="primary" @click="handle('tjgljl')" v-auth="'hqgl-tjgljl'">添加管理记录</a-button>
</template>
<!--操作栏-->
......@@ -82,7 +82,7 @@
const useCategory = useCategoryData();
const treeData = useCategory.data; // 行业类别-数据
const changeSuspect = useCategory.changeIsSuspect; // 行业类别-方法
const [registerTable, {}, { rowSelection, selectedRowKeys }] = tableContext;
const [registerTable, {}, { rowSelection, selectedRowKeys, selectedRows }] = tableContext;
function handle(v) {
if (selectedRowKeys.value.length == 0) {
......@@ -91,7 +91,9 @@
}
if (v == 'ckglxx') {
// 跳查看管理列表
router.push(`/dkgl/hqgl/ViewList?wrdkid=${selectedRowKeys.value[0]}`);
router.push(
`/dkgl/hqgl/ViewList?wrdkid=${selectedRowKeys.value[0]}&wrdkmc=${selectedRows.value[0].wrdkmc}&wrdkbm=${selectedRows.value[0].wrdkbm}`
);
} else if (v == 'tjgljl') {
router.push(`/dkgl/hqgl/add?wrdkid=${selectedRowKeys.value[0]}`);
}
......
src/views/dkgl/repair/DetailList.vue
浏览文件 @ b919d6ec
......@@ -32,10 +32,7 @@
<template v-if="type == '填报'">
<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-popconfirm title="确定要删除此方案？" ok-text="确定" cancel-text="取消" @confirm="del">
<a-button type="primary" v-auth="'repair-tbz-scfa'">删除方案</a-button>
</a-popconfirm>
<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="NoEval" v-auth="'repair-tbz-bps'">不评审</a-button>
</template>
......@@ -83,6 +80,7 @@
import { useMessage } from '/@/hooks/web/useMessage';
import { usePermission } from '/@/hooks/web/usePermission';
import { useListPage } from '/@/hooks/system/useListPage';
import { Modal } from 'ant-design-vue';
import AcceptanceModal from './modal/AcceptanceModal.vue';
import backModal from '@/components/customComponent/backModal.vue';
import SendBack from '/@/components/customComponent/SendBack.vue';
......@@ -94,7 +92,7 @@
const { createMessage } = useMessage();
const { hasPermission } = usePermission();
const [registerModal, { openModal }] = useModal();
const [registerConfirmedModal, { openModal:openConfirmedModal }] = useModal();
const [registerConfirmedModal, { openModal: openConfirmedModal }] = useModal();
const [registerBackModal, { openModal: openBackModal }] = useModal();
const [registerNoModal, { openModal: openNoModal }] = useModal();
const wrdkid = ref(router.currentRoute.value.query.wrdkid);
......@@ -151,8 +149,17 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
await delGkxf({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
centered: true,
okText: '确认',
cancelText: '取消',
onOk: async () => {
await delGkxf({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
},
});
}
// 查看基本信息
function view() {
......@@ -260,7 +267,7 @@
isUpdate: true,
showFooter: true,
});
}else{
} else {
createMessage.info('数据还未提交，请提交后再进行操作');
}
}
......
src/views/dkgl/xfpg/DetailList.vue
浏览文件 @ b919d6ec
......@@ -32,9 +32,7 @@
<template v-if="type == '填报'">
<a-button type="primary" @click="add" v-auth="'xfpg-tbz-xzfa'">新增方案</a-button>
<a-button type="primary" @click="filling" v-auth="'xfpg-tbz-zltb'">资料填报</a-button>
<a-popconfirm title="确定要删除此方案？" ok-text="确定" cancel-text="取消" @confirm="del">
<a-button type="primary" v-auth="'xfpg-tbz-scfa'">删除方案</a-button>
</a-popconfirm>
<a-button type="primary" v-auth="'xfpg-tbz-scfa'" @click="del">删除方案</a-button>
<a-button type="primary" @click="submit('tj')" v-auth="'xfpg-tbz-zxps'">提交</a-button>
<a-button type="primary" @click="NoEval" v-auth="'xfpg-tbz-bps'">不评审</a-button>
......@@ -77,6 +75,7 @@
<script lang="ts" name="dkgl-fxgk-Filling" setup>
import { ref } from 'vue';
import { Modal } from 'ant-design-vue';
import { BasicTable } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useRouter } from 'vue-router';
......@@ -94,7 +93,7 @@
const { createMessage } = useMessage();
const { hasPermission } = usePermission();
const [registerModal, { openModal }] = useModal();
const [registerConfirmedModal, { openModal:openConfirmedModal }] = useModal();
const [registerConfirmedModal, { openModal: openConfirmedModal }] = useModal();
const [registerBackModal, { openModal: openBackModal }] = useModal();
const [registerNoModal, { openModal: openNoModal }] = useModal();
const wrdkid = ref(router.currentRoute.value.query.wrdkid);
......@@ -151,8 +150,17 @@
createMessage.info('请选择需要处理的内容，每次只能选中一条');
return;
}
await delXgpg({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
Modal.confirm({
title: '确认删除',
content: '是否删除选中数据',
centered: true,
okText: '确认',
cancelText: '取消',
onOk: async () => {
await delXgpg({ id: selectedRowKeys.value[0], wrdkid: wrdkid.value });
reload();
},
});
}
// 查看基本信息
function view() {
......@@ -269,7 +277,7 @@
isUpdate: true,
showFooter: true,
});
}else{
} else {
createMessage.info('数据还未提交，请提交后再进行操作');
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论