Commit 8eb0d43a by liupeng

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

parents de44679b 797757aa
......@@ -74,6 +74,11 @@ export const DnabzrwUpdateDnabdById= params =>
// 新增DNA关系结果信息
export const dnabzhcInsertDnabzjg= params =>
postform(`${base.alyIP}/dnabzhc/insertDnabzjg`, params);
// 新增DNA关系结果信息(new)
export const insertDnabzjg= params =>
postform(`${base.alyIP}/dnabz/insertDnabzjg`, params);
//DNA比中关系删除
export const dnabzhcDeleteDnabzjgById= params =>
post(`${base.alyIP}/dnabzhc/deleteDnabzjgById`, params);
......
......@@ -43,3 +43,6 @@ export const updateZjbzjg = params =>
postform(`${base.alyIP}/ZjZjbzxx/updateZjbzjg`, params);
export const saveZwbzrw = params =>
postform(`${base.alyIP}/Zwbzrw/saveZwbzrw`, params);
//提取
export const selectRyxxBysfz = params =>
postform(`${base.alyIP}/xxgzry/selectRyxxBysfz`, params);
......@@ -38,4 +38,15 @@ export const pageTbYwWjpjckxq = params =>
// 21.4.3 功能运行分析
export const getGnyxFxjg = params =>
post(`${base.alyIP}/gnXnpg/getGnyxFxjg`, params);
\ No newline at end of file
post(`${base.alyIP}/gnXnpg/getGnyxFxjg`, params);
//查询阶段性微决评价
export const queryJdswjpj = params =>
post(`${base.alyIP}/wjpjwszx/queryJdswjpj`, params);
//查询模型策略基本信息
export const getTbYwMxclzx = params =>
post(`${base.alyIP}/mxclzx/getTbYwMxclzx`, params);
//查询模型策略基本信息
export const wjpjwszxGetTbYwMxclzx = params =>
post(`${base.alyIP}/wjpjwszx/getTbYwMxclzx`, params);
......@@ -36,4 +36,19 @@ export const bkxxSp = params =>
// 1.2.4.7 线索布控结果查询
export const getTaskResult = params =>
post(`${base.alyIP}/xsbk/getTaskResult`, params);
\ No newline at end of file
post(`${base.alyIP}/xsbk/getTaskResult`, params);
// 1.2.4.7 线索布控删除
export const deleteBkxx = params =>
post(`${base.alyIP}/xsbk/deleteBkxx`, params);
// 1.2.4.7 提请审批
export const bkxxTqsp = params =>
post(`${base.alyIP}/xsbk/bkxxTqsp`, params);
// 1.2.4.7 撤回审批
export const bkxxChsp = params =>
post(`${base.alyIP}/xsbk/bkxxChsp`, params);
\ No newline at end of file
......@@ -98,4 +98,8 @@ export const delXsfj = params =>
// 1.2.3.4 用户警号提取
export const getZbzzByYhjh = params =>
post(`${base.alyIP}/xshb/getZbzzByYhjh`, params);
\ No newline at end of file
post(`${base.alyIP}/xshb/getZbzzByYhjh`, params);
// 1.2.3.4 用户警号提取
export const getWfqdzczlListNew = params =>
post(`${base.alyIP}/zczl/getWfqdzczlListNew`, params);
\ No newline at end of file
......@@ -43,9 +43,6 @@ export const zczlQs = params =>
//增加回报或续报
export const doAddHb = params =>
postform(`${base.alyIP}/zczl/doAddHbNew`, params);
//根据分派编号与是否续报编号拿到回报信息
export const getHbxxDoHbxgByFpbh = params =>
post(`${base.alyIP}/zczl/getHbDetailByFpbh`, params);
//修改回报信息
export const doHbEdit = params =>
postform(`${base.alyIP}/zczl/doHbEdit`, params);
......@@ -59,6 +56,9 @@ export const doYjNew = params =>
//指令回报修改或续报修改
export const getHbDetailByFpbh = params =>
post(`${base.alyIP}/zczl/getHbDetailByFpbh`, params);
//本级回报上级的所有回报信息
export const getAllResponseFromMe = params =>
post(`${base.alyIP}/zczl/getAllResponseFromMe`, params);
//
export const getChildUnitAndPeople = params =>
post(`${base.alyIP}/zczl/getChildUnitAndPeople`, params);
......@@ -74,7 +74,7 @@ export const doEvaluate = params =>
postform(`${base.alyIP}/zczl/doEvaluate`, params);
//回报信息
export const getAllHbInfoByFpbh = params =>
post(`${base.alyIP}/zczl/getAllHbInfoByFpbh`, params);
post(`${base.alyIP}/zczl/getAllChildHbInfo`, params);
//附件下载
export const downloadZczlAttachment = params =>
post(`${base.alyIP}/zczl/downloadZczlAttachment`, params);
......@@ -55,6 +55,10 @@ const nfhbxg = {
'0': '不能',
'1': '能',
}
const nfxbxg = {
'0': '不能',
'1': '能',
}
const nffp = {
'0': '不能',
'1': '能',
......@@ -94,6 +98,15 @@ const xjZczlzt = {
'2': '已签收未回报',
'3': '已签收已回报',
}
// 认定标识
const rdbs = {
'0': '未认定',
'1': '已认定',
}
const zlType = {
'1' : '指令下发',
'2' : '指令分派'
}
export {
spsftg,
xjZlsfqs,
......@@ -110,5 +123,8 @@ export {
hbpjdj,
xbpjdj,
zczlzt,
xjZczlzt
xjZczlzt,
rdbs,
zlType,
nfxbxg
}
......@@ -14,7 +14,7 @@
<div class="module">
<div class="title">{{ item.title }}</div>
<div class="rows">
<div v-if="index === 0" class="ryzp"><img :src="zp" width="120"/></div>
<div v-if="index === 0 && item.objStr == 'xyrxx'" class="ryzp"><img :src="zp" width="120"/></div>
<div :class="'col' + i.col" v-for="(i, index) in item.data" :key="index" >
<span v-if="i.labelWidth" class="label" :style="{ width: i.labelWidth }">{{ i.label }}</span>
<span v-else class="label" :style="{ width: labelWidth }">{{ i.label }}</span>
......@@ -29,7 +29,7 @@
</div>
</div>
</div>
<div class="zpdb" v-if="index === 2">
<div class="zpdb" v-if="!item.objStr">
<div>
<img :src="ytp" alt="" width="280"/>
</div>
......
......@@ -4,7 +4,7 @@
<div class="left">
<p class="p-title">原图</p>
<p><el-image :src="ytp" lazy></el-image></p>
<div class="zcbd" @click="getResult">再次对比</div>
<div class="zcbd" @click="bdAgain">再次对比</div>
<p class="p3">{{ dswObj.xxlyms }}</p>
</div>
<div class="right">
......@@ -23,11 +23,23 @@
</ul>
</div>
</div>
<div class="cont middle">
<div class="cont middle" v-loading="loading3">
<p class="p-title">认定战果<span class="num">{{ rdjgList.length || 0 }}</span></p>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane lazy v-for="(item, index) in rdjgList" :key="index" :label="`战果${index+1}`" :name="`index${index}`">
<div class="zhanguo">
<div v-if="rxcc" class="zhanguo">
<div class="div-zg" style="margin-left: 0px;">
<p><span class="span01">姓名:</span><span class="span02">{{ item.bzrXm }}</span></p>
<p><span class="span01">身份证:</span><span class="span02">{{ item.bzrGmsfhm }}</span></p>
<p><span class="span01">案事件编号:</span><span class="span02">{{ item.asjbh }}</span></p>
<p><span class="span01">案件名称:</span><span class="span02">{{ item.ajmc }}</span></p>
<p><span class="span01">案件类别:</span><span class="span02">{{ item.ajlbmc }}</span></p>
</div>
<div class="div-zg jyaq">
<p><span class="span01">简要案情:</span><span class="span02">{{ item.jyaq }}</span></p>
</div>
</div>
<div v-else class="zhanguo">
<div><el-image :src="'data:image/jpeg;base64,' + item.zp" lazy></el-image></div>
<div class="div-zg">
<p><span class="span01">姓名:</span><span class="span02">{{ item.xm }}</span></p>
......@@ -43,17 +55,17 @@
<div class="bottom">
<el-button type="primary" @click="gameOver">完成</el-button>
</div>
<el-dialog title="涉案情况" :visible.sync="dialogTableVisible" append-to-body>
<el-dialog title="涉案情况" :visible.sync="dialogTableVisible" append-to-body width="80%">
<el-table :data="tableData" v-loading="loading2">
<el-table-column
prop="asjbh"
label="案事件编号"
width="180">
width="230">
</el-table-column>
<el-table-column
prop="ajmc"
label="案件名称"
width="180">
width="200">
</el-table-column>
<el-table-column
prop="jyaq"
......@@ -61,13 +73,21 @@
</el-table-column>
<el-table-column
prop="ajlbdmStr"
label="案件类别">
label="案件类别"
width="120">
</el-table-column>
<el-table-column
label="操作"
width="120">
<template slot-scope="scope">
<el-button @click="submit(scope.row)" type="text" size="small">认 定</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<!-- <div slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisible = false">取 消</el-button>
<el-button type="primary" @click="submit(sardform)">认 定</el-button>
</div>
</div> -->
</el-dialog>
</div>
</template>
......@@ -87,6 +107,7 @@ export default {
rdjgList: [], //认定战果
loading: false,
loading2: false,
loading3: false,
cxUrl5: '/rxbz/querySaAll' //查询人像涉案列表信息
}
},
......@@ -106,6 +127,18 @@ export default {
handleClick(tab, event) {
console.log(tab, event);
},
// 再次比对
bdAgain() {
this.loading = true
setTimeout(() => {
this.$message({
message: ' 发送比对任务成功',
type: 'success'
})
this.loading = false
this.gameOver()
}, 2000)
},
// 查询人像比中结果
getResult() {
this.loading = true
......@@ -131,26 +164,34 @@ export default {
},
// 进行认定操作
submit(obj) {
let form = {}
if(this.rxcc) {
form = {glxxzjbh: this.xxzjbh, asjbh: obj.asjbh, ajmc: obj.ajmc, ajlbmc: obj.ajlbdmStr, bzrGmsfhm: obj.zhfzxyrCyzjZjhm, bzrXm: obj.zhfzxyrXm, jyaq: obj.jyaq }
} else {
form = obj
}
console.log('form', form)
this.loading = true
post(`${url.alyIP}${this.cxUrl3}`, obj).then(
post(`${url.alyIP}${this.cxUrl3}`, form).then(
(res) => {
if (res.success) {
this.getRdjg()
this.dialogTableVisible = false
this.loading = false
}
this.loading = false
}
);
},
// 查询战果
getRdjg() {
this.loading = true
this.loading3 = true
post(`${url.alyIP}${this.cxUrl4}`, {xxzjbh:this.xxzjbh}).then(
(res) => {
if (res.success) {
this.rdjgList = res.data.rows
console.log('this.rdjgList', this.rdjgList)
}
this.loading = false
this.loading3 = false
}
);
},
......@@ -173,9 +214,9 @@ export default {
if (res.success) {
if(res.data.rows && res.data.rows.length > 0) {
this.tableData = res.data.rows
const rows = res.data.rows[0]
this.sardform = {glxxzjbh: item.xxzjbh, asjbh: rows.asjbh, ajmc: rows.ajmc, ajlbmc: rows.ajlbmc, bzrGmsfhm: item.cyzjZjhm, bzrXm: item.xm}
console.log(res.data.rows)
// const rows = res.data.rows[0]
// this.sardform = {glxxzjbh: this.xxzjbh, asjbh: rows.asjbh, ajmc: rows.ajmc, ajlbmc: rows.ajlbmc, bzrGmsfhm: item.cyzjZjhm, bzrXm: item.xm}
// console.log(res.data.rows)
} else {
this.tableData = []
}
......@@ -282,7 +323,7 @@ export default {
// justify-content: space-between;
margin-top: 15px;
.div-zg{
width: 288px;
width: 370px;
font-size: 14px;
margin-top: 5px;
margin-left: 35px;
......@@ -292,13 +333,16 @@ export default {
.span01{
display: inline-block;
margin-right: 10px;
width: 64px;
width: 75px;
color: #808591;
}
.span02{
color: #222222;
}
}
.jyaq{
width:calc(100% - 370px)
}
}
}
.bottom{
......
......@@ -426,6 +426,7 @@
pageBs != 'qyeryrlqbxsBJ' &&
pageBs != 'addCase' &&
pageBs != 'addSwtz' &&
pageBs != 'queryHbyp' &&
pageBs != 'addQtsf' &&
pageBs != 'addWffzjl' &&
pageBs != 'addGxr' &&
......@@ -436,6 +437,7 @@
pageBs != 'addRygd' &&
pageBs != 'addBshgj' &&
pageBs != 'addRyhd' &&
pageBs != 'cxyhz' &&
pageBs != 'queryXshb' &&
pageBs != 'addRysc' &&
pageBs != 'queryGnxnpg' &&
......@@ -444,6 +446,9 @@
pageBs != 'addThjl' &&
pageBs != 'addGlbsh' &&
pageBs != 'addTxl' &&
pageASs != 'nonewAdd' &&
pageBs != 'dzajzb' &&
pageBs != 'queryXsxx' &&
pageBs != 'qyeryrlqbxsGl' &&
pageBs != 'fzjcgxlfx' &&
pageBs != 'qyeryrlqbxsDetailList'
......@@ -782,6 +787,7 @@
:prop="columnTitle.prop"
:key="columnTitle.label"
:label="columnTitle.label"
:show-overflow-tooltip="columnTitle.overflow"
>
<template slot-scope="scope">
<div
......
......@@ -129,6 +129,14 @@ const menuLayouts = [
component: () => import("@/views/ajxscxbd/xczj/detailXczj.vue")
},
{
path: "/detailXczjdc",
name: "detailXczjdc",
meta: {
title: '足迹涉案倒查详情'
},
component: () => import("@/views/ajxscxbd/xczj/detailXczjdc.vue")
},
{
path: "/queryRxbd",
name: "queryRxbd",
meta: {
......
......@@ -255,6 +255,14 @@ export default [
component: () => import("@/views/sf/dwxnpgbg.vue")
},
{
path: "/queryMxlbReport",
name: "queryMxlbReport",
meta: {
title: '模型列表'
},
component: () => import("@/views/mxgl/cxmxlb/report.vue")
},
{
path: "/grxnpgbg",
name: "grxnpgbg",
meta: {
......@@ -262,4 +270,4 @@ export default [
},
component: () => import("@/views/sf/grxnpgbg.vue")
},
]
\ No newline at end of file
]
......@@ -37,15 +37,23 @@ const menuLayouts = [
path: "/xsbk",
name: "xsbk",
meta: {
title: '线索布控'
title: '我发起的线索布控'
},
component: () => import("@/views/xshb/xsbk/xsbk.vue")
},
{
path: "/xsbksp",
name: "xsbksp",
meta: {
title: '我审批的线索布控'
},
component: () => import("@/views/xshb/xsbk/xsbksp.vue")
},
{
path: "/detailXsbks",
name: "detailXsbks",
meta: {
title: '线索布控详情'
title: '我发起的线索布控详情'
},
component: () => import("@/views/xshb/xsbk/detailXsbks.vue")
},
......@@ -53,7 +61,7 @@ const menuLayouts = [
path: "/adjustXsbks",
name: "adjustXsbks",
meta: {
title: '线索布控新增'
title: '我发起的线索布控新增'
},
component: () => import("@/views/xshb/xsbk/adjustXsbks.vue")
},
......@@ -61,7 +69,7 @@ const menuLayouts = [
path: "/queryXsbkResult",
name: "queryXsbkResult",
meta: {
title: '线索布控结果查询'
title: '我发起的线索布控结果查询'
},
component: () => import("@/views/xshb/xsbk/queryXsbkResult.vue")
},
......
......@@ -6,7 +6,7 @@
@submit="submit"
:propTitle="title"
>
</form-compontent>
</form-compontent>
</div>
</template>
......
......@@ -29,22 +29,21 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Dnabzrw/getDnarwList"
cxUrl="/Dnabzrw/selectBzbJglist"
@add="add1"
@toInfor="toInfor"
ref="rightContent1"
>
<template #btnGroup="scope">
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button> -->
<!-- <template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
</template>
</template> -->
</right-content>
</el-drawer>
</div>
......@@ -80,6 +79,15 @@
},
cxQueryField: [
{
name: "类型",
id: "yxxType",
type: "codeTreeDialog",
props: [],
value: "",
col: "3",
codeOptions: [{label: "DNA编号", id: 'DNA编号'},{label: "证件号码", id: '证件号码'},{label: "案件编号", id: '案件编号'}],
},
{
name: "源信息",
id: "dnabh",
type: "text",
......
......@@ -67,7 +67,7 @@
:table="table"
:rxcc="rxcc"
cxUrl="/Rxbzrw/selectJglist"
cxUrl2="/Rxbzrw/selectDetain"
cxUrl2="/Rxccbzrw/selectDetain"
cxUrl3='/Rxccbzrw/updateRxbdSardById'
cxUrl4='/Rxccbzrw/selectJglist'>
</compare-info>
......@@ -77,9 +77,11 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteRxcbrwById,updateRxbdById,selectJglist,deleteRxbz } from "@/api/dswtz/bzxx";
import { updateRxbdById,selectJglist,deleteRxbz } from "@/api/dswtz/bzxx";
import { deleteRyzpById } from "@/api/dswtz/rxxx.js";
import {bdzt} from "@/assets/js/transformFormTable.js";
import { deleteRxcbrwById } from "@/api/xscxbd/ajbd.js";
// import {leftMenus} from "@p/dswtzxx/index.js";
import compareInfo from "@c/compareInfo.vue";
export default {
......
......@@ -44,7 +44,7 @@
data: [
{
name: "ystr编号:",
id: "dnabh",
id: "ystrbh",
type: "text",
value: "",
placeholder: "请输入",
......
......@@ -17,8 +17,8 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
......@@ -28,13 +28,12 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Ystrbzrw/selectRyJglist"
cxUrl="/Ystrbzrw/selectSaJglist"
@add="add1"
ref="rightContent1"
>
......@@ -95,19 +94,24 @@
{label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
{label: "案事件编号", prop: "asjbh"},
{label: "人员编号", prop: "asjxgrybh"},
{label: "姓名", prop: "xm"},
{label: "别名", prop: "bmch"},
{label: "证件类型", prop: "cyzjCyzjmc"},
{label: "证件号码", prop: "cyzjZjhm"},
{label: "性别", prop: "xbdmStr"},
{label: "出生日期", prop: "csrq"},
{label: "国籍", prop: "gjdmStr"},
{label: "民族", prop: "mzdmStr"},
{label: "籍贯", prop: "jgdmStr"},
{label: "政治面貌", prop: "zzmmdmStr"},
{label: "学历", prop: "xldmStr"},
// {label: "案事件编号", prop: "asjbh"},
// {label: "人员编号", prop: "asjxgrybh"},
// {label: "姓名", prop: "xm"},
// {label: "别名", prop: "bmch"},
// {label: "证件类型", prop: "cyzjCyzjmc"},
// {label: "证件号码", prop: "cyzjZjhm"},
// {label: "性别", prop: "xbdmStr"},
// {label: "出生日期", prop: "csrq"},
// {label: "国籍", prop: "gjdmStr"},
// {label: "民族", prop: "mzdmStr"},
// {label: "籍贯", prop: "jgdmStr"},
// {label: "政治面貌", prop: "zzmmdmStr"},
// {label: "学历", prop: "xldmStr"},
{label: "案件编号", prop: "asjbh"},
{label: "现勘编号", prop: "xkbh"},
{label: "案件名称", prop: "ajmc"},
{label: "案件类别", prop: "ajlb"},
{label: "简要案情", prop: "jyaq"}
],
// 需要转化table的显示
cxUrl: "/Ystrbzrw/getYstrrwList",
......
......@@ -17,8 +17,8 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
......@@ -28,9 +28,8 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
......@@ -80,7 +79,7 @@
cxQueryField: [
{
name: "ystr编号",
id: "dnabh",
id: "ystrbh",
type: "text",
props: "checkEmpty",
value: "",
......@@ -95,7 +94,7 @@
{label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
{label: "案事件编号", prop: "asjbh"},
// {label: "案事件编号", prop: "asjbh"},
{label: "人员编号", prop: "asjxgrybh"},
{label: "姓名", prop: "xm"},
{label: "别名", prop: "bmch"},
......
......@@ -23,128 +23,128 @@ export default {
data() {
return {
cxQueryField: [
{
title: "人员基本信息", //如果不分小模块就删除title
id: 1,
objStr: "xyrxx", //对象中的对应字段
data: [
{
label: "",
prop: "",
col: "3",
},
{
label: "人员编号:",
prop: "asjxgrybh",
col: "3",
},
{
label: "学历:",
prop: "xldmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "出生日期:",
prop: "csrq",
col: "3",
},
{
label: "民族:",
prop: "mzdmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "政治面貌:",
prop: "zzmmdmStr",
col: "3",
},
{
label: "职业:",
prop: "zylbdmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "姓名:",
prop: "xm",
col: "3",
},
{
label: "籍贯:",
prop: "jgdmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "工作单位:",
prop: "gzdw",
col: "3",
},
{
label: "性别:",
prop: "xbdmStr",
col: "3",
},
{
label: "国籍:",
prop: "gjdmStr",
col: "3",
},
{
label: "别名:",
prop: "bmch",
col: "3",
},
{
label: "证件号码:",
prop: "cyzjZjhm",
col: "3",
},
{
label: "户籍地区划:",
prop: "hjdzXzqhdmStr",
col: "3",
},
{
label: "现住址区划:",
prop: "xzzXzqhdmStr",
col: "3",
},
{
label: "证件类型:",
prop: "cyzjCyzjmc",
col: "3",
},
{
label: "户籍地详址:",
prop: "hjdzDzmc",
col: "3",
},
{
label: "现住址详址:",
prop: "xzzDzmc",
col: "10",
},
],
},
// {
// title: "人员基本信息", //如果不分小模块就删除title
// id: 1,
// objStr: "xyrxx", //对象中的对应字段
// data: [
// {
// label: "",
// prop: "",
// col: "3",
// },
// {
// label: "人员编号:",
// prop: "asjxgrybh",
// col: "3",
// },
// {
// label: "学历:",
// prop: "xldmStr",
// col: "3",
// },
// {
// label: "",
// prop: "",
// col: "3",
// },
// {
// label: "出生日期:",
// prop: "csrq",
// col: "3",
// },
// {
// label: "民族:",
// prop: "mzdmStr",
// col: "3",
// },
// {
// label: "",
// prop: "",
// col: "3",
// },
// {
// label: "政治面貌:",
// prop: "zzmmdmStr",
// col: "3",
// },
// {
// label: "职业:",
// prop: "zylbdmStr",
// col: "3",
// },
// {
// label: "",
// prop: "",
// col: "3",
// },
// {
// label: "姓名:",
// prop: "xm",
// col: "3",
// },
// {
// label: "籍贯:",
// prop: "jgdmStr",
// col: "3",
// },
// {
// label: "",
// prop: "",
// col: "3",
// },
// {
// label: "工作单位:",
// prop: "gzdw",
// col: "3",
// },
// {
// label: "性别:",
// prop: "xbdmStr",
// col: "3",
// },
// {
// label: "国籍:",
// prop: "gjdmStr",
// col: "3",
// },
// {
// label: "别名:",
// prop: "bmch",
// col: "3",
// },
// {
// label: "证件号码:",
// prop: "cyzjZjhm",
// col: "3",
// },
// {
// label: "户籍地区划:",
// prop: "hjdzXzqhdmStr",
// col: "3",
// },
// {
// label: "现住址区划:",
// prop: "xzzXzqhdmStr",
// col: "3",
// },
// {
// label: "证件类型:",
// prop: "cyzjCyzjmc",
// col: "3",
// },
// {
// label: "户籍地详址:",
// prop: "hjdzDzmc",
// col: "3",
// },
// {
// label: "现住址详址:",
// prop: "xzzDzmc",
// col: "10",
// },
// ],
// },
{
title: "案件基本信息", //如果不分小模块就删除title
id: 2,
......
<template>
<div class="Content" id="hmxsDetail">
<right-content
:cxQueryField="cxQueryField"
:pageObject="pageObject"
:pageFooterProps="pageFooterProps"
labelWidth="100px"
title="现场足迹串查详情"
>
</right-content>
</div>
</template>
<script>
import rightContent from "@c/IdentityInfor.vue";
import { xczjcDetail } from "@/api/ajxscxbd.js";
import axios from "@/utils/http.js";
export default {
name: "detailXczj",
components: {
rightContent,
},
data() {
return {
cxQueryField: [
{
title: "人员基本信息", //如果不分小模块就删除title
id: 1,
objStr: "xyrxx", //对象中的对应字段
data: [
{
label: "",
prop: "",
col: "3",
},
{
label: "人员编号:",
prop: "asjxgrybh",
col: "3",
},
{
label: "学历:",
prop: "xldmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "出生日期:",
prop: "csrq",
col: "3",
},
{
label: "民族:",
prop: "mzdmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "政治面貌:",
prop: "zzmmdmStr",
col: "3",
},
{
label: "职业:",
prop: "zylbdmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "姓名:",
prop: "xm",
col: "3",
},
{
label: "籍贯:",
prop: "jgdmStr",
col: "3",
},
{
label: "",
prop: "",
col: "3",
},
{
label: "工作单位:",
prop: "gzdw",
col: "3",
},
{
label: "性别:",
prop: "xbdmStr",
col: "3",
},
{
label: "国籍:",
prop: "gjdmStr",
col: "3",
},
{
label: "别名:",
prop: "bmch",
col: "3",
},
{
label: "证件号码:",
prop: "cyzjZjhm",
col: "3",
},
{
label: "户籍地区划:",
prop: "hjdzXzqhdmStr",
col: "3",
},
{
label: "现住址区划:",
prop: "xzzXzqhdmStr",
col: "3",
},
{
label: "证件类型:",
prop: "cyzjCyzjmc",
col: "3",
},
{
label: "户籍地详址:",
prop: "hjdzDzmc",
col: "3",
},
{
label: "现住址详址:",
prop: "xzzDzmc",
col: "10",
},
],
},
{
title: "案件基本信息", //如果不分小模块就删除title
id: 2,
objStr: "xyasjxx", //对象中的对应字段
data: [
{
label: "案件名称:",
prop: "ajmc",
col: "3",
},
{
label: "案件编号:",
prop: "asjbh",
col: "3",
},
{
label: "案件类别:",
prop: "ajlbdmStr",
col: "3",
},
{
label: "现勘编号:",
prop: "xkbh",
col: "3",
},
{
label: "发案日期:",
prop: "asjfssjfxAsjfskssjStr",
col: "3",
},
{
label: "发案地区划:",
prop: "fxasjddXzqhdmStr",
col: "3",
},
{
label: "发案地详址:",
prop: "fxasjddDzmc",
col: "10",
},
{
label: "简要案情:",
prop: "jyaq",
col: "10",
},
],
},
{
id: 3,
title: "比中信息", //如果不分小模块就删除title
data: [
{
label: "信息主键编号:",
prop: "xxzjbh",
col: "6",
},
{
label: "比中时间:",
prop: "bzsjStr",
col: "3",
},
{
label: "比中单位名称:",
prop: "bzdwGajgmc",
col: "3",
},
{
label: "比中嫌疑人足迹部位:",
prop: "bzxyrzjbw",
col: "3",
labelWidth: '150px'
},
{
label: "比中案件足迹序号:",
prop: "bzajzjxh",
col: "3",
labelWidth: '140px'
},
{
label: "案件足迹图片:",
prop: "",
col: "3",
isImg: true
},
{
label: "嫌疑人足迹图像:",
prop: "",
col: "3",
labelWidth: '150px',
isImg: true
},
],
}
],
pageFooterProps: [
{
label: "填表单位:",
prop: "xxdjdwGajgmc",
col: "3",
},
{
label: "填表人:",
prop: "xxdjryXm",
col: "3",
},
{
label: "填表时间:",
prop: "djsj",
col: "3",
},
],
defaultProps: {
parent: "parentId", // 父级唯一标识
value: "id", // 唯一标识
label: "label", // 标签显示
children: "children", // 子级
},
pageObject: {},
xxzjbh: "",
breadcrumbList: [
{
name: "现场指纹管理列表",
to: "/queryXczw",
isActive: false,
},
{
name: "现场足迹串查",
to: "/queryXczj",
isActive: false,
},
{
name: "现场足迹串查详情",
to: "/detailXczj",
isActive: true,
},
],
};
},
mounted() {},
methods: {
getInfor() {
let _this = this;
xczjcDetail({
xxzjbh: _this.xxzjbh,
}).then((res) => {
var result = res.data.zjbzxx;
result.ytp = result.ajzjtx || ''
result.bdtp = result.xyrzjtx || ''
this.pageObject = result;
_this.filterTreeCode(result);
});
},
filterTreeCode(obj) {
let _this = this;
let arr = [..._this.cxQueryField, ..._this.pageFooterProps];
console.log(arr);
arr.forEach((i) => {
if (i.type && i.type == "codeTree") {
axios
.get(`JsonData/${i.codeTree}.json`)
.then((codRes) => {
let value = _this.queryTree(codRes.data.rows, obj[i.prop]);
_this.$set(_this.pageObject, i.prop, value);
})
.catch((err) => {
console.log(err);
});
} else {
_this.$set(_this.pageObject, i.prop, obj[i.prop]);
}
});
console.log(_this.pageObject);
},
queryTree(tree, id) {
let stark = [];
stark = stark.concat(tree);
while (stark.length) {
const temp = stark.shift();
if (temp[this.defaultProps.children]) {
stark = stark.concat(temp[this.defaultProps.children]);
}
if (temp[this.defaultProps.value] === id) {
return temp[this.defaultProps.label];
}
}
return "";
},
},
created() {
this.$store.commit("user/SET_Breadcrumb", this.breadcrumbList);
this.xxzjbh = this.$route.query.xxzjbh;
this.getInfor();
},
};
</script>
<style scoped lang="scss">
</style>
......@@ -18,31 +18,36 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
<el-drawer
destroy-on-close
:with-header="false"
:visible.sync="table"
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:tableOperationWidth="100"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Zjccbzrw/selectRyJglist"
cxUrl="/Zjccbzrw/selectBzbJglist"
@add="add1"
@toInfor="toInfor"
ref="rightContent1"
:transformFormTable="transformFormTable"
>
<template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="iamSure(scope.scope)" type="text">认 定</el-button>
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button> -->
</template>
</right-content>
</el-drawer>
......@@ -53,8 +58,9 @@
import rightContent from "@c/ptCxForm_components.vue";
// import {leftMenus} from "@p/dswtzxx/index.js";
import { ZjccbzrwUpdateZjbdById,deleteZjbzjgById,ZjccbzrwDeleteZjcbrwById } from "@/api/dswtz/bzxx";
import { deleteZjcbrwById } from "@/api/xscxbd/ajbd";
import {bdzt} from "@/assets/js/transformFormTable.js";
import {bdzt, rdbs} from "@/assets/js/transformFormTable.js";
import { post } from "@/utils/http.js";
import url from "@/api/base";
export default {
name: "lbxx",
components: {
......@@ -65,7 +71,7 @@
tableColumnDefinition:[
{label:'足迹图片', prop:'zpDzwjnr'}
],
transformFormTable: {bdzt},
transformFormTable: {bdzt, rdbs},
table: false,
gridData: [],
tableOperation:true,
......@@ -99,26 +105,37 @@
{label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
{label: "人员编号", prop: "asjxgrybh"},
{label: "姓名", prop: "xm"},
{label: "别名", prop: "bmch"},
{label: "证件类型", prop: "cyzjCyzjmc"},
{label: "证件号码", prop: "cyzjZjhm"},
{label: "性别", prop: "xbdmStr"},
{label: "出生日期", prop: "csrq"},
{label: "国籍", prop: "gjdmStr"},
{label: "民族", prop: "mzdmStr"},
{label: "籍贯", prop: "jgdmStr"},
{label: "政治面貌", prop: "zzmmdmStr"},
{label: "学历", prop: "xldmStr"},
{label: "相似度", prop: "similarity"},
// {label: "人员编号", prop: "asjxgrybh"},
// {label: "姓名", prop: "xm"},
// {label: "别名", prop: "bmch"},
// {label: "证件类型", prop: "cyzjCyzjmc"},
// {label: "证件号码", prop: "cyzjZjhm"},
// {label: "性别", prop: "xbdmStr"},
// {label: "出生日期", prop: "csrq"},
// {label: "国籍", prop: "gjdmStr"},
// {label: "民族", prop: "mzdmStr"},
// {label: "籍贯", prop: "jgdmStr"},
// {label: "政治面貌", prop: "zzmmdmStr"},
// {label: "学历", prop: "xldmStr"},
// {label: "相似度", prop: "similarity"},
{label: "信息主键", prop: "xxzjbh", toInfor: true, width: "300"},
// {label: "姓名", prop: "xm"},
// {label: "公民身份号码", prop: "sfzh"},
{label: "案件编号", prop: "asjbh"},
{label: "现勘编号", prop: "xkbh"},
{label: "案件名称", prop: "ajmc"},
{label: "案件类别", prop: "ajlb"},
{label: "比中单位", prop: "bzdw"},
{label: "比中时间", prop: "bzsj"},
{label: "认定标识", prop: "rdbs"}
],
// 需要转化table的显示
cxUrl: "/Zjccbzrw/getRxCcrwList",
rdUrl: '/Zjccbzrw/updateZjbdrdById',
Menu: [
{
id: "bdmbXxzjbh",
label: "现场足迹串查",
label: "足迹比中信息",
index: "wfqdzczl",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -172,7 +189,7 @@
type: "warning",
})
.then(() => {
deleteZjcbrwById({
ZjccbzrwDeleteZjcbrwById({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
......@@ -198,7 +215,7 @@
type: "warning",
})
.then(() => {
deleteZjcbrwById({
deleteZjbzjgById({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
......@@ -226,10 +243,17 @@
},
toSwtzxxgl(i){
this.$router.push({
path:'/swtzxxgl',
query:{rybh:i.row.asjxgrybh}
// this.$router.push({
// path:'/swtzxxgl',
// query:{rybh:i.row.asjxgrybh}
// })
let routeUrl = this.$router.resolve({
path: "/swtzxxgl",
query: {
rybh: i.row.rybh
},
})
window.open(routeUrl.href, '_blank')
},
zwbd(scope){
let self = this
......@@ -263,6 +287,26 @@
})
},
toInfor(obj) {
let routeUrl = this.$router.resolve({
path: "/detailXczj",
query: {
xxzjbh: obj.xxzjbh,
},
})
window.open(routeUrl.href, '_blank')
},
// 认定操作
iamSure(obj) {
console.log('obj', obj)
post(`${url.alyIP}${this.rdUrl}`, {xxzjbh:obj.row.xxzjbh}).then(
(res) => {
if (res.success) {
this.$refs.rightContent1.doQuery("yes");
}
}
);
}
},
mounted() {},
};
......
......@@ -34,9 +34,8 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
......@@ -45,11 +44,11 @@
@toInfor="toInfor"
ref="rightContent1"
>
<template #btnGroup="scope">
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit 1(scope.scope)" type="text">修改</el-button> -->
<!-- <template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit 1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
</template>
</template> -->
</right-content>
</el-drawer>
......
......@@ -10,15 +10,20 @@
@add="add"
ref="rightContent"
>
<template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
<template #jrnt="scope">
<span
class="hbyps"
class="hbyp"
@click="toBrai(scope.scope)"
v-if="scope.scope.row.spzt == '审批通过'"
>进入脑图</span
>
<span
class="hbyps"
class="hbyp"
@click="sqspBtna(scope.scope)"
v-if="scope.scope.row.spzt == '未发起申请'"
>申请审批</span
......@@ -468,7 +473,7 @@ export default {
</style>
<style scoped lang="scss">
@import "@/assets/styles/rightContent.scss";
.hbyps {
.hbyp {
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
......@@ -482,4 +487,19 @@ export default {
line-height: 28px;
text-align: center;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
\ No newline at end of file
......@@ -35,7 +35,7 @@
data() {
return {
tableOperation:true,
tableOperationWidth:800,
tableOperationWidth:100,
header: "DNA信息",
pageBs: "dswtzxxlbxx",
cxFormData: {
......
......@@ -45,30 +45,12 @@
index: 0,
data: [
{
name: "姓名:",
id: "xm",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
disabled:true
},
{
name: "公民身份号码:",
id: "gmsfhm",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
disabled:true
},
{
name: "左虹膜:",
id: "hmsjLeft",
type: "photo",
value: "",
placeholder: "请输入",
col: "22",
col: "2",
},
{
name: "右虹膜:",
......@@ -76,7 +58,7 @@
type: "photo",
value: "",
placeholder: "请输入",
col: "22",
col: "2",
},
],
},
......
......@@ -19,7 +19,7 @@
<script>
import formCompontent from "@c/form.vue";
import { dnabzhcSelectDetail,dnabzhcInsertDnabzjg,dnabzhcUpdateDnabzjg } from "@/api/dswtz/bzxx";
import { dnabzhcSelectDetail,dnabzhcInsertDnabzjg,dnabzhcUpdateDnabzjg, insertDnabzjg } from "@/api/dswtz/bzxx";
export default {
name: "addryxx",
props:{
......@@ -40,105 +40,226 @@
objStr: "",
index: 0,
data: [
// {
// name: "案事件编号:",
// id: "asjbh",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "现勘编号:",
// id: "xkbh",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "案件名称:",
// id: "ajmc",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "案件类别:",
// id: "ajlb",
// type: "codeTree",
// codeTree: "CODE_AJLB",
// codeOptions: [],
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "案件发生时间:",
// id: "ajfssj",
// type: "DateVal",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "案件发生地点:",
// id: "ajfsdd",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "嫌疑人姓名:",
// id: "xyrXm",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "嫌疑人证件号码:",
// id: "xyrZjhm",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "人员编号:",
// id: "rybh",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "比中人:",
// id: "bzrXm",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "比中单位:",
// id: "bzdwGajgmc",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
// {
// name: "比中时间:",
// id: "bzsj",
// type: "DateVal",
// value: "",
// placeholder: "请输入",
// col: "2",
// },
{
name: "案事件编号:",
id: "asjbh",
name: "DNA实验室编号:",
id: "bzrySysbh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "现勘编号:",
id: "xkbh",
name: "DNA实验室名称:",
id: "bzrySysmc",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "案件名称:",
id: "ajmc",
name: "检出基因座数量:",
id: "bzryJcjyzsl",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "案件类别:",
id: "ajlb",
type: "codeTree",
codeTree: "CODE_AJLB",
codeOptions: [],
name: "物证编号:",
id: "bzajWzbh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "案件发生时间:",
id: "ajfssj",
type: "DateVal",
name: "物证名称:",
id: "bzajWzmc",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "案件发生地点:",
id: "ajfsdd",
name: "现勘编号:",
id: "bzajXkbh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "嫌疑人姓名:",
id: "xyrXm",
name: "案件编号:",
id: "bzajAjbh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "嫌疑人证件号码:",
id: "xyrZjhm",
name: "案件名称:",
id: "bzajAjmc",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "人员编号:",
id: "rybh",
type: "text",
name: "案件类别:",
id: "bzajAjlb",
type: "codeTree",
codeTree: "CODE_AJLB",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "比中人:",
id: "bzrXm",
name: "案发时间:",
id: "bzajAfsj",
type: "DateVal",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "比中时间:",
id: "bzsj",
type: "DateVal",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "比中姓名:",
id: "bzryXm",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "比中单位:",
id: "bzdwGajgmc",
name: "比中证件号码:",
id: "bzrySfzh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "比中时间:",
id: "bzsj",
type: "DateVal",
name: "人员编号:",
id: "bzryRybh",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "简要案情:",
id: "bzajJyaq",
type: "textarea",
value: "",
placeholder: "请输入",
col: "1",
},
],
},
],
......@@ -175,7 +296,7 @@
});
if(this.$route.query.glxxzjbh){
params.append('glxxzjbh',this.$route.query.glxxzjbh)
dnabzhcInsertDnabzjg(params).then(res=>{
insertDnabzjg(params).then(res=>{
if(res.code){
loading.close()
this.$router.go(-1)
......@@ -191,8 +312,6 @@
}
})
}
},
handleRemove(val) {
this.removeFileXxzjbh.push(val.xxzjbh);
......
......@@ -64,7 +64,7 @@
data() {
return {
tableColumnDefinition:[
{label:'足迹片', prop:'zpDzwjnr'}
{label:'足迹片', prop:'zpDzwjnr'}
],
transformFormTable: {bdzt},
table: false,
......@@ -94,10 +94,15 @@
},
],
cxDefaultFormThead: [
// {label: "图片名称", prop: "zpDzwjbt"},
// {label: "建立时间", prop: "zpJlsj"},
// {label: "比中状态", prop: "bdzt"},
// {label: "登录姓名", prop: "xxdjryXm"},
// {label: "足迹照片", prop: "zpDzwjbt"},
{label: "图片名称", prop: "zpDzwjbt"},
{label: "建立时间", prop: "zpJlsj"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
// {label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
// {label: "人员编号", prop: "asjxgrybh"},
......
......@@ -69,7 +69,8 @@
data() {
return {
tableColumnDefinition:[
{label:'源信息', prop:'zwbh',spare:'zpDzwjnr'}
// {label:'指纹照片', prop:'zwbh',spare:'zpDzwjnr'}
{label:'指纹照片', prop:'zpDzwjnr'}
],
transformFormTable: {bdzt},
table: false,
......@@ -108,10 +109,15 @@
},
],
cxDefaultFormThead: [
// {label: "图片名称", prop: "zpDzwjbt"},
// {label: "建立时间", prop: "djsj"},
// {label: "比中状态", prop: "bdzt"},
// {label: "登录姓名", prop: "xxdjryXm"},
// {label: "指纹照片", prop: "zpDzwjbt"},
{label: "图片名称", prop: "zpDzwjbt"},
{label: "指纹编号", prop: "zwbh"},
{label: "建立时间", prop: "djsj"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
],
// cxDefaultFormThead1: [
// {label: "人员编号", prop: "asjxgrybh"},
......
......@@ -7,6 +7,7 @@
:propTitle="title"
@handleRemove="handleRemove"
@removePhoto="removePhoto"
@ajtq="ajtq"
pageBs="addsqfbzl"
ref="formCompontent"
>
......@@ -17,7 +18,7 @@
<script>
import formCompontent from "@c/form.vue";
import { insertRyxx,selectRyxxById, selectRyzpList, updateRyxx} from "@/api/dswtzxx.js";
import { insertRyxx,selectRyxxById, selectRyzpList, updateRyxx,selectRyxxBysfz} from "@/api/dswtzxx.js";
export default {
name: "addryxx",
components: {
......@@ -33,30 +34,7 @@
objStr: "",
index: 0,
data: [
{
name: "正面照片:",
id: "R_ZMZP_File",
type: "photo",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
},
{
name: "左侧面照片:",
id: "R_ZCMZP_File",
type: "photo",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
},
{
name: "右侧面照片:",
id: "R_YCMZP_File",
type: "photo",
value: "",
requestUrl: "/flwsFj/tbstasjflwsCj/save",
col: "2",
},
{
name: "姓名:",
id: "xm",
......@@ -88,7 +66,7 @@
{
name: "证件号码:",
id: "zjhm",
type: "text",
type: "textTq",
value: "",
placeholder: "请输入",
col: "2",
......@@ -196,6 +174,30 @@
};
},
methods: {
ajtq(gmsfzh){
let params = new FormData();
let self = this;
params.append('zjhm',gmsfzh)
selectRyxxBysfz(params).then(res=>{
if(res.code===200){
let result = res.data.rows;
if(result.hasOwnProperty('xm')){
self.propFormField.forEach((fieldItem) => {
if (fieldItem.data && fieldItem.data.length > 0) {
fieldItem.data.forEach((i) => {
this.$set(this.formLabelAlign, i.id, result[i.id]);
});
}
this.$forceUpdate();
});
}
else {
this.$message.warning('暂无此证件号码信息')
}
}
})
},
submit(params) {
let loading = this.$loading({
lock: true,
......
......@@ -122,11 +122,7 @@
label: "性别",
prop: "xbdmStr",
},
{
label: "十指指纹编号",
prop: "szzwbh",
width:'200'
},
],
cxUrl: "/rycj/selectRyxxList",
Menu: [
......
......@@ -8,9 +8,13 @@
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
ref="rightContent"
@add="add"
@toInfor="toInfor"
>
<template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
<template #btnGroup="scope">
<span
v-if="scope.scope.row.sfkfk == '1'"
......@@ -42,8 +46,12 @@
@click="toDb(scope.scope)"
>督办合并研判</span
>
<!-- v-if="scope.scope.row.sfkfk == 1" -->
<span class="hbyp" @click="toFk(scope.scope)">反馈合并研判</span>
<span
v-if="scope.scope.row.sfkfk == 1"
class="hbyp"
@click="toFk(scope.scope)"
>反馈合并研判</span
>
<span class="hbyp" @click="toCbyp(scope.scope)">串并研判</span>
<span class="hbyp" @click="toXdzl(scope.scope)">下达指令</span>
<span
......@@ -1217,4 +1225,19 @@ export default {
.black {
color: black;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
......@@ -11,7 +11,7 @@
class="demo-ruleForm login-page"
>
<div>
<div style="position: absolute; top: -35px; left: 166px">
<!-- <div style="position: absolute; top: -35px; left: 166px">
<img src="../../assets/img/login/jinhui.png" alt="" />
</div>
<div style="text-align: center">
......@@ -20,7 +20,7 @@
alt=""
style="margin-top: 25px"
/>
</div>
</div> -->
</div>
<div
......
......@@ -55,18 +55,6 @@
</el-table-column>
<el-table-column prop="mxms" label="模型描述" width="200">
</el-table-column>
<el-table-column prop="mxsrCsmc" label="模型输入参数名称" width="200">
</el-table-column>
<el-table-column prop="mxsrCslx" label="模型输入参数类型" width="200">
</el-table-column>
<el-table-column prop="mxsrCsms" label="模型输入参数描述" width="200">
</el-table-column>
<el-table-column prop="mxscCsmc" label="模型输出参数名称" width="200">
</el-table-column>
<el-table-column prop="mxscCslx" label="模型输出参数类型" width="200">
</el-table-column>
<el-table-column prop="mxscCsms" label="模型输出参数描述" width="200">
</el-table-column>
<el-table-column prop="jszy" label="计算资源" width="200">
</el-table-column>
<el-table-column prop="cyyw" label="参与业务" width="200">
......
......@@ -56,23 +56,11 @@
</el-table-column>
<el-table-column prop="mxms" label="模型描述" width="200">
</el-table-column>
<el-table-column prop="mxsrCsmc" label="模型输入_参数名称" width="200">
</el-table-column>
<el-table-column prop="mxsrCslx" label="模型输入_参数类型" width="200">
</el-table-column>
<el-table-column prop="mxsrCsms" label="模型输入_参数描述" width="200">
</el-table-column>
<el-table-column prop="mxscCsmc" label="模型输出_参数名称" width="200">
</el-table-column>
<el-table-column prop="mxscCslx" label="模型输出_参数类型" width="200">
</el-table-column>
<el-table-column prop="mxscCsms" label="模型输出_参数描述" width="200">
</el-table-column>
<el-table-column prop="jszy" label="计算资源" width="200">
</el-table-column>
<el-table-column prop="cyyw" label="参与业务" width="200">
</el-table-column>
<el-table-column fixed="right" prop="sffb" label="操作" width="300">
<el-table-column fixed="right" prop="sffb" label="操作" width="350">
<template slot-scope="scope">
<el-button type="text" @click="showGxlfxDialog('yw', scope)"
>业务贡献率分析</el-button
......@@ -80,6 +68,9 @@
<el-button type="text" @click="showGxlfxDialog('fz', scope)"
>辅助决策贡献率分析</el-button
>
<el-button type="text" @click="toQueryMxlbReport( scope)"
>生成报告</el-button
>
</template>
</el-table-column>
</el-table>
......@@ -227,9 +218,8 @@ export default {
this.value = num / arr.length;
},
submitPj() {
debugger;
insertTbYwWjpjwszx({
mxmc: this.scoppes.row.mxmc,
sfmc: this.scoppes.row.mxmc,
mxclzxXxzjbh: this.scoppes.row.xxzjbh,
dw: this.dw.unitcode,
pjf: this.value,
......@@ -255,8 +245,14 @@ export default {
});
console.log("res", this.gxlfxList);
},
toQueryMxlbReport(scoppe){
console.log(scoppe);
this.$router.push({
path:'/queryMxlbReport',
query:{xxzjbh:scoppe.row.xxzjbh}
})
},
showGxlfxDialog(type, scoppe) {
debugger;
var obj = JSON.parse(sessionStorage.getItem("userInfo"));
if (type == "yw") {
this.types = "1";
......
......@@ -7,15 +7,21 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
:tableOperation="true"
@selectionChange="selectionChange"
ref="rightContent"
>
<template #listOperation="scope">
<el-button size="small" @click="DBFX(scope.scope,'阶段性对比分析')">阶段性对比分析</el-button>
<el-button size="small" @click="DBFX(scope.scope,'单位对比分析')">单位对比分析</el-button>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="toXq(scope.scope)">查看详情</span>
<!-- <span class="hbyp" @click="toWjpj(scope.scope)">微决评价</span> -->
</template>
</right-content>
<el-dialog title="详情信息" :visible.sync="dialogFormVisible" width="60%">
<div style="margin: 20px;height: 374px;overflow-y: scroll;" v-loading="loading">
<div style="margin: 20px;height: 374px;" v-loading="loading">
<el-table :data="tableData" border style="width: 100%">
<el-table-column
v-for="(item, index) in tableData1"
......@@ -57,12 +63,27 @@
</div>
</div>
</el-dialog>
<el-dialog :title="DBFXSHOWTITLE" :visible.sync="DBFXSHOW" width="60%">
<div class="block_fzjcgxlfx" style="width: 400px;margin: 20px;display: flex;justify-content: space-between">
<el-date-picker
v-model="value1"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-button size="mini" style="margin-left: 20px;" @click="getDate">查询</el-button>
</div>
<div v-if="DBFXSHOW" id="charts" ref="charts" ></div>
</el-dialog>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { pageTbYwWjpjckxq } from "@/api/fzjc.js";
import { pageTbYwWjpjckxq,queryJdswjpj } from "@/api/fzjc.js";
export default {
name: "queryHbyp",
components: {
......@@ -70,12 +91,19 @@
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
selectedId:[],
loading: false,
value1: [],
tableData: [],
dwss: "",
page: 1,
limit: 5,
pflx: 1,
pflx: 2,
tableDataLength: 0,
tableData1: [
{
......@@ -139,6 +167,8 @@
pjForm: {},
value: 0,
dialogFormVisible: false,
DBFXSHOW: false,
DBFXSHOWTITLE: '',
colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
dialogFormVisiblePj: false,
formLabelWidth: "130px",
......@@ -161,33 +191,23 @@
},
],
header: "微决评价完善中心",
pageBs: "queryWjpj",
pageBs: "fzjcgxlfx",
cxFormData: {
limit: 10,
page: 1,
mxmc: "",
sfmc: "",
dw: "",
pflx:'2'
},
cxQueryField: [
{
name: "模型名称",
id: "mxmc",
id: "sfmc",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "单位",
id: "dw",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
value: "",
col: "3",
codeOptions: [],
codeTree: "CODE_UNIT",
},
],
cxDefaultFormThead: [
{
......@@ -246,12 +266,69 @@
},
fileArr: [],
zdXxzjbh: "",
gllx: "",
};
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
},
methods: {
getDate(){
this.DBFX(1,this.DBFXSHOWTITLE )
},
selectionChange(row){
this.selectedId = [];
row.forEach((item) => {
this.selectedId.push(item.xxzjbh);
});
},
DBFX(i,t){
this.DBFXSHOWTITLE =t;
this.DBFXSHOW = true;
let fxFlag='';
if(t==='阶段性对比分析'){fxFlag=1} else {fxFlag=2};
let kssj,jssj,xxzjbhList;
if(this.value1){kssj=this.value1[0];jssj=this.value1[1];}
if(this.selectedId.length){xxzjbhList = this.selectedId.toString()}
queryJdswjpj({
pflx:this.cxFormData.pflx,
fxFlag:fxFlag,kssj,jssj,xxzjbhList})
.then(res=>{
if( res.code===200){
let rows = res.data.rows;
let jdPjf = [];
let mxmc = [];
rows.find((v)=>{
jdPjf.push(v['jdPjf']);
mxmc.push(v['mxmc'])
})
let myChart = this.$echarts.init(this.$refs.charts);
let option = {
xAxis: {
type: 'category',
data: mxmc
},
yAxis: {
type: 'value'
},
series: [
{
data: jdPjf,
type: 'bar',
showBackground: true,
backgroundStyle: {
color: 'rgba(180, 180, 180, 0.2)'
}
}
]
};
myChart.setOption(option)
}
})
},
handleSizeChange(val) {
this.limit = val;
this.getZbzzList();
......@@ -263,16 +340,18 @@
// 详情
toXq(scope) {
this.dialogFormVisible = true;
this.dwss = scope.row.mxmc;
this.dwss = scope.row.sfmc;
this.gllx = scope.row.gllx;
this.getZbzzList();
},
getZbzzList() {
this.loading = true;
pageTbYwWjpjckxq({
mxmc: this.dwss,
sfmc: this.dwss,
page: this.page,
limit: this.limit,
pflx: this.pflx,
gllx: this.gllx,
}).then((res) => {
this.tableData = res.data.rows;
this.loading = false;
......@@ -347,6 +426,11 @@
.Content .el-date-editor--daterange.el-input__inner {
width: 100% !important;
}
.rightContent .el-input__icon, #formCommonPage .el-input__icon, .el-input__suffix-inner{
display: flex;
flex-direction: column;
justify-content: center;
}
</style>
<style scoped lang="scss">
.el-form-item {
......@@ -385,4 +469,9 @@
/deep/.el-select.el-select--mini {
width: 100px;
}
#charts {
background-color: #fff;
width: 100%;
height: 400px;
}
</style>
......@@ -7,15 +7,21 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
:tableOperation="true"
@selectionChange="selectionChange"
ref="rightContent"
>
<template #listOperation="scope">
<el-button size="small" @click="DBFX(scope.scope,'阶段性对比分析')">阶段性对比分析</el-button>
<el-button size="small" @click="DBFX(scope.scope,'单位对比分析')">单位对比分析</el-button>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="toXq(scope.scope)">查看详情</span>
<!-- <span class="hbyp" @click="toWjpj(scope.scope)">微决评价</span> -->
</template>
</right-content>
<el-dialog title="详情信息" :visible.sync="dialogFormVisible" width="60%">
<div style="margin: 20px;height: 374px;overflow-y: scroll;" v-loading="loading">
<div style="margin: 20px;height: 374px;" v-loading="loading">
<el-table :data="tableData" border style="width: 100%">
<el-table-column
v-for="(item, index) in tableData1"
......@@ -57,12 +63,28 @@
</div>
</div>
</el-dialog>
<el-dialog :title="DBFXSHOWTITLE" :visible.sync="DBFXSHOW" width="60%">
<div class="block_fzjcgxlfx" style="width: 400px;margin: 20px;display: flex;justify-content: space-between">
<el-date-picker
v-model="value1"
:picker-options="pickerOptions"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-button size="mini" style="margin-left: 20px;" @click="getDate">查询</el-button>
</div>
<div v-if="DBFXSHOW" id="charts" ref="charts" ></div>
</el-dialog>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { pageTbYwWjpjckxq } from "@/api/fzjc.js";
import { pageTbYwWjpjckxq,queryJdswjpj } from "@/api/fzjc.js";
export default {
name: "queryHbyp",
components: {
......@@ -70,7 +92,14 @@
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
selectedId:[],
loading: false,
value1: [],
tableData: [],
dwss: "",
page: 1,
......@@ -139,6 +168,8 @@
pjForm: {},
value: 0,
dialogFormVisible: false,
DBFXSHOW: false,
DBFXSHOWTITLE: '',
colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
dialogFormVisiblePj: false,
formLabelWidth: "130px",
......@@ -161,33 +192,23 @@
},
],
header: "微决评价完善中心",
pageBs: "queryWjpj",
pageBs: "fzjcgxlfx",
cxFormData: {
limit: 10,
page: 1,
mxmc: "",
sfmc: "",
dw: "",
pflx:'1'
},
cxQueryField: [
{
name: "模型名称",
id: "mxmc",
id: "sfmc",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "单位",
id: "dw",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
value: "",
col: "3",
codeOptions: [],
codeTree: "CODE_UNIT",
},
],
cxDefaultFormThead: [
{
......@@ -246,12 +267,70 @@
},
fileArr: [],
zdXxzjbh: "",
gllx: "",
};
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
},
methods: {
getDate(){
this.DBFX(1,this.DBFXSHOWTITLE )
console.log(this.value1);
},
selectionChange(row){
this.selectedId = [];
row.forEach((item) => {
this.selectedId.push(item.xxzjbh);
});
},
DBFX(i,t){
this.DBFXSHOWTITLE =t;
this.DBFXSHOW = true;
let fxFlag='';
if(t==='阶段性对比分析'){fxFlag=1} else {fxFlag=2};
let kssj,jssj,xxzjbhList;
if(this.value1){kssj=this.value1[0];jssj=this.value1[1];}
if(this.selectedId.length){xxzjbhList = this.selectedId.toString()}
queryJdswjpj({
pflx:this.cxFormData.pflx,
fxFlag:fxFlag,kssj,jssj,xxzjbhList})
.then(res=>{
if( res.code===200){
let rows = res.data.rows;
let jdPjf = [];
let mxmc = [];
rows.find((v)=>{
jdPjf.push(v['jdPjf']);
mxmc.push(v['mxmc'])
})
let myChart = this.$echarts.init(this.$refs.charts);
let option = {
xAxis: {
type: 'category',
data: mxmc
},
yAxis: {
type: 'value'
},
series: [
{
data: jdPjf,
type: 'bar',
showBackground: true,
backgroundStyle: {
color: 'rgba(180, 180, 180, 0.2)'
}
}
]
};
myChart.setOption(option)
}
})
},
handleSizeChange(val) {
this.limit = val;
this.getZbzzList();
......@@ -263,16 +342,18 @@
// 详情
toXq(scope) {
this.dialogFormVisible = true;
this.dwss = scope.row.mxmc;
this.dwss = scope.row.sfmc;
this.gllx = scope.row.gllx;
this.getZbzzList();
},
getZbzzList() {
this.loading = true;
pageTbYwWjpjckxq({
mxmc: this.dwss,
sfmc: this.dwss,
page: this.page,
limit: this.limit,
pflx: this.pflx,
gllx: this.gllx,
}).then((res) => {
this.tableData = res.data.rows;
this.loading = false;
......@@ -347,6 +428,11 @@
.Content .el-date-editor--daterange.el-input__inner {
width: 100% !important;
}
.rightContent .el-input__icon, #formCommonPage .el-input__icon, .el-input__suffix-inner{
display: flex;
flex-direction: column;
justify-content: center;
}
</style>
<style scoped lang="scss">
.el-form-item {
......@@ -385,4 +471,9 @@
/deep/.el-select.el-select--mini {
width: 100px;
}
#charts {
background-color: #fff;
width: 100%;
height: 400px;
}
</style>
......@@ -21,7 +21,8 @@
import { selectHmzpList} from "@/api/dswtz/hmxx.js";
// import { DnabzrwSaveDswDnabzrw } from "@/api/dswtz/bzxx";
import { saveYstrDcbzrw } from "@/api/xscxbd/ajbd";
// import { saveYstrDcbzrw } from "@/api/xscxbd/ajbd";
import { saveYstrDcbzrw } from "@/api/xscxbd/rybd";
export default {
name: "addryxx",
props:{
......@@ -44,7 +45,7 @@
data: [
{
name: "ystr编号:",
id: "dnabh",
id: "ystrbh",
type: "text",
value: "",
placeholder: "请输入",
......@@ -84,7 +85,7 @@
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
saveYstrbzrw(params).then(res=>{
saveYstrDcbzrw(params).then(res=>{
if(res.code){
loading.close()
this.$router.go(-1)
......
......@@ -44,7 +44,7 @@
data: [
{
name: "ystr编号:",
id: "dnabh",
id: "ystrbh",
type: "text",
value: "",
placeholder: "请输入",
......
......@@ -21,7 +21,7 @@
import { selectHmzpList} from "@/api/dswtz/hmxx.js";
import { ZjccbzrwSaveRxbzrw } from "@/api/dswtz/bzxx";
import { saveZjbzDcrw } from "@/api/xscxbd/rybd";
import { saveZjbzDcrw } from "@/api/xscxbd/rybd";
export default {
name: "addryxx",
props:{
......@@ -34,7 +34,7 @@
return {
loading: true,
fileBase64:{},
title: "添加指纹比中",
title: "添加足迹比中",
propFormField: [
{
title: "",
......@@ -136,7 +136,7 @@
},
created() {
if (this.$route.query.rybh) {
this.title = "添加指纹比中";
this.title = "添加足迹比中";
this.rybh = this.$route.query.rybh;
this.getshuju();
}
......
......@@ -29,22 +29,21 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Dnabzrw/getDnarwList"
cxUrl="/Dnabzrw/selectBzbJglist"
@add="add1"
@toInfor="toInfor"
ref="rightContent1"
>
<template #btnGroup="scope">
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button> -->
<!-- <template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
</template>
</template> -->
</right-content>
</el-drawer>
</div>
......@@ -80,6 +79,15 @@
},
cxQueryField: [
{
name: "类型",
id: "yxxType",
type: "codeTreeDialog",
props: [],
value: "",
col: "3",
codeOptions: [{label: "DNA编号", id: 'DNA编号'},{label: "证件号码", id: '证件号码'},{label: "案件编号", id: '案件编号'}],
},
{
name: "源信息",
id: "dnabh",
type: "text",
......
......@@ -11,14 +11,15 @@
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@add="add"
ref="rightContent"
:transformFormTable="transformFormTable"
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
......@@ -28,21 +29,25 @@
direction="rtl"
size="90%">
<right-content
destroy-on-close
:tableOperation="tableOperation"
:tableOperationWidth="300"
:tableOperationWidth="100"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Dnabzrw/selectRyJglist"
@add="add1"
ref="rightContent1"
:transformFormTable="transformFormTable"
>
<!-- <template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
</template> -->
<template #btnGroup="scope">
<el-button @click="iamSure(scope.scope)" type="text">认 定</el-button>
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button> -->
<!-- <el-button @click="edit1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button> -->
</template>
</right-content>
</el-drawer>
</div>
......@@ -52,7 +57,9 @@
import rightContent from "@c/ptCxForm_components.vue";
// import {leftMenus} from "@p/dswtzxx/index.js";
import { DnabzrwUpdateDnabdById,dnabzhcDeleteDnabzjgById,DnabzrwDeleteDnarwById } from "@/api/dswtz/bzxx";
import {bdzt} from "@/assets/js/transformFormTable.js";
import {bdzt, rdbs} from "@/assets/js/transformFormTable.js";
import { post } from "@/utils/http.js";
import url from "@/api/base";
export default {
name: "lbxx",
components: {
......@@ -60,7 +67,7 @@
},
data() {
return {
transformFormTable: {bdzt},
transformFormTable: {bdzt, rdbs},
table: false,
gridData: [],
tableOperation:true,
......@@ -78,7 +85,7 @@
},
cxQueryField: [
{
name: "DNA编号",
name: "源信息",
id: "dnabh",
type: "text",
props: "checkEmpty",
......@@ -88,27 +95,30 @@
},
],
cxDefaultFormThead: [
{label: "DNA编号", prop: "dnabh"},
{label: "源信息", prop: "dnabh"},
{label: "建立时间", prop: "djsj"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
{label: "人员编号", prop: "asjxgrybh"},
{label: "Dna编号", prop: "rydnabh", width: '280'},
{label: "人员编号", prop: "asjxgrybh", width: '280'},
{label: "姓名", prop: "xm"},
{label: "别名", prop: "bmch"},
{label: "证件类型", prop: "cyzjCyzjmc"},
{label: "证件号码", prop: "cyzjZjhm"},
{label: "性别", prop: "xbdmStr"},
{label: "出生日期", prop: "csrq"},
{label: "国籍", prop: "gjdmStr"},
{label: "民族", prop: "mzdmStr"},
{label: "籍贯", prop: "jgdmStr"},
{label: "政治面貌", prop: "zzmmdmStr"},
{label: "学历", prop: "xldmStr"},
{label: "认定标识", prop: "rdbs"},
// {label: "国籍", prop: "gjdmStr"},
// {label: "民族", prop: "mzdmStr"},
// {label: "籍贯", prop: "jgdmStr"},
// {label: "政治面貌", prop: "zzmmdmStr"},
// {label: "学历", prop: "xldmStr"},
],
// 需要转化table的显示
cxUrl: "/Dnabzrw/getDnaHcrwList",
rdUrl: '/Dnabzrw/updateDnabdrdById',
Menu: [
{
id: "bdmbXxzjbh",
......@@ -257,6 +267,17 @@
})
},
// 认定操作
iamSure(obj) {
console.log('obj', obj)
post(`${url.alyIP}${this.rdUrl}`, {xxzjbh:obj.row.xxzjbh}).then(
(res) => {
if (res.success) {
this.$refs.rightContent1.doQuery("yes");
}
}
);
}
},
mounted() {},
};
......
......@@ -34,8 +34,6 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData1"
......@@ -45,11 +43,11 @@
@toInfor="toInfor"
ref="rightContent1"
>
<template #btnGroup="scope">
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit 1(scope.scope)" type="text">修改</el-button> -->
<!-- <template #btnGroup="scope">
<el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit 1(scope.scope)" type="text">修改</el-button>
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
</template>
</template> -->
</right-content>
</el-drawer>
......
......@@ -35,20 +35,23 @@
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:tableOperationWidth="100"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Zwbzrw/selectBzbJglist"
cxUrl="/Zwbzrw/selectRyJglist"
@add="add1"
@toInfor="toInfor"
ref="rightContent1"
:transformFormTable="transformFormTable"
>
<template #btnGroup="scope">
<el-button @click="iamSure(scope.scope)" type="text">认 定</el-button>
<!-- <el-button @click="dele1(scope.scope)" type="text">删除</el-button>
<el-button @click="edit 1(scope.scope)" type="text">修改</el-button> -->
<el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button>
<!-- <el-button @click="toSwtzxxgl(scope.scope)" type="text">生物特征信息管理</el-button> -->
</template>
</right-content>
......@@ -60,7 +63,9 @@
import rightContent from "@c/ptCxForm_components.vue";
import {leftMenus} from "@p/dswtzxx/index.js";
import { updateZwbdById,deleteZwbzjgById,deleteZjcbrwById } from "@/api/dswtz/bzxx";
import {bdzt} from "@/assets/js/transformFormTable.js";
import {bdzt, rdbs} from "@/assets/js/transformFormTable.js";
import { post } from "@/utils/http.js";
import url from "@/api/base";
export default {
name: "lbxx",
components: {
......@@ -71,7 +76,7 @@
tableColumnDefinition:[
{label:'源信息', prop:'zwbh',spare:'zpDzwjnr'}
],
transformFormTable: {bdzt},
transformFormTable: {bdzt, rdbs},
table: false,
gridData: [],
tableOperation:true,
......@@ -176,10 +181,12 @@
{
label: "指纹编号",
prop: "zwbh",
width: '280'
},
{
label: "人员编号",
prop: "asjxgrybh",
width: '280'
},
{
label: "姓名",
......@@ -212,6 +219,7 @@
],
// 需要转化table的显示
cxUrl: "/Zwbzrw/getZwrwHcList",
rdUrl: '/Zwbzrw/updateZwbdrdById',
Menu: [
{
id: "bdmbXxzjbh",
......@@ -375,6 +383,21 @@
})
window.open(routeUrl.href, '_blank')
},
// 认定操作
iamSure(obj) {
console.log('obj', obj)
const param = {
xxzjbh: obj.row.xxzjbh,
glxxzjbh: this.xxzjbh
}
post(`${url.alyIP}${this.rdUrl}`, param).then(
(res) => {
if (res.success) {
this.$refs.rightContent1.doQuery("yes");
}
}
);
}
},
mounted() {},
};
......
......@@ -67,7 +67,7 @@
:table="table"
:rxcc="rxcc"
cxUrl="/Rxbzrw/selectJglist"
cxUrl2="/Rxbzrw/selectDetain"
cxUrl2="/Rxccbzrw/selectDetain"
cxUrl3='/Rxbzrw/updateRxbdrdById'
cxUrl4='/Rxbzrw/selectRdJglist'>
</compare-info>
......@@ -77,9 +77,10 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteRxcbrwById,updateRxbdById,selectJglist,deleteRxbz } from "@/api/dswtz/bzxx";
import { updateRxbdById,selectJglist,deleteRxbz } from "@/api/dswtz/bzxx";
import { deleteRyzpById } from "@/api/dswtz/rxxx.js";
import {bdzt} from "@/assets/js/transformFormTable.js";
import { deleteRxcbrwById } from "@/api/xscxbd/ajbd.js";
// import {leftMenus} from "@p/dswtzxx/index.js";
import compareInfo from "@c/compareInfo.vue";
export default {
......
......@@ -17,8 +17,8 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
......@@ -28,13 +28,12 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Ystrbzrw/selectRyJglist"
cxUrl="/Ystrbzrw/selectSaJglist"
@add="add1"
ref="rightContent1"
>
......@@ -53,7 +52,7 @@
// import {leftMenus} from "@p/dswtzxx/index.js";
import { DnabzrwUpdateDnabdById,dnabzhcDeleteDnabzjgById,DnabzrwDeleteDnarwById } from "@/api/dswtz/bzxx";
import {bdzt} from "@/assets/js/transformFormTable.js";
import { updateYstrbdById } from "@/api/xscxbd/rybd";
import { updateYstrbdById, deleteYstrrwById } from "@/api/xscxbd/rybd";
export default {
name: "lbxx",
components: {
......@@ -80,7 +79,7 @@
cxQueryField: [
{
name: "ystr编号",
id: "dnabh",
id: "ystrbh",
type: "text",
props: "checkEmpty",
value: "",
......@@ -89,24 +88,29 @@
},
],
cxDefaultFormThead: [
{label: "ystr编号", prop: "dnabh"},
{label: "ystr编号", prop: "ystrbh"},
{label: "建立时间", prop: "djsj"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
{label: "人员编号", prop: "asjxgrybh"},
{label: "姓名", prop: "xm"},
{label: "别名", prop: "bmch"},
{label: "证件类型", prop: "cyzjCyzjmc"},
{label: "证件号码", prop: "cyzjZjhm"},
{label: "性别", prop: "xbdmStr"},
{label: "出生日期", prop: "csrq"},
{label: "国籍", prop: "gjdmStr"},
{label: "民族", prop: "mzdmStr"},
{label: "籍贯", prop: "jgdmStr"},
{label: "政治面貌", prop: "zzmmdmStr"},
{label: "学历", prop: "xldmStr"},
// {label: "人员编号", prop: "asjxgrybh"},
// {label: "姓名", prop: "xm"},
// {label: "别名", prop: "bmch"},
// {label: "证件类型", prop: "cyzjCyzjmc"},
// {label: "证件号码", prop: "cyzjZjhm"},
// {label: "性别", prop: "xbdmStr"},
// {label: "出生日期", prop: "csrq"},
// {label: "国籍", prop: "gjdmStr"},
// {label: "民族", prop: "mzdmStr"},
// {label: "籍贯", prop: "jgdmStr"},
// {label: "政治面貌", prop: "zzmmdmStr"},
// {label: "学历", prop: "xldmStr"},
{label: "案件编号", prop: "asjbh"},
{label: "现勘编号", prop: "xkbh"},
{label: "案件名称", prop: "ajmc"},
{label: "案件类别", prop: "ajlb"},
{label: "简要案情", prop: "jyaq"}
],
// 需要转化table的显示
cxUrl: "/Ystrbzrw/getYstrDcrwList",
......@@ -167,7 +171,7 @@
type: "warning",
})
.then(() => {
DnabzrwDeleteDnarwById({
deleteYstrrwById({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
......
......@@ -17,8 +17,8 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
......@@ -28,9 +28,8 @@
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
......@@ -81,7 +80,7 @@
cxQueryField: [
{
name: "ystr编号",
id: "dnabh",
id: "ystrbh",
type: "text",
props: "checkEmpty",
value: "",
......@@ -90,7 +89,7 @@
},
],
cxDefaultFormThead: [
{label: "ystr编号", prop: "dnabh"},
{label: "ystr编号", prop: "ystrbh"},
{label: "建立时间", prop: "djsj"},
{label: "比中状态", prop: "bdzt"},
{label: "登录姓名", prop: "xxdjryXm"},
......@@ -110,7 +109,7 @@
{label: "学历", prop: "xldmStr"},
],
// 需要转化table的显示
cxUrl: "Ystrbzrw/getYstrHcrwList",
cxUrl: "/Ystrbzrw/getYstrHcrwList",
Menu: [
{
id: "bdmbXxzjbh",
......
......@@ -18,25 +18,26 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
<el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button>
<el-button v-if="scope.scope.row.bdzt=='比对结果'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
<!-- <el-button @click="zwbd(scope.scope)" type="text">指纹比对</el-button> -->
<el-button v-if="scope.scope.row.bdzt=='已比对' || scope.scope.row.bdzt=='已认定'" @click="bjjg(scope.scope)" type="text">比对结果</el-button>
</template>
</right-content>
<el-drawer
destroy-on-close
:with-header="false"
:visible.sync="table"
direction="rtl"
size="90%">
<right-content
:tableOperation="tableOperation"
:tableOperationWidth="300"
:pageBs="pageBs"
pageASs="nonewAdd"
:header="header"
:cxFormData="cxFormData1"
:cxDefaultFormThead="cxDefaultFormThead1"
cxUrl="/Zjccbzrw/selectRyJglist"
cxUrl="/Zjccbzrw/selectBzbJglist"
@add="add1"
@toInfor="toInfor"
ref="rightContent1"
>
<!-- <template #btnGroup="scope">
......@@ -98,26 +99,35 @@
{label: "登录姓名", prop: "xxdjryXm"},
],
cxDefaultFormThead1: [
{label: "人员编号", prop: "asjxgrybh"},
// {label: "人员编号", prop: "asjxgrybh"},
// {label: "姓名", prop: "xm"},
// {label: "别名", prop: "bmch"},
// {label: "证件类型", prop: "cyzjCyzjmc"},
// {label: "证件号码", prop: "cyzjZjhm"},
// {label: "性别", prop: "xbdmStr"},
// {label: "出生日期", prop: "csrq"},
// {label: "国籍", prop: "gjdmStr"},
// {label: "民族", prop: "mzdmStr"},
// {label: "籍贯", prop: "jgdmStr"},
// {label: "政治面貌", prop: "zzmmdmStr"},
// {label: "学历", prop: "xldmStr"},
// {label: "相似度", prop: "similarity"},
{label: "信息主键", prop: "xxzjbh", toInfor: true, width: "300"},
{label: "姓名", prop: "xm"},
{label: "别名", prop: "bmch"},
{label: "证件类型", prop: "cyzjCyzjmc"},
{label: "证件号码", prop: "cyzjZjhm"},
{label: "性别", prop: "xbdmStr"},
{label: "出生日期", prop: "csrq"},
{label: "国籍", prop: "gjdmStr"},
{label: "民族", prop: "mzdmStr"},
{label: "籍贯", prop: "jgdmStr"},
{label: "政治面貌", prop: "zzmmdmStr"},
{label: "学历", prop: "xldmStr"},
{label: "相似度", prop: "similarity"},
{label: "公民身份号码", prop: "sfzh"},
{label: "案件编号", prop: "asjbh"},
{label: "现勘编号", prop: "xkbh"},
{label: "案件名称", prop: "ajmc"},
{label: "案件类别", prop: "ajlb"},
{label: "比中单位", prop: "bzdw"},
{label: "比中时间", prop: "bzsj"}
],
// 需要转化table的显示
cxUrl: "/Zjccbzrw/getRxDcrwList",
Menu: [
{
id: "bdmbXxzjbh",
label: "人员足迹涉案倒查",
label: "足迹比中信息",
index: "wfqdzczl",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -225,10 +235,17 @@
},
toSwtzxxgl(i){
this.$router.push({
path:'/swtzxxgl',
query:{rybh:i.row.asjxgrybh}
// this.$router.push({
// path:'/swtzxxgl',
// query:{rybh:i.row.asjxgrybh}
// })
let routeUrl = this.$router.resolve({
path: "/swtzxxgl",
query: {
rybh: i.row.rybh
},
})
window.open(routeUrl.href, '_blank')
},
zwbd(scope){
let self = this
......@@ -262,6 +279,15 @@
})
},
toInfor(obj) {
let routeUrl = this.$router.resolve({
path: "/detailXczjdc",
query: {
xxzjbh: obj.xxzjbh,
},
})
window.open(routeUrl.href, '_blank')
},
},
mounted() {},
};
......
......@@ -9,13 +9,15 @@
:cxUrl="cxUrl"
@toInfor="toInfor"
:pageASs='pageASs'
@add="add"
@selectionChange="selectionChange"
ref="rightContent"
>
<template #listOperation="scope">
<span class="hbyps" @click="toSb(scope.scope)">上报</span>
<span class="hbyps" @click="toXf(scope.scope)">下发</span>
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="xsFk(scope.scope)">线索反馈</span>
......
......@@ -631,12 +631,20 @@ export default {
},
{
id: "xsbk",
label: "线索布控",
label: "我发起的线索布控",
index: "xsbk",
auth: "M01",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
{
id: "xsbksp",
label: "我审批的线索布控",
index: "xsbksp",
auth: "M01",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
],
selectArr: [],
revokeVisiable: false,
......
......@@ -20,11 +20,7 @@
<script>
import formCompontent from "@c/form.vue";
import {
addBkxx,
updateBkxx,
getBkxxByXxzjbh,
} from "@/api/xshb/xsbk.js";
import { addBkxx, updateBkxx, getBkxxByXxzjbh } from "@/api/xshb/xsbk.js";
export default {
name: "adjustXsbks",
components: {
......@@ -41,15 +37,15 @@ export default {
objStr: "",
index: 0,
data: [
{
name: "线索编号:",
id: "xsbh",
type: "text",
value: "",
prop: "checkEmpty",
placeholder: "请输入",
col: "2",
},
// {
// name: "线索编号:",
// id: "xsbh",
// type: "text",
// value: "",
// prop: "checkEmpty",
// placeholder: "请输入",
// col: "2",
// },
{
name: "布控对象类型:",
id: "bkdxLxdm",
......@@ -156,7 +152,7 @@ export default {
disabled: false,
},
],
xxzjbh:'',//信息主键编号
xxzjbh: "", //信息主键编号
};
},
methods: {
......@@ -177,20 +173,66 @@ export default {
},
//新增保存
addSubmit(params, loading) {
params.append(
"glxxlx",
this.$route.query.glxxlx ? this.$route.query.glxxlx : "0001"
);
params.append(
"glxxXxzjbh",
this.$route.query.glxxXxzjbh ? this.$route.query.glxxXxzjbh : ""
);
addBkxx(params).then((res) => {
if (res.success && res.code == 200) {
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
loading.close();
this.$router.push("/xsbk");
sessionStorage.setItem("routerPath", "xsbk");
setTimeout(() => {
this.$bus.$emit("routerPath");
}, 20);
},
});
if (res.data.flag == 1) {
this.$confirm(`${res.data.result}`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
params.append("saveFlag", "true");
addBkxx(params).then((res) => {
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
loading.close();
this.$router.push("/xsbk");
sessionStorage.setItem("routerPath", "xsbk");
setTimeout(() => {
this.$bus.$emit("routerPath");
}, 20);
},
});
});
})
.catch(() => {
loading.close();
this.$message({
type: "info",
message: "已取消重新布控",
});
});
} else if (res.data.flag == 2) {
this.$message({
type: "error",
message: `${res.data.result}`,
});
loading.close();
} else if (res.data.flag == 0) {
this.$alert("保存成功!", "提示", {
confirmButtonText: "确定",
type: "success",
callback: () => {
loading.close();
this.$router.push("/xsbk");
sessionStorage.setItem("routerPath", "xsbk");
setTimeout(() => {
this.$bus.$emit("routerPath");
}, 20);
},
});
}
} else {
loading.close();
}
......@@ -279,24 +321,20 @@ export default {
},
created() {
if (this.$route.query.xxzjbh) {
this.title = "修改线索布控信息";
this.title = "修改我发起的线索布控信息";
this.xxzjbh = this.$route.query.xxzjbh;
this.getshuju();
}else{
//新增时,需要回显登录人的信息
let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
this.propFormField[0].data.forEach(el=>{
let value = '';
if(el.id == 'sqrLxdh') value = userInfo.phone
if(el.id == 'sqrJh') value = userInfo.account
if(el.id == 'sqrZjhm') value = userInfo.identitycard
if(el.id == 'sqrXm') value = userInfo.realname
this.$set(
this.formLabelAlign,
el.id,
value
);
})
} else {
//新增时,需要回显登录人的信息
let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
this.propFormField[0].data.forEach((el) => {
let value = "";
if (el.id == "sqrLxdh") value = userInfo.phone;
if (el.id == "sqrJh") value = userInfo.account;
if (el.id == "sqrZjhm") value = userInfo.identitycard;
if (el.id == "sqrXm") value = userInfo.realname;
this.$set(this.formLabelAlign, el.id, value);
});
}
},
};
......
......@@ -37,14 +37,14 @@ export default {
id: 1,
objStr: "", //对象中的对应字段
data: [
{
label: "线索编号:",
prop: "xsbh",
col: "3",
},
// {
// label: "线索编号:",
// prop: "xsbh",
// col: "3",
// },
{
label: "布控对象类型:",
prop: "bkdxLxdm",
prop: "bkdxLxdmStr",
col: "3",
},
{
......
......@@ -17,29 +17,59 @@
</template>
<template #btnGroup="scope">
<span
v-if="scope.scope.row.bkzt == '01' || scope.scope.row.bkzt == '03'"
v-if="
scope.scope.row.bkzt == '0' &&
(scope.scope.row.spjgPdbz == '3' || scope.scope.row.spjgPdbz == '2')
"
class="hbyp"
@click="edit(scope.scope)"
>修改</span
>
<span
v-if="scope.scope.row.bkzt == '01'"
v-if="
scope.scope.row.bkzt == '0' &&
(scope.scope.row.spjgPdbz == '3' || scope.scope.row.spjgPdbz == '2')
"
class="hbyp"
@click="dele(scope.scope)"
>删除</span
>
<span
v-if="scope.scope.row.bkzt == '1'"
class="hbyp"
@click="toCk(scope.scope)"
>撤控</span
>
<span
v-if="scope.scope.row.bkzt == '01'"
<!-- <span
v-if="scope.scope.row.bkzt == '0' && scope.scope.row.spjgPdbz == '0'"
class="hbyp"
@click="toXXSP(scope.scope)"
>审批</span
>
> -->
<span
v-if="scope.scope.row.bkzt == '02'"
v-if="
(scope.scope.row.bkzt == '1' || scope.scope.row.bkzt == '2') &&
scope.scope.row.sfybkjg == '1'
"
class="hbyp"
@click="toJGCX(scope.scope)"
>结果查询</span
>
<span
v-if="
scope.scope.row.bkzt == '0' &&
scope.scope.row.spjgPdbz != '0' && scope.scope.row.spjgPdbz != '1'
"
class="hbyp"
@click="tqsp(scope.scope)"
>提请审批</span
>
<span
v-if="scope.scope.row.bkzt == '0' && scope.scope.row.spjgPdbz == '0'"
class="hbyp"
@click="chsp(scope.scope)"
>撤回审批</span
>
</template>
</right-content>
</div>
......@@ -47,7 +77,14 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { backBkxx, bkxxSp, getTaskResult } from "@/api/xshb/xsbk.js";
import {
backBkxx,
bkxxSp,
getTaskResult,
deleteBkxx,
bkxxTqsp,
bkxxChsp,
} from "@/api/xshb/xsbk.js";
export default {
name: "xsbk",
components: {
......@@ -124,8 +161,8 @@ export default {
],
cxDefaultFormThead: [
{
label: "线索编号",
prop: "xsbh",
label: "信息主键编号",
prop: "xxzjbh",
toInfor: true,
width: "250",
},
......@@ -164,7 +201,7 @@ export default {
Menu: [
{
id: "xsbk",
label: "线索布控",
label: "我发起的线索布控",
index: "xsbk",
auth: "M0101",
className: "iconfont iconrizhi",
......@@ -183,6 +220,60 @@ export default {
this.$store.commit("user/SET_Menu", this.Menu);
},
methods: {
// 提请审批
tqsp(scope) {
this.$confirm("是否提请审批, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
bkxxTqsp({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "提请审批成功",
});
this.$refs.rightContent.doQuery("yes");
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消提请审批",
});
});
},
// 撤回审批
chsp(scope) {
this.$confirm("是否撤回审批, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
bkxxChsp({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "撤回审批成功",
});
this.$refs.rightContent.doQuery("yes");
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消撤回审批",
});
});
},
/**
* @description 新增
*/
......@@ -244,10 +335,12 @@ export default {
* @description 结果查询
*/
toJGCX(scope) {
debugger;
this.$router.pushToTab({
path: "/queryXsbkResult",
query: {
xxzjbh: scope.row.xxzjbh,
type: scope.row.bkdxLxdm,
},
});
},
......@@ -278,6 +371,33 @@ export default {
}
});
},
// 删除
dele(scope) {
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteBkxx({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
},
watch: {},
};
......
<template>
<div class="Content">
<right-content
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@toInfor="toInfor"
ref="rightContent"
>
<template #btnGroup="scope">
<span class="hbyp" @click="toXXSP(scope.scope)">审批</span>
</template>
</right-content>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import {
backBkxx,
bkxxSp,
getTaskResult,
deleteBkxx,
bkxxTqsp,
bkxxChsp,
} from "@/api/xshb/xsbk.js";
export default {
name: "xsbk",
components: {
rightContent,
},
data() {
return {
header: "线索核办",
pageBs: "xsbk",
cxFormData: {
limit: 10,
page: 1,
bkdxLxdm: "",
bkdxHm: "",
sqrXm: "",
djsjStart: "",
djsjEnd: "",
spjgPdbz : "0",
},
cxQueryField: [
// {
// name: "线索编号",
// id: "xsbh",
// type: "text",
// value: "",
// placeholder: "请输入",
// col: "3",
// },
{
name: "布控对象类型",
id: "bkdxLxdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
value: "",
col: "3",
codeOptions: [],
codeTree: "CODE_BKLXDM",
},
{
name: "布控对象号码",
id: "bkdxHm",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
// {
// name: "布控状态",
// id: "bkzt",
// type: "codeTreeDialog",
// props: [], //字典弹框需要的字段
// value: "",
// col: "3",
// codeOptions: [],
// codeTree: "CODE_BKZTDM",
// },
{
name: "申请人",
id: "sqrXm",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "申请时间",
id: "djsjStart",
id2: "djsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "信息主键编号",
prop: "xxzjbh",
toInfor: true,
width: "250",
},
{
label: "布控对象类型",
prop: "bkdxLxdmStr",
width: "200",
},
{
label: "布控对象号码",
prop: "bkdxHm",
width: "200",
},
{
label: "布控要求",
prop: "bkyq",
width: "300",
},
{
label: "布控依据",
prop: "bkyj",
width: "300",
},
{
label: "申请人",
prop: "sqrXm",
width: "200",
},
{
label: "申请时间",
prop: "djsj",
width: "200",
},
],
cxUrl: "/xsbk/getBkxxList",
Menu: [
{
id: "xsbksp",
label: "我审批的线索布控",
index: "xsbksp",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
],
selectArr: [],
ckForm: {
file: "",
},
fileArr: [],
zdXxzjbh: "",
};
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
},
methods: {
toInfor(row) {
this.$router.pushToTab({
path: "/detailXsbks",
query: {
xxzjbh: row.xxzjbh,
},
});
},
toXXSP(scope) {
let loading = this.$loading({
lock: true,
text: "正在加载...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
backBkxx({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$alert("审批成功!", "提示", {
confirmButtonText: "确定",
type: "success",
});
loading.close();
} else {
this.$message({
type: "error",
message: res.message,
});
}
});
},
},
watch: {},
};
</script>
<style>
.el-dialog__body {
padding: 10px 15px !important;
}
.rightContent .el-input__inner,
#formCommonPage .el-input__inner {
height: 32px;
line-height: 32px;
font-family: inherit;
}
.el-table__header-wrapper th,
.el-table__header-wrapper tr {
background: #f4f6f7;
}
.rightContent .el-input__icon,
#formCommonPage .el-input__icon,
.el-input__suffix-inner {
line-height: 36px;
}
.rightContent .el-range-separator {
position: relative;
top: -4px;
}
.rightContent .el-textarea__inner,
#formCommonPage .el-textarea__inner {
width: 100%;
font-family: inherit;
}
.rightContent .el-range-input,
#formCommonPage .el-range-input {
vertical-align: top;
}
.rightContent .el-date-editor .el-range__close-icon {
margin-top: -4px;
}
.rightContent .el-form-item__error {
left: calc(66% - 27px);
top: 12px;
}
.success-row {
background-color: #fbf9f4 !important;
}
.Content .el-input,
.Content .el-date-editor--daterange.el-input__inner {
width: 100% !important;
}
</style>
<style scoped lang="scss">
.el-form-item {
margin: 15px 0 20px 0;
}
.red {
color: red;
}
.black {
color: black;
}
@import "@/assets/styles/rightContent.scss";
.hbyp {
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #007aff;
margin-right: 16px;
cursor: pointer;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
......@@ -323,6 +323,86 @@
</div>
<div style="margin-top: 20px">
<div class="add">
<div class="contents">
<div>
<div class="title">下达指令管理</div>
<div style="margin: -20px 0 0 38px">
<div class="zczz">
<!-- <div class="xzs" @click="glgxAdd">
<i class="el-icon-plus"></i>
新增
</div> -->
<el-table
v-loading="loadingXdzl"
:data="xdzlList"
border
stripe
style="width: 100%"
>
<el-table-column
v-for="(glgxItem, index) in xdzlxlList"
:key="index"
:label="glgxItem.label"
:width="glgxItem.width"
align="center"
>
<template slot-scope="scope">
<div v-if="glgxItem.toIxdzl">
<span
style="color: #0061f7; cursor: pointer"
@click="toIxdzl(scope.row)"
class="edit"
v-html="scope.row[glgxItem.prop]"
>
</span>
</div>
<div v-else>
<span v-html="scope.row[glgxItem.prop]"> </span>
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<span
style="margin-right: 10px"
class="anList"
v-if="scope.row.spsftg != '通过'"
@click="eleteXdzl(scope)"
>删除</span
>
<span
v-if="
scope.row.spsftg == '未通过' ||
scope.row.spsftg == '草稿'
"
class="anList"
@click="examine(scope)"
>提请审批</span
>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
background
@size-change="handleSizeChangexd"
@current-change="handleCurrentChangexd"
:current-page.sync="pagexd"
:page-sizes="[5, 10, 20, 50]"
:page-size="limitxd"
layout="sizes,prev, pager, next"
:total="tableDataLengthxd"
>
</el-pagination>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div style="margin-top: 20px">
<div class="add">
<div class="contents" v-loading="loadingGzjl">
<div>
<div class="title">工作结论</div>
......@@ -477,6 +557,15 @@
</div>
</div>
</div>
<el-drawer size="80%" :with-header="false" :visible.sync="drawer">
<zczl
infoType="2"
v-if="drawer"
:zczlbh="zczlbh"
:fpbh="fpbh"
:sub="sub"
></zczl>
</el-drawer>
</div>
</template>
......@@ -490,13 +579,18 @@ import {
getHcxxList,
getHcglxyrList,
getHcglasjList,
getWfqdzczlListNew,
} from "@/api/xshb/xshb.js";
import { zlToDelete, zlTqsp } from "@/api/zczl/zczl.js";
import { getKyxsByxxzjbh } from "@/api/rlqbxs.js";
import axios from "axios";
import zczl from "@p/zczl/zczl/detailZczl.vue";
import base from "@/api/base";
export default {
name: "",
components: {},
components: {
zczl,
},
data() {
return {
ryList: [],
......@@ -511,10 +605,12 @@ export default {
rotate: true,
loadingZC: false,
loadingGlgx: false,
loadingXdzl: false,
loadingGzjl: false,
tableDataLength: 0,
tableDataLength1: 0,
tableDataLength2: 0,
tableDataLengthxd: 0,
propTitle: "线索详情",
xs: [
{
......@@ -858,6 +954,64 @@ export default {
prop: "xxdjryXm",
},
],
xdzlxlList: [
{
label: "工作指令编号",
prop: "zczlbh",
width: "300",
toIxdzl: true,
},
{
label: "指令文号",
width: "200",
prop: "zlwh",
},
{
width: "200",
label: "指令类型",
prop: "zllxStr",
},
{
width: "200",
label: "指令事由",
prop: "zlsy",
},
{
label: "工作要求",
width: "200",
prop: "gzyq",
},
{
label: "发布时间",
width: "200",
prop: "fbsj",
},
{
label: "回报期限",
width: "200",
prop: "hbqx",
},
{
label: "审批是否通过",
width: "200",
prop: "spsftg",
},
{
label: "指令接收单位",
width: "200",
prop: "zljsdwdmName",
},
{
label: "指令状态",
width: "200",
prop: "xjZczlzt",
},
{
width: "200",
label: "最近回报时间",
prop: "nearyResponseTime",
},
],
gzjl: [
{
name: "办结单位",
......@@ -948,12 +1102,19 @@ export default {
ajList: [],
glgXList1: [],
gzjlList1: [],
xdzlList: [],
page: 1,
limit: 5,
page1: 1,
limit1: 5,
page2: 1,
limit2: 1,
pagexd: 1,
limitxd: 1,
drawer: false,
zczlbh: "",
fpbh: "",
sub: "",
};
},
created() {
......@@ -964,8 +1125,16 @@ export default {
this.getZbzzList();
this.getXsglbshList();
this.getHcxxList();
this.getWfqdzczlListNew();
},
methods: {
toIxdzl(scope) {
debugger;
this.sub = "PJ";
this.drawer = true;
this.zczlbh = scope.zczlbh;
this.fpbh = scope.fpbh;
},
toInfor(scope) {
debugger;
// let path = `http://39.99.155.173:8007/naotuBox?type=hnDxzp&kybh=${scope.row.asjbh}`;
......@@ -1111,6 +1280,14 @@ export default {
this.page1 = val;
this.getXsglbshList();
},
handleSizeChangexd(val) {
this.limitxd = val;
this.getWfqdzczlListNew();
},
handleCurrentChangexd(val) {
this.pagexd = val;
this.getWfqdzczlListNew();
},
handleSizeChange2(val) {
this.limit2 = val;
this.getHcxxList();
......@@ -1202,6 +1379,27 @@ export default {
}
});
},
getWfqdzczlListNew() {
this.loadingXdzl = true;
let xslxdms = "";
if (this.xslx == "rlqb") {
xslxdms = "01";
} else {
xslxdms = "02";
}
getWfqdzczlListNew({
xslxdm: xslxdms,
xsbh: this.xsbh,
page: this.pagexd,
limit: this.limitxd,
}).then((res) => {
if (res.code == 200) {
this.xdzlList = res.data.rows;
this.tableDataLengthxd = res.data.total;
this.loadingXdzl = false;
}
});
},
getHcxxList() {
this.loadingGzjl = true;
let xslxdms = "";
......@@ -1357,6 +1555,60 @@ export default {
},
});
},
eleteXdzl(scope) {
console.log(scope);
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
zlToDelete({
zczlbh: scope.row.zczlbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "删除成功",
});
this.getWfqdzczlListNew();
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
examine(scope) {
console.log(scope);
this.$confirm("此操作将该指令提请审批, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
zlTqsp({
zczlbh: scope.row.zczlbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "提请审批成功",
});
this.getWfqdzczlListNew();
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消提请审批",
});
});
},
// 关联关系删除
eleteGlgx(row) {
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
......@@ -2109,6 +2361,10 @@ $-header-fontSize: 18px;
}
</style>
<style scoped lang='scss'>
.el-drawer.rtl {
/* margin: 10px; */
padding: 10px 0 0 36px;
}
.add {
width: 1200px;
margin: 0 auto;
......
......@@ -8,10 +8,15 @@
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@dele="dele"
@add="add"
@toInfor="toInfor"
ref="rightContent"
></right-content>
>
<template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
</right-content>
<el-dialog title="新增用户组" :visible.sync="dialogFormVisible">
<span class="btx">*</span>
<eldialog-content
......@@ -350,7 +355,10 @@ export default {
params.append(`userList[${index}].yhLxdh`, item.telephone);
params.append(`userList[${index}].yhDwdm`, item.unitcode);
params.append(`userList[${index}].yhDwmc`, item.unitname);
params.append(`userList[${index}].yhJb`, index == this.indexRadio ? '0001' : '0000');
params.append(
`userList[${index}].yhJb`,
index == this.indexRadio ? "0001" : "0000"
);
});
// this.selectedId1.forEach((item, index) => {
// params.append(`userList[${index}].yhJb`, item.radio);
......@@ -452,4 +460,19 @@ export default {
left: 77px;
z-index: 100;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
......@@ -69,12 +69,13 @@ export default {
value: "",
placeholder: "请输入",
col: "2",
prop: 'checkEmpty'
},
{
name: "指令接收单位:",
id: "zljsdwdm",
type: "codeTree",
codeTree: "CODE_XZUNIT",
codeTree: "CODE_UNIT",
codeOptions: [],
value: "",
placeholder: "请输入",
......
......@@ -240,7 +240,7 @@ export default {
});
},
toInfor(scope) {
this.sub = 'PJ';
this.sub = 'XQ';
this.drawer = true;
this.zczlbh = scope.zczlbh;
this.fpbh = scope.fpbh;
......
......@@ -19,6 +19,7 @@
>
<template #btnGroup="scope">
<el-button @click="dele(scope.scope)" type="text" v-if="scope.scope.row.spsftg != '通过'">删除</el-button>
<el-button @click="ONPJ(scope.scope)" type="text" v-if="scope.scope.row.nfpj=='1'">评价</el-button>
<el-button @click="examine(scope.scope)"
v-if="scope.scope.row.spsftg == '未通过' || scope.scope.row.spsftg == '草稿'" type="text">提请审批
</el-button>
......@@ -278,20 +279,21 @@ export default {
prop: "hbqx",
},
{
label: "审批是否通过",
label: "审批状态",
prop: "spsftg",
},
{
label: "指令接收单位",
prop: "zljsdwdmName",
overflow: true
},
{
label: "指令状态",
prop: "xjZczlzt",
},
{
label: "最回报时间",
prop: "nearyResponseTime"
label: "最回报时间",
prop: "nearlyResponseTime"
}
// {
// label: "指令回报次数",
......@@ -416,6 +418,12 @@ export default {
});
},
toInfor(scope) {
this.sub = 'XQ';
this.drawer = true;
this.zczlbh = scope.zczlbh;
this.fpbh = scope.fpbh;
},
ONPJ(scope) {
this.sub = 'PJ';
this.drawer = true;
this.zczlbh = scope.zczlbh;
......
......@@ -19,6 +19,7 @@
<el-button v-if="scope.scope.row.nfqs == '1' " @click="qs(scope.scope)" type="text">签收</el-button>
<el-button v-if="scope.scope.row.nfhb == '能' " @click="toHb(scope.scope)" type="text">回报</el-button>
<el-button v-if="scope.scope.row.nfhbxg == '能' " @click="toXG(scope.scope)" type="text">回报修改</el-button>
<el-button v-if="scope.scope.row.nfxbxg == '能' " @click="toXG(scope.scope)" type="text">续报修改</el-button>
<el-button v-if="scope.scope.row.nfxb == '能' " @click="toXb(scope.scope)" type="text">续报</el-button>
<el-button v-if="scope.scope.row.nffp == '能' " @click="FenPai(scope.scope)" type="text">分派</el-button>
<el-button v-if="scope.scope.row.nffp == '能' " @click="YIJiao(scope.scope)" type="text">移交</el-button>
......@@ -91,28 +92,6 @@
<el-dialog title="指令分派" :visible.sync="FP">
<el-form :inline="true" :model="FPForm" class="demo-form-inline">
<el-row>
<!-- <el-col :span="20" :offset="1" >
<el-form-item label="指令编号" style="width:100%" label-width="100px">
<el-input
disabled
type="text"
v-model="FPForm.zczlbh"
style="width: 400px"
placeholder="请输入"
></el-input>
</el-form-item>
</el-col>
<el-col :span="20" :offset="1">
<el-form-item label="分派编号" style="width:100%" label-width="100px">
<el-input
disabled
type="text"
v-model="FPForm.fpbh"
style="width: 400px"
placeholder="请输入"
></el-input>
</el-form-item>
</el-col>-->
<el-col :span="20" :offset="1" class="JKS">
<el-form-item label="接收单位" label-width="100px" style="width:500px">
<el-select v-model="FPForm.qsrgajgdm" placeholder="请选择" multiple style="width: 500px;">
......@@ -189,8 +168,30 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import zczl from '@p/zczl/zczl/detailZczl.vue'
import {zczlQs, doAddHb, doFpNew, doYjNew, getChildUnitAndPeople, editHbInfo, doEvaluate} from "@/api/zczl/zczl.js"
import {zlqszt, nfxb, nfhb, nfhbxg, nffp, zlhbzt, sfczhbxx, hbpjdj, xbpjdj,zczlzt,xjZczlzt} from "@/assets/js/transformFormTable.js";
import {
zczlQs,
doAddHb,
doFpNew,
doYjNew,
getChildUnitAndPeople,
editHbInfo,
doEvaluate,
queryLlys
} from "@/api/zczl/zczl.js"
import {
zlqszt,
nfxb,
nfhb,
nfhbxg,
nffp,
zlhbzt,
sfczhbxx,
hbpjdj,
xbpjdj,
zczlzt,
xjZczlzt,
nfxbxg
} from "@/assets/js/transformFormTable.js";
import axios from "@/utils/http.js"
export default {
......@@ -214,7 +215,7 @@ export default {
header: "工作指令",
pageBs: "xywspdzczl",
transformFormTable: {
nfxb, zlqszt, nfhb, nfhbxg, nffp, zlhbzt, sfczhbxx, hbpjdj, xbpjdj,zczlzt,xjZczlzt
nfxb, zlqszt, nfhb, nfhbxg, nffp, zlhbzt, sfczhbxx, hbpjdj, xbpjdj, zczlzt, xjZczlzt,nfxbxg
},
GD: {
qsrgajgdm: {
......@@ -461,14 +462,15 @@ export default {
{
label: "下级指令接收单位",
prop: "zljsdwdmName",
overflow: true
},
{
label: "下级指令状态",
prop: "xjZczlzt",
},
{
label : "最近回报时间",
prop : "nearyResponseTime"
label: "最新回报时间",
prop: "nearlyResponseTime"
}
// {
// label: "能否回报",
......@@ -647,7 +649,7 @@ export default {
fpgzyq: "",
qsrgajgdm: "",
qsrjh: "",
ywlx:""
ywlx: ""
},
YJ: false,
YJForm: {
......@@ -665,8 +667,7 @@ export default {
},
methods: {
toInfor(row) {
this.sub = 'PJ';
this.sub = 'XQ';
this.drawer = true;
this.zczlbh = row.zczlbh
this.fpbh = row.fpbh
......@@ -722,13 +723,30 @@ export default {
})
}
if (this.sub === 'FP') {
let self = this;
queryLlys({unitcodes: params.qsrgajgdm.toString()}).then((res) => {
if (res.success && res.code == 200) {
if (res.data && res.data.flag == "0") {
this.$message.error("该单位没有联络员,不能发布指令");
} else {
let dwdm = params.get("zljsdwdm").split(",");
let resDwdm = res.data.flag.split(",");
self.$set(self.formLabelAlign, "zljsdwdm", resDwdm);
if (dwdm.length !== resDwdm.length) {
this.$message.warning("已自动过滤没有联络员的单位");
}
params.set("zljsdwdm", res.data.flag);
self.zczlSubmit(params);
}
}
});
let t = new FormData();
t.append('zczlbh', this.FPForm.zczlbh)
t.append('fpbh', this.FPForm.fpbh)
t.append('fpgzyq', params.fpgzyq)
t.append('ywlx', params.ywlx)
t.append('qsrjh', params.qsrjh.toString())
t.append('qsrgajgdm', params.qsrgajgdm.toString())
doFpNew(t).then(res => {
if (res.code == 200 && res.success) {
this.$message.success("指派成功");
......@@ -751,8 +769,17 @@ export default {
this.$refs.rightContent.doQuery("yes");
}
})
}
if (this.sub === 'XBXG') {
params.append('zczlbh', this.zczlbh)
params.append('sfxb', '1')
editHbInfo(params).then(res => {
if (res.success && res.code == 200) {
this.$message.success("提交成功");
this.drawer = false;
this.$refs.rightContent.doQuery("yes");
}
})
}
if (this.sub === 'PJ') {
doEvaluate(params)
......@@ -777,14 +804,17 @@ export default {
});
},
toXG(scope) {
this.sub = 'HBXG';
if(scope.row.nfhbxg == '能'){
this.sub = 'HBXG';
}else if (scope.row.nfxbxg == '能'){
this.sub = 'XBXG';
}
this.drawer = true;
let row = scope.row;
this.fpbh = row.fpbh;
this.zczlbh = row.zczlbh;
this.lkForm.zczlbh = row.zczlbh;
this.lkForm.fpbh = row.fpbh;
},
qs(scope) {
this.sub = "QS"
......@@ -798,22 +828,24 @@ export default {
toXb(scope) {
this.sfxb = "1";
this.zczlbh = scope.row.zczlbh;
this.fpbh = scope.row.fpbh;
this.drawer = true
this.sub = 'HB'
this.$set(this.lkForm, "zczlbh", scope.row.zczlbh);
this.$set(this.lkForm, "fpbh", scope.row.fpbh);
this.$set(this.lkForm, "sfxb", this.sfxb);
},
toHb(scope) {
this.sfxb = "0";
this.zczlbh = scope.row.zczlbh;
this.drawer = true
this.fpbh = scope.row.fpbh;
this.drawer = true;
this.sub = 'HB'
this.$set(this.lkForm, "zczlbh", scope.row.zczlbh);
this.$set(this.lkForm, "fpbh", scope.row.fpbh);
this.$set(this.lkForm, "sfxb", this.sfxb);
// this.newlyVisiable = true;
// getHbxxDoHbxgByFpbh({ fpbh: scope.row.fpbh, sfxbxg: "" });
},
submitLKD() {
let params = new FormData();
......@@ -836,11 +868,13 @@ export default {
},
FenPai(scope) {
let rows = scope.row;
let zczlbh = rows.zczlbh
let fpbh = rows.fpbh
this.FPForm.zczlbh = zczlbh
this.FPForm.fpbh = fpbh
this.FPForm.ywlx = rows.ywlx
let zczlbh = rows.zczlbh;
let fpbh = rows.fpbh;
this.FPForm.zczlbh = zczlbh;
this.FPForm.fpbh = fpbh;
this.FPForm.ywlx = rows.ywlx;
this.zczlbh = zczlbh;
this.fpbh = fpbh;
this.drawer = true
this.sub = 'FP'
},
......@@ -864,23 +898,13 @@ export default {
this.sub = 'YJ'
this.drawer = true
let rows = scope.row;
let zczlbh = rows.zczlbh
let fpbh = rows.fpbh
this.YJForm.zczlbh = zczlbh
let zczlbh = rows.zczlbh;
let fpbh = rows.fpbh;
this.YJForm.zczlbh = zczlbh;
this.YJForm.fpbh = fpbh;
/* getChildUnitAndPeople({onlyLly:1,unitCode:'540100000000'}).then(res=>{
if (res.code == 200 && res.success) {
let list = res.data.unitChilds;
let account = JSON.parse(sessionStorage.getItem('userInfo')).account
for(let i in list){
let peopleAccount = list[i].peopleAccount;
if(peopleAccount ===account ){
list.splice(i,1)
}
}
this.unitChilds = list
}
})*/
this.zczlbh = zczlbh;
this.fpbh = fpbh;
},
PJ(scope) {
this.sub = 'PJ';
......
......@@ -10,6 +10,7 @@
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@examine="examine"
@toInfor="toInfor"
ref="rightContent"
>
<template #btnGroup="scope">
......@@ -17,10 +18,10 @@
</template>
</right-content>
<el-drawer
size="80%"
:with-header="false"
:visible.sync="drawer">
<zczl infoType="1" fpbh="" v-if="drawer" @post="post" :zczlbh="zczlbh" sub="SP"></zczl>
size="80%"
:with-header="false"
:visible.sync="drawer">
<zczl infoType="1" :fpbh="fpbh" v-if="drawer" @post="post" :zczlbh="zczlbh" :sub="sub"></zczl>
</el-drawer>
<!-- 撤控 -->
<el-dialog title="申请指令信息" :visible.sync="revokeVisiable" width="30%">
......@@ -71,21 +72,24 @@
import rightContent from "@c/ptCxForm_components.vue";
import zczl from '@p/zczl/zczl/detailZczl.vue'
import {tjsp} from "@/api/zczl/zczl.js";
import {spsftg, ifsp} from "@/assets/js/transformFormTable.js";
import {spsftg, ifsp, zlType} from "@/assets/js/transformFormTable.js";
export default {
name: "rlqbxsxx",
components: {
rightContent,zczl
rightContent, zczl
},
data() {
return {
zczlbh:'',
sub: '',
zczlbh: '',
fpbh: '',
drawer: false,
tableOperation: true,
transformFormTable: {
ifsp,
spsftg
spsftg,
zlType
},
header: "需要我审批的工作指令",
pageBs: "xywspdzczl",
......@@ -178,36 +182,42 @@ export default {
value: "",
col: "3",
},
{
name: "审批是否通过",
id: "spsftg",
type: "select",
selectData: [
{
name: "全部",
value: "",
},
{
name: "待审批",
value: "2",
},
{
name: "通过",
value: "1",
},
{
name: "未通过",
value: "0",
},
],
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
},
/* {
name: "审批是否通过",
id: "spsftg",
type: "select",
selectData: [
{
name: "全部",
value: "",
},
{
name: "待审批",
value: "2",
},
{
name: "通过",
value: "1",
},
{
name: "未通过",
value: "0",
},
],
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
},*/
],
cxDefaultFormThead: [
{
label: "工作指令编号",
prop: "zczlbh",
width: '300',
toInfor: true
},
{
label: "回报期限",
prop: "hbqx",
},
......@@ -223,17 +233,13 @@ export default {
{
label: "指令接收单位名称",
prop: "zljsdwdmName",
overflow: true
},
{
label: "指令文号",
prop: "zlwh",
},
{
label: "业务编号",
prop: "zczlbh",
width:'300'
},
{
label: "业务类型",
prop: "ywlxStr",
},
......@@ -251,7 +257,11 @@ export default {
},
{
label: "业务名称",
prop: "spsftg",
prop: "ywmc",
},
{
label: "审批类型",
prop: "zlType",
},
],
cxUrl: "/zczl/getXywspdzczlListNew",
......@@ -271,7 +281,7 @@ export default {
this.$store.commit("user/SET_Menu", this.Menu);
},
methods: {
post(params){
post(params) {
tjsp(params).then((res) => {
if (res.success && res.code == 200) {
this.$message.success("审批成功");
......@@ -295,49 +305,58 @@ export default {
});
},
examine(scope) {
console.log(scope.row.fpbh)
if (scope.row.ifsp == "不能") {
this.$message.error("不可以审批此条消息");
return;
}
this.sub = 'SP';
this.drawer = true;
this.zczlbh = scope.row.zczlbh
/* let params = new FormData();
let self = this;
params.append("zczlbh", scope.row.zczlbh);
this.$set(self.params, "zczlbh", scope.row.zczlbh);
let loading = self.$loading({
lock: true,
text: "正在设置...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
queryZlxqByZczlbh(params).then((res) => {
if (res.code == 200 && res.success) {
loading.close();
let result = res.data.tbYwZczl;
if (result.qqfqrxm) {
this.$set(self.ckForm, "fqyxm", result.qqfqrxm);
this.$set(self.ckForm, "fqydwmc", result.qqfqrdwmc);
this.$set(self.ckForm, "fqylxdh", result.qqfqrlxdh);
this.$set(self.labelForm, "xm", "申请发起人姓名");
this.$set(self.labelForm, "dwmc", "申请发起人单位");
this.$set(self.labelForm, "dh", "申请发起人电话");
this.$set(self.params, "sfqqzl", "1");
} else {
this.$set(self.ckForm, "fqyxm", result.zlfqrxm);
this.$set(self.ckForm, "fqydwmc", result.zlfqrdwmc);
this.$set(self.ckForm, "fqylxdh", result.zlfqrlxdh);
this.$set(self.labelForm, "xm", "指令发起人姓名");
this.$set(self.labelForm, "dwmc", "指令发起人单位");
this.$set(self.labelForm, "dh", "指令发起人电话");
this.$set(self.params, "sfqqzl", "0");
}
self.revokeVisiable = true;
} else {
loading.close();
this.$message.error("提取信息失败");
}
});*/
this.zczlbh = scope.row.zczlbh;
this.fpbh = scope.row.fpbh
/* let params = new FormData();
let self = this;
params.append("zczlbh", scope.row.zczlbh);
this.$set(self.params, "zczlbh", scope.row.zczlbh);
let loading = self.$loading({
lock: true,
text: "正在设置...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
queryZlxqByZczlbh(params).then((res) => {
if (res.code == 200 && res.success) {
loading.close();
let result = res.data.tbYwZczl;
if (result.qqfqrxm) {
this.$set(self.ckForm, "fqyxm", result.qqfqrxm);
this.$set(self.ckForm, "fqydwmc", result.qqfqrdwmc);
this.$set(self.ckForm, "fqylxdh", result.qqfqrlxdh);
this.$set(self.labelForm, "xm", "申请发起人姓名");
this.$set(self.labelForm, "dwmc", "申请发起人单位");
this.$set(self.labelForm, "dh", "申请发起人电话");
this.$set(self.params, "sfqqzl", "1");
} else {
this.$set(self.ckForm, "fqyxm", result.zlfqrxm);
this.$set(self.ckForm, "fqydwmc", result.zlfqrdwmc);
this.$set(self.ckForm, "fqylxdh", result.zlfqrlxdh);
this.$set(self.labelForm, "xm", "指令发起人姓名");
this.$set(self.labelForm, "dwmc", "指令发起人单位");
this.$set(self.labelForm, "dh", "指令发起人电话");
this.$set(self.params, "sfqqzl", "0");
}
self.revokeVisiable = true;
} else {
loading.close();
this.$message.error("提取信息失败");
}
});*/
},
toInfor(scope) {
this.sub = 'XQ';
this.drawer = true;
this.zczlbh = scope.zczlbh;
this.fpbh = scope.fpbh;
},
},
mounted() {
......
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