Skip to content

F
founder_vue
Commit 86860d4b by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 1a91dd2b 2fa280da
Showing with 630 additions and 512 deletions
src/assets/css/globalBase.scss
......@@ -5,43 +5,105 @@
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner, /deep/.el-input__inner:focus {
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055FE7;
color: #055fe7;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner, /deep/.el-input__inner:focus-within {
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08) !important;
border-color: none !important;
color: #055FE7;
color: #055fe7;
.el-range-input {
color: #055FE7;
color: #055fe7;
}
}
/deep/.el-table td,
.el-table th.is-leaf {
background-color: #ffffff;
border: none;
// border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid;
}
// 去除table表格最底部边框
.el-table__row > td {
border: none;
}
// 去除table表格最底部边框
.el-table::before {
height: 0px;
}
/deep/.el-table .el-table__header-wrapper tr th{
background-color: #ECF1F7!important;
/deep/.el-table .el-table__header-wrapper tr th {
background-color: #ecf1f7 !important;
font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282F3C !important;
color: #282f3c !important;
height: 48px !important;
padding: 0 !important;
}
/deep/.el-table .el-table__body tr.current-row > td {
background-color: #F2F7FE !important;
background-color: #f2f7fe !important;
}
/deep/.el-table .el-table__body tr:hover > td {
background-color: #F2F7FE !important;
background-color: #f2f7fe !important;
}
/deep/.el-table__row {
height: 48px !important;
}
/deep/.el-table__row--level-1 {
.el-table__cell {
background-color: #F5F6F7 !important;
background-color: #f5f6f7 !important;
}
}
/deep/.el-table .el-table__cell {
padding: 0 !important;
}
/deep/.el-table__body {
width: 100% !important;
}
/deep/.btn-prev {
cursor: pointer;
i {
cursor: pointer;
}
}
/deep/.btn-next {
cursor: pointer;
i {
cursor: pointer;
}
}
// 分页
/deep/.el-pager {
.number {
background-color: transparent !important;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/.btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
// 修改下拉框样式
......@@ -49,6 +111,10 @@
padding-left: 10px !important;
}
/deep/.el-input__inner:hover {
cursor: text;
}
// 日期选择器
/deep/.el-date-editor {
display: flex;
......@@ -57,8 +123,10 @@
/deep/.el-date-editor .el-range-separator {
line-height: 26px;
}
/deep/.el-input__icon {
height: 32px;
/deep/.el-date-editor {
/deep/.el-range__close-icon {
height: 32px !important;
}
}
/deep/ .el-input__icon.el-range__icon.el-icon-date {
position: absolute;
......@@ -67,27 +135,27 @@
.f-primary-button {
cursor: pointer;
background: #055FE7 !important;
background: #055fe7 !important;
&:hover {
background: #377FEC !important;
background: #377fec !important;
}
&:active {
background: #044CB9 !important;
background: #044cb9 !important;
}
}
.f-default-button {
border-radius: 6px;
border: 1px solid #AEB5C2 !important;
border: 1px solid #aeb5c2 !important;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #2E3846 !important;
color: #2e3846 !important;
&:hover {
border: 1px solid #055FE7 !important;
color: #055FE7 !important;
border: 1px solid #055fe7 !important;
color: #055fe7 !important;
}
&:active {
border: 1px solid #044CB9 !important;
color: #044CB9 !important;
border: 1px solid #044cb9 !important;
color: #044cb9 !important;
}
}
src/router/modules/leftMenu.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-10 12:00:05
* @LastEditTime: 2022-01-12 11:27:48
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -41,7 +41,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -55,7 +54,6 @@ export default [
meta: {
parentId: 'zzwlr',
title: '新增人员',
// auth: 'A'
},
component: () => import('@/views/zzwlr/xzry.vue')
},
......@@ -128,18 +126,6 @@ export default [
component: () => import('@/views/Editor/ajzwbj.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/zljc',
name: 'zljc',
hidden: false,
......@@ -176,6 +162,18 @@ export default [
component: () => import('@/views/daxx/Index.vue')
},
{
path: '/cxyrd',
name: 'cxyrd',
hidden: false,
icon_d: '/img/cxyrd_d.png',
icon_a: '/img/cxyrd_a.png',
meta: {
title: '查询与认定',
auth: 'C'
},
component: () => import('@/views/cxyrd/QueryConfirm.vue')
},
{
path: '/AllPersonnelBaseIndex',
name: 'AllPersonnelBaseIndex',
redirect: '/AllPersonnelBase',
......@@ -318,7 +316,7 @@ export default [
hidden: false,
meta: {
title: '发查询权限',
auth: 'H-4',
auth: 'H-5',
parentId: 'SystemManage'
},
component: () =>
......@@ -380,7 +378,7 @@ export default [
hidden: false,
meta: {
title: '系统分库管理',
auth: 'H-4',
auth: 'H-6',
parentId: 'SystemManage'
},
component: () =>
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -222,7 +222,6 @@
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="auto"
>
......@@ -1032,7 +1031,7 @@ export default {
* @return {*}
*/
Tpage () {
return Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize);
return Math.round(this.reqParam.page.total / this.reqParam.page.pageSize);
}
},
mounted () {
......
src/views/Home.vue
......@@ -892,10 +892,10 @@ export default {
.el-tabs /deep/ {
font-family: HarmonyOS_Sans_SC;
width: 1235px;
height: 60px;
height: 56px;
.el-tabs__header {
margin: 0;
height: 60px;
height: 56px;
.el-tabs__nav-wrap.is-top {
height: 100%;
}
......@@ -1220,7 +1220,7 @@ export default {
.main {
// padding: 24px;
width: 100%;
height: calc(100% - 60px);
height: calc(100% - 56px);
.contain {
position: relative;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -8,7 +8,7 @@
<div class="display_style">
<span class="labelFont">条码号：</span>
<el-input
class="el_input"
class="el_input tmh"
v-model="reqParam.contrastCustomSearchReq.barcode"
placeholder="请输入条码号"
></el-input>
......@@ -247,8 +247,8 @@
v-show="isShowTip"
>
<i
class="el-icon-info"
style="color: #055fe7; font-size: 0.9375rem"
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i>
已选择
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
......@@ -1489,14 +1489,14 @@ b {
font-size: 12px;
}
.el-button {
width: 96px;
width: 72px;
height: 32px;
border-radius: 4px;
margin: 0;
padding: 0;
}
.el-button__inner {
width: 56px;
width: 72px;
height: 16px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -1510,6 +1510,7 @@ b {
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
font-size: 0.75rem;
}
.confirm-page {
......@@ -1608,6 +1609,9 @@ b {
border-radius: 4px;
// border: 1px solid #e6e6e8;
}
.tmh {
width: 232px;
}
/deep/.el-input__inner {
height: 32px !important;
}
......@@ -1690,7 +1694,7 @@ b {
}
.el-button--primary {
width: 96px;
width: 72px;
height: 32px;
line-height: 22px;
padding: 0;
......@@ -1795,7 +1799,9 @@ b {
}
.confirm_main {
width: 100%;
height: 60px;
// height: 60px;
height: 620px;
border-bottom: 1px solid #eeeeee;
}
.confirm_main_table {
margin: 6px 0 15px 0;
......
src/views/drFPTX/Index.vue
......@@ -89,6 +89,7 @@
FPTX的条码号
</div>
<el-table
:border="false"
height="33rem"
:data="datas"
@selection-change="checkAll1"
......
src/views/drFPTX/RAList.vue
......@@ -247,12 +247,13 @@
<!-- <el-divider style="background-color: #EEEEEE !important;"></el-divider> -->
<!-- 三 -->
<div class="split-line">
<div class="options">
<div class="left">
<div
class="btn"
@click="batch"
style="font-size:14px"
style="font-size:0.875rem"
>批量操作</div>
</div>
<div class="right">
......@@ -260,7 +261,7 @@
v-if="roleArr.includes('B-2-4')"
class="btn"
@click="isShowTjddlBtn"
style="font-size:14px"
style="font-size:0.875rem"
>添加到队列</div>
<div
class="btn"
......@@ -268,7 +269,7 @@
@click="getBarcodeSuccess(0)"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
style="font-size:14px"
style="font-size:0.875rem"
>
复制入库失败编号
</div>
......@@ -278,7 +279,7 @@
@click="getBarcodeSuccess(1)"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
style="font-size:14px"
style="font-size:0.875rem"
>
复制入库成功编号
</div>
......@@ -288,7 +289,7 @@
@click="getBarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
style="font-size:14px"
style="font-size:0.875rem"
>
复制条码
</div>
......@@ -296,19 +297,19 @@
v-if='showType!=2'
class="btn send"
@click="isShowFcxBtn"
style="font-size:14px"
style="font-size:0.875rem"
>发查询</div>
</div>
</div>
<!--四 -->
<el-tag
style="width: 100%; color: #666666; margin-bottom: 16px"
style="width: 100%; color: #666666; margin-bottom: 1rem;background: #ddebff;"
v-show="isShowTip"
>
<span v-html="'&nbsp;&nbsp;'"></span>
<i
class="iconfont icon-tanhao1"
style="color: #055fe7; font-size: 16px; margin: 0 0.625rem;"
style="color: #055fe7; font-size: 1rem; margin: 0 0.625rem;"
></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
......@@ -317,13 +318,18 @@
<el-link
type="primary"
:underline="false"
style="margin-left: 20px"
:style="{
marginLeft: '1.25rem',
color: '#055FE7',
transform: 'translateY(-2px)',
}"
@click="toggleSelection()"
>清除</el-link>
</el-tag>
<!-- 五 -->
<div v-if="showType == 1 || showType == 3">
<el-table
:border="false"
:class="{delSelection: !selectBoo}"
:height="height"
ref="multipleTable"
......@@ -511,6 +517,7 @@
</div>
<el-table
:border="false"
class="bzTable"
:class="{delSelection: !selectBoo}"
v-if="showType == 2"
......@@ -615,9 +622,9 @@
v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''"
style="margin-top:6px;margin-right: 5px;"
>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 0.4375rem;height: 0.4375rem;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div>
<div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
<div style="width: 0.4375rem;height: 0.4375rem;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
</div>
<div>
<div>{{ scope.row.srcBarcode }}</div>
......@@ -763,6 +770,7 @@
</template>
</el-table-column>
</el-table>
</div>
<!-- 六 -->
<div
class="block"
......@@ -1841,7 +1849,10 @@ export default {
}
}
}
.split-line {
height: 650px;
border-bottom: 1px solid #eee;
}
.options {
height: 72px;
display: flex;
......@@ -1906,6 +1917,7 @@ export default {
margin-left: 0;
}
img {
cursor: pointer;
width: 16px;
height: 16px;
object-fit: fill;
......
src/views/zljc/Index.vue
......@@ -82,14 +82,15 @@
>清空</el-button>
<el-button
type="primary"
class='sx'
class='sx f-primary-button'
@click="onSubmit"
>筛选结果</el-button>
>筛选</el-button>
</div>
</div>
<div class="line">
<div></div>
</div>
<div class="split-line">
<div class="cz">
<div class="czLeft">
<div
......@@ -125,7 +126,7 @@
</el-tag>
<el-table
:max-height="height"
:height="height"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
......@@ -243,6 +244,7 @@
</el-table-column>
</el-table>
</div>
</div>
<div class="footer">
<span class="record">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{
Tpage
......@@ -305,7 +307,7 @@ export default {
width1: 220,
width2: 160,
width3: 110,
height: 550,
height: "33rem",
tableDate: [],
// 当前页数
currPage: 1,
......@@ -482,9 +484,9 @@ export default {
this.isShowTip = false;
this.toggleSelection();
if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
} else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
}
},
/**
......@@ -498,9 +500,9 @@ export default {
this.toggleSelection();
// this.$set(this.multipleSelection, [])
if (this.isShowTip) {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '30.375rem');
} else {
document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
// document.getElementsByTagName('body')[0].style.setProperty('--tableHeight', '34.375rem');
}
},
/**
......@@ -604,7 +606,7 @@ export default {
<style lang="scss" scoped>
// table表的高度
$tableHeight: var(--tableHeight, 550px);
$tableHeight: var(--tableHeight, 33rem);
.czBtn {
width: 72px;
......@@ -673,34 +675,68 @@ $tableHeight: var(--tableHeight, 550px);
.bhgSpan {
background: #fe0000;
}
.split-line {
margin: 0 24px;
height: 650px;
border-bottom: 1px solid #eee;
}
// .footer {
// position: fixed;
// bottom: 0;
// padding: 0 24px;
// box-sizing: border-box;
// margin-top: 16px;
// width: 100%;
// display: flex;
// align-items: center;
// justify-content: space-between;
// .record {
// font-size: 14px;
// font-family: HarmonyOS_Sans_SC;
// color: #666666;
// }
// }
.footer {
padding: 0 24px;
box-sizing: border-box;
margin-top: 16px;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
width: 1544px;
position: absolute;
bottom: 27px;
left: 24px;
.record {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
}
.paging {
float: right;
}
}
// .footer {
// width: 96.5rem;
// position: absolute;
// bottom: 1.6875rem;
// left: 1.5rem;
// }
.content {
margin-top: 24px;
margin-top: 15px;
width: 100%;
padding: 0 24px;
// padding: 0 24px;
box-sizing: border-box;
.el-tag {
width: 100%;
margin-bottom: 24px;
margin-bottom: 15px;
color: #666;
span {
color: #409eff;
}
}
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
padding: 0 8px !important;
background: #ddebff;
border-radius: 4px;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......@@ -722,8 +758,9 @@ $tableHeight: var(--tableHeight, 550px);
.cz {
display: flex;
justify-content: space-between;
padding: 0 24px;
// padding: 0 24px;
.btn {
cursor: pointer;
width: 96px;
height: 32px;
border-radius: 4px;
......@@ -744,7 +781,7 @@ $tableHeight: var(--tableHeight, 550px);
}
}
.line {
margin: 24px 0;
margin: 15px 0;
width: 100%;
padding: 0 24px;
box-sizing: border-box;
......@@ -765,12 +802,28 @@ $tableHeight: var(--tableHeight, 550px);
justify-content: space-between;
margin: 24px;
.left {
.demo-form-inline {
display: flex;
align-items: center;
}
/deep/.el-form-item {
height: 32px;
margin-left: 24px;
display: flex;
align-items: center;
.el-input__inner {
height: 32px;
}
}
.el-form-item__label {
height: 32px !important;
}
.el-form-item__content {
height: 32px !important;
}
.el-input {
height: 32px;
}
.w156 {
/deep/.el-input__inner {
width: 156px;
......@@ -792,17 +845,21 @@ $tableHeight: var(--tableHeight, 550px);
.right {
margin-right: 24px;
/deep/.sx {
width: 96px;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
color: #fff;
cursor: pointer;
span {
cursor: pointer;
}
}
}
}
/deep/.el-table tr {
height: 55px;
}
// /deep/.el-table tr {
// height: 55px;
// }
/deep/.el-table th > .cell {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -836,4 +893,5 @@ $tableHeight: var(--tableHeight, 550px);
position: absolute;
right: 0;
}
@import "@/assets/css/globalBase.scss";
</style>
\ No newline at end of file
src/views/zzwlr/htcj.vue
......@@ -6,23 +6,36 @@
<div class="top_fir">
<div class="filter rybh">
<span>人员编号：</span>
<el-input placeholder="请输入人员编号" v-model="liveCollectionTo.barcode">
<el-input
placeholder="请输入人员编号"
v-model="liveCollectionTo.barcode"
>
</el-input>
</div>
<div class="filter xm">
<span style="width: 82px;">姓名：</span>
<span style="width: 82px">姓名：</span>
<el-input placeholder="请输入用户名" v-model="liveCollectionTo.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" v-model="liveCollectionTo.sex"
id="sex"></SelectCode>
<span style="width: 51px">性别：</span>
<SelectCode
ref="xbdm"
codeUrl="/api/code/sex"
:clearable="true"
:multiple="false"
:form="ruleForm"
class="xb"
v-model="liveCollectionTo.sex"
id="sex"
></SelectCode>
</div>
<div class="filter sfzh">
<span>身份证号：</span>
<el-input placeholder="请输入身份证号" v-model="liveCollectionTo.idcard">
<el-input
placeholder="请输入身份证号"
v-model="liveCollectionTo.idcard"
>
</el-input>
</div>
</div>
......@@ -31,23 +44,36 @@
<div class="top_sec_lef">
<div class="filter cjdw">
<span>采集单位：</span>
<Cascader ref="cascader" :form="ruleForm" id="collectionDw" class="cjdw"></Cascader>
<Cascader
ref="cascader"
:form="ruleForm"
id="collectionDw"
class="cjdw"
></Cascader>
</div>
<div class="filter cjr">
<span>采集人：</span>
<el-input placeholder="请输入采集人" v-model="liveCollectionTo.collectionName">
<el-input
placeholder="请输入采集人"
v-model="liveCollectionTo.collectionName"
>
</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="{
<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>
......@@ -59,42 +85,85 @@
<div class="middle">
<!-- 左边 -->
<div class="middle_lef">
<div class="btn" @click="batch">
批量操作
</div>
<div class="btn" @click="batch">批量操作</div>
</div>
<!-- 右边 -->
<div class="middle_rig">
<div class="btn" v-clipboard:copy="ysxtAsjxgrybh" @click="getBarcode" v-clipboard:success="onCopy"
v-clipboard:error="onError">复制条码</div>
<div class="btn" @click="delMore">删除</div>
<div class="btn xzry" @click="toAdd">
<div
class="btn"
v-clipboard:copy="ysxtAsjxgrybh"
@click="getBarcode"
v-clipboard:success="onCopy"
v-clipboard:error="onError"
v-if="roleArr.includes('F-1-2')"
>
复制条码
</div>
<div class="btn" @click="delMore" v-if="roleArr.includes('F-1-5')">
删除
</div>
<div class="btn xzry" @click="toAdd" v-if="roleArr.includes('F-1-7')">
<i class="el-icon-plus"></i>
新增人员
</div>
</div>
</div>
<!-- 3 已选择x项弹弹出框 -->
<el-tag style="width: 100%; color: #666666 " v-show="isShowTip">
<el-tag style="width: 100%; color: #666666" 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>
<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-link
type="primary"
:underline="false"
style="margin-left: 1.25rem"
@click="toggleSelection()"
>清除</el-link
>
</el-tag>
<!-- 4 表格 -->
<el-table :max-height="height" ref="multipleTable" :data="tableDate" :row-key="getRowKeys" tooltip-effect="dark"
:class="{ delSelection: !selectBoo }" @selection-change="handleSelectionChange" @row-click="isShowRyxxkBtn">
<el-table-column type="selection" :reserve-selection="true" :width="width33">
<el-table
:max-height="height"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
tooltip-effect="dark"
:class="{ delSelection: !selectBoo }"
@selection-change="handleSelectionChange"
@row-click="isShowRyxxkBtn"
>
<el-table-column
type="selection"
:reserve-selection="true"
:width="width33"
>
</el-table-column>
<el-table-column prop="barcode" label="人员编号" :width="width1" show-overflow-tooltip>
<el-table-column
prop="barcode"
label="人员编号"
:width="width1"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="name" label="姓名" :width="width2" show-overflow-tooltip>
<el-table-column
prop="name"
label="姓名"
:width="width2"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="sex" label="性别" :width="width33">
</el-table-column>
<el-table-column prop="idCard" label="身份证号" :width="width3" show-overflow-tooltip>
<el-table-column
prop="idCard"
label="身份证号"
:width="width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column prop="address" label="现住址" :width="width3">
</el-table-column>
......@@ -108,18 +177,40 @@
</el-table-column>
<el-table-column prop="completeness" label="完整度" :width="width5">
<template slot-scope="scope">
<img v-show="scope.row.completeness == 0" src="../../assets/img/htcj/不完整.svg"></img>
<img v-show="scope.row.completeness == 1" src="../../assets/img/htcj/完整.svg"></img>
<img
v-show="scope.row.completeness == 0"
src="../../assets/img/htcj/不完整.svg"
/>
<img
v-show="scope.row.completeness == 1"
src="../../assets/img/htcj/完整.svg"
/>
</template>
</el-table-column>
<el-table-column :formatter="dateTimeFormat" prop="stampTime" label="捺印时间" :width="width4">
<el-table-column
:formatter="dateTimeFormat"
prop="stampTime"
label="捺印时间"
:width="width4"
>
</el-table-column>
<el-table-column prop="stampDw" label="捺印单位" :width="width3" show-overflow-tooltip>
<el-table-column
prop="stampDw"
label="捺印单位"
:width="width3"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="操作" :width="width33">
<template slot-scope="scope">
<el-tooltip class="item" v-if="roleArr.includes('F-1-8')" effect="dark" content="修改" placement="top"
:open-delay="500">
<el-tooltip
class="item"
v-if="roleArr.includes('F-1-8')"
effect="dark"
content="修改"
placement="top"
:open-delay="500"
>
<!-- <i></i> -->
<!-- <span class="iconfont icon-bianji1 zttb"></span> -->
<div class="icon-div" @click="handleClick(scope.row)">
......@@ -131,24 +222,33 @@
</el-table>
<!-- 页码 -->
<div class="block">
<span class="record">共{{ liveCollectionTo.total }}条记录 第{{ liveCollectionTo.currPage }}/{{
Tpage
}}页</span>
<el-pagination class="paging" @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page="liveCollectionTo.currPage" :page-sizes="[10, 20, 30, 40]" background layout="prev, pager, next"
:total="liveCollectionTo.total">
<span class="record"
>共{{ liveCollectionTo.total }}条记录 第{{
liveCollectionTo.currPage
}}/{{ Tpage }}页</span
>
<el-pagination
class="paging"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="liveCollectionTo.currPage"
:page-sizes="[10, 20, 30, 40]"
background
layout="prev, pager, next"
:total="liveCollectionTo.total"
>
</el-pagination>
</div>
</div>
</template>
<script>
import moment from "moment";
import SelectCode from "../../components/SelectCode.vue";
import Cascader from "../../components/Cascader.vue"
import zoom from "@/utils/autosize";
export default {
name: 'htcj',
import moment from "moment";
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 {
......@@ -156,27 +256,29 @@
startEndDate: null,
isShowTip: false, //批量操作提示
multipleSelection: [], // 表单选择项目
ruleForm: { //性别和采集单位
sex: '',
collectionDw: ''
ruleForm: {
//性别和采集单位
sex: "",
collectionDw: "",
},
selectBoo: false, // 是否批量操作,
tableDate: [],
// reqParam: {
// 请求参数
liveCollectionTo: {
"barcode": "", //人员号
"name": "", //姓名
"sex": "", //性别
"idCard": "", //身份证
"collectionDw": "", //采集单位
"collectionName": "", //采集人
"printingTimeStart": "", //开始时间
"printingTimeEnd": "", //结束时间
"pageSize": 10, //页面数据数 int类型
"currPage": 1, //当前页 int类型
"total": 0, //表格条数
"completeness": ''
barcode: "", //人员号
name: "", //姓名
sex: "", //性别
idCard: "", //身份证
collectionDw: "", //采集单位
collectionName: "", //采集人
printingTimeStart: "", //开始时间
printingTimeEnd: "", //结束时间
pageSize: 10, //页面数据数 int类型
currPage: 1, //当前页 int类型
total: 0, //表格条数
size: 0,
completeness: "",
},
// page: {
// pageSize: 10, //当前选择要显示的条数
......@@ -197,7 +299,7 @@
width2: 100,
width1: 220,
height: 500,
}
};
},
created() {
let w1 = 1920;
......@@ -210,7 +312,8 @@
this.width5 = (this.width5 * w2) / w1;
},
methods: {
disabledDate(a) { // 捺印时间设置
disabledDate(a) {
// 捺印时间设置
if (a.getTime() > new Date().getTime()) {
return true;
} else {
......@@ -227,34 +330,39 @@
this.startEndDate[1]
).format("YYYY-MM-DD");
} else {
this.liveCollectionTo.printingTimeStart = ""
this.liveCollectionTo.printingTimeEnd = ""
this.liveCollectionTo.printingTimeStart = "";
this.liveCollectionTo.printingTimeEnd = "";
}
},
handleClick(row) {
// console.log(row);
this.$store.commit('layout/delcachePageName', 'xzry')
this.$router.push({ path: "/xzry/edit/", query: { barcode: row.barcode } });
this.$store.commit("layout/delcachePageName", "xzry");
this.$router.push({
path: "/xzry/edit/",
query: { barcode: row.barcode },
});
},
toAdd() {
this.$store.commit('layout/delcachePageName', 'xzry')
this.$router.push('/xzry');
this.$store.commit("layout/delcachePageName", "xzry");
this.$router.push("/xzry");
},
clear() { //清空按钮
this.liveCollectionTo.name = '',
this.liveCollectionTo.barcode = '',
this.liveCollectionTo.idCard = '',
this.liveCollectionTo.collectionName = '',
// this.liveCollectionTo.collectionDw = '',
this.ruleForm.sex = "",
this.ruleForm.collectionDw = "",
// this.liveCollectionTo.sex= '',
this.liveCollectionTo.printingTimeStart = ''
this.liveCollectionTo.printingTimeEnd = ''
this.startEndDate=''
clear() {
//清空按钮
this.liveCollectionTo.name = ""
this.liveCollectionTo.barcode = ""
this.liveCollectionTo.idCard = ""
this.liveCollectionTo.collectionName = ""
// this.liveCollectionTo.collectionDw = ''
this.ruleForm.sex = ""
this.ruleForm.collectionDw = ""
// this.liveCollectionTo.sex= ''
this.liveCollectionTo.printingTimeStart = ""
this.liveCollectionTo.printingTimeEnd = ""
this.startEndDate = null
this.search()
},
batch() { //批量操作弹出
batch() {
//批量操作弹出
this.disabled = !this.disabled;
this.selectBoo = !this.selectBoo;
this.isShowTip = !this.isShowTip;
......@@ -265,7 +373,7 @@
},
toggleSelection(rows) {
if (rows) {
rows.forEach(row => {
rows.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row);
});
} else {
......@@ -273,18 +381,22 @@
}
// //console.log(this.multipleSelection);
},
search() { // 获取全部人员列表请求
search() {
// 获取全部人员列表请求
// console.info("请求===>", this.liveCollectionTo);
this.liveCollectionTo.sex = this.ruleForm.sex
this.liveCollectionTo.collectionDw = this.ruleForm.collectionDw
this.getParam()
delete this.liveCollectionTo.total
delete this.liveCollectionTo.completeness
console.log(this.liveCollectionTo);
this.liveCollectionTo.sex = this.ruleForm.sex;
this.liveCollectionTo.collectionDw = this.ruleForm.collectionDw;
this.getParam();
// delete this.liveCollectionTo.total;
delete this.liveCollectionTo.completeness;
// console.log(this.liveCollectionTo);
this.$axios
.post("/api/liveCollection/getLiveCollectionList", this.liveCollectionTo)
.then(response => {
console.log(this.liveCollectionTo,response.data);
.post(
"/api/liveCollection/getLiveCollectionList",
this.liveCollectionTo
)
.then((response) => {
console.log(this.liveCollectionTo, response.data);
if (response.data.code === 200) {
this.tableDate = response.data.detail.persons;
this.liveCollectionTo.total = response.data.detail.total;
......@@ -296,14 +408,14 @@
});
},
getRyinfo() {
let self = this
let self = this;
this.$axios
.post("/api/personstore/person/list", this.liveCollectionTo)
.then(response => {
.then((response) => {
// console.log(response);
if (response.data.code === 0) {
self.ryInfo = response.data.ret.list[0]
self.initData()
self.ryInfo = response.data.ret.list[0];
self.initData();
} else {
self.$message.error(response.data.message);
}
......@@ -315,13 +427,13 @@
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据！");
this.selectBoo = true// 是否批量操作
this.isShowTip = true
this.selectBoo = true; // 是否批量操作
this.isShowTip = true;
return;
} else {
// this.$bus.emit('isBlur', true)
this.$confirm("是否确认删除？", "提示")
.then(_ => {
.then((_) => {
// 封装删除的psns为数组
let psns = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
......@@ -329,7 +441,7 @@
}
this.doDelete(psns);
})
.catch(_ => { });
.catch((_) => {});
}
},
// 单选删除
......@@ -345,7 +457,7 @@
doDelete(psns) {
this.$axios
.post("/api/personstore/delete", { psns: psns })
.then(response => {
.then((response) => {
if (response.data.code === 0) {
this.$message.success("删除成功");
this.search();
......@@ -354,7 +466,8 @@
}
});
},
getRowKeys(row) {// 保存选中的数据,row-key就是要指定一个key标识这一行的数据
getRowKeys(row) {
// 保存选中的数据,row-key就是要指定一个key标识这一行的数据
return row.id;
},
......@@ -368,8 +481,8 @@
// }
},
isShowRyxxkBtn(row) {// 人员信息卡操作
isShowRyxxkBtn(row) {
// 人员信息卡操作
// console.log("row", row)
this.rowData = row;
// console.log("row", row);
......@@ -409,8 +522,8 @@
},
// 复制条码号 获取选中条码值
getBarcode() {
this.selectBoo = true// 是否批量操作
this.isShowTip = true
this.selectBoo = true; // 是否批量操作
this.isShowTip = true;
this.ysxtAsjxgrybh = [];
// console.log(this.multipleSelection.length);
if (this.multipleSelection.length === 0) {
......@@ -448,22 +561,20 @@
},
mounted() {
this.search();
if (this.$route.query.xzry === "true") {
this.isShowXzry = true;
}
},
computed: {
roleArr() {
return this.$store.state.layout.Menu;
},
Tpage() {
return Math.floor(this.liveCollectionTo.total / this.liveCollectionTo.pageSize);
}
}
};
return Math.ceil(
this.liveCollectionTo.total / this.liveCollectionTo.pageSize
);
},
},
};
</script>
<style lang="scss" scoped>
@import "./htcj.scss";
@import "./htcj.scss";
</style>
\ No newline at end of file
src/views/zzwlr/xzry.scss
......@@ -84,16 +84,16 @@
padding: 0 245px;
}
}
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
// .inputBh {
// /deep/.el-input-group__prepend {
// width: 40px;
// text-align: center;
// padding: 0;
// }
// /deep/.el-input__inner {
// width: 224px;
// }
// }
// 滚动条的宽度
/deep/ .el-form::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
src/views/zzwlr/xzry.vue
......@@ -14,25 +14,19 @@
<span>人员信息 </span>
<div class="dashed"></div>
</div>
<div class="unactive">
<!-- <div class="unactive">
<div class="cir">2</div>
<span>人像采集</span>
<div class="solid"></div>
</div>
</div> -->
<div class="unactive">
<div class="cir">3</div>
<div class="cir">2</div>
<span>指掌纹采集</span>
</div>
</div>
<div class="content">
<el-form
:label-position="labelPosition"
:inline="true"
:model="ruleForm"
:rules="rules"
ref="ruleForm"
class="demo-form-inline"
>
<el-form :label-position="labelPosition" :inline="true" :model="ruleForm" :rules="rules" ref="ruleForm"
class="demo-form-inline">
<!-- 一 -->
<el-row class="title">
<div class="colorDiv"></div>
......@@ -41,31 +35,16 @@
<!-- 二 -->
<el-row>
<el-col :span="12">
<el-form-item
label="人员编号："
prop="ysxtAsjxgrybh"
>
<el-input
v-model.trim="ruleForm.ysxtAsjxgrybh"
placeholder="请输入人员编号"
maxlength="22"
class="inputBh"
show-word-limit
clearable
>
<template slot="prepend">R</template>
<el-form-item label="人员编号：" prop="ysxtAsjxgrybh">
<el-input v-model.trim="ruleForm.ysxtAsjxgrybh" placeholder="请输入人员编号" maxlength="23" 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="警综人员编号：">
<el-input
v-model.trim="ruleForm.jzrybh"
placeholder="请输入警综人员编号"
maxlength="23"
show-word-limit
clearable
>
<el-input v-model.trim="ruleForm.jzrybh" placeholder="请输入警综人员编号" maxlength="23" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
......@@ -73,31 +52,16 @@
<!-- 三 -->
<el-row>
<el-col :span="12">
<el-form-item
label="采集信息原因："
prop="cjxxyydm"
>
<SelectCode
codeUrl="/api/code/cjxxyydm"
width="16.5"
clearable
: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"
ref="cjxxyydm" multiple :multipleLimit="5"></SelectCode>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指掌纹卡编号：">
<!-- -->
<el-input
v-model.trim="ruleForm.zzhwkbh"
placeholder="请输入指掌纹卡编号"
maxlength="23"
show-word-limit
clearable
></el-input>
<el-input v-model.trim="ruleForm.zzhwkbh" placeholder="请输入指掌纹卡编号" maxlength="23" show-word-limit
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -111,13 +75,8 @@
<el-col :span="12">
<el-form-item label="案事件相关人员编号：">
<!-- -->
<el-input
v-model.trim="ruleForm.asjxgrybh"
placeholder="请输入案事件相关人员编号"
maxlength="23"
show-word-limit
clearable
></el-input>
<el-input v-model.trim="ruleForm.asjxgrybh" placeholder="请输入案事件相关人员编号" maxlength="23" show-word-limit
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -130,29 +89,14 @@
<!-- 六 -->
<el-row>
<el-col :span="12">
<el-form-item
label="姓名："
prop="xm"
>
<el-input
v-model.trim="ruleForm.xm"
placeholder="请输入姓名"
clearable
maxlength="50"
show-word-limit
>
<el-form-item label="姓名：" prop="xm">
<el-input v-model.trim="ruleForm.xm" placeholder="请输入姓名" clearable maxlength="50" show-word-limit>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="别名/绰号：">
<el-input
v-model.trim="ruleForm.bmch"
placeholder="请输入别名/绰号"
maxlength="50"
show-word-limit
clearable
>
<el-input v-model.trim="ruleForm.bmch" placeholder="请输入别名/绰号" maxlength="50" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
......@@ -160,153 +104,69 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item
label="性别："
prop="xbdm"
>
<SelectCode
codeUrl="/api/code/sex"
width="16.5"
clearable
:form="ruleForm"
id="xbdm"
></SelectCode>
<el-form-item label="性别：" prop="xbdm">
<SelectCode codeUrl="/api/code/sex" width="16.5" clearable :form="ruleForm" id="xbdm"></SelectCode>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="出生日期："
prop="csrq"
>
<el-date-picker
type="date"
placeholder="请选择出生日期"
v-model="ruleForm.csrq"
style="width: 100%"
<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>
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item
label="国籍："
prop="gjdm"
>
<SelectCode
codeUrl="/api/code/nationality"
width="16.5"
:form="ruleForm"
id="gjdm"
></SelectCode>
<el-form-item label="国籍：" prop="gjdm">
<SelectCode codeUrl="/api/code/nationality" width="16.5" :form="ruleForm" id="gjdm"></SelectCode>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="民族："
prop="mzdm"
>
<SelectCode
codeUrl="/api/code/nation"
width="16.5"
clearable
:form="ruleForm"
id="mzdm"
></SelectCode>
<el-form-item label="民族：" prop="mzdm">
<SelectCode codeUrl="/api/code/nation" width="16.5" clearable :form="ruleForm" id="mzdm"></SelectCode>
</el-form-item>
</el-col>
</el-row>
<!-- 九 -->
<el-row>
<el-col :span="12">
<el-form-item
label="证件类型："
prop="cyzjdm"
>
<SelectCode
codeUrl="/api/code/certificates"
width="16.5"
clearable
:form="ruleForm"
id="cyzjdm"
>
<el-form-item label="证件类型：" prop="cyzjdm">
<SelectCode codeUrl="/api/code/certificates" width="16.5" clearable :form="ruleForm" id="cyzjdm">
</SelectCode>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="证件号码："
prop="zjhm"
>
<el-input
v-model.trim="ruleForm.zjhm"
placeholder="请输入证件号码"
maxlength="18"
show-word-limit
clearable
>
<el-form-item label="证件号码：" prop="zjhm">
<el-input v-model.trim="ruleForm.zjhm" placeholder="请输入证件号码" maxlength="30" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="户籍地行政区："
prop="hjdzXzqhdm"
>
<Cascader
:form="ruleForm"
id="hjdzXzqhdm"
codeName="CODE_XZQH"
></Cascader>
<el-form-item label="户籍地行政区：" prop="hjdzXzqhdm">
<Cascader :form="ruleForm" id="hjdzXzqhdm" codeName="CODE_XZQH"></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="户籍地址："
prop="hjdzDzmc"
>
<el-input
v-model="ruleForm.hjdzDzmc"
placeholder="请输入户籍地址"
maxlength="100"
show-word-limit
clearable
>
<el-form-item label="户籍地址：" prop="hjdzDzmc">
<el-input v-model="ruleForm.hjdzDzmc" placeholder="请输入户籍地址" maxlength="100" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="现住址行政区："
prop="xzzXzqhdm"
>
<Cascader
:form="ruleForm"
id="xzzXzqhdm"
codeName="CODE_XZQH"
></Cascader>
<el-form-item label="现住址行政区：" prop="xzzXzqhdm">
<Cascader :form="ruleForm" id="xzzXzqhdm" codeName="CODE_XZQH"></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="现住址："
prop="xzzDzmc"
>
<el-input
v-model.trim="ruleForm.xzzDzmc"
placeholder="请输入现住址"
maxlength="100"
show-word-limit
clearable
>
<el-form-item label="现住址：" prop="xzzDzmc">
<el-input v-model.trim="ruleForm.xzzDzmc" placeholder="请输入现住址" maxlength="100" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
......@@ -315,14 +175,8 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注信息：">
<el-input
resize="none"
type="textarea"
placeholder="请输入内容"
v-model.trim="ruleForm.bz"
maxlength="1024"
show-word-limit
>
<el-input resize="none" type="textarea" placeholder="请输入内容" v-model.trim="ruleForm.bz" maxlength="1024"
show-word-limit>
</el-input>
</el-form-item>
</el-col>
......@@ -335,16 +189,9 @@
</el-row>
<el-row class="flexBox">
<div style="margin: 15px 0"></div>
<el-checkbox-group
v-model="checkedTargets"
style="
padding-right: 110px"
>
<el-checkbox
v-for="(value,key) in targets"
:key="key"
:label="value.code"
>{{ value.name }}</el-checkbox>
<el-checkbox-group v-model="checkedTargets" style="
padding-right: 110px">
<el-checkbox v-for="(value,key) in targets" :key="key" :label="value.code">{{ value.name }}</el-checkbox>
</el-checkbox-group>
</el-row>
<el-divider></el-divider>
......@@ -356,28 +203,13 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item
label="捺印单位："
prop="nydwGajgjgdm"
>
<Cascader
:form="ruleForm"
id="nydwGajgjgdm"
></Cascader>
<el-form-item label="捺印单位：" prop="nydwGajgjgdm">
<Cascader :form="ruleForm" id="nydwGajgjgdm"></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="捺印人姓名："
prop="nyryXm"
>
<el-input
v-model="ruleForm.nyryXm"
placeholder="请输入捺印人姓名"
maxlength="50"
show-word-limit
clearable
>
<el-form-item label="捺印人姓名：" prop="nyryXm">
<el-input v-model="ruleForm.nyryXm" placeholder="请输入捺印人姓名" maxlength="50" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
......@@ -385,33 +217,16 @@
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item
label="捺印日期："
prop="nysj"
>
<el-date-picker
type="date"
placeholder="请输入捺印日期"
v-model="ruleForm.nysj"
style="width: 100%"
<el-form-item label="捺印日期：" prop="nysj">
<el-date-picker type="date" placeholder="请输入捺印日期" v-model="ruleForm.nysj" style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker>
}"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="捺印人身份证号："
prop="nyryGmsfhm"
>
<el-input
v-model="ruleForm.nyryGmsfhm"
placeholder="请输入捺印人身份证号"
maxlength="18"
show-word-limit
clearable
>
<el-form-item label="捺印人身份证号：" prop="nyryGmsfhm">
<el-input v-model="ruleForm.nyryGmsfhm" placeholder="请输入捺印人身份证号" maxlength="18" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
......@@ -422,55 +237,36 @@
<el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="捺印人联系电话："
prop="nyryLxdh"
>
<el-input
v-model="ruleForm.nyryLxdh"
placeholder="请输入捺印人联系电话"
maxlength="11"
show-word-limit
clearable
>
<el-form-item label="捺印人联系电话：" prop="nyryLxdh">
<el-input v-model="ruleForm.nyryLxdh" placeholder="请输入捺印人联系电话" maxlength="18" show-word-limit clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span
slot="footer"
class="dialog-footer"
>
<el-button @click="submitForm('ruleForm')">提交</el-button>
<el-button
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
<span slot="footer" class="dialog-footer">
<!-- <el-button @click="submitForm('ruleForm')">提交</el-button> -->
<el-button @click="tijiao('ruleForm')">提交</el-button>
<el-button @click="resetForm('ruleForm')" type="primary">取 消</el-button>
</span>
</div>
</div>
</template>
<script>
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
export default {
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
export default {
name: 'xzry',
components: {
Cascader,
SelectCode
},
props: {
isShowXzry: {
type: [Number, String, Boolean],
default: false,
},
},
data () {
data() {
return {
ryInfo: {},
edit: '新增人员',
// edit: '新增人员',
dialogVisible: false, // 弹窗状态
labelPosition: "left", // 数据项对齐方式
checkedTargets: ['1'], // 选定的目标逻辑库
......@@ -521,7 +317,7 @@ export default {
logicList: [],// 逻辑库代码
rules: {
ysxtAsjxgrybh: [
{ min: 22, max: 22, message: '编号长度有误！', trigger: 'change' },
{ min: 23, max: 23, message: '编号长度有误！', trigger: 'change' },
{ required: true, message: "请输入人员条码号", trigger: "blur" },
],
jzrybh: [
......@@ -591,8 +387,7 @@ export default {
},
}
},
mounted () {
this.dialogVisible = this.isShowXzry;
mounted() {
// console.log(this.$route.query.barcode)
if (this.$route.params.type === 'edit') {
this.edit = '修改人员'
......@@ -600,26 +395,91 @@ export default {
} else {
// console.log(this.$route.params.type==='edit');
this.edit = '新增人员'
}
},
watch: {
isShowXzry (newVal, oldVal) {
this.dialogVisible = newVal;
},
dialogVisible (val) {
this.$emit("closeXzry", this.dialogVisible);
},
},
methods: {
disabledDate (a) {
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
submitForm (formName) {
tijiao(e) {
let tjType = this.$route.params.type
if (tjType === 'edit') {
this.editForm(e)
} else {
this.submitForm(e)
}
},
editForm(formName) {
let self = this
// debugger
// console.log(self.ruleForm);
// console.log(formName);
this.$refs[formName].validate((valid) => {
if (valid) {
// let logicList = this.ruleForm.logicdbtype2.map(Number)
// let cjxxyyList = this.ruleForm.cjxxyydm
// delete this.ruleForm.cjxxyydm
this.logicList = this.checkedTargets.map(Number)
let reqParam = {
personDo: "",
logicList: [],
cjxxyyList: []
};
// reqParam.cjxxyyList = this.ruleForm.cjxxyydm
// this.ruleForm.cjxxyydm.forEach(item => {
// item = Number(item)
// })
// console.log(reqParam.cjxxyyList);
// delete this.ruleForm.cjxxyydm
reqParam.personDo = this.ruleForm;
reqParam.cjxxyyList = this.ruleForm.cjxxyydm;
// reqParam.personDo.ysxtAsjxgrybh = this.ruleForm.ysxtAsjxgrybh
// reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
reqParam.logicList = this.logicList
delete reqParam.personDo.cjxxyydm
this.$axios
.post("/api/personstore/person/file", reqParam)
.then(res => {
// console.log(res.data);
if (res.data.code === 0) {
self.$message.success('修改成功！')
// 清除全部案件库缓存
self.$store.commit('layout/delcachePageName', 'htcj')
this.$router.pushToTab({
path: `/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`,
query: {
type: 0
}
})
} else {
self.$message.error('修改失败！')
}
})
self.$bus.emit('isBlur', false)
} else {
this.$nextTick(() => {
let isError = document.getElementsByClassName('is-error')
isError[0].scrollIntoView({
// 滚动到指定节点
// 值有start,center,end，nearest，当前显示在视图区域中间
block: 'center',
// 值有auto、instant,smooth，缓动动画（当前是慢速的）
behavior: 'smooth',
})
})
return false;
}
});
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.checkedTargets.length == 0) {
......@@ -634,7 +494,8 @@ export default {
reqParam.cjxxyyList = this.ruleForm.cjxxyydm
delete this.ruleForm.cjxxyydm
reqParam.personDo = this.ruleForm;
reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
reqParam.personDo.ysxtAsjxgrybh = this.ruleForm.ysxtAsjxgrybh
// reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
reqParam.logicList = this.logicList
this.$axios
.post("/api/personstore/personadd", reqParam)
......@@ -683,7 +544,7 @@ export default {
} else {
this.$message.error("新增失败");
this.$set(this.ruleForm, 'cjxxyydm', [])
this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
// this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
}
});
}
......@@ -692,11 +553,11 @@ export default {
}
});
},
resetForm (formName) {
resetForm(formName) {
this.$refs[formName].resetFields();
this.dialogVisible = false;
},
initData () {
initData() {
// 赋值
this.ruleForm.id = this.ryInfo.id
this.ruleForm.rybh = this.ryInfo.ysxtAsjxgrybh
......@@ -734,7 +595,7 @@ export default {
this.ruleForm.nyryGmsfhm = this.ryInfo.nyryGmsfhm
this.ruleForm.nyryLxdh = this.ryInfo.nyryLxdh
},
getRyinfo (code) {
getRyinfo(code) {
let self = this
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = code
this.$axios
......@@ -743,17 +604,18 @@ export default {
if (response.data.code === 0) {
self.ryInfo = response.data.ret.list[0]
self.initData()
this.ruleForm = self.ryInfo
this.ruleForm.ysxtAsjxgrybh = self.ryInfo.ysxtAsjxgrybh.toString().substr(1)
this.ruleForm.ysxtAsjxgrybh = self.ryInfo.ysxtAsjxgrybh
// this.ruleForm = self.ryInfo
// this.ruleForm.ysxtAsjxgrybh = self.ryInfo.ysxtAsjxgrybh.toString().substr(1)
} else {
self.$message.error(response.data.message);
}
});
},
}
};
};
</script>
<style lang="scss" scoped>
@import "./xzry.scss";
@import "./xzry.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