Compare commits

..

No commits in common. "cec1b42f9953d02f1a005ecd4f056766c37b1112" and "6a87415fee042ca8b631f5b7a3925164d301c4a3" have entirely different histories.

3 changed files with 124 additions and 53 deletions

View File

@ -12,7 +12,6 @@ declare module 'vue' {
'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default'] 'CenterMap copy': typeof import('./src/components/centerMap copy.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
Components: typeof import('./src/components/index.js')['default'] Components: typeof import('./src/components/index.js')['default']
copy: typeof import('./src/components/centerMap copy.vue')['default']
CurrentTime: typeof import('./src/components/currentTime.vue')['default'] CurrentTime: typeof import('./src/components/currentTime.vue')['default']
CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default']
CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default']

View File

@ -248,14 +248,8 @@ export function exportlandInspection(params = {}) {
// #region // #region
/* 查询土地违法处理 */ /* 查询土地违法处理 */
// export function getLandIllegal(params = {}) { export function getLandIllegal(params = {}) {
// return request('land-resource/landViolation/page', { return request('land-resource/landViolation/page', {
// method: 'GET',
// params,
// });
// }
export function getIllegalList(params = {}) {
return request('/land-resource/inspection/illegal/list', {
method: 'GET', method: 'GET',
params, params,
}); });

View File

@ -18,12 +18,21 @@
@cell-click="handleCellClick" @cell-click="handleCellClick"
> >
<template #menu="{ row }"> <template #menu="{ row }">
<el-button link type="primary" @click="handleInfo(row)">查看</el-button> <el-button v-if="row.status == '0'" type="primary" @click="handleInfo(row)">登记处理</el-button>
<el-button link type="primary" @click="handleInfo(row)">案件处理</el-button> </template>
<template #status="{ row }"> {{ row.status == '0' ? '未' : '已' }}处理 </template>
<template #sceneProof-form="{ row, type }">
<section class="proof_content_">
<span v-if="type == 'add'">照片视频</span>
<Attrs v-model:attrs="examineForm.proof" :type="type" :limit="5" :file-num="5" accept="image/*,video/*" />
</section>
</template>
<template #attrs_-form="{ row, type }">
<FileUpload v-model:attrs="examineForm.attrs" :format="['rar', 'zip', 'doc', 'docx', 'pdf']" :type="type" />
</template> </template>
</avue-crud> </avue-crud>
</section> </section>
<div>222</div> <Register v-model:visible="caseInfo.visible" />
</template> </template>
<script setup> <script setup>
@ -32,7 +41,7 @@ import { CRUD_OPTIONS } from '@/config';
import { useUserStore } from '@/store/modules/user'; import { useUserStore } from '@/store/modules/user';
import Register from './common/Register.vue'; import Register from './common/Register.vue';
import FileUpload from './common/FileUpload.vue'; import FileUpload from './common/FileUpload.vue';
import { getIllegalList, createLandIllegal, registerLandIllegal, illegalInfo } from '@/apis/land'; import { getLandIllegal, createLandIllegal, registerLandIllegal, illegalInfo } from '@/apis/land';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import Attrs from '../../common/Attrs.vue'; import Attrs from '../../common/Attrs.vue';
import { add } from 'lodash'; import { add } from 'lodash';
@ -100,36 +109,16 @@ const documentData = ref([
const option = ref({ const option = ref({
...CRUD_OPTIONS, ...CRUD_OPTIONS,
refreshBtn: false, refreshBtn: false,
index: false,
rowKey: 'caseId', rowKey: 'caseId',
editTitle: '案件登记处理', editTitle: '案件登记处理',
selection: false, selection: false,
addBtn: false,
column: [ column: [
{ {
label: '违法行为', label: '案件编号',
prop: 'illegalTypeName', prop: 'caseId',
search: true, search: true,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
type: 'select',
dicData: [
{ label: '未处理', value: 0 },
{ label: '已处理', value: 1 },
],
// rules: [
// {
// required: true,
// message: '',
// trigger: 'blur',
// },
// ],
},
{
label: '违法行为描述',
prop: 'desc',
editDisplay: false,
viewDisplay: false,
rules: [ rules: [
{ {
required: true, required: true,
@ -139,39 +128,129 @@ const option = ref({
], ],
}, },
{ {
label: '任务编号', label: '案件名称',
prop: 'illegalTypeCode', prop: 'caseName',
search: true,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
rules: [ rules: [
{ {
required: true, required: true,
message: '请输入任务编号', message: '请选择',
trigger: 'blur', trigger: 'blur',
}, },
], ],
}, },
{ {
label: '巡查任务名称', label: '关联单位',
prop: 'inspectionTaskName', prop: 'relatedUnit',
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
}, },
{ {
label: '巡查任务对象', label: '关联土地·',
prop: 'inspectionTaskTarget', prop: 'landId',
type: 'select',
addDisplay: true,
hide: true,
dicUrl: `${VITE_APP_BASE_API}/land-resource/landManage/page`,
dicQuery: {
current: 1,
size: 9999,
},
props: {
value: 'id',
label: 'landName',
},
dicMethod: 'get',
dicHeaders: {
authorization: UserStore.token,
},
dicFormatter: (res) => {
landsArr.value = res?.data?.records ?? [];
return res?.data?.records ?? [];
},
editDisplay: false,
viewDisplay: false,
rules: [
{
required: true,
message: '请选择',
trigger: 'blur',
},
],
},
{
label: '联系电话',
prop: 'phone',
hide: true,
editDisplay: false,
viewDisplay: false,
},
{
label: '法定代表人',
prop: 'legalPerson',
addDisplay: true,
hide: true,
editDisplay: false,
viewDisplay: false,
},
{
label: '统一社会信用代码',
prop: 'usciCode',
addDisplay: true,
hide: true,
editDisplay: false,
viewDisplay: false,
},
{
label: '违法情况',
prop: 'violationSituation',
type: 'textarea',
addDisplay: true,
hide: true,
width: '100%',
span: 24,
editDisplay: false,
viewDisplay: false,
},
{
label: '负责人',
prop: 'responsiblePerson',
display: false,
addDisplay: true, addDisplay: true,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
}, },
{ {
label: '状态', label: '案件进度',
prop: 'status', prop: 'status',
display: false,
search: true,
type: 'select',
dicData: [
{ label: '未处理', value: 0 },
{ label: '已处理', value: 1 },
],
addDisplay: true, addDisplay: true,
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
}, },
{
label: '案件结果',
prop: 'status',
display: false,
addDisplay: true,
editDisplay: false,
viewDisplay: false,
},
{
label: '处理时间',
prop: 'updateTime',
display: false,
addDisplay: false,
editDisplay: true,
viewDisplay: false,
},
], ],
group: [ group: [
{ {
@ -360,14 +439,13 @@ watch(
// #region // #region
async function getList() { async function getList() {
// _loading.value = true; _loading.value = true;
let params = { let params = {
illegalFlag: 1,
current: page.value.currentPage, current: page.value.currentPage,
size: page.value.pageSize, size: page.value.pageSize,
// ...searchData.value, ...searchData.value,
}; };
let res = await getIllegalList(params); let res = await getLandIllegal(params);
console.log('res -- ', res); console.log('res -- ', res);
_loading.value = false; _loading.value = false;
if (res.code == 200) { if (res.code == 200) {
@ -386,10 +464,10 @@ function handleSizeChange(val) {
} }
function handleInfo(row) { function handleInfo(row) {
console.log('row', row); console.log('row', row);
// examineForm.caseId = row.caseId; examineForm.caseId = row.caseId;
// // caseInfo.value.visible = true; // caseInfo.value.visible = true;
// crudRef.value.rowEdit(row); crudRef.value.rowEdit(row);
// // crudRef.value.rowView(row); // crudRef.value.rowView(row);
} }
async function handleSearch(form, done) { async function handleSearch(form, done) {
page.value.currentPage = 1; page.value.currentPage = 1;
@ -491,7 +569,7 @@ function handleOpenFrom(done, type) {
if (type == 'view') { if (type == 'view') {
option.value.group.find((v) => v.prop == 'caseHandle').column.find((v) => v.prop == 'attrs_').label = lab; option.value.group.find((v) => v.prop == 'caseHandle').column.find((v) => v.prop == 'attrs_').label = lab;
} }
// done(); done();
} }
function handleCloseFrom(done) { function handleCloseFrom(done) {
console.log('form close'); console.log('form close');