Commit 5303f1c1 by 叶富雄

Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

parents 210f9690 5e011978
......@@ -921,7 +921,7 @@
>支持png,jpg,doc,pdf格式,大小不超过3MB</span
>
<span
v-else-if="item4.id == 'asjfjDzwjnr'"
v-else-if="item4.id == 'asjfjDzwjnr' || item4.id == 'spflwsfj'"
style="
color: red;
margin-left: 20px;
......@@ -1566,6 +1566,9 @@ export default {
}
// debugger
console.log(this.pageBs);
console.log(self.formLabelAlign);
if (
self.pageBs &&
((self.pageBs == "adjustRlqbxs" &&
......@@ -1578,7 +1581,7 @@ export default {
} else if(self.pageBs && self.pageBs == 'adjustZdxxgl' && self.formLabelAlign.zdryxxgl[0].xm == "") {
this.$message.error("请填写阵地管理人员");
return;
} else if(self.pageBs && self.pageBs == 'addzdcyryxx' && self.formLabelAlign.ryjl[0].dwmc == "") {
} else if(self.pageBs && self.pageBs == 'addzdcyryxx' && self.formLabelAlign.ryjl.length == 0) {
this.$message.error("请填写从业人员及人员经历");
} else if(self.pageBs && self.pageBs == 'addzdjyhd' && (self.formLabelAlign.xgry[0].xm == "" || self.formLabelAlign.zpxx[0].wjmc == "" || self.formLabelAlign.spxx[0].wjmc == "")) {
this.$message.error("请填写交易活动相关人员以及图片视频信息");
......
......@@ -219,7 +219,7 @@ const zdglryxx = [
{
name: "证件号码:",
id: "zjhm",
type: "text",
type: "textTqs",
disabled: false,
prop: "checkEmpty",
value: "",
......
......@@ -107,7 +107,7 @@ export default {
propFormField: [
//基本信息
{
title: "",
title: "人员信息",
id: 1,
objStr: "zdry",
index: 0,
......@@ -422,6 +422,10 @@ export default {
messageGet: {
cxDefaultFormThead: [
{
label: "阵地名称",
prop: "zdmc",
},
{
label: "阵地规模",
prop: "zdgm",
},
......@@ -430,10 +434,6 @@ export default {
prop: "fxcd",
},
{
label: "阵地名称",
prop: "zdmc",
},
{
label: "阵地联系电话",
prop: "zdlxdh",
},
......@@ -480,7 +480,7 @@ export default {
});
},
editSubmit(params, loading) {
params.append("xxzjbh", this.xxzjbh);
params.append("zdry.xxzjbh", this.xxzjbh);
updateZdcyryxx(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("修改成功!", "提示", {
......@@ -515,6 +515,7 @@ export default {
return "";
},
ajtq(item) {
console.log(this.formLabelAlign);
debugger;
let self = this;
var params = new FormData();
......@@ -548,7 +549,7 @@ export default {
self.$set(
self.formLabelAlign,
j.id,
i.objStr ? result[i.objStr][j.id] : result[j.id]
result[j.id]
);
}
});
......
......@@ -829,7 +829,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -862,7 +862,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -899,7 +899,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -940,7 +940,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -981,7 +981,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -1022,7 +1022,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -1059,7 +1059,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -1096,7 +1096,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -1137,7 +1137,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -2042,18 +2042,18 @@ export default {
created() {
this.$store.commit("user/SET_Breadcrumb", this.Menu);
console.log(this.$route.query);
if (this.$route.query.glzdxxzjbh) {
this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
this.ssdy.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.ssfjdc.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.ssjdc.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.sskl.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.ssqtwp.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.ssqz.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.ssww.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.ssydtxsb.cxFormData.glzdxxzjbh = this.glzdxxzjbh
this.sszj.cxFormData.glzdxxzjbh = this.glzdxxzjbh
console.log(this.glzdxxzjbh);
if (this.$route.query.xxzjbh) {
this.xxzjbh = this.$route.query.xxzjbh;
this.ssdy.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssfjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.sskl.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssqtwp.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssqz.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssww.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssydtxsb.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.sszj.cxFormData.gljyhdxxzjbh = this.xxzjbh
console.log(this.xxzjbh);
}
if (this.$route.query.xxzjbh) {
// this.$set(this.propFormField[0], "title", "修改阵地交易活动信息");
......
......@@ -524,7 +524,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -557,7 +557,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -594,7 +594,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -635,7 +635,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -676,7 +676,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -717,7 +717,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -754,7 +754,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -791,7 +791,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -832,7 +832,7 @@ export default {
cxFormData: {
limit: 10,
page: 1,
glzdxxzjbh: this.glzdxxzjbh,
gljyhdxxzjbh: this.xxzjbh,
},
cxDefaultFormThead: [
{
......@@ -1592,6 +1592,19 @@ export default {
},
},
created() {
if (this.$route.query.xxzjbh) {
this.xxzjbh = this.$route.query.xxzjbh;
this.ssdy.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssfjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssjdc.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.sskl.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssqtwp.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssqz.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssww.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.ssydtxsb.cxFormData.gljyhdxxzjbh = this.xxzjbh
this.sszj.cxFormData.gljyhdxxzjbh = this.xxzjbh
console.log(this.xxzjbh);
}
this.xxzjbh = this.$route.query.xxzjbh;
this.glzdxxzjbh = this.$route.query.glzdxxzjbh;
this.getInfor();
......
......@@ -62,8 +62,8 @@ export default {
},
{
label: "线索类型:",
prop: "zdxsrlqbxs",
col: "10",
prop: "zdxsrlqbxsStr",
col: "3",
},
],
},
......
......@@ -6,6 +6,9 @@
:formLabelAligns="formLabelAlign"
@submit="submit"
:propTitle="title"
@queryDatas="queryDatas(arguments)"
@showDatas="showDatas(arguments)"
:propQuery="propQuery"
></form-compontent>
<!-- 阵地从业人员 -->
......@@ -55,6 +58,9 @@
<span class="hbyp" @click="giveInstructions(scope.scope)"
>下达指令</span
>
<span class="hbyp" @click="TOxxtk(scope.scope)"
>推送至刑嫌人员</span
>
</template>
</right-content>
</div>
......@@ -104,6 +110,53 @@
</right-content>
</div>
</el-card>
<!-- 阵地交易活动人员 -->
<el-card
class="box-card"
style="margin-bottom: 70px"
v-if="!!this.xxzjbh && this.xxzjbh != ''"
>
<div slot="header" class="clearfix">
<span>阵地交易人员</span>
<el-button
style="float: right; padding: 3px 0"
type="text"
v-show="!showJYRY"
@click="showJYRY = true"
>展开</el-button
>
<el-button
style="float: right; padding: 3px 0"
type="text"
v-show="showJYRY"
@click="showJYRY = false"
>收起</el-button
>
</div>
<div class="text item" v-show="showJYRY">
<right-content
:pageBs="pageBs"
:cxFormData="cxFormDataJYRY"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormTheadJYRY"
:cxUrl="cxUrlJYRY"
ref="rightContentJYRY"
@toInfor="toInforJY"
>
<!-- <template #listOperation="scope">
<span class="hbyps" @click="addJYRY(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template> -->
<template #btnGroup="scope">
<span class="hbyp" @click="TOBK(scope.scope)">布控</span>
<span class="hbyp" @click="TOxxtk(scope.scope)"
>推送至刑嫌人员</span
>
</template>
</right-content>
</div>
</el-card>
<!-- 阵地线索信息 -->
<el-card
class="box-card"
......@@ -394,6 +447,76 @@
<el-button @click="dialogG = false">关闭</el-button>
</span>
</el-dialog>
<el-dialog title="发送信息" :visible.sync="dialogVisiableM" width="43%">
<el-table
element-loading-text="拼命加载中"
ref="itemDataTable"
:data="propQuery"
tooltip-effect="dark"
max-height="600"
style="margin: 0 auto"
width="100%"
size="small"
>
<el-table-column
align="center"
v-for="(columnTitle, index) in messageGet.cxDefaultFormThead"
:key="index"
:label="columnTitle.label"
width="200"
:prop="columnTitle.prop"
>
<template slot-scope="scope">
<div v-if="columnTitle.prop == 'jyaq'">
<div class="ajxq_s">
<span class="none" v-html="scope.row[columnTitle.prop]"></span
><a
href="javascript:void(0);"
onclick='javascript:this.parentNode.style.display="none";this.parentNode.nextSibling.style.display="block"'
style="
display: inline-block;
width: 100%;
text-align: right;
color: #3692c6;
font-weight: 600;
"
id="open"
v-show="
scope.row[columnTitle.prop] != '' &&
scope.row[columnTitle.prop] != null
"
>展开</a
>
</div>
<div class="ajxq_n" style="display: none">
<span
style="display: block"
v-html="scope.row[columnTitle.prop]"
></span
><a
href="javascript:void(0);"
onclick='javascript:this.parentNode.style.display="none";this.parentNode.previousSibling.style.display="block"'
style="float: right; color: #3692c6; font-weight: 600"
id="stop"
v-show="
scope.row[columnTitle.prop] != '' &&
scope.row[columnTitle.prop] != null
"
>收起</a
>
</div>
</div>
<div v-else>
{{ scope.row[columnTitle.prop] }}
</div>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiableM = false">关闭</el-button>
</span>
</el-dialog>
</div>
</template>
......@@ -404,6 +527,7 @@ import {
updateZdxxgl,
getZdxxByxxzjbh,
} from "@/api/zdxx/zdxxgl.js";
import { getjyryxxtsByZjhm } from "@/api/zdxx/zdjyhd.js";
// import {
// deleteSsdyxx,
// getSnajByssdy,
......@@ -430,6 +554,7 @@ import { deleteZdcyryxx } from "@/api/zdxx/zdcyryxx.js";
import { deleteBbkwp } from "@/api/bkwpxx.js";
import { deleteZdjyhd } from "@/api/zdxx/zdjyhd.js";
import { deleteZdxsxx } from "@/api/zdxsxx.js";
import { insertGzry } from "@/api/xxtk/gzry.js";
export default {
name: "zdxx",
components: {
......@@ -492,6 +617,7 @@ export default {
//列表展示数据
showCY: false,
showJY: false,
showJYRY: false,
showBK: false,
showXS: false,
pageBs: "adjustZdxxgl",
......@@ -506,6 +632,11 @@ export default {
page: 1,
glxxZdxxzjbh: this.xxzjbh,
},
cxFormDataJYRY: {
limit: 10,
page: 1,
glxxZdxxzjbh: this.xxzjbh,
},
cxFormDataBK: {
limit: 10,
page: 1,
......@@ -592,6 +723,30 @@ export default {
},
],
cxUrlJY: "/zdjyhdxx/selectZdjyhd",
cxDefaultFormTheadJYRY: [
{
label: "姓名",
prop: "xm",
width: "220",
toInfor: true,
},
{
label: "证件号码",
prop: "zjhm",
width: "220",
},
{
label: "是否刑嫌人员",
prop: "sfsxxry",
width: "220",
},
{
label: "是否布控人员",
prop: "sfbbkry",
width: "220",
},
],
cxUrlJYRY: "/zdjyhdxx/selectZdjyryList",
cxDefaultFormTheadXS: [
{
label: "阵地线索名称",
......@@ -604,7 +759,7 @@ export default {
},
{
label: "线索类型",
prop: "zdxsrlqbxs",
prop: "zdxsrlqbxsStr",
},
{
label: "关联案件",
......@@ -745,6 +900,29 @@ export default {
pageShowG: false,
currentPage1G: 1,
currentPage1S: 1,
//消息推送
propQuery: [],
dialogVisiableM: false,
messageGet: {
cxDefaultFormThead: [
{
label: "阵地规模",
prop: "zdgm",
},
{
label: "分线程度",
prop: "fxcd",
},
{
label: "阵地名称",
prop: "zdmc",
},
{
label: "阵地联系电话",
prop: "zdlxdh",
},
],
},
};
},
methods: {
......@@ -772,6 +950,7 @@ export default {
this.xxzjbh = res.data.xxzjbh;
this.cxFormDataCY.glzdxxzjbh = this.xxzjbh;
this.cxFormDataJY.glxxZdxxzjbh = this.xxzjbh;
this.cxFormDataJYRY.glxxZdxxzjbh = this.xxzjbh;
this.cxFormDataBK.glxxXxzjbh = this.xxzjbh;
this.cxFormDataXS.glzdxxzjbh = this.xxzjbh;
this.$alert("保存成功!", "提示", {
......@@ -857,6 +1036,23 @@ export default {
}, 500);
});
},
//提取信息列表展示
queryDatas(item) {
console.log(item);
var params = new FormData();
params.append("zjhm", item[0]);
params.append("page", "1");
params.append("limit", "10");
getjyryxxtsByZjhm(params).then((res) => {
console.log(res.data.rows);
this.propQuery = [...res.data.rows];
console.log(this.propQuery);
});
},
showDatas(item) {
console.log(item);
this.dialogVisiableM = true;
},
//列表的方法
//阵地从业人员
addCY() {
......@@ -872,14 +1068,57 @@ export default {
query: { xxzjbh: scope.row.xxzjbh },
});
},
TOBK(scope){
TOBK(scope) {
this.$router.pushToTab({
path: '/adjustXsbks',
query: { glxxlx: '0003',
bkdxLxdm: '04',
bkdx_hm: scope.row.zjhm,
glxxXxzjbh: scope.row.xxzjbh},
})
path: "/adjustXsbks",
query: {
glxxlx: "0003",
bkdxLxdm: "04",
bkdx_hm: scope.row.zjhm,
glxxXxzjbh: scope.row.xxzjbh,
},
});
},
TOxxtk(scope) {
let loading = this.$loading({
lock: true,
text: "正在保存...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
console.log(scope.row);
console.log(scope.row.csrq);
var sendData = scope.row
debugger
sendData.csrq = this.$moment(scope.row.csrq).format("YYYY-MM-DD HH:mm:ss")
sendData.djsj = this.$moment(scope.row.djsj).format("YYYY-MM-DD HH:mm:ss")
sendData.gxsj = this.$moment(scope.row.gxsj).format("YYYY-MM-DD HH:mm:ss")
console.log(sendData);
var params = new FormData()
for(let item in scope.row) {
params.append(item,scope.row[item])
}
insertGzry(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("推送成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
loading.close();
},
});
} else {
loading.close();
this.$message.error("添加失败,请检查数据格式是否正确");
}
});
// this.$router.pushToTab({
// path: '/adjustXsbks',
// query: { glxxlx: '0003',
// bkdxLxdm: '04',
// bkdx_hm: scope.row.zjhm,
// glxxXxzjbh: scope.row.xxzjbh},
// })
},
deleCY(scope) {
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
......@@ -1770,6 +2009,7 @@ export default {
this.getshuju();
this.cxFormDataCY.glzdxxzjbh = this.xxzjbh;
this.cxFormDataJY.glxxZdxxzjbh = this.xxzjbh;
this.cxFormDataJYRY.glxxZdxxzjbh = this.xxzjbh;
this.cxFormDataBK.glxxXxzjbh = this.xxzjbh;
this.cxFormDataXS.glzdxxzjbh = this.xxzjbh;
// this.ssdy.cxFormData.glzdxxzjbh = this.xxzjbh;
......@@ -1788,7 +2028,7 @@ export default {
<style >
.box-card {
width: 1200px !important;
width: 1200px !important;
margin: 0 auto;
margin-top: -50px;
}
......
......@@ -130,7 +130,15 @@ export default {
type: "text",
value: "",
placeholder: "请输入",
col: "2",
col: "3",
},
{
name: "阵地编号:",
id: "xxzjbh",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "阵地管理人员姓名",
......@@ -167,6 +175,11 @@ export default {
width: "200",
},
{
label: "阵地编号",
prop: "xxzjbh",
width: "260",
},
{
label: "登记时间",
prop: "djsj",
},
......@@ -302,14 +315,14 @@ export default {
// className: "iconfont iconrizhi",
// disabled: false,
// },
{
id: "queryZdxxss",
label: "阵地线索信息管理",
index: "queryZdxxss",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
// {
// id: "queryZdxxss",
// label: "阵地线索信息管理",
// index: "queryZdxxss",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
{
id: "queryqzdjs",
label: "全阵地信息检索",
......
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