Skip to content

F
founder_vue
Commit 780bd670 by xue_wengang
Options

Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

parents 664d5020 0ade8fd8
Showing with 221 additions and 155 deletions
src/components/ptCxForm_components.vue
......@@ -650,6 +650,7 @@
pageBs != 'queryAjcc' &&
pageBs != 'queryZjcljcqk' &&
pageBs != 'queryFzth' &&
pageBs != 'queryFzths' &&
pageBs != 'queryShseaj' &&
pageBs != 'queryDwxnpg' &&
pageBs != 'queryGrxnpg' &&
......@@ -1107,6 +1108,7 @@
pageBs == 'lkyj' ||
pageBs == 'tqhjwzqk' ||
pageBs == 'qyeryrlqbxsBJ' ||
pageBs == 'queryFzth' ||
pageBs == 'transactionFlow'
"
>
......@@ -1611,6 +1613,21 @@
style="margin-right: 16px"
v-html="scope.row[columnTitle.prop]"
></span>
<span v-else-if="columnTitle.toInforAjzb">
<el-tooltip
class="item"
effect="dark"
content="案件侦办"
placement="right"
>
<img
@click="$emit('toInforAjzb', scope.row)"
style="width: 22px"
src="@/assets/img/asjxx_ychy.png"
alt=""
/>
</el-tooltip>
</span>
</div>
<div v-else-if="columnTitle.toInforDa">
......@@ -2051,9 +2068,9 @@
pageBs == 'queryWcqkNew' ||
pageBs == 'queryGxqkNew' ||
pageBs == 'queryDzrygl' ||
pageBs == 'queryFzth' ||
pageBs == 'queryDh' ||
pageBs == 'jdcxsGl' ||
pageBs == 'queryFzths' ||
pageBs == 'queryWjsdbg' ||
pageBs == 'queryRole' ||
pageBs == 'queryGrxnpg' ||
......@@ -2221,6 +2238,7 @@
pageBs == 'qyeryrlqbxsDetailList' ||
pageBs == 'queryWjpj' ||
pageBs == 'queryFzth' ||
pageBs == 'queryFzths' ||
pageBs == 'queryRlqbxs' ||
pageBs == 'queryRlqbxs' ||
pageBs == 'xsbk' ||
......@@ -2263,17 +2281,18 @@
pageBs == 'queryZdcs' ||
pageBs == 'xsbk1' ||
pageBs == 'transactionFlow' ||
pageBs == 'addGzzkyxs'||
pageBs == 'addGzqk'||
pageBs == 'addGzzkyxs' ||
pageBs == 'addGzqk' ||
pageBs == 'dswtzxxlbxxbd'
)
"
>修改</span
>
<span @click="editXxtk(scope)"
class="edit"
style="margin-right: 16px"
v-if="
<span
@click="editXxtk(scope)"
class="edit"
style="margin-right: 16px"
v-if="
pageBs == 'addCase' ||
pageBs == 'addSwtz' ||
pageBs == 'addQtsf' ||
......@@ -2290,10 +2309,12 @@
pageBs == 'addRyyp' ||
pageBs == 'addThjl' ||
pageBs == 'addGlbsh' ||
pageBs == 'addTxl'||
pageBs == 'addGzzkyxs'||
pageBs == 'addTxl' ||
pageBs == 'addGzzkyxs' ||
pageBs == 'addGzqk'
">修改</span>
"
>修改</span
>
<span
@click="$emit('sqspBtn', scope)"
class="edit"
......@@ -2440,6 +2461,7 @@
pageBs != 'queryShserhfx' &&
pageBs != 'xsbk' &&
pageBs != 'queryFzth' &&
pageBs != 'queryFzths' &&
pageBs != 'queryfzxyr' &&
pageBs != 'queryShseaj' &&
pageBs != 'gzrygl' &&
......@@ -2513,15 +2535,16 @@
pageBs != 'addRyyp' &&
pageBs != 'addThjl' &&
pageBs != 'addGlbsh' &&
pageBs != 'addTxl'&&
pageBs != 'addGzzkyxs'&&
pageBs != 'addTxl' &&
pageBs != 'addGzzkyxs' &&
pageBs != 'addGzqk'
"
>删除</span
>
<span @click="deleXxtk(scope)"
class="dele"
v-if="
<span
@click="deleXxtk(scope)"
class="dele"
v-if="
pageBs == 'addCase' ||
pageBs == 'addSwtz' ||
pageBs == 'addQtsf' ||
......@@ -2538,10 +2561,12 @@
pageBs == 'addRyyp' ||
pageBs == 'addThjl' ||
pageBs == 'addGlbsh' ||
pageBs == 'addTxl'||
pageBs == 'addGzzkyxs'||
pageBs == 'addTxl' ||
pageBs == 'addGzzkyxs' ||
pageBs == 'addGzqk'
">删除</span>
"
>删除</span
>
<span
@click="dele(scope)"
class="dele"
......@@ -4565,7 +4590,7 @@ export default {
},
editXxtk(scope) {
console.log(scope);
debugger
debugger;
if (this.pageBs == "addCase") {
scope.router = "addCase";
this.$emit("editXxtk", scope);
......@@ -4929,6 +4954,7 @@ export default {
currentUrl = `${url.alyIP2}${this.cxUrl}`;
} else if (
this.pageBs == "queryFzth" ||
this.pageBs == "queryFzths" ||
this.pageBs == "queryShseaj" ||
this.pageASs == "queryShsery" ||
this.pageASs == "queryXsxx" ||
......
src/views/shse/fzth/queryFzth.vue
......@@ -8,18 +8,19 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@selectionChange="selectionChange"
@toInfor='toInfor'
ref="rightContent"
>
<!-- <template #listOperation="scope">
<template #listOperation="scope">
<span class="hbyps" @click="toAdd(scope.scope)">新增</span>
<span class="hbyps" @click="toHb(scope.scope)">合并</span>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="thxq(scope.scope)">研判报告</span>
</template> -->
</template>
</right-content>
<!-- <el-dialog
<el-dialog
title="待合并团伙"
:visible.sync="dialogVisible"
width="40%"
......@@ -57,13 +58,13 @@
>确认合并</el-button
>
</div>
</el-dialog> -->
</el-dialog>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
// import { hbThajxyr } from "@/api/shse/shse.js";
import { hbThajxyr } from "@/api/shse/shse.js";
export default {
name: "queryHbyp",
components: {
......@@ -71,27 +72,27 @@ export default {
},
data() {
return {
// radio: false,
// xsTableList: [
// {
// label: "团伙编号",
// prop: "thbh",
// width: "200",
// },
// {
// label: "团伙名称",
// width: "200",
// prop: "thmc",
// },
// {
// label: "团伙头目",
// width: "145",
// prop: "thtm",
// },
// ],
// sfzth: "",
// dialogVisible: false,
// xsShuju: [],
radio: false,
xsTableList: [
{
label: "团伙编号",
prop: "thbh",
width: "200",
},
{
label: "团伙名称",
width: "200",
prop: "thmc",
},
{
label: "团伙头目",
width: "145",
prop: "thtm",
},
],
sfzth: "",
dialogVisible: false,
xsShuju: [],
header: "涉黑涉恶案件侦查",
pageBs: "queryFzth",
cxFormData: {
......@@ -262,14 +263,14 @@ export default {
disabled: false,
},
],
// selectArr: [],
// revokeVisiable: false,
// ckForm: {
// file: "",
// },
// fileArr: [],
// zdXxzjbh: "",
// indexRadio: 0,
selectArr: [],
revokeVisiable: false,
ckForm: {
file: "",
},
fileArr: [],
zdXxzjbh: "",
indexRadio: 0,
};
},
created() {
......@@ -285,67 +286,67 @@ export default {
},
});
},
// getRadio(scope, index) {
// this.indexRadio = index;
// debugger;
// },
// selectionChange(row) {
// debugger;
// this.xsShuju = row;
// },
getRadio(scope, index) {
this.indexRadio = index;
debugger;
},
selectionChange(row) {
debugger;
this.xsShuju = row;
},
// // add() {
// // this.$router.push({
// // path: '/fzthxz'
// // })
// // },
// toHb(scope) {
// if (this.xsShuju.length > 1) {
// this.dialogVisible = true;
// } else {
// this.$alert("请选择两条合并的线索", "提示!", {
// confirmButtonText: "确定",
// type: "warning",
// callback: () => {},
// });
// }
// },
// // 确认合并
// handleHb() {
// debugger;
// let params = new FormData();
// this.xsShuju.forEach((item, index) => {
// params.append("th" + "[" + index + "]" + ".thbh", item.thbh);
// params.append(
// "th" + "[" + index + "]" + ".sfzth",
// index == this.indexRadio ? "1" : "0"
// );
// console.log(index == this.indexRadio ? "1" : "0");
// });
// hbThajxyr(params).then((res) => {
// if (res.code == 200) {
// this.dialogVisible = false;
// this.$message.success("合并成功");
// this.$refs.rightContent.doQuery("yes");
// this.xsShuju = [];
// } else {
// this.$message.error("合并失败");
// }
// });
// },
// thxq(scope) {
// debugger;
// this.$router.pushToTab({
// path: "/xq",
// query: {
// thbh: scope.row.thbh,
// },
// });
// },
// toAdd() {
// this.$router.pushToTab({
// path: "/fzth",
// });
// },
toHb(scope) {
if (this.xsShuju.length > 1) {
this.dialogVisible = true;
} else {
this.$alert("请选择两条合并的线索", "提示!", {
confirmButtonText: "确定",
type: "warning",
callback: () => {},
});
}
},
// 确认合并
handleHb() {
debugger;
let params = new FormData();
this.xsShuju.forEach((item, index) => {
params.append("th" + "[" + index + "]" + ".thbh", item.thbh);
params.append(
"th" + "[" + index + "]" + ".sfzth",
index == this.indexRadio ? "1" : "0"
);
console.log(index == this.indexRadio ? "1" : "0");
});
hbThajxyr(params).then((res) => {
if (res.code == 200) {
this.dialogVisible = false;
this.$message.success("合并成功");
this.$refs.rightContent.doQuery("yes");
this.xsShuju = [];
} else {
this.$message.error("合并失败");
}
});
},
thxq(scope) {
debugger;
this.$router.pushToTab({
path: "/xq",
query: {
thbh: scope.row.thbh,
},
});
},
toAdd() {
this.$router.pushToTab({
path: "/fzth",
});
},
},
mounted() {},
// watch: {
......
src/views/shse/shseaj/queryShseaj.vue
......@@ -9,6 +9,7 @@
:cxUrl="cxUrl"
ref="rightContent"
@toInfor="toInfor"
@toInforAjzb="toInforAjzb"
>
<template #listOperation="scope">
<span class="hbyps" @click="getAjlb(scope.scope)">案件列表</span>
......@@ -40,7 +41,11 @@
<el-form :inline="true" :model="examineInfo" class="demo-form-inline">
<el-row>
<el-col :span="20" :offset="3" style="margin-top: 20px">
<el-form-item label="案件编号" class="sqsp-form" style="width：100%;">
<el-form-item
label="案件编号"
class="sqsp-form"
style="width：100%;"
>
<span>{{ examineInfo.asjbh1 }}</span>
</el-form-item>
</el-col>
......@@ -110,8 +115,8 @@
type="textarea"
style="width: 600px"
v-model="examineInfo.sqyy"
@blur="checkempty"
></el-input>
<!-- @blur="checkempty" -->
</el-form-item>
</el-col>
</el-row>
......@@ -132,8 +137,8 @@
{
required: true,
message: '审核状态不能为空',
trigger: 'blur'
}
trigger: 'blur',
},
]"
style="width：100%;"
class="sqsp-form"
......@@ -154,8 +159,8 @@
{
required: true,
message: '审核状态不能为空',
trigger: 'blur'
}
trigger: 'blur',
},
]"
style="width：100%;"
class="sqsp-form"
......@@ -175,9 +180,18 @@
<span slot="footer" class="dialog-footer">
<!-- @click="dialogVisible = false" -->
<el-button v-if="activeName == 'first'" @click="tabClick('first')">下一步</el-button>
<el-button v-if="activeName == 'second'" @click="activeName = 'first'">上一步</el-button>
<el-button v-if="activeName == 'second'" type="primary" @click="updateExamine">确 定</el-button>
<el-button v-if="activeName == 'first'" @click="tabClick('first')"
>下一步</el-button
>
<el-button v-if="activeName == 'second'" @click="activeName = 'first'"
>上一步</el-button
>
<el-button
v-if="activeName == 'second'"
type="primary"
@click="updateExamine"
>确 定</el-button
>
</span>
</el-dialog>
......@@ -188,12 +202,20 @@
width="35%"
center
>
<div style="padding: 22px;width: 100%;box-sizing: border-box;height: 350px;overflow-y: auto;">
<div
style="
padding: 22px;
width: 100%;
box-sizing: border-box;
height: 350px;
overflow-y: auto;
"
>
<!-- 双签同事 -->
<el-input
v-model="selectPerson.title"
placeholder="请选择"
style="width: 100%;margin: 0 0 22px"
style="width: 100%; margin: 0 0 22px"
v-if="sqld == 'sq'"
></el-input>
<el-radio-group v-model="radioval" v-if="sqld == 'sq'" class="dis3">
......@@ -204,13 +226,15 @@
style="margin: 0 0 22px 0"
class="col3"
@change="onRadio(item, 'sq')"
> {{ item.trueName }} </el-radio>
>
{{ item.trueName }}
</el-radio>
</el-radio-group>
<!-- 领导审批 -->
<el-input
v-model="selectLeader.title"
placeholder="请选择"
style="width: 100%;margin: 0 0 22px"
style="width: 100%; margin: 0 0 22px"
v-if="sqld == 'ld'"
></el-input>
<el-radio-group v-model="radioval1" v-if="sqld == 'ld'" class="dis3">
......@@ -221,7 +245,9 @@
style="margin: 0 0 22px 0"
class="col3"
@change="onRadio(item, 'ld')"
> {{ item.trueName }} </el-radio>
>
{{ item.trueName }}
</el-radio>
</el-radio-group>
</div>
<!-- 双签同事 -->
......@@ -247,7 +273,7 @@ import { getApproveUsers, saveSpxx } from "@/api/brainPhoto.js";
export default {
name: "queryHbyp",
components: {
rightContent
rightContent,
},
data() {
return {
......@@ -256,7 +282,7 @@ export default {
examineChoose: {
checkedsqts: "",
checkedshld: "",
checkedspld: ""
checkedspld: "",
},
// 审批审批
examineInfo: {
......@@ -266,11 +292,11 @@ export default {
xslx: "案件编号",
asjbh: "",
xsbz: "",
sqyy: ""
sqyy: "",
},
leaderArr: [
{ name: "SQTS", value: [] },
{ name: "YJSP", value: [] }
{ name: "YJSP", value: [] },
],
dialogVisible: false, //审批对话框
// 双签同事对话框
......@@ -278,13 +304,13 @@ export default {
leaderStr: "", // 双签同事
selectPerson: {
title: "",
value: ""
value: "",
},
// 领导审批对话
policemanidStr: "",
selectLeader: {
title: "",
value: ""
value: "",
},
sqld: "", //判断人员审批
radioval: "",
......@@ -330,6 +356,7 @@ export default {
{
label: "案事件编号",
toInfor: true,
toInforAjzb: true,
prop: "asjbh",
width: "250",
},
......@@ -348,7 +375,7 @@ export default {
prop: "larq",
width: "200",
},
{
{
label: "立案单位",
prop: "ladwGajgmc",
width: "200",
......@@ -364,7 +391,7 @@ export default {
prop: "asjlydmStr",
width: "200",
},
{
{
label: "简要案情",
prop: "jyaq",
width: "200",
......@@ -397,8 +424,10 @@ export default {
methods: {
toInfor(scope, columnTitle) {
if (columnTitle.prop == "asjbh") {
let identitycard = JSON.parse(sessionStorage.getItem("userInfo")).identitycard;
let path = `${this.$baseUrl.alyIP6}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&zjhm=${identitycard}`;
let identitycard = JSON.parse(
sessionStorage.getItem("userInfo")
).identitycard;
let path = `${this.$baseUrl.alyIP6}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&zjhm=${identitycard}`;
window.open(path, "_blank");
} else {
window.open(
......@@ -407,6 +436,16 @@ export default {
);
}
},
toInforAjzb(scope) {
let userToken = sessionStorage.getItem("userToken");
let appToken = sessionStorage.getItem("appToken");
let path = `${this.$baseUrl.alyIP10}?zjhm=${
JSON.parse(sessionStorage.getItem("userInfo")).identitycard
}&path=/ajzbDetail?id=${
scope.asjbh
}&userToken=${userToken}&appToken=${appToken}`;
window.open(path, "_blank");
},
getAjlb() {
var self = this;
self.cxUrl = "/shseaj/selectAjxx";
......@@ -452,8 +491,8 @@ export default {
type: "shse",
kybh: scope.row.asjbh,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/shse/shsery/queryShsery.vue
......@@ -229,8 +229,8 @@ export default {
type: "KyRy",
kybh: scope.row.zjhm,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/shse/xxyj/ajxx.vue
......@@ -240,8 +240,8 @@ export default {
type: "shse",
kybh: scope.row.asjbh,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/shse/xxyj/ryxs.vue
......@@ -208,8 +208,8 @@ export default {
type: "KyRy",
kybh: scope.row.zjhm,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/xshb/xshb/djgzxs.vue
......@@ -1439,8 +1439,8 @@ export default {
type: "KyRy",
kybh: scope.gmsfzh,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......@@ -1495,8 +1495,8 @@ export default {
type: bsh,
kybh: kybh,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......@@ -1532,8 +1532,8 @@ export default {
type: "KyRy",
kybh: scope.gmsfzh,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/xxtk/gzry/queryGzrys.vue
......@@ -1352,8 +1352,8 @@ export default {
type: "KyRy",
kybh: scope.row.zjhm,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/xxtk/queryCklz.vue
......@@ -1329,8 +1329,8 @@ export default {
type: "KyRy",
kybh: scope.row.zjhm,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/xxtk/queryLklz.vue
......@@ -1336,8 +1336,8 @@ export default {
type: "KyRy",
kybh: scope.row.zjhm,
userId: obj.identitycard,
username: obj.userName,
trueName: obj.userName,
username: obj.policemanid,
trueName: obj.realname,
identitycard: obj.identitycard,
unitcode: obj.unitcode,
unitname: obj.unitname,
......
src/views/yzzfzxsyp/thxs/queryFzths.vue
......@@ -72,7 +72,7 @@ export default {
data() {
return {
header: "涉黑涉恶案件侦查",
pageBs: "queryFzth",
pageBs: "queryFzths",
cxFormData: {
limit: 10,
page: 1,
......@@ -235,7 +235,7 @@ export default {
{
id: "queryFzths",
label: "犯罪团伙信息管理",
index: "queryFzth",
index: "queryFzths",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
......
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