Skip to content

F
founder_vue
Commit 4e3b95ef by 米嘉伟
Options

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

parents 199aef2e b9f52178
Showing with 306 additions and 238 deletions
src/store/modules/test-module.js 0 → 100644
import _TEST_KEY from './test-types.js'
const state = {
state_xm: [],
state_age: [],
}
const mutations = {
[_RY_KEY._actionkey.SET_XM](state, res) {
state.state_xm = res
},
[_RY_KEY._actionkey.SET_AGE](state, res) {
state.state_xm = res
},
}
const actions = {
[_RY_KEY._mutationKey._XM](context, options) {// 获取人员逻辑库
//TODO... 需要根据业务补充
},
[_RY_KEY._mutationKey._AGE](context, options) {// 获取人员逻辑库
//TODO... 需要根据业务补充
},
}
export default {
namespaced: true,
state,
mutations,
actions
}
src/store/modules/test-types.js 0 → 100644
const _MODULE_NAME = 'ry'// 这个要和 Store注册modules里名称保持一致
const _ACTION_KEY = {
_XM: _MODULE_NAME + '/_xm',
_AGE: _MODULE_NAME + '/_age',
}
const _MUTATION_KEY = {
SET_XM: 'setXm',
SET_AGE: 'setAge',
}
export default {
_actionkey: _ACTION_KEY,
_mutationKey: _MUTATION_KEY,
}
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2022-01-08 14:09:16
* @LastEditTime: 2022-01-14 16:25:06
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -232,7 +232,6 @@ export default {
// 指纹编辑区域发送指纹数据，替换指纹图片
console.log(finger);
this.$bus.emit('ajzwbjImage', { finger_image: finger.image, finger_dealFlag: finger.dealFlag, finger_position: finger.finger_position })
},
/**
* 获取案件指纹原图
......@@ -299,6 +298,7 @@ export default {
})
}
}
self.$bus.emit('', self.fingers)
// //console.log(self.fingers);
// 自动获取第一个
if (self.fingers.length > 0) {
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2022-01-10 21:19:18
* @LastEditTime: 2022-01-14 16:09:52
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -300,7 +300,7 @@
</div>
<div class="tjxh">
<span>推荐序号</span>
<input v-if="zwType=='指纹'" type="text" v-model="tjxh" oninput="if(value>99)value=99;if(value<1)value=1" />
<input v-if="zwType=='指纹'" type="text" v-model="tjxh" oninput="if(value>99)value=99;if(value<0)value=0" />
<input v-else type="text" v-model="tjxh" oninput="if(value<101)value=101" />
</div>
</div>
......
src/views/bzxxgl/scss/BzxxsfOpt.scss deleted 100644 → 0
.root-div {
position: relative;
display: inline-block;
}
.opt-select-right-svg {
width: 16px;
height: 16px;
}
.item-svg-red {
color: red;
}
.btn-sh {
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 4px;
border: 1px solid #fe0000;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #fe0000;
display: flex;
align-items: center;
justify-content: center;
}
.select-left {
float: left;
width: 94px;
height: 32px;
border-radius: 4px 0px 0px 4px;
border: 1px solid #D5E5FC;
border-right: 0px;
z-index: 501;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 32px;
padding-left: 16px;
/*display: flex;*/
/*align-items: center;*/
/*justify-content: left;*/
}
.select-right-normal {
float: left;
width: 32px;
height: 32px;
background: #E1EDFF;
border: 1px solid #D5E5FC;
border-radius: 0px 4px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.select-right-focus {
float: left;
width: 32px;
height: 32px;
background: #D5E5FC;
box-shadow: 2px 2px 2px 0px rgba(2, 122, 255, 0.41);
border-radius: 0px 4px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
.select-opt-list-content {
margin-top: 0px;
margin-left: 0px;
width: 126px;
/*height: 100px;*/
display: block;
padding: 10px 0px;
/*margin-top: 32px;*/
/*clear: left;*/
z-index: 499;
background: #FFFFFF;
/*background: black;*/
border-radius: 0px 0px 4px 4px;
border: 1px solid #D5E5FC;
position: absolute;
&.el-popper[x-placement^=bottom] .popper__arrow::after {
boder-style: none;
}
&.el-popper[x-placement^=bottom] .popper__arrow {
boder-style: none;
}
}
.select-opt-list-content-item {
width: 126px;
height: 32px;
display: inline-block;
position: relative;
z-index: 500;
/*background: red;*/
margin-left: 0px;
padding-left: 16px;
display: flex;
align-items: center;
justify-content: left;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 32px;
}
.select-opt-list-content-item:hover {
background: #F5F5F7;
}
.ysb-left {
float: left;
width: 94px;
height: 32px;
background: #FFFFFF;
border-radius: 4px 0px 0px 4px;
border: 1px solid #D9DCE2;
border-right: 0px;
font-family: HarmonyOS_Sans_SC;
color: #666666;
line-height: 14px;
display: flex;
align-items: center;
justify-content: center;
}
.ysb-right {
float: left;
width: 32px;
height: 32px;
background: #ECEDF1;
border: 1px solid #D9DCE2;
border-radius: 0px 4px 4px 0px;
display: flex;
align-items: center;
justify-content: center;
}
src/views/xtfkgl/AjXtljfkView.vue
......@@ -14,62 +14,62 @@
<el-table-column prop="sjkyh" label="数据库用户组/用户" :width="width2">
<template slot-scope="scope">
<div class="tagsBox">
<div
v-for="item in strArr(scope.row.groups)"
:class="{ tags: true, tagszu: item.type === 1 }"
:key="item.logicId"
<div v-for="item in strArr(scope.row.groups)" :key="item.logicId"
v-show="item !== ''">
<div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip
class="item"
effect="dark"
placement="bottom"
:open-delay="300"
style="width: auto !important">
<span>{{ item.name }}</span>
<div slot="content" class="tooTipBtn">
<div
v-for="it in item.user"
:open-delay="300">
<div :class="{ tags: true, tagszu: item.type === 1 }">{{ item.name }}</div>
<div slot="content" class="tooTipBtn" style="padding: 10px;">
<div v-for="it in item.user"
:title="it.name"
:key="it.id"
>
:key="it.id">
{{ it.name }}
</div>
</div>
</el-tooltip>
</div>
<div v-else>
<div v-else class="tags">
{{ item.name }}
</div>
</div>
<el-tooltip
class="item"
effect="dark"
placement="right"
style="width: auto !important"
v-if="scope.row.groups && scope.row.groups.length > 4"
>
<span style="margin-left: 5px">...</span>
<div slot="content" class="tooTipBtn">
<div
v-for="item in scope.row.groups"
:class="{divtext:item.type === 1}"
:title="item.name"
:key="item.id">
:manual="true"
:open-delay="300"
v-model="scope.row.disabled"
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 5px" @mouseover="groupItemFocus(scope.$index)">...</span>
<div slot="content" class="tooTipBtn" @mouseleave="groupItemNoFocus()">
<div v-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip
class="item"
class="two-tooltip"
effect="dark"
placement="right"
style="width: auto !important">
<span>{{ item.name }}</span>
<div slot="content" class="tooTipBtn">
:manual="true"
v-model="item.disabled"
style="transform: translateX(10px);">
<div :class="{divtext:item.type === 1}"
style="padding-right: 10px"
@mouseover="twItemFocus(scope.$index,index)">
{{item.name }}
</div>
<div slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)"
@mouseleave="twoItemNoFocus(scope.$index,index)">
<div
v-for="it in item.user"
:title="it.name"
:key="it.id"
>
:key="it.id">
{{ it.name }}
</div>
</div>
......@@ -79,6 +79,7 @@
{{ item.name }}
</div>
</div>
</div>
</el-tooltip>
</div>
......@@ -160,7 +161,7 @@
class="paging"
@current-change="handleCurrentChange"
:current-page="currPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
background
layout="prev, pager, next"
:total="total"
......@@ -183,14 +184,16 @@ export default {
width4: 136, //启用状态
width5: 260, //逻辑库说明
width6: 120, // 操作
height: 550,
height: '42rem',
tableDate: [],
currPage: 1, // 当前页数
pageSize: 10, // 每页的数据条数
pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数
totalPage: 0, // 总共页数
curOneGradeIndex: -1,
curTwoGradeIndex: -1,
}
},
created() {
......@@ -209,6 +212,42 @@ export default {
// this.getList()
},
methods: {
twoItemNoFocus(gindex, cindex) {
this.tableDate[gindex].groups[cindex].disabled = false
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
},
twItemFocus(gindex, cindex) {
if (cindex >= 0 && gindex >= 0) {
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) {
this.tableDate[gindex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[gindex].groups[cindex].disabled = true
this.tableDate[gindex].disabled = true
this.curOneGradeIndex = gindex
this.curTwoGradeIndex = cindex
}
},
groupItemNoFocus() {
if (this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
},
groupItemFocus(index) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[index].disabled = true
this.curOneGradeIndex = index
},
getRowKeys(row) {
return row.logicId
},
......@@ -287,7 +326,7 @@ export default {
var _that = this
_that.getList(page)
},
getList(page = 1, limit = 10) {
getList(page = 1, limit = this.pageSize) {
let _that = this
let ruleForm = {}
this.currPage = page
......
src/views/xtfkgl/RyXtljfkView.vue
......@@ -16,51 +16,57 @@
<div class="tagsBox">
<div v-for="item in strArr(scope.row.groups)" :key="item.logicId"
:class="{ tags: true, tagszu: item.type === 1 }"
v-show="item !== ''">
<div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip
class="item"
effect="dark"
placement="bottom"
:open-delay="300"
style="width: auto !important">
<span>{{ item.name }}</span>
<div slot="content" class="tooTipBtn">
<div
v-for="it in item.user"
:open-delay="300">
<div :class="{ tags: true, tagszu: item.type === 1 }">{{ item.name }}</div>
<div slot="content" class="tooTipBtn" style="padding: 10px;">
<div v-for="it in item.user"
:title="it.name"
:key="it.id"
>
:key="it.id">
{{ it.name }}
</div>
</div>
</el-tooltip>
</div>
<div v-else>
<div v-else class="tags">
{{ item.name }}
</div>
</div>
<el-tooltip
class="item"
effect="dark"
placement="right"
style="width: auto !important"
:manual="true"
:open-delay="300"
v-model="scope.row.disabled"
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 0.3125rem">...</span>
<div slot="content" class="tooTipBtn">
<div v-for="item in scope.row.groups">
<span style="margin-left: 5px" @mouseover="groupItemFocus(scope.$index)">...</span>
<div slot="content" class="tooTipBtn" @mouseleave="groupItemNoFocus()">
<div v-for="(item,index) in scope.row.groups">
<div v-if="item.type === 1 && item.user && item.user.length >0">
<el-tooltip
class="item"
class="two-tooltip"
effect="dark"
placement="right"
style="width: auto !important;">
<div :class="{divtext:item.type === 1}">
<span>{{ item.name }}</span>
:manual="true"
v-model="item.disabled"
style="transform: translateX(10px);">
<div :class="{divtext:item.type === 1}"
style="padding-right: 10px"
@mouseover="twItemFocus(scope.$index,index)">
{{item.name }}
</div>
<div slot="content" class="tooTipBtn">
<div slot="content" class="tooTipBtn"
@mouseover="twItemFocus(scope.$index,index)"
@mouseleave="twoItemNoFocus(scope.$index,index)">
<div
v-for="it in item.user"
:title="it.name"
......@@ -74,8 +80,10 @@
{{ item.name }}
</div>
</div>
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
......@@ -149,7 +157,7 @@
</el-table>
</div>
<div class="line-botttom"></div>
<!-- <div class="line-botttom"></div>-->
<!-- 分页-->
<div class="footer">
<span class="count">共&nbsp;{{ total }}&nbsp;条记录 第{{ currPage }}/{{totalPage}}页</span>
......@@ -158,7 +166,7 @@
class="paging"
@current-change="handleCurrentChange"
:current-page="currPage"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
background
layout="prev, pager, next"
:total="total"
......@@ -181,14 +189,16 @@ export default {
width4: 136, //启用状态
width5: 260, //逻辑库说明
width6: 120, // 操作
height: "33rem",
height: '42rem',
tableDate: [],
currPage: 1, // 当前页数
pageSize: 10, // 每页的数据条数
pageSize: 13, // 每页的数据条数
total: 0, // 数据总条数
totalPage: 0, // 总共页数
curOneGradeIndex: -1,
curTwoGradeIndex: -1,
}
},
created() {
......@@ -206,6 +216,42 @@ export default {
this.getList()
},
methods: {
twoItemNoFocus(gindex, cindex) {
this.tableDate[gindex].groups[cindex].disabled = false
this.tableDate[gindex].disabled = false
this.curOneGradeIndex = -1
},
twItemFocus(gindex, cindex) {
if (cindex >= 0 && gindex >= 0) {
if (this.curTwoGradeIndex !== cindex && this.curTwoGradeIndex >= 0) {
this.tableDate[gindex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[gindex].groups[cindex].disabled = true
this.tableDate[gindex].disabled = true
this.curOneGradeIndex = gindex
this.curTwoGradeIndex = cindex
}
},
groupItemNoFocus() {
if (this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.curOneGradeIndex = -1
this.curTwoGradeIndex = -1
},
groupItemFocus(index) {
if (this.curOneGradeIndex !== index && this.curOneGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].disabled = false
}
if (this.curOneGradeIndex >= 0 && this.curTwoGradeIndex >= 0) {
this.tableDate[this.curOneGradeIndex].groups[this.curTwoGradeIndex].disabled = false
}
this.tableDate[index].disabled = true
this.curOneGradeIndex = index
},
getRowKeys(row) {
return row.logicId
},
......@@ -285,7 +331,7 @@ export default {
var _that = this
_that.getList(page)
},
getList(page = 1, limit = 10) {
getList(page = 1, limit = this.pageSize) {
let _that = this
let ruleForm = {}
this.currPage = page
......
src/views/xtfkgl/SjkyhSelect.vue
......@@ -107,6 +107,12 @@ export default {
},
mounted() {
this.updateSelectSet()
let _that = this
document.addEventListener('click', function (e) {
if (_that.isShowing) {
_that.isShowing = false
}
})
},
beforeDestroy() {
this.isShowing = false
......@@ -298,7 +304,19 @@ export default {
}
}
</script>
<style lang="scss">
.el-popper[x-placement^="bottom-end"] {
border-style: none;
}
.el-popper[x-placement^="bottom-end"] .popper__arrow::after {
border-style: none;
}
.el-popper[x-placement^="bottom-end"] .popper__arrow {
border-style: none;
}
</style>
<style scoped lang="scss">
@import "../../../public/iconfont/iconfont.css";
......@@ -433,9 +451,10 @@ export default {
width: 264px;
height: 216px;
display: block;
padding-top: 10px;
padding-top: 0px;
z-index: 999;
background: #FFFFFF;
/*background: black;*/
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
border: 1px solid #E6E6E8;
......@@ -450,10 +469,12 @@ export default {
width: 28%;
height: 216px;
/*height: 40px;*/
background: #FFFFFF;
/*background: #FFFFFF;*/
background: transparent;
border: 1px none #EEEEEE;
border-right-style: solid;
/*border: 1px none #EEEEEE;*/
/*border-right-style: solid;*/
border-right: 1px solid #EEEEEE;
.list-item {
width: 100%;
......@@ -485,10 +506,11 @@ export default {
width: 72%;
height: 216px;
/*background: black;*/
background: transparent;
.top-div {
width: 100%;
height: 170px;
height: 160px;
overflow: scroll;
.top-item {
......@@ -519,13 +541,14 @@ export default {
.bottom-div {
width: 100%;
height: 55px;
background: #FFFFFF;
background: transparent;
box-shadow: 0px -2px 4px 0px rgba(0, 0, 0, 0.06);
border-radius: 0px 0px 3px 3px;
display: flex;
align-items: center;
justify-content: center;
/*line-height: 55px;*/
.queding {
width: 72px;
......
src/views/xtfkgl/XtfkAndGzlView.vue
......@@ -46,6 +46,7 @@
<el-form-item class="info-item" label="数据库用户：">
<sjkyh-select ref='sjkyhSelect' :params='ljfkRuleForm.usersOrUserGroups'
@select="selectYh"></sjkyh-select>
<div class="tip" style="margin-top: -18px;"><span class="iconfont">&#xe649;</span>提示：如果不选择，默认全部用户！</div>
</el-form-item>
</el-col>
</el-row>
......@@ -123,7 +124,7 @@
v-show="getDlmcArr() && getDlmcArr().length > 0"
:style="{marginLeft: gindex===0?'0px':'20px'}">
<i v-if="!isBxCxdl(item.type)"
class="el-icon-circle-plus icon" style="color: #055fe7"
class="el-icon-circle-plus icon" style="color: #055fe7;"
@click="updateGzdl(item,gindex,true)" />
<div :key="item.type">
{{ item.name || '-'}}
......
src/views/xtfkgl/scss/dialog_table.scss
......@@ -89,7 +89,7 @@
.fix-height {
min-height: 430px;
max-height: 600px;
max-height: 690px;
overflow: scroll;
}
}
......@@ -397,6 +397,7 @@
> .icon {
position: absolute;
color: #055fe7;
background: white;
top: -6px;
right: -6px;
cursor: pointer;
......@@ -458,13 +459,14 @@
.addbtns {
border-top: 1px solid #eeeeee;
padding-top: 20px;
padding-top: 0px;
width: 100%;
text-align: center;
.add {
width: 72px;
height: 40px;
margin-top: 10px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
......@@ -478,6 +480,7 @@
.cancel {
width: 72px;
height: 40px;
margin-top: 10px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
......@@ -494,6 +497,17 @@
border: 1px solid #E6E6E8;
}
.tip {
margin-left: 0px;
color: #f8980a;
font-family: HarmonyOS_Sans_SC;
font-size: 13px;
span {
font-size: 13px;
margin-right: 5px;
}
}
.dialog /deep/ {
.el-form-item__content {
......@@ -525,7 +539,7 @@
&::before {
position: absolute;
//left: -10px;
left: -10px;
//transform: translateY(3px);
}
}
......
src/views/xtfkgl/scss/xtfkgl_main.scss
.tooTipBtn {
padding: 10px;
padding: 10px 0;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
......@@ -28,7 +28,6 @@
overflow: hidden;
white-space: nowrap;
word-wrap: break-word;
padding: 0 10px;
height: 24px;
background: #5e5e5e;
border-radius: 4px;
......@@ -37,7 +36,7 @@
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #FFFFFF;
line-height: 20px;
line-height: 24px;
&:last-of-type {
margin-bottom: 0;
......@@ -50,6 +49,46 @@
}
.two-tooltip{
.el-tooltip__popper{
//transform: translateX(20px);
//margin-left: 30px;
}
}
.tooTipBtn1 {
padding: 10px 0px;
max-height: 317px;
overflow: auto;
// 滚动条的宽度
&::-webkit-scrollbar {
width: 6px; /*高宽分别对应横竖滚动条的尺寸*/
height: 1px;
}
/* 滚动槽 */
&::-webkit-scrollbar-track {
height: 65px;
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 10px;
}
/* 滚动条滑块 */
&::-webkit-scrollbar-thumb {
border-radius: 10px;
height: 65px;
background: #595a5a;
}
}
.manage-page {
width: 100%;
......@@ -129,18 +168,17 @@
.tagsBox {
display: flex;
.el-tooltip {
width: auto !important;
}
//.el-tooltip {
// width: auto !important;
//}
}
.tags {
flex-shrink: 0;
//flex-shrink: 0;
width: 134px;
height: 24px;
background: #F0F3F6;
border-radius: 4px;
padding: 0 13px;
text-align: center;
margin-right: 12px;
overflow: hidden;
......@@ -151,7 +189,7 @@
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 20px;
line-height: 24px;
}
.tagszu {
......@@ -160,6 +198,13 @@
color: #FA9500;
}
.yonghu-name {
//padding: 0 13px;
background: red;
width: 134px;
height: 24px;
}
.circle-red {
width: 8px;
height: 8px;
......@@ -178,6 +223,7 @@
-webkit-border-radius: 50%;
}
}
.line-botttom {
height: 1px;
width: 1592px;
......
src/views/zzwlr/htcj.vue
......@@ -31,7 +31,7 @@
codeUrl="/api/code/sex"
:clearable="true"
:multiple="false"
:form="ruleForm"
:form="liveCollectionTo"
class="xb"
v-model="liveCollectionTo.sex"
id="sex"
......@@ -43,7 +43,7 @@
<span>身份证号：</span>
<el-input
placeholder="请输入身份证号"
v-model="liveCollectionTo.idcard"
v-model="liveCollectionTo.idCard"
@keyup.enter.native="search"
>
</el-input>
......@@ -56,7 +56,7 @@
<span>采集单位：</span>
<Cascader
ref="cascader"
:form="ruleForm"
:form="liveCollectionTo"
id="collectionDw"
class="cjdw"
:width="17.1612"
......@@ -75,6 +75,7 @@
<div class="filter nysj">
<span>捺印日期：</span>
<el-date-picker
@change="getParam"
v-model="startEndDate"
style="display: flex; align-items: center"
type="daterange"
......@@ -592,10 +593,14 @@ export default {
deep: true,
immediate: true,
handler: function (newV, oldV) {
console.log(newV);
if(newV.barcode || newV.name || newV.sex || newV.idCard || newV.collectionDw || newV.collectionName || newV.printingTimeStart !== ''){
// console.log('不为空，有清空');
this.isActive = true
this.isShow = false
} else {
this.isActive = false
this.isShow = true
}
}
}
......
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