Skip to content

F
founder_vue
Commit 00aaa73d by 张超军
Options

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

parents 47a58b0e d9a6c700
Showing with 412 additions and 83 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -455,7 +455,7 @@
@closeFcx="closeFcx"
>
</fcx>
<!-- 新增案件弹窗 -->
<!-- 新增人员弹窗 -->
<xzry
:isShowXzry="isShowXzry"
@closeXzry="closeXzry"
......@@ -624,6 +624,9 @@ export default {
// 增加毛玻璃
this.$bus.emit('isBlur', val)
this.isShowXzry = val;
if (val == false) {
this.search()
}
// this.search();
},
// 人员信息卡操作
......@@ -1008,7 +1011,7 @@ export default {
},
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
/**
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -473,9 +473,12 @@ export default {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
this.$router.push(
"/ajzwbj/" + "xz" + "/" + this.ruleForm.ysxtAsjbh
);
this.$router.push({
path: "/ajzwbj/" + "xz" + "/" + this.ruleForm.ysxtAsjbh,
query: {
id: response.data.ret.id
}
})
} else {
this.$message.error("新增失败");
}
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -98,6 +98,8 @@
clearable
:form="ruleForm"
id="cjxxyydm"
multiple
:multipleLimit="5"
></SelectCode>
</el-form-item>
</el-col>
......@@ -576,6 +578,10 @@ export default {
}
},
submitForm (formName) {
console.log(this.ruleForm.cjxxyydm, 'caijiyuanying')
console.log(this.checkedTargets)
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -602,8 +608,11 @@ export default {
// console.log(this.logicDatabaseCode)
let reqParam = {
personDo: "",
logicList: []
logicList: [],
cjxxyyList: []
};
reqParam.cjxxyyList = this.ruleForm.cjxxyydm
delete this.ruleForm.cjxxyydm
reqParam.personDo = this.ruleForm;
reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
reqParam.logicList = this.logicList
......@@ -613,7 +622,6 @@ export default {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
} else {
this.$message.error("新增失败");
}
......
src/views/Editor/modules/rydaxx.vue
<template>
<el-drawer size="50%" class="rydaxx-drawer" :modal="false" @close="closeDrawer" :append-to-body="true" :modal-append-to-body="false" :visible.sync="drawer" :with-header="false">
<el-drawer
size="50%"
class="rydaxx-drawer"
:modal="false"
@close="closeDrawer"
:append-to-body="true"
:modal-append-to-body="false"
:visible.sync="drawer"
:with-header="false"
>
<div class="header">
<div class="header-title">人员档案信息</div>
<div class="header-close" @click="closeDrawer">
<svg class="icon" aria-hidden="true">
<div
class="header-close"
@click="closeDrawer"
>
<svg
class="icon"
aria-hidden="true"
>
<use xlink:href="#icon-fanhui"></use>
</svg>
</div>
</div>
<div class="content drawer-content">
<el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="10.125rem" class="demo-ruleForm" :status-icon="true">
<el-form
:model="ruleForm"
label-position="left"
:rules="rules"
ref="ruleForm"
label-width="10.125rem"
class="demo-ruleForm"
:status-icon="true"
>
<div class="ayzzwjbxx">
<div class="title">
<div class="line"></div>
......@@ -17,25 +40,69 @@
</div>
<div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item">
<el-form-item label="人员编号：" prop="rybh">
<el-input placeholder="请输入人员编号" v-model="ruleForm.rybh" maxlength="23" show-word-limit disabled></el-input>
<el-form-item
label="人员编号："
prop="rybh"
>
<el-input
placeholder="请输入人员编号"
v-model="ruleForm.rybh"
maxlength="23"
show-word-limit
disabled
></el-input>
</el-form-item>
<el-form-item label="警综人员编号：" prop="jzrybh">
<el-input placeholder="请输入警综人员编号" v-model="ruleForm.jzrybh" maxlength="23" show-word-limit></el-input>
<el-form-item
label="警综人员编号："
prop="jzrybh"
>
<el-input
placeholder="请输入警综人员编号"
v-model="ruleForm.jzrybh"
maxlength="23"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="采集信息原因：" prop="cjxxyydm">
<SelectCode codeUrl="/api/code/cjxxyydm" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="cjxxyydm" multiple :multipleLimit="5"></SelectCode>
<el-form-item
label="采集信息原因："
prop="cjxxyydm"
>
<SelectCode
codeUrl="/api/code/cjxxyydm"
width="16.5"
:clearable="true"
:form="ruleForm"
id="cjxxyydm"
multiple
:multipleLimit="5"
></SelectCode>
</el-form-item>
<el-form-item label="指掌纹卡编号：" prop="zzhwkbh">
<el-input placeholder="请输入指掌纹卡编号" v-model="ruleForm.zzhwkbh" maxlength="23" show-word-limit></el-input>
<el-form-item
label="指掌纹卡编号："
prop="zzhwkbh"
>
<el-input
placeholder="请输入指掌纹卡编号"
v-model="ruleForm.zzhwkbh"
maxlength="23"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<div></div>
<el-form-item label="案事件相关人员编号：" prop="asjxgrybh">
<el-input placeholder="请输入案事件相关人员编号" v-model="ruleForm.asjxgrybh" maxlength="23" show-word-limit></el-input>
<el-form-item
label="案事件相关人员编号："
prop="asjxgrybh"
>
<el-input
placeholder="请输入案事件相关人员编号"
v-model="ruleForm.asjxgrybh"
maxlength="23"
show-word-limit
></el-input>
</el-form-item>
</div>
</div>
......@@ -46,59 +113,183 @@
</div>
<div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item">
<el-form-item label="姓名：" prop="xm">
<el-input placeholder="请输入姓名" v-model="ruleForm.xm" maxlength="50" show-word-limit></el-input>
<el-form-item
label="姓名："
prop="xm"
>
<el-input
placeholder="请输入姓名"
v-model="ruleForm.xm"
maxlength="50"
show-word-limit
></el-input>
</el-form-item>
<el-form-item label="别名/绰号：" prop="bmch">
<el-input placeholder="请输入别名/绰号" v-model="ruleForm.bmch" maxlength="50" show-word-limit></el-input>
<el-form-item
label="别名/绰号："
prop="bmch"
>
<el-input
placeholder="请输入别名/绰号"
v-model="ruleForm.bmch"
maxlength="50"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="性别：" prop="xbdm">
<SelectCode codeUrl="/api/code/sex" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="xbdm"></SelectCode>
<el-form-item
label="性别："
prop="xbdm"
>
<SelectCode
codeUrl="/api/code/sex"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xbdm"
></SelectCode>
</el-form-item>
<el-form-item label="出生日期：" prop="csrq">
<el-date-picker type="date" placeholder="请输入出生日期" v-model="ruleForm.csrq"
<el-form-item
label="出生日期："
prop="csrq"
>
<el-date-picker
type="date"
placeholder="请输入出生日期"
v-model="ruleForm.csrq"
:picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
}"
></el-date-picker>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="国籍：" prop="gjdm">
<SelectCode codeUrl="/api/code/nationality" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="gjdm"></SelectCode>
<el-form-item
label="国籍："
prop="gjdm"
>
<SelectCode
codeUrl="/api/code/nationality"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="gjdm"
></SelectCode>
</el-form-item>
<el-form-item label="民族：" prop="mzdm">
<SelectCode codeUrl="/api/code/nation" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="mzdm"></SelectCode>
<el-form-item
label="民族："
prop="mzdm"
>
<SelectCode
codeUrl="/api/code/nation"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="mzdm"
></SelectCode>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="证件类型：" prop="cyzjdm" class="select">
<SelectCode codeUrl="/api/code/certificates" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="cyzjdm"></SelectCode>
<el-form-item
label="证件类型："
prop="cyzjdm"
class="select"
>
<SelectCode
codeUrl="/api/code/certificates"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="cyzjdm"
></SelectCode>
</el-form-item>
<el-form-item label="证件号码：" prop="zjhm" class="input2">
<el-input placeholder="请输入证件号码" v-model="ruleForm.zjhm" maxlength="30" show-word-limit></el-input>
<el-form-item
label="证件号码："
prop="zjhm"
class="input2"
>
<el-input
placeholder="请输入证件号码"
v-model="ruleForm.zjhm"
maxlength="30"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="户籍地行政区：" prop="hjdzXzqhdm" class="select">
<SelectCode codeUrl="/api/code/administrative" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="hjdzXzqhdm"></SelectCode>
<el-form-item
label="户籍地行政区："
prop="hjdzXzqhdm"
class="select"
>
<SelectCode
codeUrl="/api/code/administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="hjdzXzqhdm"
></SelectCode>
</el-form-item>
<el-form-item label="户籍地址：" prop="hjdzDzmc" class="input2">
<el-input placeholder="请输入户籍地址" v-model="ruleForm.hjdzDzmc" maxlength="100" show-word-limit></el-input>
<el-form-item
label="户籍地址："
prop="hjdzDzmc"
class="input2"
>
<el-input
placeholder="请输入户籍地址"
v-model="ruleForm.hjdzDzmc"
maxlength="100"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="现住址行政区：" prop="xzzXzqhdm" class="select">
<SelectCode codeUrl="/api/code/administrative" width="16.5" :clearable="true" :multiple="false" :form="ruleForm" id="xzzXzqhdm"></SelectCode>
<el-form-item
label="现住址行政区："
prop="xzzXzqhdm"
class="select"
>
<SelectCode
codeUrl="/api/code/administrative"
width="16.5"
:clearable="true"
:multiple="false"
:form="ruleForm"
id="xzzXzqhdm"
></SelectCode>
</el-form-item>
<el-form-item label="现地址：" prop="xzzDzmc" class="input2">
<el-input placeholder="请输入现住址" v-model="ruleForm.xzzDzmc" maxlength="100" show-word-limit></el-input>
<el-form-item
label="现地址："
prop="xzzDzmc"
class="input2"
>
<el-input
placeholder="请输入现住址"
v-model="ruleForm.xzzDzmc"
maxlength="100"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item ayzzwjbxx-item2">
<el-form-item label="备注信息：" prop="bz" class="input3">
<el-input type="textarea" :rows="2" placeholder="请输入备注信息" v-model="ruleForm.bz" maxlength="1024" show-word-limit></el-input>
<el-form-item
label="备注信息："
prop="bz"
class="input3"
>
<el-input
type="textarea"
:rows="2"
placeholder="请输入备注信息"
v-model="ruleForm.bz"
maxlength="1024"
show-word-limit
></el-input>
</el-form-item>
</div>
</div>
......@@ -108,9 +299,16 @@
<span class="name">人员逻辑分库</span>
</div>
<div class="ryljfk">
<el-form-item prop="logicdbtype2" class="fk">
<el-form-item
prop="logicdbtype2"
class="fk"
>
<el-checkbox-group v-model="ruleForm.logicdbtype2">
<el-checkbox v-for="(item,index) in ryljfkArr" :label="item.value" :key="index">{{item.label}}</el-checkbox>
<el-checkbox
v-for="(item,index) in ryljfkArr"
:label="item.value"
:key="index"
>{{item.label}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</div>
......@@ -121,29 +319,66 @@
</div>
<div class="ayzzwjbxx-items">
<div class="ayzzwjbxx-item">
<el-form-item label="捺印单位：" prop="nydwGajgjgdm">
<el-form-item
label="捺印单位："
prop="nydwGajgjgdm"
>
<!-- <el-input placeholder="请输入捺印单位名称" v-model="ruleForm.unitCode"></el-input>-->
<Cascader :form="ruleForm" id="nydwGajgjgdm"></Cascader>
<Cascader
:form="ruleForm"
id="nydwGajgjgdm"
></Cascader>
</el-form-item>
<el-form-item label="捺印人姓名：" prop="nyryXm">
<el-input placeholder="请输入捺印人姓名" v-model="ruleForm.nyryXm" maxlength="50" show-word-limit></el-input>
<el-form-item
label="捺印人姓名："
prop="nyryXm"
>
<el-input
placeholder="请输入捺印人姓名"
v-model="ruleForm.nyryXm"
maxlength="50"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<el-form-item label="捺印时间：" prop="nysj">
<el-date-picker type="date" placeholder="请输入捺印时间" v-model="ruleForm.nysj"
<el-form-item
label="捺印时间："
prop="nysj"
>
<el-date-picker
type="date"
placeholder="请输入捺印时间"
v-model="ruleForm.nysj"
:picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
}"
></el-date-picker>
</el-form-item>
<el-form-item label="捺印人身份证号：" prop="nyryGmsfhm">
<el-input placeholder="请输入捺印人身份证号" v-model="ruleForm.nyryGmsfhm" maxlength="18" show-word-limit></el-input>
<el-form-item
label="捺印人身份证号："
prop="nyryGmsfhm"
>
<el-input
placeholder="请输入捺印人身份证号"
v-model="ruleForm.nyryGmsfhm"
maxlength="18"
show-word-limit
></el-input>
</el-form-item>
</div>
<div class="ayzzwjbxx-item">
<div></div>
<el-form-item label="捺印人联系电话：" prop="nyryLxdh">
<el-input placeholder="请输入捺印人联系电话" v-model="ruleForm.nyryLxdh" maxlength="18" show-word-limit></el-input>
<el-form-item
label="捺印人联系电话："
prop="nyryLxdh"
>
<el-input
placeholder="请输入捺印人联系电话"
v-model="ruleForm.nyryLxdh"
maxlength="18"
show-word-limit
></el-input>
</el-form-item>
</div>
</div>
......@@ -153,31 +388,75 @@
<span class="name">操作记录列表</span>
</div>
<div class="czjl-table">
<el-table :header-cell-style="{background: '#F6F8FA',color:'#282F3C'}" :data="tableData" border style="width: 100%">
<el-table-column align="center" :width="width1" type="index">
<el-table
:header-cell-style="{background: '#F6F8FA',color:'#282F3C'}"
:data="tableData"
border
style="width: 100%"
>
<el-table-column
align="center"
:width="width1"
type="index"
>
</el-table-column>
<el-table-column prop="czr" align="center" label="操作人" width="auto">
<el-table-column
prop="czr"
align="center"
label="操作人"
width="auto"
>
</el-table-column>
<el-table-column prop="czrq" align="center" label="操作日期" width="auto">
<el-table-column
prop="czrq"
align="center"
label="操作日期"
width="auto"
>
</el-table-column>
<el-table-column prop="czsj" align="center" label="操作事件" width="auto">
<el-table-column
prop="czsj"
align="center"
label="操作事件"
width="auto"
>
</el-table-column>
</el-table>
</div>
</div>
<div class="horizontal-line"></div>
<div class="form-footer">
<div class="save" @click="submitForm('ruleForm')">保存</div>
<div class="cancel" @click="closeDrawer('ruleForm')">取消</div>
<div class="export" @click="isShowDcftpxBtn">FPTX导出</div>
<div
class="save"
@click="submitForm('ruleForm')"
>保存</div>
<div
class="cancel"
@click="closeDrawer('ruleForm')"
>取消</div>
<div
class="export"
@click="isShowDcftpxBtn"
>FPTX导出</div>
</div>
</el-form>
</div>
<div class="arrow-down" @click="goBottom">
<img class="arrow-down-img" src="@/assets/img/jiantou.gif" alt="">
<div
class="arrow-down"
@click="goBottom"
>
<img
class="arrow-down-img"
src="@/assets/img/jiantou.gif"
alt=""
>
</div>
<!-- 导出FPTX弹窗 -->
<dcftpx :isShowDcftpx="isShowDcftpx" :rowData="rowData" @closeDcftpx="closeDcftpx"></dcftpx>
<dcftpx
:isShowDcftpx="isShowDcftpx"
:rowData="rowData"
@closeDcftpx="closeDcftpx"
></dcftpx>
</el-drawer>
</template>
......@@ -197,13 +476,13 @@ export default {
drawer: false,
// ryljfkArr: ['基本人员库', '高危人员库', '非违人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'],
ryljfkArr: [
{label: '基本人员库', value: '1'},
{label: '高危人员库', value: '2'},
{label: '非违人员库', value: '3'},
{label: '在逃人员库', value: '4'},
{label: '布控人员库', value: '5'},
{label: '前科人员库', value: '6'},
{label: '协查人员库', value: '7'},
{ label: '基本人员库', value: '1' },
{ label: '高危人员库', value: '2' },
{ label: '非违人员库', value: '3' },
{ label: '在逃人员库', value: '4' },
{ label: '布控人员库', value: '5' },
{ label: '前科人员库', value: '6' },
{ label: '协查人员库', value: '7' },
],
ruleForm: {
id: '',
......@@ -387,7 +666,7 @@ export default {
this.ruleForm.rybh = this.ryInfo.ysxtAsjxgrybh
this.ruleForm.jzrybh = this.ryInfo.jzrybh
// 人员档案信息
if(this.ryInfo.cjxxyydm) {
if (this.ryInfo.cjxxyydm) {
this.ruleForm.cjxxyydm = this.ryInfo.cjxxyydm.split(',')
}
this.ruleForm.zzhwkbh = this.ryInfo.zzhwkbh
......@@ -408,7 +687,7 @@ export default {
// 人员逻辑分库
// let ryljfk = this.ryInfo.logicdbtype.split('')
// this.ruleForm.logicdbtype = ryljfk
if(this.ryInfo.logicDatabaseCode && this.ryInfo.logicDatabaseCode.length > 0) {
if (this.ryInfo.logicDatabaseCode && this.ryInfo.logicDatabaseCode.length > 0) {
this.ruleForm.logicdbtype2 = this.ryInfo.logicDatabaseCode.split(',')
} else {
this.ruleForm.logicdbtype2 = []
......@@ -448,7 +727,7 @@ export default {
"Content-Type": "application/json;charset=UTF-8"
},
url: '/api/personstore/person/file',
data: JSON.stringify({personDo: self.ruleForm, logicList: logicList, cjxxyyList: cjxxyyList})
data: JSON.stringify({ personDo: self.ruleForm, logicList: logicList, cjxxyyList: cjxxyyList })
}).then(res => {
if (res.data.code === 0) {
self.$message.success('保存成功！')
......
src/views/zljc/Index.vue
......@@ -100,7 +100,10 @@
<div
class="btn"
v-if="roleArr.includes('D-1-2')"
@click="batch"
v-clipboard:copy="barcode"
@click="getbarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
>复制条码</div>
</div>
</div>
......@@ -309,6 +312,8 @@ export default {
kssj: '',// 捺印开始时间
jssj: '',// 捺印结束时间
barcode: '',// 复制条码
}
},
methods: {
......@@ -403,6 +408,37 @@ export default {
}
})
},
getbarcode () {
let self = this;
this.barcode = [];
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据！");
this.selectBoo = true;
} else {
self.multipleSelection.forEach((item) => {
self.barcode.push(item.barcode);
});
this.barcode = this.barcode.join(",");
}
},
// 复制成功时的回调函数
onCopy (e) {
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
if (this.multipleSelection.length != 0) {
this.$message.error("抱歉，复制条码号失败！");
}
},
// 格式化参数(开始时间，结束时间)
getParam () {
if (this.formInline.nysj !== null) {
......
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