Commit 9f46d679 by xue_wengang

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

parents 5fcd0838 ff90da09
......@@ -35,6 +35,8 @@ export const TqRlqbxx = params =>
//一键分析
export const doAnalyse = params =>
postform(`${base.alyIP}/rlqb/doAnalyse`, params);
//发送信息
export const insertUserMessage = params =>
postform(`${base.alyIP}/rlqb/insertUserMessage`, params);
......@@ -1669,6 +1669,16 @@ export default {
}
}
},
"formLabelAlign.sffs"(val) {
var boo = false
if(val == 1) {
boo = true
this.$emit("insertMessage",boo)
}else {
boo = false
this.$emit("insertMessage",boo)
}
}
},
computed: {},
};
......
......@@ -363,7 +363,9 @@
pageBs != 'sqqxgl' &&
pageBs != 'queryMyyhz' &&
pageBs != 'hpyprwSp' &&
pageBs != 'queryfzxyr'
pageBs != 'queryfzxyr' &&
pageBs != 'qyeryrlqbxsfs' &&
pageBs != 'qyeryrlqbxsBJ'
"
>
<i class="el-icon-plus"></i> 新增
......@@ -520,8 +522,11 @@
width="100%"
size="small"
v-if="listMode != 2"
@select="select"
@selection-change="handleSelectionChange"
@expand-change="rowExpand"
@select-all="onSelectAll"
@row-click="rowClick"
>
<el-table-column type="expand" v-if="pageASs == 'queryZj'">
<template slot-scope="props">
......@@ -595,7 +600,8 @@
pageBs == 'queryZdjyhd' ||
pageBs == 'zdxxgl' ||
pageBs == 'queryZjcl' ||
pageBs == 'zdryGl'
pageBs == 'zdryGl' ||
pageBs == 'qyeryrlqbxsBJ'
"
>
</el-table-column>
......@@ -959,7 +965,8 @@
pageBs == 'bxqjsdzczl' ||
pageBs == 'queryZjcl' ||
pageBs == 'queryJcgz' ||
pageBs == 'queryZjclLb'
pageBs == 'queryZjclLb' ||
pageBs == 'qyeryrlqbxsBJ'
)
"
>
......@@ -989,6 +996,9 @@
pageBs == 'cxyhz' ||
pageBs == 'queryHbyp' ||
pageBs == 'hpyprwSp' ||
pageBs == 'wfqdzczl' ||
pageBs == 'qyeryrlqbxsfs' ||
pageBs == 'qyeryrlqbxsBJ' ||
pageBs == 'queryMyyhz' ||
pageBs == 'wfqdzczl'
)
......@@ -1097,6 +1107,9 @@
pageBs != 'wfzdzczl' &&
pageBs != 'queryHbyp' &&
pageBs != 'hpyprwSp' &&
pageBs != 'queryfzxyr' &&
pageBs != 'qyeryrlqbxsfs' &&
pageBs != 'qyeryrlqbxsBJ' &&
pageBs != 'queryMyyhz' &&
pageBs != 'queryfzxyr'
"
......@@ -1114,6 +1127,12 @@
v-if="pageBs == 'queryRlqbxs'"
>发送消息</span
>
<span
@click="sendMessageTo(scope)"
class="edit"
v-if="pageBs == 'qyeryrlqbxsfs'"
>发送消息</span
>
<!-- <span
@click="$emit('qxfp', scope)"
class="dele"
......@@ -1615,6 +1634,8 @@ export default {
zjhm: "",
imageUrl: "",
imgRaw: {},
//选中当前行
selectData: [],
};
},
methods: {
......@@ -1642,13 +1663,45 @@ export default {
};
this.$emit("bjBack", obj);
},
select(selection, row) {
if (this.pageBs == "qyeryrlqbxsBJ") {
// 清除所有选中
this.$refs.itsmDataTable.clearSelection();
if (selection.length === 0) return;
// 将当前点击项选中
this.$refs.itsmDataTable.toggleRowSelection(row, true);
}
},
handleChange(file) {
this.imageUrl = URL.createObjectURL(file.raw);
this.imgRaw = file.raw;
},
handleSelectionChange(row) {
this.selectData = row;
this.$emit("selectionChange", row);
},
onSelectAll() {
if (this.pageBs == "qyeryrlqbxsBJ") {
this.$refs.itsmDataTable.clearSelection();
}
},
rowClick(row) {
if (this.pageBs == "qyeryrlqbxsBJ") {
var selectData = this.selectData;
this.$refs.itsmDataTable.clearSelection();
if (selectData.length === 1) {
selectData.forEach((item) => {
if (item === row) {
this.$refs.itsmDataTable.toggleRowSelection(row, false);
} else {
this.$refs.itsmDataTable.toggleRowSelection(row, true);
}
});
} else {
this.$refs.itsmDataTable.toggleRowSelection(row, true);
}
}
},
EditCode() {
var self = this;
if (this.zdyCodeEdit.length > 0) {
......@@ -1694,6 +1747,9 @@ export default {
send(scope) {
this.$emit("send", scope.row);
},
sendMessageTo(scope) {
this.$emit("sendMessageTo", scope.row);
},
bqDetail(item, zjhm) {
this.bqShuju = [];
if (item == "团伙作案" || item == "结伙作案") {
......
......@@ -355,7 +355,7 @@ const jdcxsgl = [
value: "",
placeholder: "请输入",
col: "2",
// prop: "wpNumbers",
prop: "wpNumbers",
},
{
name: "警综物品编号:",
......@@ -364,7 +364,7 @@ const jdcxsgl = [
value: "",
placeholder: "请输入",
col: "2",
// prop: "wpNumbers",
prop: "wpNumbers",
},
{
name: "机动车使用性质:",
......
......@@ -8,56 +8,67 @@
:pageBs="pageBs"
@examine="examine"
@messageTq="messageTq"
@insertMessage="insertMessage"
>
</form-compontent>
<el-dialog
title="提取信息"
:visible.sync="dialogVisiable"
width="35%"
>
<el-table
:data="resultTq"
style="width: 100%">
<el-table-column
align="center"
prop="xxzjbh"
label="信息主键编号"
width="500">
</el-table-column>
<el-table-column
label="操作"
width="150">
<template slot-scope="scope">
<span
<el-dialog title="提取信息" :visible.sync="dialogVisiable" width="35%">
<el-table :data="resultTq" style="width: 100%">
<el-table-column
align="center"
prop="xxzjbh"
label="信息主键编号"
width="500"
>
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<span
@click="extra(scope.row)"
style="margin-right: 16px;color:blue;cursor: pointer;"
style="margin-right: 16px; color: blue; cursor: pointer"
>提取</span
>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiable = false">取 消</el-button>
<el-button type="primary" @click="dialogVisiable = false">确 定</el-button>
<el-button type="primary" @click="dialogVisiable = false"
>确 定</el-button
>
</span>
</el-dialog>
<right-content
v-show="listVisiable"
style="margin-top: -85px; margin-left: 20px"
:pageBs="sendMessage.pageBs"
:cxFormData="sendMessage.cxFormData"
:cxQueryField="sendMessage.cxQueryField"
:cxDefaultFormThead="sendMessage.cxDefaultFormThead"
:cxUrl="sendMessage.cxUrl"
ref="rightContent"
@selectionChange="selectionChange"
></right-content>
</div>
</template>
<script>
import formCompontent from "@c/form.vue";
import { kysscj, xstgz, ryxsgl, jdcxsgl, fjdcxsgl } from "@/utils/params.js";
import rightContent from "@c/ptCxForm_components.vue";
import {
insertKyxs,
updateKyxsxx,
getKyxsByxxzjbh,
insertTqsp,
TqRlqbxx
TqRlqbxx,
} from "@/api/rlqbxs.js";
export default {
name: "addRlqbxs",
components: {
formCompontent,
rightContent,
},
data() {
return {
......@@ -175,6 +186,26 @@ export default {
},
],
},
{
title: "是否发送",
id: 6,
objStr: "",
index: 5,
data: [
{
name: "是否发送:",
id: "sffs",
type: "radio",
radioData: [
{ name: "是", value: "1" },
{ name: "否", value: "0" },
],
value: "0",
placeholder: "请选择",
col: "2",
},
],
},
],
formLabelAlign: {},
xxzjbh: "",
......@@ -207,13 +238,62 @@ export default {
isActive: true,
},
],
dialogVisiable: false,
resultTq: [],
dialogVisiable: false,
listVisiable: false,
resultTq: [],
identitycard: "",
unitcode: "",
sendMessage: {
pageBs: "qyeryrlqbxsBJ",
cxFormData: {
page: 1,
limit: 5,
username: "",
identitycard: "",
},
cxQueryField: [
{
name: "姓名",
id: "username",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "身份证号码",
id: "identitycard",
type: "text",
value: "",
placeholder: "",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "姓名",
prop: "username",
},
{
label: "身份证",
prop: "identitycard",
},
{
label: "所属单位",
prop: "unitname",
},
],
cxUrl: "/rlqb/getUserListN",
},
};
},
methods: {
submit(params) {
console.log(params);
if (this.listVisiable == true) {
params.append("kyxs.identitycard", this.identitycard);
params.append("kyxs.unitcode", this.unitcode);
}
let loading = this.$loading({
lock: true,
text: "正在保存...",
......@@ -254,30 +334,43 @@ export default {
},
messageTq(item) {
console.log(item);
var params = new FormData()
params.append("xm",item.xm)
params.append("zjhm",item.zjhm)
var params = new FormData();
params.append("xm", item.xm);
params.append("zjhm", item.zjhm);
TqRlqbxx(params).then((res) => {
if (res.success && res.code == 200) {
this.$message.success("提取成功")
var result = res.data.rows
this.$message.success("提取成功");
var result = res.data.rows;
// this.resultTq =result
result.map((item,index) => {
result.map((item, index) => {
// this.resultTq.push({ xxzjbh:item })
this.$set(this.resultTq,index,{xxzjbh:item})
})
this.$set(this.resultTq, index, { xxzjbh: item });
});
console.log(this.resultTq);
this.dialogVisiable = true
this.dialogVisiable = true;
} else {
loading.close();
this.$message.error("提取失败")
this.$message.error("提取失败");
}
});
},
insertMessage(boo) {
this.listVisiable = boo;
},
extra(item) {
console.log(item);
this.xxzjbh = item.xxzjbh
this.getshuju()
this.xxzjbh = item.xxzjbh;
this.getshuju();
},
// addTolist(obj) {
// console.log(obj);
// this.identitycard = obj.identitycard;
// this.unitcode = obj.unitcode;
// },
selectionChange(obj) {
console.log(obj);
this.identitycard = obj[0].identitycard;
this.unitcode = obj[0].unitcode;
},
getshuju() {
var self = this;
......
......@@ -25,160 +25,160 @@
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="婚姻状况" name="1">
<el-radio-group v-model="radioHY" size="small">
<el-radio label="10" border
<el-radio label="10" border style="margin-left:10px"
>未婚 ({{ analizeResult.whgs }})</el-radio
>
<el-radio label="20" border
>已婚 ({{ analizeResult.Yhgs }})</el-radio
>已婚 ({{ analizeResult.yhgs }})</el-radio
>
<el-radio label="21" border
>初婚 ({{ analizeResult.Chgs }})</el-radio
>初婚 ({{ analizeResult.chgs }})</el-radio
>
<el-radio label="22" border
>再婚 ({{ analizeResult.Zhgs }})</el-radio
>再婚 ({{ analizeResult.zhgs }})</el-radio
>
<el-radio label="23" border
>复婚 ({{ analizeResult.Fhgs }})</el-radio
>复婚 ({{ analizeResult.fhgs }})</el-radio
>
<el-radio label="30" border
>丧偶 ({{ analizeResult.Sogs }})</el-radio
>丧偶 ({{ analizeResult.sogs }})</el-radio
>
<el-radio label="40" border
>离婚 ({{ analizeResult.Lhgs }})</el-radio
>离婚 ({{ analizeResult.lhgs }})</el-radio
>
<el-radio label="90" border
>未说明情况 ({{ analizeResult.Wsmqk }})</el-radio
>未说明情况 ({{ analizeResult.wsmqk }})</el-radio
>
</el-radio-group>
</el-collapse-item>
<el-collapse-item title="学历代码" name="2">
<el-radio-group v-model="radioXL" size="small">
<el-radio label="10" border
>文盲 ({{ analizeResult.Wmgs }})</el-radio
<el-radio label="10" border style="margin-left:10px"
>文盲 ({{ analizeResult.wmgs }})</el-radio
>
<el-radio label="20" border
>小学 ({{ analizeResult.Xxgs }})</el-radio
>小学 ({{ analizeResult.xxgs }})</el-radio
>
<el-radio label="30" border
>初中 ({{ analizeResult.Czgs }})</el-radio
>初中 ({{ analizeResult.czgs }})</el-radio
>
<el-radio label="40" border
>高中 ({{ analizeResult.Gzgs }})</el-radio
>高中 ({{ analizeResult.gzgs }})</el-radio
>
<el-radio label="50" border
>大中专 ({{ analizeResult.Dzzgs }})</el-radio
>大中专 ({{ analizeResult.dzzgs }})</el-radio
>
<el-radio label="60" border
>本科 ({{ analizeResult.Bkgs }})</el-radio
>本科 ({{ analizeResult.bkgs }})</el-radio
>
<el-radio label="70" border
>硕士研究生 ({{ analizeResult.Ssyjsgs }})</el-radio
>硕士研究生 ({{ analizeResult.ssyjsgs }})</el-radio
>
</el-radio-group>
</el-collapse-item>
<el-collapse-item title="机动车物权类别" name="3">
<el-radio-group v-model="radioJDC" size="small">
<el-radio label="1" border
>所有 ({{ analizeResult.Wmgs }})</el-radio
<el-radio label="1" border style="margin-left:10px"
>所有 ({{ analizeResult.jdcsygs }})</el-radio
>
<el-radio label="2" border
>持有 ({{ analizeResult.Xxgs }})</el-radio
>持有 ({{ analizeResult.jdccygs }})</el-radio
>
<el-radio label="3" border
>使用 ({{ analizeResult.Czgs }})</el-radio
>使用 ({{ analizeResult.jdcsyygs }})</el-radio
>
<el-radio label="4" border
>担保 ({{ analizeResult.Gzgs }})</el-radio
>担保 ({{ analizeResult.jdcdbgs }})</el-radio
>
</el-radio-group>
</el-collapse-item>
<el-collapse-item title="机动车车辆颜色" name="4">
<el-radio-group v-model="radioYS" size="small">
<el-radio label="B" border
>灰色 ({{ analizeResult.Jdchsgs }})</el-radio
<el-radio label="B" border style="margin-left:10px"
>灰色 ({{ analizeResult.jdchsgs }})</el-radio
>
<el-radio label="C" border
>黄色 ({{ analizeResult.Jdcchusgs }})</el-radio
>黄色 ({{ analizeResult.jdcchusgs }})</el-radio
>
<el-radio label="D" border
>粉色 ({{ analizeResult.Jdcfesgs }})</el-radio
>粉色 ({{ analizeResult.jdcfesgs }})</el-radio
>
<el-radio label="E" border
>红色 ({{ analizeResult.Jdchosgs }})</el-radio
>红色 ({{ analizeResult.jdchosgs }})</el-radio
>
<el-radio label="F" border
>紫色 ({{ analizeResult.Jdczisgs }})</el-radio
>紫色 ({{ analizeResult.jdczisgs }})</el-radio
>
<el-radio label="G" border
>绿色 ({{ analizeResult.Jdclvsgs }})</el-radio
>绿色 ({{ analizeResult.jdclvsgs }})</el-radio
>
<el-radio label="H" border
>蓝色 ({{ analizeResult.Jdclasgs }})</el-radio
>蓝色 ({{ analizeResult.jdclasgs }})</el-radio
>
<el-radio label="I" border
>棕色 ({{ analizeResult.Jdczhsgs }})</el-radio
>棕色 ({{ analizeResult.jdczhsgs }})</el-radio
>
<el-radio label="J" border
>黑色 ({{ analizeResult.Jdchesgs }})</el-radio
>黑色 ({{ analizeResult.jdchesgs }})</el-radio
>
<el-radio label="Z" border
>其他颜色 ({{ analizeResult.Jdcqtsgs }})</el-radio
<el-radio label="Z" border style="margin-right: 0px"
>其他颜色 ({{ analizeResult.jdcqtsgs }})</el-radio
>
<el-radio label="A" border
>白色 ({{ analizeResult.Jdcbaigs }})</el-radio
>白色 ({{ analizeResult.jdcbaigs }})</el-radio
>
</el-radio-group>
</el-collapse-item>
<el-collapse-item title="非机动车物权类别" name="5">
<el-radio-group v-model="radioFJDC" size="small">
<el-radio label="1" border
>所有 ({{ analizeResult.fJdcsygs }})</el-radio
<el-radio label="1" border style="margin-left:10px"
>所有 ({{ analizeResult.fjdcsygs }})</el-radio
>
<el-radio label="2" border
>持有 ({{ analizeResult.fJdccygs }})</el-radio
>持有 ({{ analizeResult.fjdccygs }})</el-radio
>
<el-radio label="3" border
>使用 ({{ analizeResult.fJdcsyygs }})</el-radio
>使用 ({{ analizeResult.fjdcsyygs }})</el-radio
>
<el-radio label="4" border
>担保 ({{ analizeResult.fJdcdbgs }})</el-radio
>担保 ({{ analizeResult.fjdcdbgs }})</el-radio
>
</el-radio-group>
</el-collapse-item>
<el-collapse-item title="非机动车车辆颜色" name="6">
<el-radio-group v-model="radioFYS" size="small">
<el-radio label="B" border
>灰色 ({{ analizeResult.Jdchsgs }})</el-radio
<el-radio label="B" border style="margin-left:10px"
>灰色 ({{ analizeResult.fjdchsgs }})</el-radio
>
<el-radio label="C" border
>黄色 ({{ analizeResult.Jdcchusgs }})</el-radio
>黄色 ({{ analizeResult.fjdcchusgs }})</el-radio
>
<el-radio label="D" border
>粉色 ({{ analizeResult.Jdcfesgs }})</el-radio
>粉色 ({{ analizeResult.fjdcfesgs }})</el-radio
>
<el-radio label="E" border
>红色 ({{ analizeResult.Jdchosgs }})</el-radio
>红色 ({{ analizeResult.fjdchosgs }})</el-radio
>
<el-radio label="F" border
>紫色 ({{ analizeResult.Jdczisgs }})</el-radio
>紫色 ({{ analizeResult.fjdczisgs }})</el-radio
>
<el-radio label="G" border
>绿色 ({{ analizeResult.Jdclvsgs }})</el-radio
>绿色 ({{ analizeResult.fjdclvsgs }})</el-radio
>
<el-radio label="H" border
>蓝色 ({{ analizeResult.Jdclasgs }})</el-radio
>蓝色 ({{ analizeResult.fjdclasgs }})</el-radio
>
<el-radio label="I" border
>棕色 ({{ analizeResult.Jdczhsgs }})</el-radio
>棕色 ({{ analizeResult.fjdczhsgs }})</el-radio
>
<el-radio label="J" border
>黑色 ({{ analizeResult.Jdchesgs }})</el-radio
>黑色 ({{ analizeResult.fjdchesgs }})</el-radio
>
<el-radio label="Z" border
>其他颜色 ({{ analizeResult.Jdcqtsgs }})</el-radio
<el-radio label="Z" border style="margin-right: 0px"
>其他颜色 ({{ analizeResult.fjdcqtsgs }})</el-radio
>
<el-radio label="A" border
>白色 ({{ analizeResult.Jdcbaigs }})</el-radio
>白色 ({{ analizeResult.fjdcbaigs }})</el-radio
>
</el-radio-group>
</el-collapse-item>
......@@ -187,46 +187,21 @@
</div>
<el-dialog
title="提取信息"
title="发送信息"
:visible.sync="searchDialogVisiable"
width="35%"
width="55%"
>
<!-- <el-table
:data="resultTq"
style="width: 100%">
<el-table-column
align="center"
prop="xxzjbh"
label="信息主键编号"
width="500">
</el-table-column>
<el-table-column
label="操作"
width="150">
<template slot-scope="scope">
<span
@click="extra(scope.row)"
style="margin-right: 16px;color:blue;cursor: pointer;"
>提取</span
>
</template>
</el-table-column>
</el-table> -->
<right-content
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@oneClickAnalize="oneClickAnalize"
@send="send"
@toInfor="toInfor"
ref="rightContent"
></right-content>
:pageBs="sendMessage.pageBs"
:cxFormData="sendMessage.cxFormData"
:cxQueryField="sendMessage.cxQueryField"
:cxDefaultFormThead="sendMessage.cxDefaultFormThead"
:cxUrl="sendMessage.cxUrl"
@sendMessageTo="sendMessageTo"
ref="rightContent"
></right-content>
<span slot="footer" class="dialog-footer">
<el-button @click="searchDialogVisiable = false">取 消</el-button>
<el-button type="primary" @click="searchDialogVisiable = false">确 定</el-button>
<el-button @click="searchDialogVisiable = false">关闭</el-button>
</span>
</el-dialog>
</div>
......@@ -234,7 +209,7 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteKyxsxx, doAnalyse } from "@/api/rlqbxs.js";
import { deleteKyxsxx, doAnalyse, insertUserMessage } from "@/api/rlqbxs.js";
export default {
name: "rlqbxsxx",
components: {
......@@ -438,6 +413,55 @@ export default {
radioFYS: "",
activeNames: ["1"],
searchDialogVisiable: false,
sendMessage: {
pageBs: "qyeryrlqbxsfs",
cxFormData: {
page: 1,
limit: 5,
username: "",
identitycard: "",
},
cxQueryField: [
{
name: "姓名",
id: "username",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "身份证号码",
id: "identitycard",
type: "text",
value: "",
placeholder: "",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "姓名",
prop: "username",
},
{
label: "身份证",
prop: "identitycard",
},
{
label: "所属单位",
prop: "unitname",
},
],
cxUrl: "/rlqb/getUserListN",
},
sendOutMessage: {
qbxsmc: "",
qbxsnr: "",
xxzjbh: "",
// identitycard: "",
// unitcode: "",
},
};
},
created() {
......@@ -460,7 +484,7 @@ export default {
doAnalyse(params).then((res) => {
if (res.success && res.code == 200) {
console.log(res.data.rows);
this.analizeResult = res.data.rows;
this.analizeResult = { ...res.data.rows };
this.radioHY = "";
this.radioXL = "";
this.radioJDC = "";
......@@ -479,7 +503,27 @@ export default {
},
send(item) {
console.log(item);
this.searchDialogVisiable = true
this.sendOutMessage.qbxsmc = item.qbxsmc
this.sendOutMessage.qbxsnr = item.qbxsnr
this.sendOutMessage.xxzjbh = item.xxzjbh
this.searchDialogVisiable = true;
},
sendMessageTo(item) {
console.log(item);
var params = new FormData()
params.append('qbxsmc',this.sendOutMessage.qbxsmc)
params.append('qbxsmc',this.sendOutMessage.qbxsnr)
params.append('qbxsmc',this.sendOutMessage.xxzjbh)
params.append('qbxsmc',item.identitycard)
params.append('qbxsmc',item.unitcode)
insertUserMessage(params).then((res) => {
if (res.success && res.code == 200) {
this.$message.success("发送成功")
}else{
this.$message.error("发送失败")
}
});
},
edit(scope) {
this.$router.push({
......
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