Skip to content

F
founder_vue
Commit ec98406c by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt 

# Conflicts:
#	public/iconfont/demo_index.html
#	public/iconfont/iconfont.css
#	public/iconfont/iconfont.js
#	public/iconfont/iconfont.json
#	public/iconfont/iconfont.ttf
#	public/iconfont/iconfont.woff
#	public/iconfont/iconfont.woff2
parents e013662f 994613f3
Showing with 292 additions and 54 deletions
src/assets/icon_font/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2614723 */
src: url('iconfont.woff2?t=1623997578522') format('woff2'),
url('iconfont.woff?t=1623997578522') format('woff'),
url('iconfont.ttf?t=1623997578522') format('truetype');
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1641808946261') format('woff2'),
url('iconfont.woff?t=1641808946261') format('woff'),
url('iconfont.ttf?t=1641808946261') format('truetype');
}
.iconfont {
......@@ -13,47 +13,227 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-xiugai4:before {
content: "\e646";
}
.icon-shujuguanli:before {
content: "\e603";
}
.icon-gongzuoliu:before {
content: "\e601";
}
.icon-chexiaozhanguo:before {
content: "\e645";
}
.icon-fuhexiangqing:before {
content: "\e644";
}
.icon-fuhe:before {
content: "\e642";
}
.icon-shenheyouxiao:before {
content: "\e643";
}
.icon-xiajiantou:before {
content: "\e640";
}
.icon-jinyongjiantou:before {
content: "\e641";
}
.icon-buhege:before {
content: "\e63f";
}
.icon-hege:before {
content: "\e63e";
}
.icon-bianji:before {
content: "\e63d";
}
.icon-cuowu-buhege:before {
content: "\e63c";
}
.icon-baocun:before {
content: "\e63b";
}
.icon-jiancha:before {
content: "\e63a";
}
.icon-tanhao1:before {
content: "\e638";
}
.icon-chaxunrending:before {
content: "\e637";
}
.icon-zhizhangwenluru1:before {
content: "\e634";
}
.icon-xitongguanlibeifen:before {
content: "\e636";
}
.icon-shujuziyuanguanli1:before {
content: "\e631";
}
.icon-zhiliangjianchabeifen:before {
content: "\e632";
}
.icon-xingzhuang:before {
content: "\e633";
}
.icon-danchuangguanbianniu:before {
content: "\e630";
}
.icon-xitongjiaose:before {
content: "\e62e";
}
.icon-ketianjiajiaose1:before {
content: "\e62f";
}
.icon-danganxinxi:before {
content: "\e62d";
}
.icon-xingxing:before {
content: "\e62c";
}
.icon-yiguanzhu:before {
content: "\e62b";
}
.icon-shanchu1:before {
content: "\e62a";
}
.icon-chenggong:before {
content: "\e629";
}
.icon-tanhao:before {
content: "\e628";
}
.icon-riqi:before {
content: "\e627";
}
.icon-xiala:before {
content: "\e66d";
content: "\e626";
}
.icon-fanhui:before {
content: "\e625";
}
.icon-duihao:before {
content: "\e624";
}
.icon-cishu:before {
content: "\e622";
}
.icon-shijian:before {
content: "\e623";
}
.icon-xiugaiyonghuquanxian-bianji:before {
content: "\e621";
}
.icon-shanchujiaose:before {
content: "\e61c";
}
.icon-tianjiajiaose:before {
content: "\e61b";
}
.icon-shenhe-xiala:before {
content: "\e612";
}
.icon-bujizhanguo:before {
content: "\e60b";
}
.icon-chexiaoshenhe:before {
content: "\e60c";
}
.icon-jiruzhanguo:before {
content: "\e60d";
}
.icon-shenhe:before {
content: "\e60e";
}
.icon-shenhewuxiao:before {
content: "\e60f";
}
.icon-bofang:before {
content: "\e66e";
.icon-shangbaoshengxingzhuan:before {
content: "\e610";
}
.icon-guanbi:before {
content: "\e66f";
.icon-zhongxinshenhe:before {
content: "\e611";
}
.icon-xuanzhong:before {
content: "\e670";
.icon-quxiaoguanzhu:before {
content: "\e60a";
}
.icon-xuanzeqi:before {
content: "\e671";
.icon-rengongrending:before {
content: "\e608";
}
.icon-wenjianjia:before {
content: "\e672";
.icon-shanchu:before {
content: "\e609";
}
.icon-yulan:before {
content: "\e673";
.icon-fuzhitiaomahao:before {
content: "\e602";
}
.icon-zanting:before {
content: "\e674";
.icon-gaihao:before {
content: "\e604";
}
.icon-zhiwen:before {
content: "\e675";
.icon-fuzhishuju:before {
content: "\e605";
}
.icon-shezhi:before {
content: "\e676";
.icon-dayin:before {
content: "\e606";
}
.icon-zhiwencaijibiaoji:before {
content: "\e677";
.icon-chaxun:before {
content: "\e607";
}
src/router/modules/leftMenu.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-10 12:00:05
* @LastEditTime: 2021-12-24 16:55:48
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -46,6 +46,20 @@ export default [
component: () => import('@/views/zzwlr/xzry.vue')
},
{
path: '/xzry/:type',
// redirect: "/fingerprintIndex/R4300000000002021125008/admin",
name: 'xzry',
hidden: true,
// icon_d: '/img/zzwcj_d.png',
// icon_a: '/img/zzwcj_a.png',
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
{
path: '/zzwlr',
name: 'zzwlr',
hidden: false,
......@@ -55,7 +69,7 @@ export default [
title: '指掌纹录入',
auth: 'B'
},
component: () => import('@/views/zzwlr/Index.vue'),
component: () => import('@/views/zzwlr/index.vue'),
},
{
path: '/drFPTX',
......
src/views/zzwlr/htcj.scss
......@@ -163,6 +163,9 @@
background-color: #dadde0;
border-radius: 3px;
}
/deep/.el-table__body-wrapper is-scrolling-none{
max-height: 340px !important;
}
/deep/.el-table th {
background-color: #f6f8fa;
}
......@@ -195,7 +198,7 @@
}
/deep/.el-table {
width: 100%;
max-height: 435px !important;
max-height: 435px !important;
margin-top: 16px;
.cell:empty::before {
content: "---";
......
src/views/zzwlr/xzry.vue
......@@ -11,7 +11,7 @@
<div class="top">
<div class="fir">
<div class="cir">1</div>
<span>新增人员</span>
<span>{{edit}}</span>
<div class="dashed"></div>
</div>
<div class="unactive">
......@@ -36,13 +36,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="人员编号：" prop="ysxtAsjxgrybh">
<el-input class="inputBh" v-model.trim="ruleForm.ysxtAsjxgrybh" placeholder="请输入人员编号" maxlength="22"
show-word-limit clearable><template slot="prepend">R</template></el-input>
<el-input v-model.trim="ruleForm.ysxtAsjxgrybh" placeholder="请输入人员编号" maxlength="22" class="inputBh"
show-word-limit clearable>
<template slot="prepend">R</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="警综人员编号：">
<!-- prop="jzrybh" -->
<el-form-item label="警综人员编号：" prop="jzrybh">
<el-input v-model.trim="ruleForm.jzrybh" placeholder="请输入警综人员编号" maxlength="23" show-word-limit clearable>
</el-input>
</el-form-item>
......@@ -57,8 +58,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指掌纹卡编号：">
<!-- prop="zzhwkbh" -->
<el-form-item label="指掌纹卡编号：" prop="zzhwkbh">
<!-- -->
<el-input v-model.trim="ruleForm.zzhwkbh" placeholder="请输入指掌纹卡编号" maxlength="23" show-word-limit
clearable></el-input>
</el-form-item>
......@@ -72,8 +73,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="案事件相关人员编号：">
<!-- prop="asjxgrybh" -->
<el-form-item label="案事件相关人员编号：" prop="asjxgrybh">
<!-- -->
<el-input v-model.trim="ruleForm.asjxgrybh" placeholder="请输入案事件相关人员编号" maxlength="23" show-word-limit
clearable></el-input>
</el-form-item>
......@@ -110,9 +111,7 @@
<el-col :span="12">
<el-form-item label="出生日期：" prop="csrq">
<el-date-picker type="date" placeholder="请选择出生日期" v-model="ruleForm.csrq" style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -215,11 +214,9 @@
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item label="捺印时间：" prop="nysj">
<el-date-picker type="datetime" placeholder="请输入捺印时间" v-model="ruleForm.nysj" style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"></el-date-picker>
<el-form-item label="捺印日期：" prop="nysj">
<el-date-picker type="date" placeholder="请输入捺印日期" v-model="ruleForm.nysj" style="width: 100%"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -267,10 +264,24 @@
},
data() {
return {
edit:'新增人员',
dialogVisible: false, // 弹窗状态
labelPosition: "left", // 数据项对齐方式
checkedTargets: ['1'], // 选定的目标逻辑库
targets: this.$store.state.ljk.targetOptions_ry, // 目标逻辑库
reqParam: {
// 请求参数
page: {
total: 0, //表格条数
pageSize: 10, //当前选择要显示的条数
currPage: 1 // 当前在第几页
},
personStoreCustomSearch: {
ysxtAsjxgrybh: "", // 搜索框内容
searchOptions: 3, // 默认搜索方式
checkboxQuery: [] //滚动平面等筛选条件
}
},
ruleForm: {
ysxtAsjxgrybh: "", // 人员编号
jzrybh: "", // 警综人员编号
......@@ -304,7 +315,7 @@
logicList: [],// 逻辑库代码
rules: {
ysxtAsjxgrybh: [
{ min: 22, max: 22, message: '编号长度有误！', trigger: 'change' },
{ min: 23, max: 23, message: '编号长度有误！', trigger: 'change' },
{ required: true, message: "请输入人员条码号", trigger: "blur" },
],
jzrybh: [
......@@ -358,7 +369,7 @@
{
type: "date",
required: true,
message: "请选择捺印时间",
message: "请选择捺印日期",
trigger: "change",
},
],
......@@ -378,6 +389,17 @@
},
mounted() {
this.dialogVisible = this.isShowXzry;
// console.log(this.$route.query.barcode)
// console.log(this.$route.params.type)
// this.getRyinfo (this.$route.query.barcode)
if(this.$route.params.type === 'edit' ){
this.edit = '修改人员'
this.getRyinfo (this.$route.query.barcode)
}else{
console.log(this.$route.params.type==='edit');
this.edit = '新增人员'
}
},
watch: {
isShowXzry(newVal, oldVal) {
......@@ -388,13 +410,13 @@
},
},
methods: {
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
// disabledDate(a) {
// if (a.getTime() > new Date().getTime()) {
// return true;
// } else {
// return false;
// }
// },
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -475,6 +497,25 @@
this.dialogVisible = false;
this.$refs[formName].resetFields();
},
getRyinfo (code) {
let self = this
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = code
this.$axios
.post("/api/personstore/person/list", this.reqParam)
.then(response => {
if (response.data.code === 0) {
console.log(response);
self.ryInfo = response.data.ret.list[0]
// self.initData()
console.log(self.ryInfo)
this.ruleForm = self.ryInfo
} else {
self.$message.error(response.data.message);
}
});
},
}
};
</script>
......
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