Commit 76f5bd02 by liupeng

修改了页面跳转

parents 082a1a5f dd15fb56
......@@ -1753,7 +1753,6 @@
"thread-loader": "^2.1.3",
"url-loader": "^2.2.0",
"vue-loader": "^15.9.2",
"vue-loader-v16": "npm:vue-loader@^16.0.0-beta.7",
"vue-style-loader": "^4.1.2",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.8.0",
......@@ -11911,63 +11910,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.3.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.0.tgz",
"integrity": "sha1-LxleS6D7DiY1ltaDDfF9Gjbok2w=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
"integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
/*
* @Author: your name
* @Date: 2021-08-25 19:21:14
* @LastEditTime: 2021-08-25 20:18:34
* @LastEditors: your name
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\api\cbyp.js
*/
import { get, post , postJson} from "@/utils/http.js";
export const toQueryXszxx = params =>
......@@ -11,11 +19,33 @@ export const updateCbxsz = params =>
//合并线索组列表(其他线索组)
export const toHbxsz = params =>
post("/api/cbxsz/toHbxsz", params);
post("/api/cbxsz/toHbxsz", params);
//合并线索
export const insertHbXszxx = params =>
post("/api/xlaj/insertHbXszxx", params);
//合并线索
export const tjajHttp = params =>
post("/api/dwcx/EsAsjQuery", params);
\ No newline at end of file
export const getQgAsjxxByXszajbh = params =>
post("/api/cbxsz/getQgAsjxxByXszajbh", params);
export const queryCbzAsjGlxx = params =>
post("/api/xlaj/queryCbzAsjGlxx", params);
export const getCbzXyry = params =>
post("/api/xlaj/getCbzXyry", params);
export const getCbzBhry = params =>
post("/api/xlaj/getCbzBhry", params);
// 白名单删除接口
export const removeBshWhiteList = params =>
post('/api/bshgl/removeBshWhiteList', params)
// 我的系列案件列表删除
export const updateCbz = params =>
post('/api/xlaj/updateCbz', params)
......@@ -293,7 +293,7 @@ export default {
filterVal.push(val.prop);
});
post(this.cxUrl, formDatas).then((res) => {
if (res.status === 200) {
if (res.code === 200) {
require.ensure([], () => {
const { export_json_to_excel } = require("../utils/Export2Excel");
const list = res.data;
......@@ -459,7 +459,7 @@ export default {
axios
.get(`JsonData/${val.codeTree}.json`)
.then((res) => {
self.$set(val, "codeOptions", res.data.data.rows);
self.$set(val, "codeOptions", res.data.rows);
})
.catch((err) => {
console.log(err);
......
......@@ -212,6 +212,9 @@
<el-button size="small" @click="clearData" style="width: 100px"
>清空
</el-button>
<el-button v-if="pageBszfc == 'wdxlaj'" type="success" size="small" @click="goNew" style="width: 100px"
>新增
</el-button>
</div>
</div>
</div>
......@@ -253,6 +256,21 @@
@expand-change="rowClick"
:row-class-name="tableRowClassName"
>
<el-table-column
label="操作"
v-if="pageBszfc == 'wdxlaj'"
width="200"
>
<template slot-scope="scope">
<span
style="cursor: pointer; color: #096cc9; margin-left: 20px"
@click="turnToEdit(scope.row, 'delete')"
>
<i class="el-icon-delete"></i>删除
</span>
</template>
</el-table-column>
<el-table-column
label="操作"
v-if="pageBszfc == 'bshxx'"
......@@ -316,7 +334,7 @@
</div>
</div>
<div
v-else-if="columnTitle.prop == 'asjbh'"
v-else-if="columnTitle.prop == 'asjbh' || columnTitle.prop == 'xlajbh'"
@click="goDetail(scope.row)"
style="
cursor: pointer;
......@@ -358,6 +376,7 @@ import LazySelectTreeDialog from "@c/lazy_treeCode_components.vue";
import Http from "@/utils/http.js";
import axios from "axios";
import { esAsjQuery } from "@/api/queryAj.js";
import { updateCbz } from "@/api/cbyp.js";
import { get, post, postform } from "@/utils/http.js";
export default {
......@@ -415,12 +434,49 @@ export default {
};
},
methods: {
rowClick(row, column, event) {},
rowClick () {},
// 删除
turnToEdit(scope, type) {
debugger
if (type == 'delete') {
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
updateCbz({
xlajbh: scope.xlajbh,
}).then((res) => {
if (res.code == 200) {
this.doQuery("yes");
} else {
this.$message({
type: "error",
message: "删除失败",
});
}
this.$options.methods.doQuery();
});
this.$message({
type: "success",
message: "删除成功!",
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
}
},
goDetail(scope) {
debugger
this.$router.pushToTab({
path: "ajbzDetail",
path: "tobjcba",
query: {
asjbh: scope.asjbh,
xlajbh: scope.xlajbh,
},
});
},
......@@ -461,7 +517,7 @@ export default {
filterVal.push(val.prop);
});
esAsjQuery(json).then((res) => {
if (res.status === 200) {
if (res.code === 200) {
require.ensure([], () => {
const { export_json_to_excel } = require("../utils/Export2Excel");
const list = res.data;
......@@ -520,6 +576,12 @@ export default {
this.formData.rows = val;
this.doQuery("yes");
},
// 新增按钮
goNew () {
this.$router.pushToTab({
path: "toAddXlaj",
});
},
clearData() {
let self = this;
for (let i in self.formData) {
......@@ -595,8 +657,8 @@ export default {
if (response.code == 200) {
debugger
self.tableData = response.data.rows || response.data.data || response.data.result;
self.tableDataLength = response.data.total;
self.tPage = Math.ceil(response.data.total / self.page_size);
self.tableDataLength = response.data.recordsTotal;
self.tPage = Math.ceil(response.data.recordsTotal / self.page_size);
self.closeLoading();
} else {
/*self.$message({
......
<template>
<div class="rightContent">
<div class="Content paneDiv paneDiv2">
<div
v-if="propQueryField.length > 0"
:class="{
Content: true,
paneDiv: true,
paneDiv2: true,
clear1: name == 'toAddXlajRelated',
}"
>
<div class="cxtjWrap">
<el-form
label-position="right"
......@@ -407,7 +415,14 @@
</div>
</div>
</div>
<div class="Content paneDiv paneDiv2">
<div
:class="{
clear2: name == 'toAddXlajRelated',
Content: true,
paneDiv: true,
paneDiv2: true,
}"
>
<div class="">
<el-row style="width: 99%; margin: 0 auto">
<el-col :span="24">
......@@ -576,14 +591,18 @@
@click="addTableItem"
>添加</el-button
>
<el-button type="danger" icon="el-icon-close" v-if="item == 'off'"
<el-button
type="danger"
icon="el-icon-close"
v-if="item == 'off'"
@click="off"
>关闭</el-button
>
<el-button
type="success"
icon="el-icon-download"
v-if="item == 'save'"
@save="save"
@click="save"
>保存</el-button
>
</div>
......@@ -746,8 +765,28 @@ export default {
closeLoading() {
this.tableLoading = false;
},
save(){
save() {
this.$emit("pageSave", this.formData);
},
off() {
this.closeWebPage();
},
closeWebPage() {
if (navigator.userAgent.indexOf("MSIE") > 0) {
if (navigator.userAgent.indexOf("MSIE 6.0") > 0) {
window.opener = null;
window.close();
} else {
window.open("", "_top");
window.top.close();
}
} else if (navigator.userAgent.indexOf("Firefox") > 0) {
window.location.href = "about:blank ";
} else {
window.opener = null;
window.open("", "_self", "");
window.close();
}
},
showLoading() {
this.tableLoading = true;
......@@ -880,6 +919,7 @@ export default {
console.log(arr);
return arr;
},
setTableSelect() {},
getTreeData() {
let self = this;
this.getTree().forEach((val) => {
......@@ -901,7 +941,7 @@ export default {
if (!this.tableInfor || this.tableInfor.length <= 0) {
self.doQuery("yes");
} else {
this.tableData = utils.deepClone(this.tableInfor);
this.tableData = this.tableInfor;
this.pageShow = false;
this.tableDataLength = this.tableInfor.length;
this.closeLoading();
......@@ -946,8 +986,7 @@ export default {
self.doQuery("yes");
this.key = 1;
} else {
console.log(this.tableData);
this.tableData = utils.deepClone(val);
this.tableData = val;
this.pageShow = false;
this.tableDataLength = this.tableInfor.length;
this.closeLoading();
......@@ -1053,6 +1092,16 @@ export default {
border-color: #e6a23c !important;
background-color: #e6a23c !important;
}
.clear1 {
margin-bottom: 0 !important;
border-radius: 8px 8px 0 0 !important;
border-bottom: none !important;
}
.clear2 {
margin-top: 0 !important;
border-radius: 0 0 8px 8px !important;
border-top: none !important;
}
.titleWrap {
margin-top: 15px;
margin-bottom: 10px;
......
......@@ -311,28 +311,28 @@ export default {
self.initCode();
},
watch: {
initNum(val){
if(val>=7){
this.$emit("closeInitLoading");
}
},
deleteId(val){
this.deleteIdKey=val;
},
AjxxDefaultFormField(val) {
this.ajxxDefaultField = val;
},
XyrxxDefaultFormField(val) {
this.xyrxxDefaultField = val;
},
ShrxxDefaultFormField(val) {
this.shrxxDefaultField = val;
},
FlxxDefaultFormField(val) {
this.flxxDefaultField = val;
this.initCode();
this.init();
},
// initNum(val){
// if(val>=7){
// this.$emit("closeInitLoading");
// }
// },
// deleteId(val){
// this.deleteIdKey=val;
// },
// AjxxDefaultFormField(val) {
// this.ajxxDefaultField = val;
// },
// XyrxxDefaultFormField(val) {
// this.xyrxxDefaultField = val;
// },
// ShrxxDefaultFormField(val) {
// this.shrxxDefaultField = val;
// },
// FlxxDefaultFormField(val) {
// this.flxxDefaultField = val;
// this.initCode();
// this.init();
// },
formData(data) {
this.formD = data;
}
......
......@@ -168,6 +168,7 @@ export default {
handler(newValue, oldValue) {
var self = this
if (oldValue.length == 0 && this.curFormData[this.curItem.id] != "") {
console.log(newValue);
let value = this.queryTree(newValue, this.curFormData[this.curItem.id]);
this.codeTreeConfig.fieldItem = [];
this.$set(
......
......@@ -98,15 +98,6 @@ export default [
component: () => import("@/views/dwcx/index.vue")
},
{
path: "/cbaAdd",
name: "cbaAdd",
meta: {
title: "登记为串并案",
auth: 5
},
component: () => import("@/views/cbyp/cbaAdd.vue")
},
{
path: "/ajbzDetail1",
name: "ajbzDetail1",
meta: {
......@@ -114,23 +105,69 @@ export default [
auth: 5
},
component: () => import("@/views/ajbzDetail1.vue")
},{
},
{
path: "/qgaj",
name: "qgaj",
meta: {
title: "全国案件",
auth: 5
title: "全国案件",
auth: 5
},
component: () => import("@/views/cbyp/qgaj.vue")
},
{
},
{
path: "/hbxsz",
name: "hbxsz",
meta: {
title: "合并线索组",
auth: 5
title: "合并线索组",
auth: 5
},
component: () => import("@/views/cbyp/hbxsz.vue")
}
},
{
path: "/cbaAdd",
name: "cbaAdd",
meta: {
title: "登记为串并案",
auth: 5
},
component: () => import("@/views/cbyp/cbaAdd.vue")
},
{
path: "/xzrgcb",
name: "xzrgcb",
meta: {
title: "新增人工串并",
auth: 5
},
component: () => import("@/views/cbyp/xzrgcb.vue")
},
{
path: "/toAddXlaj",
name: "toAddXlaj",
meta: {
title: "新增我的系列",
auth: 5
},
component: () => import("@/views/cbyp/toAddXlaj.vue")
},
{
path: "/qgxxxx",
name: "qgxxxx",
meta: {
title: "全国线索信息",
auth: 5
},
component: () => import("@/views/cbyp/qgxxxx.vue")
},
{
path: "/tobjcba",
name: "tobjcba",
meta: {
title: "系列案件详情",
auth: 5
},
component: () => import("@/views/cbyp/tobjcba.vue")
}
]
\ No newline at end of file
......@@ -91,6 +91,10 @@ instance.interceptors.response.use(
response => {
const status = response.data.code;
const message = response.data.message;
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
);
if (status < 0) {
Message({
message: message,
......@@ -122,7 +126,10 @@ json.interceptors.response.use(
response => {
const status = response.data.code;
const message = response.data.message;
var relUrlIp = window.location.host.substring(
0,
window.location.host.length - 5
);
if (status < 0) {
Message({
message: message,
......
......@@ -12,75 +12,71 @@
</template>
<script>
import rightContent from '@c/bshQuery.vue'
import rightContent from '@c/ajflQuery.vue'
export default {
name: 'ajfl',
components: {
rightContent
},
data () {
data () {
return {
header: "案件分类",
pageBs: "ajfl",
cxFormData: {
asjbh: "",
ajlbdm: "",
zatzJyqk: "",
ladwGajgjgdm: "",
larqQssj: util.timeStampTurnTime(
new Date(new Date().getFullYear() + "-01-01 00:00:00")
),
larqJssj: util.timeStampTurnTime(new Date()),
xxdjdwGajgjgdm: "",
xxdjryXm: "",
djsjQssj: "",
djsjJssj: "",
ajywztdm: "",
spsjQssj: "",
spsjJssj: "",
sflsjaPdbz: "",
typeFlag: "all",
unitcode: sessionStorage.getItem("unitcode"),
grade: sessionStorage.getItem("grade"),
header: '案件分类',
pageBs: 'ajfl',
// 查询条件
cxFormData: {
// asjfssjStart: util.timeStampTurnTime(
// new Date(new Date().getFullYear() + '-01-01 00:00:00')
// ),
// asjfssjEnd: util.timeStampTurnTime(new Date()),
fxasjddXzqhdm: '',
asjfssjStart: '',
asjfssjEnd: '',
slsjStart: '',
slsjEnd: '',
asjbh: '',
jyaq: '',
ajzlbCode: '',
ajlalbCode: '',
ajclaCode: '',
rows: 10,
page: 1,
typeFlag: "bshcb",
sEcho: 1,
draw: 1,
start: 1,
length: 10,
cbxsly: "qs"
// typeFlag: 'bshcb',
// sEcho: 1,
// draw: 1,
// start: 1,
// length: 10,
// cbxsly: 'qs'
},
cxQueryField: [
{
name: "发案时间",
id: "fasjStart",
id2: "fasjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "发案地行政区划",
id: "ladw",
type: "lazyCodeTreeDialog",
{
name: '发案时间',
id: 'asjfssjStart',
id2: 'asjfssjEnd',
type: 'zdyDate',
value: '',
col: '3'
},
{
name: '发案地行政区划',
id: 'fxasjddXzqhdm',
type: 'lazyCodeTreeDialog',
props: [], //字典弹框需要的字段
value: "",
col: "3",
value: '',
col: '3',
codeOptions: [],
codeTree: "CODE_QGUNIT",
},
{
name: "受理时间",
id: "fasjStart",
id2: "fasjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "案件编号",
id: 'gjc',
codeTree: 'CODE_QGUNIT'
},
{
name: '案件受理时间',
id: 'slsjStart',
id2: 'slsjEnd',
type: 'zdyDate',
value: '',
col: '3'
},
{
name: '案件编号',
id: 'asjbh',
type: 'text',
value: '',
placeholder: '请输入',
......@@ -88,69 +84,144 @@ export default {
},
{
name: '案件关键词',
id: 'gjc',
id: 'jyaq',
type: 'text',
value: '',
placeholder: '请输入',
col: '3'
},
{
name: "案件类别",
id: "ladw",
type: "lazyCodeTreeDialog",
{
name: '主案类别',
id: 'ajzlbCode',
type: 'lazyCodeTreeDialog',
props: [], //字典弹框需要的字段
value: "",
col: "3",
value: '',
col: '3',
codeOptions: [],
codeTree: "CODE_QGUNIT",
codeTree: 'CODE_QGUNIT'
},
],
cxDefaultFormThead: [
{
label: '案件编号',
prop: 'asjbh',
width: '220'
{
name: '类案类别',
id: 'ajlalbCode',
type: 'lazyCodeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
codeOptions: [],
codeTree: 'CODE_QGUNIT'
},
{
label: '案件名称',
prop: 'ajmc'
name: '次案类别',
id: 'ajclaCode',
type: 'lazyCodeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
codeOptions: [],
codeTree: 'CODE_QGUNIT'
},
{
label: '案件类别',
prop: 'ajlbdmStr'
name: '作案时段',
id: 'startTime',
id2: 'endTime',
type: 'zdyDate',
value: '',
col: '3'
},
{
label: '比中号码',
prop: 'cbxgfwbzh'
name: '作案地域',
id: 'zady',
type: 'lazyCodeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
codeOptions: [],
codeTree: 'CODE_QGUNIT'
},
{
label: '案件状态',
prop: 'zcjddmStr'
name: '作案人数',
id: 'zars',
type: 'radio',
value: '',
placeholder: '',
col: '3',
radioData: [
{ label: '1人', val: '1' },
{ label: '2人', val: '2' },
{ label: '3人', val: '3' },
{ label: '3人以上', val: '4' }
]
},
{
name: '性别',
id: 'bhrxb',
type: 'radio',
value: '',
placeholder: '',
col: '3',
radioData: [
{ label: '未知性别', val: '1' },
{ label: '男', val: '2' },
{ label: '女', val: '3' },
{ label: '未说明的性别', val: '4' }
]
},
{
name: '年龄',
id: 'bhrmlRange',
type: 'radio',
value: '',
placeholder: '',
col: '1',
radioData: [
{ label: '18岁以下', val: '1' },
{ label: '18岁-28岁', val: '2' },
{ label: '29岁-40岁', val: '3' },
{ label: '41岁-49岁', val: '4' },
{ label: '50岁以上', val: '5' }
]
},
{
name: '损失物品',
id: 'sswpList',
type: 'lazyCodeTreeDialog',
props: [], //字典弹框需要的字段
value: '',
col: '3',
codeOptions: [],
codeTree: 'CODE_QGUNIT'
},
],
cxDefaultFormThead: [
{
label: '发案时间',
prop: 'asjfssjKssj'
label: '案件类别中文',
prop: 'ajlb_str',
width: '220'
},
{
label: '案发地点',
prop: 'asjfsddXzqhdm'
label: '案件名称',
prop: 'ajmc'
},
{
label: '受理单位',
prop: 'sldw'
label: '案事件编号',
prop: 'asjbh'
},
{
label: '立案单位',
prop: 'ladwGajgjgdm'
label: '案事件发生地址名称',
prop: 'asjfsddmc'
},
{
label: '案事件发生时间',
prop: 'asjfssj'
},
{
label: '简要案情',
prop: 'jyaq'
}
],
cxUrl: "/api/bshgl/toQueryBsh",
cxUrl: '/api/ajfl/searchAJ'
}
},
}
}
</script>
<style>
......@@ -159,4 +230,3 @@ export default {
<style scoped lang="scss">
@import '../../assets/styles/rightContent.scss';
</style>
......@@ -12,7 +12,7 @@
</template>
<script>
import rightContent from '@c/bshQuery.vue'
import rightContent from '@c/bshBmdquery.vue'
export default {
name: 'wdxlaj',
components: {
......@@ -25,7 +25,7 @@ export default {
cxFormData: {
gjc: '',
bshlx: '',
rows: 10,
rows: 10,
page: 1,
},
cxQueryField: [
......
......@@ -45,9 +45,9 @@ export default {
unitcode: sessionStorage.getItem("unitcode"),
grade: sessionStorage.getItem("grade"),
typeFlag: "bshcb",
cbmc: '',
cblx: [],
cbxxms: ''
cbmc: '',
cblx: '',
cbxxms: ''
},
cxQueryField: [
{
......@@ -62,13 +62,12 @@ export default {
name: "串并类型",
id: "cblx",
type: "codeTreeDialog",
// type: "lazyCodeTreeDialog",
props: [], //字典弹框需要的字段
value: "",
col: "3",
codeOptions: [],
codeTree: "CODE_CBYP_CBLX",
// multiple: true
multiple: true
},
{
name: "串并依据描述",
......@@ -82,34 +81,44 @@ export default {
};
},
mounted () {
this.cxQueryField[0]
this.cxQueryField[0]
Bus.$on('addCbmc', (cbmcList) => {
console.log(cbmcList)
let arr = []
cbmcList.forEach(element => {
arr.push(element.ajmc)
});
this.str = arr.join(',')
let arr = []
cbmcList.forEach(element => {
arr.push(element.ajmc)
});
this.str = arr.join(',')
})
Bus.$on('reset', () => {
this.createMc()
})
Bus.$on('reset', () => {
this.createMc()
})
},
methods: {
async saveAj() {
let obj = {
cbmc: this.cxFormData.cbmc,
cblx: this.cxFormData.cblx,
cbxxms: this.cxFormData.cbxxms,
glxxXszajbh: this.$route.query.xszajbh
}
let res = await addxszglasj(obj)
console.log(res);
Bus.$emit('updataTable')
this.cxFormData.cbmc = ''
this.cxFormData.cblx = []
this.cxFormData.cbxxms = ''
},
async saveAj() {
console.log(this.cxFormData.cblx);
let cblx = null
if(this.cxFormData.cblx.length) {
cblx = this.cxFormData.cblx.join(',')
}
let obj = {
cbmc: this.cxFormData.cbmc,
cblx: cblx,
cbxxms: this.cxFormData.cbxxms,
glxxXszajbh: this.$route.query.xszajbh
}
let res = await addxszglasj(obj)
console.log(res);
if(res.code == 200) {
this.$message.success('添加成功!')
} else {
this.$message.error('添加失败!')
}
Bus.$emit('updataTable')
this.cxFormData.cbmc = ''
this.cxFormData.cblx = ''
this.cxFormData.cbxxms = ''
},
switchTab (path) {
this.$router.push(
{
......@@ -120,41 +129,44 @@ export default {
}
)
},
createMc() {
this.$set(this.cxFormData, 'cbmc', this.str)
console.log(this.cxQueryField);
}
createMc() {
this.$set(this.cxFormData, 'cbmc', this.str)
console.log(this.cxQueryField);
}
},
}
</script>
<style lang="scss" scoped>
.djwzba {
.header {
padding: 8px;
border-bottom: 1px dashed #000;
font-weight: 800;
}
.tabs {
height: 40px;
display: flex;
align-items: center;
font-size: 16px;
background: #fff;
border-bottom: 1px dashed #ccc;
padding: 0 8px;
margin-bottom: 5px;
.tabItem {
height: 100%;
line-height: 40px;
padding: 0 10px;
cursor: pointer;
&.active {
border: 1px solid #ccc;
border-top: 2px solid orangered;
border-bottom: none;
}
}
}
}
.djwzba {
.content-search {
overflow: hidden;
}
.header {
padding: 8px;
border-bottom: 1px dashed #000;
font-weight: 800;
}
.tabs {
height: 40px;
display: flex;
align-items: center;
font-size: 16px;
background: #fff;
border-bottom: 1px dashed #ccc;
padding: 0 8px;
margin-bottom: 5px;
.tabItem {
height: 100%;
line-height: 40px;
padding: 0 10px;
cursor: pointer;
&.active {
border: 1px solid #ccc;
border-top: 2px solid orangered;
border-bottom: none;
}
}
}
}
</style>
<!--
* @Author: your name
* @Date: 2021-08-25 10:14:13
* @LastEditTime: 2021-08-25 19:15:35
* @LastEditTime: 2021-08-25 20:40:07
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\tjaj.vue
......@@ -55,6 +55,7 @@
<script>
import listForm from "@c/tjajForm.vue";
import {tjajHttp } from "@/api/cbyp.js";
export default {
components: {
listForm,
......@@ -1490,8 +1491,20 @@ export default {
};
},
methods: {
doQueryList(data) {
console.log(data);
console.log( data.larq[0]);
if(data.larq){
this.$set(data,'larqStart',data.larq[0])
this.$set(data,'larqEnd',data.larq[1])
}
if(data.asjfssjAsjfskssj){
this.$set(data,'asjfssjAsjfskssjStart',data.asjfssjAsjfskssj[0])
this.$set(data,'asjfssjAsjfskssjEnd',data.asjfssjAsjfskssj[1])
}
tjajHttp(data).then((res )=>{
console.log(res);
})
},
},
};
......
......@@ -90,14 +90,14 @@ export default {
}
let res = await delxszglasj(obj)
console.log(res);
if(res == 200) {
if(res.code == 200) {
this.$message.success('删除成功!')
this.getData(1, 10)
} else {
this.$message.error('删除失败!')
}
},
async getData (start, length) {
let fromData = {
......@@ -141,4 +141,4 @@ export default {
margin: 5px;
}
}
</style>
\ No newline at end of file
</style>
<template>
<div class="Content">
<div class="Content" id="toAddXlaj">
<div class="topTitle">
<span>我的系列</span>
<div class="subTitle" @click="cut('related')">
<div class="ajTitle">相关案件</div>
<div :class="{ bottom: true, hidden: key !== 'related' }"></div>
</div>
<div class="subTitle">
<div class="ajTitle" @click="cut('add')">添加案件</div>
<div :class="{ bottom: true, hidden: key !== 'add' }"></div>
</div>
<div class="subTitle" @click="cut('related')">
<div class="ajTitle">相关案件</div>
<div :class="{ bottom: true, hidden: key !== 'related' }"></div>
</div>
</div>
<right-content
:cxFormData="cxFormData"
......@@ -21,6 +21,7 @@
:formType="formType"
@addTableEvent="addTableEvent"
@delTableItem="delTableItem"
@pageSave="pageSave"
:tableInfor="tableInfor"
:name="name"
></right-content>
......@@ -29,6 +30,7 @@
<script>
import rightContent from "@c/rgcb_wdxl/ptCxForm_components.vue";
import { insertCbzxx } from "@/api/cbyp.js";
import {
EsAsjQuery,
getTableTitleRedis,
......@@ -48,26 +50,38 @@ export default {
page: 1,
rows: 10,
asjbh: "",
jjbh: "",
sldwGajgjgdm: "",
slsjStart: "",
slsjEnd: "",
asjfsddXzqhdm: "",
ajlbdm: '',
larqStart: "",
larqEnd: "",
asjfssjAsjfskssjStart: "",
asjfssjAsjfskssjEnd: "",
ajzlb: "",
ajxzlb: "",
ajzlb: '',
ajxzlb: '',
xalbdmbcms: "",
asjfsddXzqhdm: "",
zhfzxyrFzxyrdaztdm: "",
ajmc: "",
ladwGajgjgdm: "",
ssjzrmbyMin: "",
ssjzrmbyMax: "",
bzzt: "",
jyaq: "",
asjfsddDzmc: "",
zhfzxyrAsjxgrybh: "",
zhfzxyrCyzjZjhm: "",
zhfzxyrXm: "",
zhfzxyrCym: '',
zhfzxyrBmch: "",
zhfzxyrXbdm: "",
zhfzxyrCsrqRqgzxxStart:'',
zhfzxyrCsrqRqgzxxEnd: '',
zhfzxyrMzdm: '',
zhfzxyrGjdm: '',
zhfzxyrHjdzXzqhdm: '',
zhfzxyrXzzXzqhdm: '',
zhfzxyrTzMin: '',
zhfzxyrTzMax: '',
zhfzxyrZcMin: '',
zhfzxyrZcMax: '',
zhfsZhfsdm: '',
zhfzxyrFzxyrdaztdm: '',
zhfzxyrSfjsbrPdbz: '',
zhdwGajgjgdm: '',
zhrqStart: '',
zhrqEnd: '',
},
cxQueryField: [
{
......@@ -318,8 +332,8 @@ export default {
{
name: "抓获单位",
id: "zhdwGajgjgdm",
type: "lazyCodeTreeDialog", //字典弹框
codeTree: "CODE_QGUNIT",
type: "codeTreeDialog", //字典弹框
codeTree: "CODE_UNIT",
props: [], //字典弹框需要的字段
codeOptions: [],
placeholder: "请选择",
......@@ -704,26 +718,38 @@ export default {
page: 1,
rows: 10,
asjbh: "",
jjbh: "",
sldwGajgjgdm: "",
slsjStart: "",
slsjEnd: "",
asjfsddXzqhdm: "",
ajlbdm: '',
larqStart: "",
larqEnd: "",
asjfssjAsjfskssjStart: "",
asjfssjAsjfskssjEnd: "",
ajzlb: "",
ajxzlb: "",
ajzlb: '',
ajxzlb: '',
xalbdmbcms: "",
asjfsddXzqhdm: "",
zhfzxyrFzxyrdaztdm: "",
ajmc: "",
ladwGajgjgdm: "",
ssjzrmbyMin: "",
ssjzrmbyMax: "",
bzzt: "",
jyaq: "",
asjfsddDzmc: "",
zhfzxyrAsjxgrybh: "",
zhfzxyrCyzjZjhm: "",
zhfzxyrXm: "",
zhfzxyrCym: '',
zhfzxyrBmch: "",
zhfzxyrXbdm: "",
zhfzxyrCsrqRqgzxxStart:'',
zhfzxyrCsrqRqgzxxEnd: '',
zhfzxyrMzdm: '',
zhfzxyrGjdm: '',
zhfzxyrHjdzXzqhdm: '',
zhfzxyrXzzXzqhdm: '',
zhfzxyrTzMin: '',
zhfzxyrTzMax: '',
zhfzxyrZcMin: '',
zhfzxyrZcMax: '',
zhfsZhfsdm: '',
zhfzxyrFzxyrdaztdm: '',
zhfzxyrSfjsbrPdbz: '',
zhdwGajgjgdm: '',
zhrqStart: '',
zhrqEnd: '',
};
this.formType = "haveTitle";
},
......@@ -770,6 +796,30 @@ export default {
};
this.haveTitle = null;
},
pageSave(form) {
if (this.tableInfor.length <= 0 || !this.tableInfor) {
this.$message.error("请添加数据后进行操作");
} else {
let asjbhArr = this.tableInfor.map((i) => i.asjbh);
insertCbzxx({
...form,
glxxXszajbh: "",
asjbhs: asjbhArr.join(","),
}).then((res) => {
if (res.data.result == "1") {
this.$message.success("录入成功");
this.tableInfor = [];
this.cxFormData = {
cbmc: "",
cblx: "",
cbxxms: "",
};
} else if (res.data.result == "0") {
this.$message.error("录入失败");
}
});
}
},
/**
* @description: 删除相关案件的表格内容
* @param {*} asjbh
......
......@@ -115,7 +115,7 @@ export default {
{
/*table默认得表头*/
label: '系列案件编号',
prop: 'xlajbn',
prop: 'xlajbh',
width: '200'
},
{
......
......@@ -111,51 +111,43 @@ export default {
},
],
cxDefaultFormThead: [
{
label: '操作',
prop: 'cz',
width: '220'
},
// {
// label: '操作',
// prop: 'cz',
// width: '220'
// },
{
/*table默认得表头*/
label: '系列案件编号',
prop: 'xlajbn',
width: '200'
prop: 'xlajbh',
},
{
label: '系列案件名称',
prop:'cbmc',
width: '220'
},
{
label: '涉案/已破',
prop: 'cbzGlajCount/rn', // 字段名没有改
width: '120'
prop: 'cbzGlajCount/rn',
},
{
label: '串并依据',
prop: 'cblx',
width: '115'
},
{
label: '串并案件跨度',
prop: 'cbajKd',
width: '150'
},
{
label: '串并人',
prop: 'xxdjryXm',
width: '140'
},
{
label: '串并时间',
prop: 'djsj',
width: '180'
},
{
label: '串并单位',
prop: 'xxdjdwGajgmc',
width: '220'
}
],
cxUrl: '/api/xlaj/getCbzxx'
......
<template>
<div class="Content">
<div class="topTitle">
<span>人工串并</span>
<span>我的系列</span>
<div class="subTitle">
<div class="ajTitle">新增串并</div>
<div class="bottom"></div>
<div class="ajTitle" @click="cut('add')">新增串并</div>
<div :class="{ bottom: true, hidden: key !== 'add' }"></div>
</div>
<div class="subTitle" @click="cut('related')">
<div class="ajTitle">查看线索组</div>
<div :class="{ bottom: true, hidden: key !== 'related' }"></div>
</div>
</div>
<right-content
......@@ -12,8 +16,13 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
:tableBtns="tableBtns"
header="xzrgcb"
:pageBtns="pageBtns"
ref="rightContent"
@addTableEvent="addTableEvent"
@delTableItem="delTableItem"
@pageSave="pageSave"
:tableInfor="tableInfor"
:name="name"
></right-content>
</div>
</template>
......@@ -26,6 +35,7 @@ import {
EsShrQuery,
EsXyrQuery,
} from "@/api/dictionaryCode.js";
import { insertXzRgcbxx } from "@/api/cbyp.js";
export default {
name: "xzrgcb",
components: {
......@@ -274,12 +284,278 @@ export default {
width: "220",
},
],
tableBtns: ["add", "view"],
cxUrl: EsAsjQuery,
selectItem: [],
tableInfor: [],
key: "add",
name: "toAddXlajAdd",
pageBtns: ["add"],
};
},
methods: {},
methods: {
/**
* @description: 点击添加表格内容添加到相关案件里面
* @param {*} arr
* @return {*}
*/
addTableEvent(arr) {
this.selectItem = arr;
this.$refs.rightContent.tableSelectItem = [];
this.$message.success("添加成功");
},
/**
* @description: 切换选项卡
* @param {*} key 选项卡key值
* @return {*}
*/
cut(key) {
this.key = key;
},
delTableItem(asjbh) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let index = this.tableInfor.findIndex((i) => i.asjbh == asjbh);
if (index >= 0) {
this.tableInfor.splice(index, 1);
this.$message({
type: "success",
message: "删除成功!",
});
}
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
pageSave() {
if (this.tableInfor.length <= 0 || !this.tableInfor) {
this.$message.error("请添加数据后进行操作");
} else {
let asjbhArr = this.tableInfor.map((i) => i.asjbh);
insertXzRgcbxx({
asjbhs: asjbhArr.join(","),
}).then((res) => {
if (res.code == 200) {
this.$message.success("录入成功");
this.tableInfor = [];
} else if (res.data.result == "0") {
this.$message.error("录入失败");
}
});
}
// insertXzRgcbxx
},
addPrps() {
this.tableInfor = [];
this.pageBtns = ["add"];
this.name = "toAddXlajAdd";
this.cxQueryField = [
/*立案信息 侦查终结信息 立案信息审批 侦查终结审批通用开始*/
{
name: "案(事)件编号",
id: "asjbh",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "接警编号",
id: "jjbh",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "受理单位",
id: "sldwGajgjgdm",
type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
codeTree: "CODE_UNIT",
value: "",
col: "3",
},
{
name: "受理时间",
id: "slsjStart",
id2: "slsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "立案时间",
id: "larqStart",
id2: "larqEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "案发时间",
id: "asjfssjAsjfskssjStart",
id2: "asjfssjAsjfskssjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "主案类别",
id: "ajzlb",
type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
codeTree: "CODE_GABAJZLB",
value: "",
col: "3",
},
{
name: "类案类别",
id: "ajxzlb",
type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
codeTree: "CODE_GABAJXZLB",
value: "",
col: "3",
},
{
name: "次类案类别",
id: "xalbdmbcms",
type: "code",
codeOptions: [],
codeTree: "CODE_XALBDMBCMS",
value: "",
col: "3",
},
{
name: "案发地行政区划",
id: "asjfsddXzqhdm",
type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
codeTree: "CODE_XZQH",
value: "",
col: "3",
},
{
name: "到案状态",
id: "zhfzxyrFzxyrdaztdm",
type: "code",
codeOptions: [],
codeTree: "CODE_DAZT",
value: "",
col: "3",
},
{
name: "案件名称",
id: "ajmc",
type: "text",
placeholder: "请输入",
value: "",
col: "3",
},
{
name: "立案单位",
id: "ladwGajgjgdm",
type: "codeTreeDialog", //字典弹框
props: [], //字典弹框需要的字段
codeOptions: [],
codeTree: "CODE_UNIT",
value: "",
col: "3",
},
{
name: "损失总价值",
id: "ssjzrmbyMin",
id2: "ssjzrmbyMax",
type: "zdyText",
value: "",
col: "3",
},
{
name: "标注状态",
id: "bzzt",
type: "radio",
value: "1",
placeholder: "",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "已标注", val: "1" },
{ label: "未标注", val: "2" },
{ label: "待标注", val: "3" },
],
},
{
name: "简要案情",
id: "jyaq",
type: "text",
value: "",
placeholder: "请输入",
col: "15",
},
{
name: "案发地详址",
id: "asjfsddDzmc",
type: "text",
value: "",
placeholder: "请输入",
col: "15",
},
];
this.cxFormData = {
page: 1,
rows: 10,
asjbh: "",
jjbh: "",
sldwGajgjgdm: "",
slsjStart: "",
slsjEnd: "",
larqStart: "",
larqEnd: "",
asjfssjAsjfskssjStart: "",
asjfssjAsjfskssjEnd: "",
ajzlb: "",
ajxzlb: "",
xalbdmbcms: "",
asjfsddXzqhdm: "",
zhfzxyrFzxyrdaztdm: "",
ajmc: "",
ladwGajgjgdm: "",
ssjzrmbyMin: "",
ssjzrmbyMax: "",
bzzt: "",
jyaq: "",
asjfsddDzmc: "",
};
},
relatedProps() {
this.tableInfor = this.selectItem;
this.pageBtns = ["save", "off"];
this.name = "toAddXlajRelated";
this.cxQueryField = [];
},
},
created() {},
watch: {
key(val) {
if (val == "add") {
this.addPrps();
} else {
this.relatedProps();
}
},
},
};
</script>
<style>
......@@ -350,6 +626,7 @@ export default {
margin-left: 90px;
text-align: center;
margin-top: 19px;
cursor: pointer;
.ajTitle {
font-size: 14px;
font-weight: 400;
......@@ -363,5 +640,8 @@ export default {
margin-top: 7px;
}
}
.hidden {
visibility: hidden;
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment