Commit b8fb3a02 by 张超军

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

parents 68036f98 a9bae97f
......@@ -18,9 +18,9 @@ export default [
component: () => import('@/views/htzwcj.vue')
},
{
path: '/zzwcj',
path: '/htcj',
// redirect: "/fingerprintIndex/R4300000000002021125008/admin",
name: 'zzwcj',
name: 'htcj',
hidden: false,
// icon_d: '/img/zzwcj_d.png',
// icon_a: '/img/zzwcj_a.png',
......@@ -29,7 +29,7 @@ export default [
title: '活体采集',
auth: 'A'
},
component: () => import('@/views/zzwcj/Index.vue')
component: () => import('@/views/zzwlr/htcj.vue')
},
{
path: '/zzwlr',
......
......@@ -2,6 +2,7 @@
$tableHeight: var(--tableHeight, 450px);
#bzxxfh {
font-family: HarmonyOS_Sans_SC;
width: 100%;
overflow: hidden;
.el-date-editor {
......
......@@ -4,7 +4,7 @@ $tableHeight: var(--tableHeight, 450px);
#bzxxsh {
width: 100%;
overflow: hidden;
font-family: HarmonyOS_Sans_SC;
.bzxxsh-top {
margin: 24px 24px 16px 24px;
border-bottom: 1px solid #eeeeee;
......
......@@ -3,6 +3,7 @@
height: 100vh;
overflow: hidden;
display: flex;
font-family: HarmonyOS_Sans_SC;
.fhxxLTDom {
width: 100%;
height: 100%;
......
......@@ -5,6 +5,7 @@ $phone: var(--phone, #606266); //#ff4242;
box-sizing: border-box;
margin: 0;
padding: 0;
font-family: HarmonyOS_Sans_SC;
}
.rdwcDialog {
......
......@@ -49,7 +49,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
<el-form-item style="padding-left:18px"
label="警综人员编号:"
prop="jzrybh"
>
......@@ -77,7 +77,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指掌纹卡编号:">
<el-form-item label="指掌纹卡编号:" style="padding-left:18px">
<el-input
v-model.trim="tableDate.zzhwkbh"
maxlength="23"
......@@ -131,7 +131,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="别名/绰号:">
<el-form-item label="别名/绰号:" style="padding-left:18px">
<el-input
v-model.trim="tableDate.bmch"
maxlength="50"
......@@ -163,7 +163,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出生日期:">
<el-form-item label="出生日期:" style="padding-left:18px">
<el-date-picker
type="date"
v-model="tableDate.csrq"
......@@ -193,7 +193,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="民族:">
<el-form-item label="民族:" style="padding-left:18px">
<el-input
v-model.trim="tableDate.mzCodeName "
maxlength="50"
......@@ -232,7 +232,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证件号码:">
<el-form-item label="证件号码:" style="padding-left:18px">
<el-input
v-model.trim="tableDate.zjhm"
maxlength="30"
......@@ -261,7 +261,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="户籍地址:">
<el-form-item label="户籍地址:" style="padding-left:18px">
<el-input
v-model="tableDate.hjdzDzmc "
maxlength="100"
......@@ -290,7 +290,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
<el-form-item style="padding-left:18px"
label="现住址:"
prop="xzzDzmc"
>
......@@ -372,7 +372,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="捺印人姓名:">
<el-form-item label="捺印人姓名:" style="padding-left:18px">
<el-input
v-model="tableDate.nyryXm"
maxlength="50"
......@@ -396,7 +396,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="捺印人身份证号:">
<el-form-item label="捺印人身份证号:" style="padding-left:18px">
<el-input
:disabled="true"
v-model="tableDate.nyryGmsfhm"
......@@ -413,7 +413,7 @@
<el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="捺印人联系电话:">
<el-form-item label="捺印人联系电话:" style="padding-left:18px">
<el-input
:disabled="true"
v-model="tableDate.nyryLxdh"
......@@ -439,6 +439,8 @@
v-model.trim="jcsm"
maxlength="1024"
show-word-limit
style="background-color:'#F6F8FA'"
placeholder="在此输入说明信息"
>
</el-input>
</el-form-item>
......@@ -628,6 +630,9 @@ export default {
}
</script>
<style lang="scss"scoped>
.right{
margin-left: 10px;
}
.head {
height: 48px;
background: #f6f8fa;
......@@ -642,6 +647,7 @@ export default {
width: 100%;
display: flex;
justify-content: center;
padding-bottom: 70px;
}
.ryxxForm {
position: relative;
......@@ -728,9 +734,13 @@ export default {
margin-bottom: 16px;
}
/deep/.el-textarea__inner {
width: 722px;
width: 737px;
height: 76px;
overflow: auto;
background-color: #F6F8FA;
}
/deep/.el-input__count{
background-color:#F6F8FA ;
}
/deep/.el-row {
margin-bottom: 24px;
......
#htcj {
width: 1544px !important;
height: 100% !important;
overflow: hidden !important;
margin: 0 24px;
}
.top {
height: 132px;
background: #F6F8FA;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
margin: 0 auto;
margin: 20px 0;
padding: 24px;
display: flex;
flex-direction: column;
}
.top_fir,.top_sec{
display: flex;
align-items: center;
}
.top_fir{
justify-content: space-between;
margin-right: 111px;
.xm,.xb{
margin-left: 15px;
}
.sfzh{
margin-left: 30px;
}
}
.el-select-dropdown__item{
padding-left: 14px;
}
.top_sec{
margin-top: 20px;
.top_sec_lef{
display: flex;
justify-content: space-between;
.cjdw{
span{
width: 70px;
}
/deep/.el-cascader .el-input .el-input__inner{
position: relative;
bottom: 5px;
}
}
}
}
.filter {
display: flex;
span{
width: 90px;
height: 22px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 32px;
}
/deep/.el-input__inner,.el-select__inner{
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border: none;
border-radius: 4px;
background-color: #fff;
width: 256px;
height: 32px;
}
}
.top_sec_lef{
.cjr{
margin-left: 25px;
span{
width: 93px;
}
}
.nysj{
margin-left: 13px;
span{
width: 72px;
}
}
}
.top_sec_rig{
margin-right: 24px;
margin-left:300px ;
span{
font-size: 14px;
width: 28px;
height: 19px;
font-family: HarmonyOS_Sans_SC;
color: #055FE7;
line-height: 19px;
cursor: pointer;
}
.el-button{
width: 72px;
height: 32px;
background: #055FE7;
border-radius: 4px;
margin-left: 7px;
border: none;
}
}
// 批量操作开始
.middle{
display: flex;
justify-content: space-between;
.btn{
background: #FFFFFF;
border-radius: 8px;
border: 1px solid #AEB5C2;
padding: 0 20px;
height: 36px;
line-height: 36px;
}
.middle_lef{
}
.middle_rig{
display: flex;
.btn{
margin-left: 16px;
}
}
}
.xzry{
border: 1px solid #055fe7 !important;
// font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
background-color: #fff;
i {
// font-size: 14px;
margin-right: 5px;
}
&:hover {
border: 1px solid #377fec;
color: #377fec;
}
&:active {
border: 1px solid #044cb9;
color: #044cb9;
}
}
.el-tag{
margin-top: 16px;
}
\ No newline at end of file
<template>
<div id="htcj">
<!-- 1 上边灰色底框筛选 -->
<div class="top">
<!-- 第一行 -->
<div class="top_fir">
<div class="filter rybh">
<span>人员编号:</span>
<el-input
placeholder="请输入人员编号"
v-model="code">
</el-input>
</div>
<div class="filter xm">
<span style="width: 82px;">姓名:</span>
<el-input
placeholder="请输入用户名"
v-model="name">
</el-input>
</div>
<div class="filter xb">
<span style="width: 51px;">性别:</span>
<SelectCode ref="xbdm" codeUrl="/api/code/sex" :clearable="true" :multiple="false" :form="ruleForm" class="xb" id="xb"></SelectCode>
</div>
<div class="filter sfzh">
<span>身份证号:</span>
<el-input
placeholder="请输入身份证号"
v-model="idcard"
>
</el-input>
</div>
</div>
<!-- 第二行 -->
<div class="top_sec">
<div class="top_sec_lef">
<div class="filter cjdw">
<span>采集单位:</span>
<Cascader ref="cascader" :form="ruleForm" id="nydwGajgjgdm" class="cjdw"></Cascader>
</div>
<div class="filter cjr">
<span>采集人:</span>
<el-input
placeholder="请输入采集人"
v-model="cjr"
>
</el-input>
</div>
<div class="filter nysj">
<span>捺印时间:</span>
<el-date-picker v-model="startEndDate" style="display: flex; align-items: center" type="daterange"
range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" :picker-options="{
disabledDate: disabledDate,
}">
</el-date-picker>
</div>
</div>
<div class="top_sec_rig">
<span @click="clear">清空</span>
<el-button type="primary">筛选</el-button>
</div>
</div>
</div>
<!-- 2 批量操作中间这一块 -->
<div class="middle">
<!-- 左边 -->
<div class="middle_lef">
<div class="btn" @click="batch">
批量操作
</div>
</div>
<!-- 右边 -->
<div class="middle_rig">
<div class="btn ">复制条码</div>
<div class="btn">删除</div>
<div class="btn xzry">
<i class="el-icon-plus"></i>
新增人员
</div>
</div>
</div>
<!-- 3 已选择x项弹弹出框 -->
<el-tag style="width: 100%; color: #666666;margin-bottom:1rem " v-show="isShowTip">
<span v-html="'&nbsp;&nbsp;'"></span>
<i class="iconfont icon-tanhao1" style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<el-link type="primary" :underline="false" style="margin-left: 1.25rem" @click="toggleSelection()">清除</el-link>
</el-tag>
<!-- 4 表格 -->
</div>
</template>
<script>
import SelectCode from "../../components/SelectCode.vue";
import Cascader from "../../components/Cascader.vue"
import zoom from "@/utils/autosize";
export default {
name: 'htcj',
components: { SelectCode, Cascader },
data() {
return {
code:'', //人员编号
name:'', //姓名
idcard:'', //身份证号
cjr:'', //采集人
startEndDate: null, // 时间
isShowTip: false, //批量操作提示
multipleSelection: [], // 表单选择项目
ruleForm: { //性别和采集单位
xb: '',
cjdw: ''
},
}
},
methods: {
disabledDate(a) { // 捺印时间设置
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
clear() { //清空按钮
this.name='',
this.code='',
this.idcard='',
this.cjr='',
this.ruleForm.xb='',
this.ruleForm='',
this.startEndDate=''
},
batch() { //批量操作弹出
this.disabled = !this.disabled;
this.selectBoo = !this.selectBoo;
this.isShowTip = !this.isShowTip;
if (this.selectBoo) {
this.toggleSelection();
}
// this.$set(this.multipleSelection, [])
},
},
};
</script>
<style lang="scss" scoped>
@import "./htcj.scss";
</style>
\ No newline at end of file
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