Skip to content

F
founder_vue
Commit a820190c by liupeng
Options

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

parents 0138b006 4f191f87
Showing with 232 additions and 83 deletions
src/api/zjcl/jcgz.js
......@@ -20,3 +20,6 @@ export const deleteJcgzById = params =>
//查询检查规则详情
export const selectJcgz = params =>
post(`${base.alyIP}/jcgzxx/selectJcgz`, params);
//新删除检查规则
export const delJcgzById = params =>
post(`${base.alyIP}/zjclGz/delJcgzById`, params);
src/api/zjcl/zjcl.js
......@@ -9,3 +9,21 @@ export const deleteZjclById = params =>
//查询证据材料详情信息
export const selectZjclDetail = params =>
post(`${base.alyIP}/zjclxx/selectZjclDetail`, params);
//新的证据材料详情信息
export const getAsjjbxx = params =>
post(`${base.alyIP}/zjclJc/getAsjjbxx`, params);
//证物类型
export const getZjclLb = params =>
post(`${base.alyIP}/zjclLb/getZjclLb`, params);
//案件相关证据材料列表查询
export const getAsjZjclxx = params =>
post(`${base.alyIP}/zjclJc/getAsjZjclxx`, params);
// 案件证据材料上传 目前只能单一文件上传
export const addAsjZjcl = params =>
postform(`${base.alyIP}/zjclJc/addAsjZjcl`, params);
//证据附件信息下载
export const downAsjZjcl = params =>
post(`${base.alyIP}/zjclJc/downAsjZjcl`, params);
//证据附件信息删除
export const delAsjZjcl = params =>
post(`${base.alyIP}/zjclJc/delAsjZjcl`, params);
src/components/IdentityInfor.vue
......@@ -14,24 +14,22 @@
<div class="module">
<div class="title">{{ item.title }}</div>
<div class="rows">
<div v-if="index === 0" class="ryzp"><img src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/2wBDABsSFBcUERsXFhceHBsgKEIrKCUlKFE6PTBCYFVlZF9VXVtqeJmBanGQc1tdhbWGkJ6jq62rZ4C8ybqmx5moq6T/2wBDARweHigjKE4rK06kbl1upKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKT/wAARCAAyADIDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAUCAwQBBv/EAC4QAAEDAwMDAQYHAAAAAAAAAAEAAgMEERITIjEFIUFRMjM1YYGRFUJxcnOhwf/EABgBAAMBAQAAAAAAAAAAAAAAAAACAwEE/8QAHBEBAQEBAAMBAQAAAAAAAAAAAAECEQMTMSEi/9oADAMBAAIRAxEAPwD0ZIAuSlc1XNPI5lGBZvYvP+K/qEthHDlbVNu3oo0MejDg/G9/CTWuGzFcdO+aK80shJ5F0SU8kMZMU0gtwL3W4/JUVDZiWaTgADuv5CjbenjPT1czHtjqwN3Dwmg4WSVtPK3CQXC5RTB4kiyJ03Y3Poq510mpxtuhcQnIV1/xGnHjutbMfRKaqtE0ccr43RzRuvifI+S2MnsBIN0bh9lDy/erY/Y2kqJKqbMxwu14+6i+VreXAfVQp5HJMbKjp5P4nMz8paD9VLPPda0Y/tU0Eoiq5DO0sfIdp8EKvil6zyX+eHaFy6F0ucq0qyms1rWVEY8nlVRyya5Zp6bucCeU77Jd1OJwxqYxviPe3kLLJr6aXjO7RJ3sxP2XW6AOxmTkxhdFURNkABuFa2NjeGgKXqinsLxFI5hke2waLhqzTTtm6WHPIMpO0ebp32slDKOOPqp27S3Id+Cq5zM/CW9aG62I54Qt1kLSJKE3unfohC0FvQ/cyfvKZn2ShCAiz2AsA+NH+JCENMkIQgP/2Q==" width="120"/></div>
<div v-if="index === 0" class="ryzp"><img :src="'data:image/jpeg;base64,' + zp" width="120"/></div>
<div :class="'col' + i.col" v-for="i in item.data" :key="i.prop" >
<span class="label" :style="{ width: labelWidth }">{{ i.label }}</span>
<div v-if="item.objStr" class="cont" :style="{ width: `calc(100% - ${labelWidth})` }"> {{ (pageData[item.objStr] && pageData[item.objStr][i.prop]) || "-" }}
</div>
<div v-else class="cont" :style="{ width: `calc(100% - ${labelWidth})` }">
<!-- <span v-if="isBase64(pageData[i.prop] + '')"><img :src="'data:image/jpeg;base64,' + pageData[i.prop]" alt="" width="80"/></span>
<span v-else>{{ pageData[i.prop] || "-" }}</span> -->
<span>{{ pageData[i.prop] || "-" }}</span>
</div>
</div>
</div>
<div class="zpdb" v-if="index === 2">
<div>
<img :src="'data:image/jpeg;base64,' + bzrZp" alt="" width="280"/>
<img :src="'data:image/jpeg;base64,' + ytp" alt="" width="280"/>
</div>
<div>
<img :src="'data:image/jpeg;base64,' + xyrZp" alt="" width="280"/>
<img :src="'data:image/jpeg;base64,' + bdtp" alt="" width="280"/>
</div>
</div>
</div>
......@@ -49,8 +47,9 @@ export default {
//页面信息对象
pageData: this.pageObject,
col: 0,
bzrZp: this.pageObject.bzrZp,
xyrZp: this.pageObject.xyrZp
zp: '',
ytp: '',
bdtp: '',
}
},
props: {
......@@ -70,15 +69,6 @@ export default {
title: String
},
methods: {
// 判断字段返回值是否为base64字符串
isBase64(str) {
if (str ==='' || str.trim() ===''){ return false; }
try {
return btoa(atob(str)) == str
} catch (err) {
return false
}
}
},
mounted() {
},
......@@ -86,6 +76,9 @@ export default {
pageObject: {
handler: function (val) {
this.pageData = val;
this.zp = val.xyrxx.zp
this.ytp = val.ytp,
this.bdtp = val.bdtp,
console.log('this.pageData', this.pageData)
},
deep: true,
......
src/components/ptCxForm_components.vue
......@@ -400,13 +400,13 @@
@click="$emit('drzjhd')"
>excel导入交易活动</el-button
>
<el-button
<!-- <el-button
type="primary"
size="mini"
v-if="pageBs == 'queryZjcl'"
@click="$emit('drzjhd')"
>录入证据材料信息</el-button
>
>-->
<el-button
type="primary"
size="mini"
......@@ -807,13 +807,9 @@
pageBs == 'queryZjcl'
"
>
{{
scope.row[columnTitle.prop] > 0
? "已有"
: scope.row[columnTitle.prop] == 0
? "未有"
: "非必须"
}}
<span v-if="scope.row[columnTitle.prop] === 1" class="el-icon-check" style="color:#4CAF50"></span>
<span v-else-if=" scope.row[columnTitle.prop] === -1 " class="el-icon-close" style="color:#EF4C4C" ></span>
<span v-else class="el-icon-minus"></span>
</div>
<div
v-else-if="
......@@ -878,6 +874,14 @@
<div v-else-if="columnTitle.prop == 'sfcb'">
{{ scope.row[columnTitle.prop] == "1" ? "是" : "否" }}
</div>
<div v-else-if="columnTitle.prop == 'zjclmc'">
<el-tag
v-for="(s,k) in getSplit(scope.row[columnTitle.prop])"
:key="k"
effect="dark">
{{ s }}
</el-tag>
</div>
<div v-else v-html="scope.row[columnTitle.prop]">
{{ columnTitle.prop }}
</div>
......@@ -923,7 +927,9 @@
pageBs == 'wfqdzczl' ||
pageBs == 'xywspdzczl' ||
pageBs == 'queryDx' ||
pageBs == 'bxqjsdzczl'
pageBs == 'bxqjsdzczl' ||
pageBs == 'queryZjcl'||
pageBs == 'queryJcgz'
)
"
>
......@@ -1570,6 +1576,9 @@ export default {
};
},
methods: {
getSplit(dt){
return dt.split(',')
},
rowExpand(row, expandedRows) {
this.$emit("rowExpand", row);
},
......
src/views/ajxscxbd/rxbd/detailRxbd.vue
......@@ -198,7 +198,7 @@ export default {
},
{
label: "比中时间:",
prop: "",
prop: "bzsjStr",
col: "3",
},
{
......@@ -293,6 +293,8 @@ export default {
xxzjbh: _this.xxzjbh,
}).then((res) => {
var result = res.data.rxbz;
result.ytp = result.bzrZp || ''
result.bdtp = result.xyrZp || ''
this.pageObject = result;
_this.filterTreeCode(result);
......
src/views/ajxscxbd/xcrx/detailXcrx.vue
......@@ -208,13 +208,13 @@ export default {
col: "3",
},
{
label: "比中人员住址:",
prop: "nativePlaceAddr",
label: "比中人员照片:",
prop: "",
col: "3",
},
{
label: "比中人员照片:",
prop: "",
label: "比中人员住址:",
prop: "nativePlaceAddr",
col: "3",
},
{
......@@ -277,6 +277,7 @@ export default {
xxzjbh: _this.xxzjbh,
}).then((res) => {
var result = res.data.rxdbBdzg;
result.ytp = result.zp || ''
this.pageObject = result;
_this.filterTreeCode(result);
});
......
src/views/ajxscxbd/xcystr/detailXcystr.vue
......@@ -209,15 +209,15 @@ export default {
col: "3",
},
{
label: "比中单位名称:",
prop: "bzdwGajgmc",
label: "比中人公民身份号码:",
prop: "bzrGmsfhm",
col: "3",
},
{
label: "比中人公民身份号码:",
label: "比中人联系人电话:",
prop: "bzrLxdh",
col: "3",
},
}
],
}
],
......
src/views/ajxscxbd/xcystr/queryXcystrPeople.vue
......@@ -90,11 +90,11 @@ export default {
},
{
label: "嫌疑人姓名",
prop: "xyrXm",
prop: "xm",
},
{
label: "嫌疑人身份证号",
prop: "xyrSfzh",
prop: "cyzjZjhm",
},
{
label: "比中单位",
......
src/views/ajxscxbd/xczj/detailXczj.vue
......@@ -217,6 +217,11 @@ export default {
col: "3",
},
{
label: ":",
prop: "",
col: "3",
},
{
label: "案件足迹图片:",
prop: "",
col: "3",
......@@ -281,6 +286,8 @@ export default {
xxzjbh: _this.xxzjbh,
}).then((res) => {
var result = res.data.zjbzxx;
result.ytp = result.ajzjtx || ''
result.bdtp = result.xyrzjtx || ''
this.pageObject = result;
_this.filterTreeCode(result);
});
......
src/views/ajxscxbd/xczw/detailXczw.vue
......@@ -321,7 +321,9 @@ export default {
xczwDetail({
xxzjbh: _this.xxzjbh,
}).then((res) => {
var result = res.data.zwbz;
var result = res.data.zwbz
result.ytp = result.nyzwtx || ''
result.bdtp = result.xczwtx || ''
this.pageObject = result;
_this.filterTreeCode(result);
});
......
src/views/dswtz/rxxx/addRxxx.vue
......@@ -38,6 +38,7 @@ export default {
value: "",
placeholder: "请输入",
col: "2",
prop: 'ryNumber',
},
{
name: "正面:",
......@@ -270,4 +271,4 @@ export default {
</script>
<style scoped lang="scss">
</style>
\ No newline at end of file
</style>
src/views/zdxx/zdxx.vue
......@@ -122,9 +122,9 @@ export default {
id: "zjhm",
type: "text",
disabled: false,
prop: "checkEmpty",
prop: "identity",
value: "",
placeholder: "请输入案件编号",
placeholder: "请输入证件号码",
col: "2",
icon: "caijiIcon iconfont icontiqu",
},
......@@ -133,7 +133,7 @@ export default {
id: "lxdh",
type: "text",
disabled: false,
prop: "checkEmpty",
prop: "mustAbleIphone",
value: "",
placeholder: "请输入联系电话",
col: "2",
......@@ -797,4 +797,4 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
</style>
src/views/zjcl/jcgz/queryJcgz.vue
......@@ -2,6 +2,7 @@
<div class="Content">
<right-content
:pageBs="pageBs"
:tableOperation="tableOperation"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
......@@ -12,13 +13,18 @@
@toInfor="toInfor"
@edit="edit"
ref="rightContent"
></right-content>
>
<template #btnGroup="scope">
<el-button @click="edit(scope.scope)" type="text">修改</el-button>
<el-button @click="dele(scope.scope)" type="text">删除</el-button>
</template>
</right-content>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteJcgzById } from "@/api/zjcl/jcgz.js";
import { delJcgzById } from "@/api/zjcl/jcgz.js";
export default {
name: "queryJcgz",
components: {
......@@ -26,12 +32,16 @@ export default {
},
data() {
return {
tableOperation:true,
header: "检查规则信息",
pageBs: "queryJcgz",
cxFormData: {
limit: 10,
page: 1,
ajlbdm: "",
xxdjdwGajgjgdm:"",
djsjKssj:"",
djsjJssj:"",
},
cxQueryField: [
{
......@@ -44,48 +54,54 @@ export default {
placeholder: "请输入",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "证据材料检查规则信息主键编号",
prop: "xxzjbh",
toInfor: true,
},
{
label: "案件类别",
prop: "ajlbdmStr",
},
{
label: "物证/书证",
prop: "wzsz",
name: "录入单位",
id: "xxdjdwGajgjgdm",
type: "codeTreeDialog",
codeTree: "CODE_UNIT",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "3",
},
{
label: "证人证言",
prop: "zrzy",
name: "开始录入时间",
id: "djsjKssj",
placeholder: "请输入",
type: "date",
value: "",
col: "3",
},
{
label: "被害人陈述",
prop: "bhrcs",
name: "结束录入时间",
id: "djsjJssj",
type: "date",
value: "",
placeholder: "请选择",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "犯罪嫌疑人供述和辩解",
prop: "gshbbbj",
label: "案件类别",
prop: "ajlbdmStr",
},
{
label: "鉴定结论",
prop: "jdjl",
label: "证据分类",
prop: "zjclmc",
html:true
},
{
label: "勘查/检查笔录",
prop: "kcjcbl",
label: "录入人",
prop: "xxdjryXm",
},
{
label: "视听资料以及电子数据",
prop: "stzldzsj",
label: "录入单位",
prop: "xxdjdwGajgmc",
},
{
label: "其他",
prop: "qt",
label: "录入时间",
prop: "djsj",
},
],
Menu: [
......@@ -98,7 +114,7 @@ export default {
disabled: false,
},
],
cxUrl: "/jcgzxx/selectJcgzPage",
cxUrl: "/zjclGz/getJcgzList",
};
},
created() {
......@@ -109,14 +125,15 @@ export default {
this.$router.push("insertJcgz");
},
dele(obj) {
console.log(obj.row);
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteJcgzById({
xxzjbh: obj.row.xxzjbh,
delJcgzById({
ruleid: obj.row.ruleid,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
......
src/views/zjcl/zjclcl/queryZjcl.vue
<template>
<div class="Content">
<right-content
:tableOperation="tableOperation"
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
......@@ -13,7 +14,11 @@
ref="rightContent"
@selectionChange="selectionChange"
@drzjhd="drzjhd"
></right-content>
>
<template #btnGroup="scope">
<el-button @click="edit(scope.scope)" type="text">编辑</el-button>
</template>
</right-content>
<el-dialog
title="录入证据材料信息"
......@@ -70,7 +75,7 @@
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteZjclById, insertZjcl } from "@/api/zjcl/zjcl.js";
import { deleteZjclById, insertZjcl, getZjclLb } from "@/api/zjcl/zjcl.js";
export default {
name: "queryZjcl",
components: {
......@@ -78,12 +83,15 @@ export default {
},
data() {
return {
tableOperation:true,
header: "证据材料检查",
pageBs: "queryZjcl",
cxFormData: {
limit: 10,
page: 1,
asjbh: "",
ajmc:"",
ajqf:"",
},
cxQueryField: [
{
......@@ -94,6 +102,62 @@ export default {
placeholder: "",
col: "3",
},
{
name: "案件名称",
id: "ajmc",
type: "text",
value: "",
placeholder: "",
col: "3",
},
{
name: "证物分类",
id: "zjlbdm",
type: "select",
selectData: [
{
name: "全部",
value: "",
}
],
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
},
{
name: "案件类别",
id: "ajlbdm",
type: "codeTreeDialog",
codeTree: "CODE_AJLB",
codeOptions: [],
props: [], //字典弹框需要的字段
value: "",
col: "3",
},
{
name: "案件区分",
id: "ajqf",
type: "select",
selectData: [
{
name: "全部",
value: "",
},
{
name: "我辖区的",
value: "01",
},
{
name: "我侦办的",
value: "02",
},
],
props: "checkEmpty",
value: "",
placeholder: "请选择",
col: "3",
},
],
cxDefaultFormThead: [
{
......@@ -103,7 +167,7 @@ export default {
},
{
label: "案件类别",
prop: "ajlbdm",
prop: "ajlbdmStr",
},
{
label: "案件名称",
......@@ -142,7 +206,7 @@ export default {
prop: "qt",
},
],
cxUrl: "/zjclxx/selectZjclJcjgPage",
cxUrl: "/zjclJc/getAsjZjjcList",
Menu: [
{
id: "queryZjcl",
......@@ -181,7 +245,6 @@ export default {
},
],
revokeVisiable: false,
ckForm: {},
selectArr: [],
ckForm: {
file: "",
......@@ -214,6 +277,27 @@ export default {
this.$store.commit("user/SET_Menu", this.Menu);
this.$store.commit("user/SET_LeftMenu", this.leftMenus);
this.$store.commit("user/SET_Header", this.header);
getZjclLb().then(res=>{
if(res.code === 200) {
let list = res.data.list
for(let i of list) {
this.cxQueryField[2].selectData.push({
name:i.name,
value: i.code
})
}
}
else {
this.$message({
type: "warning",
message: res.msg,
});
}
})
},
methods: {
add() {
......@@ -236,6 +320,11 @@ export default {
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
} else {
this.$message({
type: "warning",
message: res.message,
});
}
});
})
......@@ -248,12 +337,21 @@ export default {
},
toInfor(obj) {
this.$router.push({
path: "/detailZjcl",
path: "/zjclcj",
query: {
asjbh: obj.asjbh,
},
});
},
edit(obj) {
this.$router.push({
path: "/zjclcj",
query: {
asjbh: obj.row.asjbh,
operation:'edit'
},
});
},
selectionChange(scope) {
this.selectArr = scope;
},
......
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