Skip to content

F
founder_vue
Commit aa64437e by liyuhang19990520
Options

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

parents 40fbd15f 994613f3
Showing with 562 additions and 72 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe646;</span>
<div class="name">修改4</div>
<div class="code-name">&amp;#xe646;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe603;</span>
<div class="name">数据管理</div>
<div class="code-name">&amp;#xe603;</div>
......@@ -402,9 +408,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1640333532727') format('woff2'),
url('iconfont.woff?t=1640333532727') format('woff'),
url('iconfont.ttf?t=1640333532727') format('truetype');
src: url('iconfont.woff2?t=1641808946261') format('woff2'),
url('iconfont.woff?t=1641808946261') format('woff'),
url('iconfont.ttf?t=1641808946261') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -431,6 +437,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-xiugai4"></span>
<div class="name">
修改4
</div>
<div class="code-name">.icon-xiugai4
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shujuguanli"></span>
<div class="name">
数据管理
......@@ -954,6 +969,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiugai4"></use>
</svg>
<div class="name">修改4</div>
<div class="code-name">#icon-xiugai4</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shujuguanli"></use>
</svg>
<div class="name">数据管理</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1640333532727') format('woff2'),
url('iconfont.woff?t=1640333532727') format('woff'),
url('iconfont.ttf?t=1640333532727') format('truetype');
src: url('iconfont.woff2?t=1641808946261') format('woff2'),
url('iconfont.woff?t=1641808946261') format('woff'),
url('iconfont.ttf?t=1641808946261') format('truetype');
}
.iconfont {
......@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-xiugai4:before {
content: "\e646";
}
.icon-shujuguanli:before {
content: "\e603";
}
......
public/iconfont/iconfont.json
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "27107345",
"name": "修改4",
"font_class": "xiugai4",
"unicode": "e646",
"unicode_decimal": 58950
},
{
"icon_id": "26778445",
"name": "数据管理",
"font_class": "shujuguanli",
......
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/main.js
......@@ -11,7 +11,7 @@ import './utils/CrashHandle'
import './plugins/axios'
import fHttp from './request/http.js'
import NetUtil from './netmgr/NetUtil'
import VerifyDataType from './utils/verify-data/VerifyDataType.js'
import RegExpUtil from './utils/verify-data/RegExpUtil.js'
import App from './App.vue'
import router from './router'
import store from './store'
......@@ -73,7 +73,7 @@ window.util = Util
window.logger = LoggerUtil
window.user = UserUtil
window.fHttp = fHttp
window.verifyData = VerifyDataType
window.fRegExp = RegExpUtil
window.NetUtil = NetUtil
Vue.use(VueWechatTitle)
Vue.use(VueClipboard)
......
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/utils/verify-data/CharRegExp.js 0 → 100644
/**
* Description: 校验字符的正则表达式
* @author: li_hongchao
* @date: 2022/1/10 14:27
*/
const CharRegExp = {
/* 0 汉字 */ _N_0 : /^[\u4e00-\u9fa5]{0,}$/,
/* 1 英文和数字 */ _N_1 : /^[A-Za-z0-9]+$/, // ^[A-Za-z0-9]{4,40}$
/* 2 长度为3-20的所有字符 */ _N_2 : /^.{3,20}$/,
/* 3 由26个英文字母组成的字符串 */ _N_3 : /^[A-Za-z]+$/,
/* 4 由26个大写英文字母组成的字符串 */ _N_4 : /^[A-Z]+$/,
/* 5 由26个小写英文字母组成的字符串 */ _N_5 : /^[a-z]+$/,
/* 6 由数字和26个英文字母组成的字符串 */ _N_6 : /^[A-Za-z0-9]+$/,
/* 7 由数字、26个英文字母或者下划线组成的字符串*/ _N_7 : /^\w+$/, // ^\w{3,20}$
/* 8 中文、英文、数字包括下划线 */ _N_8 : /^[\u4E00-\u9FA5A-Za-z0-9_]+$/,
/* 9 中文、英文、数字但不包括下划线等符号 */ _N_9 : /^[\u4E00-\u9FA5A-Za-z0-9]+$/, // ^[\u4E00-\u9FA5A-Za-z0-9]{2,20}$
/* 10 可以输入含有^%&',;=?$\"等字符 */ _N_10 : /[^%&',;=?$\x22]+/,
/* 11 禁止输入含有~的字符 */ _N_11 : /[^~\x22]+/,
}
export default CharRegExp
src/utils/verify-data/VerifyDataType.js → src/utils/verify-data/CommonRegExp.js
/**
* Description: 常见数据格式正则
* @author: li_hongchao
* @date: 2022/1/10 15:35
*/
export default {
/**
* Description: 逻辑分库名称正则
* @author: li_hongchao
* @date: 2022/1/9 19:47
*/
_LJFKM: /^[\u4e00-\u9fa5]{2,}$/,
_NUMBER: /^(0|([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$/,
/**
......@@ -28,6 +25,13 @@ export default {
/**
* Description: 身份证号(15位、18位数字)，最后一位是校验位，可能为数字或字符X
* @author: li_hongchao
* @date: 2022/1/10 15:06
*/
_IDCard: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
/**
* Description: 18位身份证号
* @author: li_hongchao
* @date: 2022/1/9 19:41
......@@ -49,11 +53,11 @@ export default {
_URL: /(http|https):\/\/([\w.]+\/?)\S*/,
/**
* Description: QQ号
* Description: 腾讯QQ号(腾讯QQ号从10000开始)
* @author: li_hongchao
* @date: 2022/1/9 19:42
*/
_QQ: /^[1-9]\\d{4,10}$/,
_QQ: /[1-9][0-9]{4,}/,
/**
* Description: 一个或多个汉字
......@@ -91,6 +95,145 @@ export default {
*/
_POST_CODE: /^[1-9]\\d{5}$/,
/**
* Description: 域名
* @author: li_hongchao
* @date: 2022/1/10 15:00
*/
_DOMAIN: /[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+\.?/,
/**
* Description: InternetURL
* @author: li_hongchao
* @date: 2022/1/10 15:00
*/
_NET_URL_1: /[a-zA-z]+:\/\/[^\s]*/,
_NET_URL_2: /^http:\/\/([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/,
/**
* Description: 手机号码
* @author: li_hongchao
* @date: 2022/1/10 15:01
*/
_MOBILE_PHONE_1: /^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/,
/**
* Description: 电话号码正则表达式（支持手机号码，3-4位区号，7-8位直播号码，1-4位分机号）
* @author: li_hongchao
* @date: 2022/1/10 15:05
*/
_MOBILE_PHONE_2: /((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)/,
/**
* Description: 电话号码 ("XXX-XXXXXXX"、"XXXX-XXXXXXXX"、"XXX-XXXXXXX"、"XXX-XXXXXXXX"、"XXXXXXX"和"XXXXXXXX)
* @author: li_hongchao
* @date: 2022/1/10 15:02
*/
_TELEPHONE: /^((\d{3,4}-)|\d{3.4}-)?\d{7,8}$/,
/**
* Description: 国内电话号码(0511-4405222、021-87888822)
* @author: li_hongchao
* @date: 2022/1/10 15:04
*/
_CHINA_PHONE: /\d{3}-\d{8}|\d{4}-\d{7}/,
/**
* Description: 帐号是否合法(字母开头，允许5-16字节，允许字母数字下划线)
* @author: li_hongchao
* @date: 2022/1/10 15:07
*/
_ACCOUNT: /^[a-zA-Z][a-zA-Z0-9_]{4,15}$/,
/**
* Description: 密码(以字母开头，长度在6~18之间，只能包含字母、数字和下划线)
* @author: li_hongchao
* @date: 2022/1/10 15:08
*/
_PASSWORD: /^[a-zA-Z]\w{5,17}$/,
/**
* Description: 强密码(必须包含大小写字母和数字的组合，不能使用特殊字符，长度在 8-10 之间)
* @author: li_hongchao
* @date: 2022/1/10 15:09
*/
_S_PASSWORD_1: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,10}$/,
/**
* Description: 强密码(必须包含大小写字母和数字的组合，可以使用特殊字符，长度在8-10之间)
* @author: li_hongchao
* @date: 2022/1/10 15:09
*/
_S_PASSWORD_2: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,10}$/,
/**
* Description: 日期格式 0000-00-00
* @author: li_hongchao
* @date: 2022/1/10 15:11
*/
_DATE_YYYY_MM_DD: /^\d{4}-\d{1,2}-\d{1,2}/,
/**
* Description: 一年的12个月(01～09和1～12)
* @author: li_hongchao
* @date: 2022/1/10 15:11
*/
_DATE_MONTH: /^(0?[1-9]|1[0-2])$/,
/**
* Description: 一个月的31天(01～09和1～31)
* @author: li_hongchao
* @date: 2022/1/10 15:12
*/
_DATE_DAY: /^((0?[1-9])|((1|2)[0-9])|30|31)$/,
/**
* Description: 钱的四种的表示形式:"10000.00"、"10,000.00"、没有 "分"的"10000"、"10,000"
* @author: li_hongchao
* @date: 2022/1/10 15:13
*/
_MONEY: /^[1-9][0-9]*$/,
/**
* Description: xml文件
* @author: li_hongchao
* @date: 2022/1/10 15:14
*/
_XML: /^([a-zA-Z]+-?)+[a-zA-Z0-9]+\\.[x|X][m|M][l|L]$/,
/**
* Description: 中文字符的正则表达式
* @author: li_hongchao
* @date: 2022/1/10 15:14
*/
_CHINESE_CHAR: /[\u4e00-\u9fa5]/,
/**
* Description:空白行的正则表达式
* @author: li_hongchao
* @date: 2022/1/10 15:15
*/
_BLANK_LINE: /\n\s*\r/,
/**
* Description: HTML标记的正则表达式
* @author: li_hongchao
* @date: 2022/1/10 15:15
*/
_HTML: /<(\S*?)[^>]*>.*?|<.*? \/>/,
/**
* Description: IPv4地址
* @author: li_hongchao
* @date: 2022/1/10 15:18
*/
_IPv4: /((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/,
}
src/utils/verify-data/NumRegExp.js 0 → 100644
/**
* Description: 校验数字的正则表达式
* @author: li_hongchao
* @date: 2022/1/10 14:27
*/
const NumRegExp = {
/* 0 数字 */ _N_0 : /^[0-9]*$/,
/* 1 n位的数字 */ _N_1 : /^\d{n}$/,
/* 2 至少n位的数字 */ _N_2 : /^\d{n,}$/,
/* 3 m-n位的数字 */ _N_3 : /^\d{m,n}$/,
/* 4 零和非零开头的数字 */ _N_4 : /^(0|[1-9][0-9]*)$/,
/* 5 非零开头的最多带两位小数的数字*/ _N_5 : /^([1-9][0-9]*)+(\.[0-9]{1,2})?$/,
/* 6 带1-2位小数的正数或负数 */ _N_6 : /^(\-)?\d+(\.\d{1,2})$/,
/* 7 正数、负数、和小数 */ _N_7 : /^(\-|\+)?\d+(\.\d+)?$/,
/* 8 有两位小数的正实数 */ _N_8 : /^[0-9]+(\.[0-9]{2})?$/,
/* 9 有1~3位小数的正实数 */ _N_9 : /^[0-9]+(\.[0-9]{1,3})?$/,
/* 10 非零的正整数 */ _N_10 : /^[1-9]\d*$/, // ^([1-9][0-9]*){1,3}$/ 或 ^\+?[1-9][0-9]*$/
/* 11 非零的负整数 */ _N_11 : /^-[1-9]\d*$/,
/* 12 非负整数 */ _N_12 : /^\d+$/, // ^[1-9]\d*|0$/
/* 13 非正整数 */ _N_13 : /^-[1-9]\d*|0$/, // ^((-\d+)|(0+))$/
/* 14 非负浮点数 */ _N_14 : /^\d+(\.\d+)?$/, // ^[1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0$/
/* 15 非正浮点数 */ _N_15 : /^((-\d+(\.\d+)?)|(0+(\.0+)?))$/, // ^(-([1-9]\d*\.\d*|0\.\d*[1-9]\d*))|0?\.0+|0$/
/* 16 正浮点数 */ _N_16 : /^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/, //^(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*))$/
/* 17 负浮点数 */ _N_17 : /^-([1-9]\d*\.\d*|0\.\d*[1-9]\d*)$/, // ^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/
/* 18 浮点数 */ _N_18 : /^(-?\d+)(\.\d+)?$/, // ^-?([1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0)$/
}
export default NumRegExp
src/utils/verify-data/RegExpUtil.js 0 → 100644
import NUM from './NumRegExp'
import CHAR from './CharRegExp'
import SYS from './SysRegExp'
import COMM from './CommonRegExp'
export default {
NUM, CHAR, COMM, SYS
}
src/utils/verify-data/SysRegExp.js 0 → 100644
/**
* Description: 应用于本系统正则
* @author: li_hongchao
* @date: 2022/1/10 15:35
*/
const SysRegExp = {
/**
* Description: 逻辑分库名称正则
* @author: li_hongchao
* @date: 2022/1/9 19:47
*/
_LJFKM: /^[\u4e00-\u9fa5]{2,}$/,
}
export default SysRegExp
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