Skip to content

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

校验信息修改

上级 0139e922
显示空白字符变更
内嵌 并排
正在显示 包含 68 行增加 和 132 行删除
src/views/directory/yztsj/shengjiList/api.ts
浏览文件 @ ba3b7427
import { defHttp } from '/@/utils/http/axios';
import { Modal } from 'ant-design-vue';
enum Api {
list = '/dkgl/dsrwGeoJd/provinceList',
......@@ -7,7 +6,7 @@ enum Api {
save = '/dkgl/dsrwGeoJd/add',
deleteOne = '/dkgl/dsrwGeoJd/delete',
provinceAudit = '/dkgl/dsrwGeoJd/provinceAudit',
provicecheckSubmit = '/dkgl/dsrwGeoJd/proviceCheckSubmit',
provinceCheckSubmit = '/dkgl/dsrwGeoJd/proviceCheckSubmit',
findZrzyjList = '/dkgl/dsrwGeoJdAudit/findZrzyjList',
findStbmList = '/dkgl/dsrwGeoJdAudit/findStbmList',
provinceAuditsPageList = '/dkgl/dsrwGeoJd/provinceAuditsPageList',
......@@ -86,11 +85,11 @@ export const deleteOne = (params, handleSuccess) => {
});
};
/**
* 审核校验
* 生态部门提交前校验
* @param params
*/
export const saveProvinceAuditCheck = (params) => {
return defHttp.get({ url: Api.provicecheckSubmit + '?jd=' + params.jd });
export const provinceCheckSubmit = (params) => {
return defHttp.get({ url: Api.provinceCheckSubmit + '?jd=' + params.jd });
};
/**
* 审核
......
src/views/directory/yztsj/shengjiList/index.vue
浏览文件 @ ba3b7427
......@@ -10,7 +10,9 @@
<a-button type="primary" @click="onExportXls" v-auth="'yztsjshj:export'">导出</a-button>
<a-button type="primary" @click="getMdb" v-auth="'yztsjshj:mdbgdb'">下载文件(mdb、gdb)</a-button>
<!-- <a-button type="primary" @click="handleShls" v-auth="'yztsjshj:shls'">审核历史</a-button> -->
<a-button type="primary" @click="handleZgSh(true)" v-auth="'yztsjshj:zgbmsh'" v-if="userStore.userInfo.userType ==2">自规部门审核</a-button>
<a-button type="primary" @click="handleZgSh(true)" v-auth="'yztsjshj:zgbmsh'" v-if="userStore.userInfo.userType == 2"
>自规部门审核</a-button
>
<a-button type="primary" @click="handleZgSh(false)" v-auth="'yztsjshj:zgbmshls'">自规部门审核</a-button>
<a-button type="primary" @click="handleStUp" v-auth="'yztsjshj:stbmtj'">生态部门提交</a-button>
<a-button type="primary" @click="handleFileCheck" v-auth="'yztsjshj:wjjc'">文件检查</a-button>
......@@ -22,10 +24,9 @@
<TableAction :actions="getTableAction(record)" />
</template>
</BasicTable>
</a-tab-pane>
<a-tab-pane key="2" tab="审核信息" v-if="userStore.userInfo.userType !=2">
<ShList @success="handleSuccess"/>
<a-tab-pane key="2" tab="审核信息" v-if="userStore.userInfo.userType != 2">
<ShList @success="handleSuccess" />
</a-tab-pane>
</a-tabs>
<!-- 表单区域 -->
......@@ -46,29 +47,26 @@
</template>
<div class="py-10 ml-6">该地块还未进行填报，没有详情可以查看</div>
</a-modal>
</template>
<script lang="ts" name="directory-gzml-gzml" setup>
import { ref, h, createVNode } from 'vue';
import { ref } from 'vue';
import { BasicTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, searchFormSchema } from './data';
import { list, getDownloadMdb, getDownloadGdb, deleteOne, getExportUrl, saveProvinceAuditCheck, proviceZgbmCheck, fileCheck, checkSuccessDownLoad } from './api';
import { existDclx, updateDclx, downloadFile, getDkDetail } from '/@/api/common/api';
import { list, getDownloadMdb, deleteOne, getExportUrl, provinceCheckSubmit, proviceZgbmCheck, fileCheck, checkSuccessDownLoad } from './api';
import { downloadFile, getDkDetail } from '/@/api/common/api';
import { useMessage } from '/@/hooks/web/useMessage';
import { useRouter } from 'vue-router';
import { Modal } from 'ant-design-vue';
import AddModal from './modules/AddModal.vue'
import ShlsModal from './modules/ShlsModal.vue'
import StUpdateModal from './modules/StUpdateModal.vue'
import ShList from './ShList.vue'
import StThModal from './modules/StThModal.vue'
import ZgShModal from './modules/ZgShModal.vue'
import AddModal from './modules/AddModal.vue';
import ShlsModal from './modules/ShlsModal.vue';
import StUpdateModal from './modules/StUpdateModal.vue';
import ShList from './ShList.vue';
import StThModal from './modules/StThModal.vue';
import ZgShModal from './modules/ZgShModal.vue';
import { useUserStore } from '/@/store/modules/user';
import { getNd, getJd } from '/@/utils/ndjd'
import { getNd, getJd } from '/@/utils/ndjd';
const userStore: any = useUserStore();
const { createMessage } = useMessage();
let router = useRouter();
......@@ -102,16 +100,12 @@
},
},
exportConfig: {
name: "一张图数据管理——省级审核",
name: '一张图数据管理——省级审核',
url: getExportUrl,
},
});
const open = ref(false);
const noChange = ref<boolean>(false);
const selectdclx = ref<number>(1);
const flg = ref(1);
const visible = ref<boolean>(false);
const bgvisible = ref<boolean>(false);
const [registerTable, { reload, getDataSource }, { rowSelection, selectedRows, selectedRowKeys }] = tableContext;
//成功回调
......@@ -136,7 +130,7 @@
openModalShls(true, {
isUpdate: false,
showFooter: true,
record: record
record: record,
});
}
/**
......@@ -150,26 +144,26 @@
}
const record: any = arr[0];
if (type) {
proviceZgbmCheck(null).then(res=>{
proviceZgbmCheck(null).then((res) => {
if (res) {
openModalZgSh(true, {
isUpdate: true,
showFooter: true,
record: record
record: record,
});
} else {
openModalZgSh(true, {
isUpdate: false,
showFooter: true,
record: record
record: record,
});
}
})
});
} else {
openModalZgSh(true, {
isUpdate: type,
showFooter: true,
record: record
record: record,
});
}
}
......@@ -187,28 +181,16 @@
createMessage.info('数据已提交，无需再次提交');
return;
}
const res = await saveProvinceAuditCheck({jd: record.jd});
if (res) {
if (res && res.indexOf("暂不可提交") > -1) {
Modal.warning({
title: '提交提示',
content: res,
})
} else {
Modal.confirm({
title: '提交提示',
content: res,
okText:'提交',
onOk() {
const checkRes = await provinceCheckSubmit({ jd: record.jd });
if (!checkRes || (checkRes && checkRes.indexOf('暂不可提交') > -1) || checkRes == 'false') {
createMessage.warning(checkRes);
return;
}
openModalStUp(true, {
isUpdate: false,
showFooter: true,
record: record
record: record,
});
},
})
}
}
}
async function handleFileCheck() {
......@@ -256,9 +238,9 @@
*/
function handleDetail(record: Recordable) {
getDkDetail({wrdkbm: record.dkdm}).then(res =>{
handleView(res.dkxx)
})
getDkDetail({ wrdkbm: record.dkdm }).then((res) => {
handleView(res.dkxx);
});
}
//查看基本信息
......@@ -301,7 +283,7 @@
confirm: handleDelete.bind(null, record),
},
auth: 'yztsjshj:delete',
ifShow: record.provinceStatus != 2
ifShow: record.provinceStatus != 2,
},
{
label: '详情',
......@@ -312,18 +294,7 @@
}
const getMdb = () => {
getDownloadMdb({nd: getNd(), jd: getJd()}).then((res) => {
// console.log(res);
if (res) {
downloadFile('/sys/common/static' + res, res.split('/')[res.split('/').length - 1]);
} else {
createMessage.error('文件下载失败');
}
});
};
const getGdb = () => {
getDownloadGdb({nd: getNd(), jd: getJd()}).then((res) => {
getDownloadMdb({ nd: getNd(), jd: getJd() }).then((res) => {
// console.log(res);
if (res) {
downloadFile('/sys/common/static' + res, res.split('/')[res.split('/').length - 1]);
......
src/views/directory/yztsj/shijiList/api.ts
浏览文件 @ ba3b7427
import { defHttp } from '/@/utils/http/axios';
import { Modal } from 'ant-design-vue';
enum Api {
list = '/dkgl/dsrwGeoJd/cityList',
......@@ -80,10 +79,10 @@ export const deleteOne = (params, handleSuccess) => {
});
};
/**
* 审核校验
* 生态部门提交前校验
* @param params
*/
export const saveCityAuditCheck = (params) => {
export const cityCheckSubmit = (params) => {
return defHttp.get({ url: Api.citychecksubmit + '?jd=' + params.jd });
};
/**
......@@ -95,7 +94,7 @@ export const saveCityAudit = (params) => {
};
/**
* 保存或者更新
* @param params
* @param params*
*/
export const saveOrUpdate = (params) => {
return defHttp.post({ url: Api.save, params });
......
src/views/directory/yztsj/shijiList/index.vue
浏览文件 @ ba3b7427
......@@ -8,7 +8,7 @@
<a-button type="primary" @click="onExportXls" v-auth="'yztsjsj:export'">导出</a-button>
<a-button type="primary" @click="getMdb" v-auth="'yztsjsj:mdbgdb'">下载文件(mdb、gdb)</a-button>
<a-button type="primary" @click="handleShls" v-auth="'yztsjsj:shls'">审核历史</a-button>
<a-button type="primary" @click="handleZgSh(true)" v-auth="'yztsjsj:zgbmsh'" v-if="userStore.userInfo.userType ==2">自规部门审核</a-button>
<a-button type="primary" @click="handleZgSh(true)" v-auth="'yztsjsj:zgbmsh'" v-if="userStore.userInfo.userType == 2">自规部门审核</a-button>
<a-button type="primary" @click="handleZgSh(false)" v-auth="'yztsjsj:zgbmshls'">自规部门审核</a-button>
<a-button type="primary" @click="handleStUp" v-auth="'yztsjsj:stbmtj'">生态部门提交</a-button>
<a-button type="primary" @click="handleFileCheck" v-auth="'yztsjsj:wjjc'">文件检查</a-button>
......@@ -37,26 +37,24 @@
</template>
<div class="py-10 ml-6">该地块还未进行填报，没有详情可以查看</div>
</a-modal>
</template>
<script lang="ts" name="directory-yztsj-shiji" setup>
import { ref, h } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { ref } from 'vue';
import { BasicTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, searchFormSchema } from './data';
import { list, getDownloadMdb, getDownloadGdb, deleteOne, getExportUrl, saveCityAuditCheck, cityZgbmCheck, fileCheck, checkSuccessDownLoad } from './api';
import { existDclx, updateDclx, downloadFile, getDkDetail } from '/@/api/common/api';
import { list, getDownloadMdb, deleteOne, getExportUrl, cityCheckSubmit, cityZgbmCheck, fileCheck, checkSuccessDownLoad } from './api';
import { downloadFile, getDkDetail } from '/@/api/common/api';
import { useMessage } from '/@/hooks/web/useMessage';
import AddModal from './modules/AddModal.vue'
import ShlsModal from './modules/ShlsModal.vue'
import StUpdateModal from './modules/StUpdateModal.vue'
import ZgShModal from './modules/ZgShModal.vue'
import AddModal from './modules/AddModal.vue';
import ShlsModal from './modules/ShlsModal.vue';
import StUpdateModal from './modules/StUpdateModal.vue';
import ZgShModal from './modules/ZgShModal.vue';
import { useRouter } from 'vue-router';
import { Modal } from 'ant-design-vue';
import { useUserStore } from '/@/store/modules/user';
import { getNd, getJd } from '/@/utils/ndjd'
import { getNd, getJd } from '/@/utils/ndjd';
const userStore: any = useUserStore();
const { createMessage } = useMessage();
let router = useRouter();
......@@ -89,16 +87,11 @@
},
},
exportConfig: {
name: "一张图数据管理——市级审核",
name: '一张图数据管理——市级审核',
url: getExportUrl,
},
});
const open = ref(false);
const noChange = ref<boolean>(false);
const selectdclx = ref<number>(1);
const flg = ref(1);
const visible = ref<boolean>(false);
const bgvisible = ref<boolean>(false);
const [registerTable, { reload, getDataSource }, { rowSelection, selectedRows, selectedRowKeys }] = tableContext;
//成功回调
......@@ -120,7 +113,7 @@
openModalShls(true, {
isUpdate: false,
showFooter: true,
record: record
record: record,
});
}
/**
......@@ -134,26 +127,26 @@
}
const record: any = arr[0];
if (type) {
cityZgbmCheck(null).then(res =>{
cityZgbmCheck(null).then((res) => {
if (res) {
openModalZgSh(true, {
isUpdate: true,
showFooter: true,
record: record
record: record,
});
} else {
openModalZgSh(true, {
isUpdate: false,
showFooter: true,
record: record
record: record,
});
}
})
});
} else {
openModalZgSh(true, {
isUpdate: type,
showFooter: true,
record: record
record: record,
});
}
}
......@@ -168,32 +161,17 @@
return;
}
const record: any = arr[0];
if (record.cityStatus == 2) {
createMessage.info('数据已提交，无需再次提交');
const checkRes = await cityCheckSubmit({ jd: record.jd });
if (!checkRes || (checkRes && checkRes.indexOf('暂不可提交') > -1) || checkRes == 'false') {
createMessage.warning(checkRes);
return;
}
const res = await saveCityAuditCheck({ jd: record.jd });
if (res) {
if (res && res.indexOf("暂不可提交") > -1) {
Modal.warning({
title: '提交提示',
content: res,
})
} else {
Modal.confirm({
title: '提交提示',
content: res,
okText:'提交',
onOk() {
openModalStUp(true, {
isUpdate: false,
showFooter: true,
record: record
record: record,
});
},
})
}
}
}
async function handleFileCheck() {
......@@ -240,9 +218,9 @@
* 详情
*/
function handleDetail(record: Recordable) {
getDkDetail({wrdkbm: record.dkdm}).then(res =>{
handleView(res.dkxx)
})
getDkDetail({ wrdkbm: record.dkdm }).then((res) => {
handleView(res.dkxx);
});
}
//查看基本信息
......@@ -279,7 +257,7 @@
confirm: handleDelete.bind(null, record),
},
auth: 'yztsjsj:delete',
ifShow: record.cityStatus !=2
ifShow: record.cityStatus != 2,
},
{
label: '详情',
......@@ -290,18 +268,7 @@
}
const getMdb = () => {
getDownloadMdb({nd: getNd(), jd: getJd()}).then((res) => {
// console.log(res);
if (res) {
downloadFile('/sys/common/static' + res, res.split('/')[res.split('/').length - 1]);
} else {
createMessage.error('文件下载失败');
}
});
};
const getGdb = () => {
getDownloadGdb({nd: getNd(), jd: getJd()}).then((res) => {
getDownloadMdb({ nd: getNd(), jd: getJd() }).then((res) => {
// console.log(res);
if (res) {
downloadFile('/sys/common/static' + res, res.split('/')[res.split('/').length - 1]);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论