Commit 078c9785 by xue_wengang

Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

parents b8e3992a 520a3ef4
......@@ -419,7 +419,10 @@
</div>
<div
v-else-if="
(pageBs != 'rwbd' && (columnTitle.prop == 'xxzjbh' || columnTitle.prop == 'asjbh')) || (pageBs == 'rwbd' && columnTitle.prop == 'rwmc')
(pageBs != 'rwbd' &&
(columnTitle.prop == 'xxzjbh' ||
columnTitle.prop == 'asjbh')) ||
(pageBs == 'rwbd' && columnTitle.prop == 'rwmc')
"
>
<!-- 暂时修改成这样 -->
......@@ -494,7 +497,9 @@
@click="edit(scope)"
class="edit"
style="margin-right: 16px"
v-if="!(pageBs == 'rySp' || pageBs == 'yhkxsGl'|| pageBs == 'rwbd')"
v-if="
!(pageBs == 'rySp' || pageBs == 'yhkxsGl' || pageBs == 'rwbd')
"
>修改</span
>
<span
......@@ -627,17 +632,19 @@
:key="subitem.prop"
:class="subitem.col == 3 ? 'col3' : 'col1'"
>
<div v-if="subitem.prop == 'ryxxList'" style="display:flex">
<div class="title">{{ subitem.title }}:</div>
<span v-for="sunItem in item[subitem.prop]" :key="sunItem.zhfzxyrCyzjZjhm">
<span >{{ sunItem.zhfzxyrXm }};</span>
</span>
</div>
<div v-else style="display:flex">
<div v-if="subitem.title" class="title">{{ subitem.title }}:</div>
<div>{{ item[subitem.prop] }}</div>
</div>
<div v-if="subitem.prop == 'ryxxList'" style="display: flex">
<div class="title">{{ subitem.title }}:</div>
<span
v-for="sunItem in item[subitem.prop]"
:key="sunItem.zhfzxyrCyzjZjhm"
>
<span>{{ sunItem.zhfzxyrXm }};</span>
</span>
</div>
<div v-else style="display: flex">
<div v-if="subitem.title" class="title">{{ subitem.title }}:</div>
<div>{{ item[subitem.prop] }}</div>
</div>
</div>
</div>
<div
......@@ -781,12 +788,10 @@ export default {
title: "主办侦查员",
col: 3,
},
{
{
col: 3,
},
{
col: 3,
},
{
......@@ -832,6 +837,7 @@ export default {
zdyCodeTxt: str2,
}).then((res) => {
self.$message.success("修改成功");
self.doQuery('yes')
self.dialogTableVisibleEdit = false;
});
} else {
......@@ -839,7 +845,7 @@ export default {
}
},
bqDetail(item, zjhm) {
this.bqShuju = []
this.bqShuju = [];
if (item == "团伙作案" || item == "结伙作案") {
getDrbqDetail({
zjhm,
......@@ -863,10 +869,10 @@ export default {
console.log(err);
});
} else if (item == "在逃" || item == "撤逃") {
let ryzt = item == "在逃" ? 0 : 1
let ryzt = item == "在逃" ? 0 : 1;
getZtDetail({
zjhm,
ryzt
ryzt,
})
.then((res) => {
this.dialogTableVisible = true;
......@@ -921,9 +927,10 @@ export default {
},
edit(scope) {
var self = this;
if (self.pageBs != "zdryGl") {
if (self.pageBs != "zdryGl" && self.pageBs != "dytj") {
self.$emit("edit", scope);
} else {
console.log(this.cxQueryField)
self.allZdyCode = this.cxQueryField[9].selectData;
self.zdyCodeEdit = [];
self.dialogTableVisibleEdit = true;
......
<!--
* @Author: your name
* @Date: 2021-09-03 09:32:50
* @LastEditTime: 2021-09-03 16:47:55
* @LastEditTime: 2021-09-13 16:00:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zdry\dytj.vue
......@@ -30,11 +30,14 @@
:cxFormData="cxFormData"
:cxDefaultFormThead="propdefaultFormThead"
:cxUrl="cxUrl"
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div>
</template>
<script>
import { getRybq } from "@/api/zdry/zdryGl.js";
import rightContent from "@c/ptCxForm_components.vue";
import { ryXzqhTj, getMainZdGzryxx } from "@/api/zdry/zdrytj.js";
export default {
......@@ -91,6 +94,138 @@ export default {
width: "350px",
},
],
cxQueryField: [
{
name: "",
id: "zdyCode",
type: "checkbox",
value: "",
placeholder: "",
col: "1",
checkList: [
{ label: "电信网络诈骗", val: "zd010002" },
{ label: "涉黑涉恶", val: "zd010006" },
{ label: "团伙作案", val: "zd010018" },
{ label: "一人多案", val: "zd010015" },
],
},
{
name: "姓名",
id: "xm",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "证件号码",
id: "zjhm",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "户籍地区划",
id: "xzqhdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XZQH",
},
{
name: "案件主类别",
id: "ajzlb",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_AJZLB",
},
{
name: "刑事类案案别",
id: "xalbdmbcms",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XALBDMBCMS",
},
{
name: "案件类别",
id: "ajlbCode",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeTree: "CODE_AJLB",
codeOptions: [],
},
{
name: "性别",
id: "xbdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XB",
},
{
name: "民族",
id: "mzdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_MZ",
},
{
name: "人员标签",
id: "zdyCodeTxt",
type: "select",
value: "",
col: "3",
selectData: [],
},
{
name: "危险系数",
id: "grade",
type: "radio",
value: "10",
placeholder: "请选择",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "一般", val: "10" },
{ label: "危险", val: "20" },
{ label: "高危", val: "35" },
],
},
{
name: "关注人员",
id: "isMine",
type: "radio",
value: "",
placeholder: "请选择",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "我的关注", val: "1" },
],
},
],
tableData: [],
type: "map",
key: "1",
......@@ -281,6 +416,20 @@ export default {
getTableData(dm) {
this.type = "table";
this.$set(this.cxFormData, "xzqhdm", dm);
this.$refs.rightContent.doQuery("yes");
},
getCode() {
let arr = [];
getRybq().then((res) => {
res.data.rows.forEach((item) => {
arr.push({
value: item.code,
name: item.name,
disabled: false,
});
});
});
this.$set(this.cxQueryField[9], "selectData", arr);
},
},
mounted() {
......@@ -289,7 +438,7 @@ export default {
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
// debugger;
this.getCode();
},
};
</script>
......
<!--
* @Author: your name
* @Date: 2021-09-03 09:32:50
* @LastEditTime: 2021-09-06 15:07:43
* @LastEditTime: 2021-09-13 15:58:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zdry\dytj.vue
......@@ -30,11 +30,14 @@
:cxFormData="cxFormData"
:cxDefaultFormThead="propdefaultFormThead"
:cxUrl="cxUrl"
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div>
</template>
<script>
import { getRybq } from "@/api/zdry/zdryGl.js";
import rightContent from "@c/ptCxForm_components.vue";
import { ryAjlbTj } from "@/api/zdry/zdrytj.js";
export default {
......@@ -91,6 +94,138 @@ export default {
width: "350px",
},
],
cxQueryField: [
{
name: "",
id: "zdyCode",
type: "checkbox",
value: "",
placeholder: "",
col: "1",
checkList: [
{ label: "电信网络诈骗", val: "zd010002" },
{ label: "涉黑涉恶", val: "zd010006" },
{ label: "团伙作案", val: "zd010018" },
{ label: "一人多案", val: "zd010015" },
],
},
{
name: "姓名",
id: "xm",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "证件号码",
id: "zjhm",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "户籍地区划",
id: "xzqhdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XZQH",
},
{
name: "案件主类别",
id: "ajzlb",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_AJZLB",
},
{
name: "刑事类案案别",
id: "xalbdmbcms",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XALBDMBCMS",
},
{
name: "案件类别",
id: "ajlbCode",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeTree: "CODE_AJLB",
codeOptions: [],
},
{
name: "性别",
id: "xbdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XB",
},
{
name: "民族",
id: "mzdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_MZ",
},
{
name: "人员标签",
id: "zdyCodeTxt",
type: "select",
value: "",
col: "3",
selectData: [],
},
{
name: "危险系数",
id: "grade",
type: "radio",
value: "10",
placeholder: "请选择",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "一般", val: "10" },
{ label: "危险", val: "20" },
{ label: "高危", val: "35" },
],
},
{
name: "关注人员",
id: "isMine",
type: "radio",
value: "",
placeholder: "请选择",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "我的关注", val: "1" },
],
},
],
tableData: [],
type: "map",
key: "1",
......@@ -294,6 +429,20 @@ export default {
getTableData(dm) {
this.type = "table";
this.$set(this.cxFormData, "sabq", dm);
this.$refs.rightContent.doQuery("yes");
},
getCode() {
let arr = [];
getRybq().then((res) => {
res.data.rows.forEach((item) => {
arr.push({
value: item.code,
name: item.name,
disabled: false,
});
});
});
this.$set(this.cxQueryField[9], "selectData", arr);
},
},
mounted() {
......@@ -303,6 +452,7 @@ export default {
created() {
this.$store.commit("user/SET_Menu", this.Menu);
// debugger;
this.getCode();
},
};
</script>
......
<!--
* @Author: your name
* @Date: 2021-09-03 09:32:50
* @LastEditTime: 2021-09-03 16:48:45
* @LastEditTime: 2021-09-13 15:54:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zdry\dytj.vue
-->
<template>
<div id="dytj">
<div id="charts" ref="charts" v-show="type == 'map'" v-loading="loading"></div>
<div
id="charts"
ref="charts"
v-show="type == 'map'"
v-loading="loading"
></div>
<div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
......@@ -17,11 +22,14 @@
:cxFormData="cxFormData"
:cxDefaultFormThead="propdefaultFormThead"
:cxUrl="cxUrl"
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div>
</template>
<script>
import { getRybq } from "@/api/zdry/zdryGl.js";
import { ryXbTj, getMainZdGzryxx } from "@/api/zdry/zdrytj.js";
import rightContent from "@c/ptCxForm_components.vue";
export default {
......@@ -78,6 +86,138 @@ export default {
width: "350px",
},
],
cxQueryField: [
{
name: "",
id: "zdyCode",
type: "checkbox",
value: "",
placeholder: "",
col: "1",
checkList: [
{ label: "电信网络诈骗", val: "zd010002" },
{ label: "涉黑涉恶", val: "zd010006" },
{ label: "团伙作案", val: "zd010018" },
{ label: "一人多案", val: "zd010015" },
],
},
{
name: "姓名",
id: "xm",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "证件号码",
id: "zjhm",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "户籍地区划",
id: "xzqhdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XZQH",
},
{
name: "案件主类别",
id: "ajzlb",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_AJZLB",
},
{
name: "刑事类案案别",
id: "xalbdmbcms",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XALBDMBCMS",
},
{
name: "案件类别",
id: "ajlbCode",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeTree: "CODE_AJLB",
codeOptions: [],
},
{
name: "性别",
id: "xbdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_XB",
},
{
name: "民族",
id: "mzdm",
type: "codeTreeDialog",
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
codeOptions: [],
codeTree: "CODE_MZ",
},
{
name: "人员标签",
id: "zdyCodeTxt",
type: "select",
value: "",
col: "3",
selectData: [],
},
{
name: "危险系数",
id: "grade",
type: "radio",
value: "10",
placeholder: "请选择",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "一般", val: "10" },
{ label: "危险", val: "20" },
{ label: "高危", val: "35" },
],
},
{
name: "关注人员",
id: "isMine",
type: "radio",
value: "",
placeholder: "请选择",
col: "3",
radioData: [
{ label: "全部", val: "" },
{ label: "我的关注", val: "1" },
],
},
],
tableData: [],
type: "map",
key: "1",
......@@ -94,7 +234,7 @@ export default {
disabled: false,
},
],
loading: true
loading: true,
};
},
methods: {
......@@ -249,10 +389,24 @@ export default {
}
});
},
getCode() {
let arr = [];
getRybq().then((res) => {
res.data.rows.forEach((item) => {
arr.push({
value: item.code,
name: item.name,
disabled: false,
});
});
});
this.$set(this.cxQueryField[9], "selectData", arr);
},
//表格内容接口
getTableData(dm) {
this.type = "table";
this.$set(this.cxFormData, "xbdm", dm);
this.$refs.rightContent.doQuery("yes");
},
},
mounted() {
......@@ -262,6 +416,7 @@ export default {
created() {
this.$store.commit("user/SET_Menu", this.Menu);
// debugger;
this.getCode();
},
};
</script>
......
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