Commit 304a7b68 by liyuhang19990520

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

parents 3d0da1e7 c826068f
......@@ -21,10 +21,10 @@ export const deleteGzry = params =>
//关注人员详情信息
export const selectGzryById = params =>
post(`${base.alyIP}/xxgzry/selectGzryById`, params);
//关注人员修改
//新增列控人员人员
export const insertLkGzry = params =>
postform(`${base.alyIP}/xxgzry/insertLkGzry`, params);
//关注人员修改
//新增撤控人员
export const insertCkGzry = params =>
postform(`${base.alyIP}/xxgzry/insertCkGzry`, params);
//查询人员照片列表信息
......
......@@ -8,4 +8,4 @@ export const deleteZjclById = params =>
postform(`${base.alyIP}/zjclxx/deleteZjclById`, params);
//查询证据材料详情信息
export const selectZjclDetail = params =>
postform(`${base.alyIP}/zjclxx/selectZjclDetail`, params);
post(`${base.alyIP}/zjclxx/selectZjclDetail`, params);
......@@ -261,7 +261,6 @@
pageBs != 'rygd' &&
pageBs != 'hdgdxxgl' &&
pageBs != 'ryhd' &&
pageBs != 'queryRyzp' &&
pageBs != 'rysc' &&
pageBs != 'queryRyyp' &&
pageBs != 'thjl' &&
......@@ -275,7 +274,8 @@
pageBs != 'queryXcrx' &&
pageBs != 'queryXczj' &&
pageBs != 'llygl' &&
pageBs != 'zczltj'
pageBs != 'zczltj' &&
pageBs != 'queryZjcl'
"
>
<i class="el-icon-plus"></i> 新增
......@@ -297,6 +297,13 @@
<el-button
type="primary"
size="mini"
v-if="pageBs == 'queryZjcl'"
@click="$emit('drzjhd')"
>录入证据材料信息</el-button
>
<el-button
type="primary"
size="mini"
v-if="pageBs == 'queryZdjyhd'"
@click="$emit('drjyhdry')"
>excel导入交易活动相关人员</el-button
......@@ -406,7 +413,8 @@
pageBs == 'queryUser' ||
pageBs == 'queryRole' ||
pageBs == 'queryZdjyhd' ||
pageBs == 'zdxxgl'
pageBs == 'zdxxgl' ||
pageBs == 'queryZjcl'
"
>
</el-table-column>
......@@ -476,6 +484,13 @@
v-html="scope.row[columnTitle.prop]"
></span>
</div>
<div v-else-if="columnTitle.prop == 'zpbw' && columnTitle.type == 'select'">
<span v-if="scope.row[columnTitle.prop] == '1'">二代证(人像)</span>
<span v-if="scope.row[columnTitle.prop] == '2'">正面照片</span>
<span v-if="scope.row[columnTitle.prop] == '3'">左侧面照片</span>
<span v-if="scope.row[columnTitle.prop] == '4'">右侧面照片</span>
<span v-if="scope.row[columnTitle.prop] == '5'">二代证(国徽)</span>
</div>
<div v-else-if="columnTitle.prop == 'xzgzryzt'"></div>
<div
v-else-if="
......
......@@ -131,7 +131,9 @@ export default {
});
selectgzryZp({
glxxXxzjbh: this.$route.query.xxzjbh
}).then((res) => {});
}).then((res) => {
console.log(res);
});
selectGzryById({
xxzjbh: this.$route.query.xxzjbh,
}).then((res) => {
......
......@@ -396,6 +396,14 @@ export default {
disabled: false,
},
{
id: "queryRyzp",
label: "照片",
index: "queryRyzp",
auth: "M0103",
className: "iconfont iconfangwen",
disabled: false,
},
{
id: "queryRysc",
label: "收藏",
index: "queryRysc",
......
......@@ -26,7 +26,7 @@ export default {
},
data() {
return {
header: "人员话单信息",
header: "人员照片信息",
pageBs: "queryRyzp",
cxFormData: {
limit: 10,
......@@ -45,27 +45,59 @@ export default {
],
cxDefaultFormThead: [
{
label: "电子文件格式",
prop: "ryzpDzwjgs",
label: "信息主键编号",
prop: "xxzjbh",
toInfor: true,
},
// {
// label: "人员照片电子登记内容",
// prop: "ryzpDzwjnr",
// },
{
label: "照片部位",
prop: "zpbw",
type: "select",
selectData: [
{
label: "二代证(人像)",
value: "1",
},
{
label: "正面照片",
value: "2",
},
{
label: "左侧面照片",
value: "3",
},
{
label: "右侧面照片",
value: "4",
},
{
label: "二代证(国徽)",
value: "5",
},
],
},
{
label: "电子文件标题",
prop: "ryzpDzwjbt",
},
{
label: "电子文件名称",
prop: "ryzpDzwjmc",
toInfor: true,
},
// {
// label: "电子文件格式",
// prop: "ryzpDzwjgs",
// },
// {
// label: "电子文件标题",
// prop: "ryzpDzwjbt",
// },
// {
// label: "电子文件名称",
// prop: "ryzpDzwjmc",
// },
],
cxUrl: "/gzryZp/selectgzryZp",
};
},
created() {},
mounted() {},
methods: {
add() {
this.$router.push("addRyzp");
......
......@@ -21,6 +21,7 @@ export default {
},
data() {
return {
title: "",
propFormField: [
//基本信息
{
......@@ -75,7 +76,7 @@ export default {
type: "success",
callback: () => {
loading.close();
this.$router.push("queryRyyp");
this.$router.push("queryZjcl");
},
});
} else {
......
......@@ -11,13 +11,66 @@
@dele="dele"
@toInfor="toInfor"
ref="rightContent"
@selectionChange="selectionChange"
@drzjhd="drzjhd"
></right-content>
<el-dialog
title="录入证据材料信息"
:visible.sync="revokeVisiable"
width="30%"
@closed="closed"
>
<el-form :inline="true" :model="ckForm" class="demo-form-inline">
<el-row>
<el-col :span="20" :offset="2" style="margin-top: 20px">
<el-form-item label="文件" style="width:100%">
<el-upload
class="upload-demo"
action="#"
accept=".xls,.xlsx"
:on-change="fileOnchange"
:on-remove="
(flie, fileList) => {
fileArr = fileList;
}
"
:auto-upload="false"
:http-request="() => {}"
:file-list="fileArr"
v-model="ckForm.file"
>
<el-button size="small" type="primary">选择上传</el-button>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="20" :offset="2" style="margin-top: 20px">
<el-form-item label="证据材料类型" style="width:100%">
<el-select v-model="zjcl_lxdm" clearable placeholder="请选择">
<el-option
v-for="item in codetreeData.codeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="revokeVisiable = false">取 消</el-button>
<el-button type="primary" @click="submitCKD">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteZjclById } from "@/api/zjcl/zjcl.js";
import { deleteZjclById, insertZjcl } from "@/api/zjcl/zjcl.js";
export default {
name: "queryZjcl",
components: {
......@@ -137,6 +190,34 @@ export default {
],
},
],
revokeVisiable: false,
ckForm: {},
selectArr: [],
ckForm: {
file: "",
},
fileArr: [],
asjbh: "",
zjcl_lxdm: "",
codetreeData: {
name: "案事件证据材料类型:",
id: "zjcl_lxdm",
type: "setValue",
codeTree: "",
codeOptions: [
{ label: "物证/书证", value: "01" },
{ label: "证人证言", value: "02" },
{ label: "被害人陈述", value: "03" },
{ label: "犯罪嫌疑人供述和辩解", value: "04" },
{ label: "鉴定结论", value: "05" },
{ label: "勘查/检查笔录", value: "06" },
{ label: "视听资料以及电子数据", value: "07" },
{ label: "其他", value: "08" },
],
value: "",
placeholder: "请选择",
col: "2",
},
};
},
created() {
......@@ -155,7 +236,7 @@ export default {
type: "warning",
})
.then(() => {
console.log(obj)
console.log(obj);
deleteZjclById({
xxzjbh: obj.row.xxzjbh,
}).then((res) => {
......@@ -183,6 +264,59 @@ export default {
},
});
},
selectionChange(scope) {
this.selectArr = scope;
},
drzjhd() {
if (this.selectArr.length != 1) {
this.$message.error("请选择一条数据后操作");
} else {
this.asjbh = this.selectArr[0].asjbh;
this.revokeVisiable = true;
}
},
closed() {
this.fileArr = [];
},
submitCKD() {
if (this.fileArr.length <= 0) {
this.$message.warning("请选择文件");
} else {
console.log(this.fileArr, this.asjbh);
let params = new FormData();
params.append("asjbh", this.asjbh);
params.append("zjclLxdm", this.zjcl_lxdm);
this.fileArr.forEach((i) => {
params.append("file", i.raw);
});
let loading = this.$loading({
lock: true,
text: "正在导入...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
insertZjcl(params).then((res) => {
if (res.code == 200 && res.success) {
this.$message.success("导入成功");
this.revokeVisiable = false;
this.$router.push("queryZjcl");
sessionStorage.setItem("routerPath", "queryZjcl");
setTimeout(() => {
this.$bus.$emit("routerPath");
}, 20);
} else {
this.$message.error("导入失败");
}
loading.close();
});
}
},
fileOnchange(file, fileList) {
if (fileList.length > 0) {
this.fileArr = [fileList[0]]; // 这一步,是 展示最后一次选择的csv文件
if (fileList.length > 1) this.$message.error("只能上传一个文件!");
}
},
// edit(obj) {
// this.$router.push({
// path: "/insertZjcl",
......
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