Commit cfe2d855 by 米嘉伟

逻辑库code改id,比中关系逻辑库name筛选

parent 132564c1
import { _axios } from "@/plugins/axios";
const state = {
targetOptions_ry: [],
targetOptions_aj: []
targetOptions_aj: [],
targetOptions_all: []
};
const mutations = {
ljkRy (state, res) {
......@@ -9,6 +10,9 @@ const mutations = {
},
ljkAj (state, res) {
state.targetOptions_aj = res
},
ljkAll (state, res) {
state.targetOptions_all = res
}
};
......@@ -27,6 +31,13 @@ const actions = {
}
})
},
_ljkAll (context, options) {// 获取全部逻辑库名称
_axios.get('/api/code/allLogicName').then(res => {
if (res.data.code == 0 && res.data.message == "success") {
context.commit('ljkAll', res.data.ret);
}
})
},
}
......
......@@ -172,7 +172,7 @@
<el-checkbox
v-for="value in targets_ry"
:key="value.id"
:label="value.code"
:label="value.id"
>{{ value.name }}</el-checkbox>
</el-checkbox-group>
<el-checkbox-group
......@@ -182,7 +182,7 @@
<el-checkbox
v-for="(value,key) in targets_aj"
:key="key"
:label="value.code"
:label="value.id"
>{{ value.name }}</el-checkbox>
</el-checkbox-group>
......@@ -400,7 +400,7 @@
<el-checkbox
v-for="value in targets_ry"
:key="value.id"
:label="value.code"
:label="value.id"
>{{ value.name }}</el-checkbox>
</el-checkbox-group>
<el-checkbox-group
......@@ -410,7 +410,7 @@
<el-checkbox
v-for="value in targets_aj"
:key="value.id"
:label="value.code"
:label="value.id"
>{{ value.name }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
......@@ -523,8 +523,8 @@ export default {
return {
targets_ry: this.$store.state.ljk.targetOptions_ry, // 目标逻辑库(人员) vuex
targets_aj: this.$store.state.ljk.targetOptions_aj, // 目标逻辑库(案件) vuex
dataRy: ['1'], // 人员 目标逻辑库 选中
dataAj: ['1'], // 案件 目标逻辑库 选中
dataRy: [1], // 人员 目标逻辑库 选中
dataAj: [1], // 案件 目标逻辑库 选中
radio: 'true',
fingerCount: null, //多选案件现场指位个数
......@@ -756,8 +756,8 @@ export default {
this.dialogVisible = false;
this.ruleForm.srcDataType = [] // 查询类型切换清空数据类型
this.ruleForm.srcDataTypeAj = ['7'] //源数据类型案件
this.dataRy = ['1']
this.dataAj = ['1']
this.dataRy = [1]
this.dataAj = [1]
this.ruleForm.queryClass = '3'
this.ruleForm.matchCount = '10'
this.dxcx = {
......@@ -793,8 +793,8 @@ export default {
this.dialogVisible = false;
this.ruleForm.srcDataType = [] // 查询类型切换清空数据类型
this.ruleForm.srcDataTypeAj = ['7'] //源数据类型案件
this.dataRy = ['1']
this.dataAj = ['1']
this.dataRy = [1]
this.dataAj = [1]
this.ruleForm.queryClass = '3'
this.ruleForm.matchCount = '10'
this.dxcx = { // 定向查询
......
......@@ -357,12 +357,12 @@
<el-row>
<el-col :span="12">
<el-form-item
label="捺印时间:"
label="捺印日期:"
prop="nysj"
>
<el-date-picker
type="datetime"
placeholder="请输入捺印时间"
type="date"
placeholder="请输入捺印日期"
v-model="ruleForm.nysj"
style="width: 100%"
:picker-options="{
......@@ -441,7 +441,7 @@ export default {
return {
dialogVisible: false, // 弹窗状态
labelPosition: "left", // 数据项对齐方式
checkedTargets: ['1'], // 选定的目标逻辑库
checkedTargets: [1], // 选定的目标逻辑库
targets: this.$store.state.ljk.targetOptions_ry, // 目标逻辑库
ruleForm: {
ysxtAsjxgrybh: "", // 人员编号
......@@ -530,7 +530,7 @@ export default {
{
type: "date",
required: true,
message: "请选择捺印时间",
message: "请选择捺印日期",
trigger: "change",
},
],
......@@ -652,7 +652,7 @@ export default {
ifidcard: "是", // 是否采集二代身份证
zwbdxtlxms: "1", // 指纹比对描述
}
this.checkedTargets = ['1']// 选定的目标逻辑库
this.checkedTargets = [1]// 选定的目标逻辑库
} else {
this.$message.error("新增失败");
this.$set(this.ruleForm, 'cjxxyydm', [])
......
......@@ -588,7 +588,7 @@ export default {
let self = this
this.$refs[formName].validate((valid) => {
if (valid) {
self.temp_logicList = self.ruleForm.logicList
self.temp_logicList = self.ruleForm.logicList.map(Number)
// delete self.ruleForm.logicdbtype2
self.$axios({
method: 'post',
......@@ -642,13 +642,13 @@ export default {
dcfptxAj
},
watch: {
drawer(newValue, oldValue) {
if(newValue) {
drawer (newValue, oldValue) {
if (newValue) {
//监听页面滚动
this.$nextTick(() => {
document.querySelector('.el-drawer__body').addEventListener("scroll", (e) => {
console.log(e);
if(e.target.scrollTop > 400) {
if (e.target.scrollTop > 400) {
$('.arrow-down-img').css('transform', 'rotate(180deg)');
} else {
$('.arrow-down-img').css('transform', 'rotate(0deg)');
......
......@@ -265,7 +265,7 @@
<el-checkbox
v-for="(value,key) in targets"
:key="key"
:label="value.code"
:label="value.id"
>{{ value.name }}
</el-checkbox>
</el-checkbox-group>
......@@ -439,7 +439,7 @@
<el-checkbox
v-for="(value,key) in targetsLeft"
:key="key"
:label="value.code"
:label="value.id"
>{{ value.name }}
</el-checkbox>
</el-checkbox-group>
......@@ -450,7 +450,7 @@
<el-checkbox
v-for="(value,key) in targetsRight"
:key="key"
:label="value.code"
:label="value.id"
>{{ value.name }}
</el-checkbox>
</el-checkbox-group>
......@@ -542,7 +542,7 @@ export default {
fileContent: '', // 导入文件内容
// 人员/案件 导入逻辑库
checkedTargets: ['1'], // 选定逻辑库
checkedTargets: [1], // 选定逻辑库
targetHead: '人员逻辑分库',// 逻辑库标题
targets: this.$store.state.ljk.targetOptions_ry, // 逻辑库列表
......@@ -554,9 +554,9 @@ export default {
nowSelectRightData: [], // 右边选中列表数据
// 比中关系
checkedTargetsLeft: ['1'], // 选定逻辑库
checkedTargetsLeft: [1], // 选定逻辑库
targetsLeft: this.$store.state.ljk.targetOptions_ry, // 逻辑库列表
checkedTargetsRight: ['1'], // 选定逻辑库
checkedTargetsRight: [1], // 选定逻辑库
targetsRight: this.$store.state.ljk.targetOptions_aj, // 逻辑库列表
......@@ -593,7 +593,7 @@ export default {
this.selectArr = []
this.nowSelectRightData = []
this.fileList = []
this.checkedTargets = ['1']
this.checkedTargets = [1]
this.logicList = [] // 目标逻辑库数组
this.logicPsnList = []// 比中关系人员逻辑库数组
this.logicCaseList = []//比中关系案件逻辑库数组
......@@ -607,7 +607,7 @@ export default {
this.selectArr = []
this.nowSelectRightData = []
this.fileList = []
this.checkedTargets = ['1']
this.checkedTargets = [1]
this.logicList = [] // 目标逻辑库数组
this.logicPsnList = []// 比中关系人员逻辑库数组
this.logicCaseList = []//比中关系案件逻辑库数组
......@@ -619,8 +619,8 @@ export default {
this.nowSelectRightData = []
this.fileList = []
this.checkedTargets = []
this.checkedTargetsRight = ['1']
this.checkedTargetsLeft = ['1']
this.checkedTargetsRight = [1]
this.checkedTargetsLeft = [1]
this.logicList = [] // 目标逻辑库数组
this.logicPsnList = []// 比中关系人员逻辑库数组
this.logicCaseList = []//比中关系案件逻辑库数组
......@@ -1061,7 +1061,7 @@ export default {
this.successCount = res.ret.successCount
this.failCount = res.ret.failCount
this.showProgress = false;
this.checkedTargets = ['1']
this.checkedTargets = [1]
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
......@@ -1078,8 +1078,8 @@ export default {
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.checkedTargetsLeft = ['1'] // 选定逻辑库
this.checkedTargetsRight = ['1'] // 选定逻辑库
this.checkedTargetsLeft = [1] // 选定逻辑库
this.checkedTargetsRight = [1] // 选定逻辑库
this.UploadPercent = 0
}
// this.$refs.upload.clearFiles()
......
......@@ -55,19 +55,6 @@
id="logicDatabase"
></SelectCode>
</div>
<!-- <el-select
v-model="logicDatabase"
placeholder="请选择逻辑分库"
@keyup.enter.native="search"
>
<el-option
v-for="item in logicDatabaseoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select> -->
</div>
<div class='search taskNumber'>
<div class='item'>任务号:</div>
......@@ -87,6 +74,7 @@
v-model="status"
placeholder="请选择入库状态"
@keyup.enter.native="search"
clearable
>
<el-option
v-for="item in statusoptions"
......@@ -162,12 +150,14 @@
@keyup.enter.native="search"
v-model="logicDatabase"
placeholder="请选择逻辑分库"
filterable
clearable
>
<el-option
v-for="item in logicDatabaseoptions"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="(item,key) in logicDatabaseoptions"
:key="key"
:label="item.name"
:value="item.name"
>
</el-option>
</el-select>
......@@ -873,13 +863,7 @@ export default {
width6: 160,
dataType: null, // 导入类型
barcode: "", // 条码号
logicDatabaseoptions: [
{
// 逻辑库
value: "1",
label: "人员逻辑库",
},
],
logicDatabaseoptions: this.$store.state.ljk.targetOptions_all,
statusoptions: [
{
// 入库状态
......@@ -892,7 +876,7 @@ export default {
},
],
status: null, // 入库状态
logicDatabase: "", // 逻辑库
logicDatabase: [], // 逻辑库
ruleForm: {
logicDatabase: "", // 逻辑库
......@@ -969,6 +953,7 @@ export default {
this.multipleSelection = [];
// this.search();
this.clear()
},
},
methods: {
......@@ -1005,14 +990,14 @@ export default {
reqParam = {
status: null, // 状态
barcode: "", // 条码号
logicDatabaseCode: "", // 逻辑分库
logicName: "", // 逻辑分库
queryType: "", // 类型
offSet: null, // 当前页数
limit: null // 当页条数
};
reqParam.status = this.status != null ? Number(this.status) : null;
reqParam.barcode = this.barcode;
reqParam.logicDatabaseCode = this.ruleForm.logicDatabase;
reqParam.logicName = this.logicDatabase;
reqParam.queryType = this.queryType;
reqParam.offSet = this.currPage2;
reqParam.limit = this.pageSize
......
......@@ -114,8 +114,9 @@ export default {
this.$message.success('登录成功!')
//所在单位数据
this.$store.dispatch("publicData/_getList");
this.$store.dispatch("ljk/_ljkRy") // 获取用户逻辑库
this.$store.dispatch("ljk/_ljkAj") // 获取用户逻辑库
this.$store.dispatch("ljk/_ljkRy") // 获取用户人员逻辑库JSON
this.$store.dispatch("ljk/_ljkAj") // 获取用户案件逻辑库JSON
this.$store.dispatch("ljk/_ljkAll") // 获取用户所有逻辑库名称NAME
this.$router.push("/index");
this.$bus.emit("goLogin");
this.$store.commit("layout/setMenu", res.data.auth);
......@@ -224,14 +225,16 @@ export default {
}
</style>
<style>
input:-webkit-autofill , textarea:-webkit-autofill, select:-webkit-autofill {
-webkit-text-fill-color: #ededed !important;
-webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
background-color:transparent;
background-image: none;
transition: background-color 50000s ease-in-out 0s;
}
input {
background-color:transparent;
}
input:-webkit-autofill,
textarea:-webkit-autofill,
select:-webkit-autofill {
-webkit-text-fill-color: #ededed !important;
-webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
background-color: transparent;
background-image: none;
transition: background-color 50000s ease-in-out 0s;
}
input {
background-color: transparent;
}
</style>
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