Skip to content

F
founder_vue
Commit ecc88398 by 米嘉伟
Options

导入列表

parent 1eb2f914
Showing with 289 additions and 73 deletions
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -306,8 +306,8 @@
<el-radio-group v-model="ruleForm.cxlx.querytype">
<el-radio
label="2"
style="color: #00ccb5"
class='color_00ccb5'
style="color: #00b47a"
class='color_00b47a'
>正查</el-radio>
<el-radio
label="3"
......@@ -1085,8 +1085,8 @@ export default {
/deep/.color_fa9500 .el-radio__input.is-checked + .el-radio__label {
color: #fa9500;
}
/deep/.color_00ccb5 .el-radio__input.is-checked + .el-radio__label {
color: #00ccb5;
/deep/.color_00b47a .el-radio__input.is-checked + .el-radio__label {
color: #00b47a;
}
/deep/.color_055fe7 .el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
......
src/views/drFPTX/Index.vue
......@@ -85,8 +85,8 @@
>
</el-table-column>
<el-table-column
prop="name"
label="文件名称"
prop="index"
label="内序"
>
</el-table-column>
<!-- <el-table-column label="条码号">
......@@ -150,8 +150,8 @@
>
</el-table-column>
<el-table-column
prop="name"
label="文件名称"
prop="index"
label="内序"
>
</el-table-column>
<el-table-column
......@@ -225,7 +225,7 @@
<template slot-scope="scope">
<div
v-if='scope.row.type==0'
style="color: #ffa219;"
style="color: #fa9500;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==1'
......@@ -233,7 +233,7 @@
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==2'
style="color: #08BD9E;"
style="color: #00b47a;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==3'
......@@ -282,7 +282,7 @@
<el-table
height="550"
:data="selectArr"
ref="selection"
ref="dataTable"
@selection-change="checkRightAll"
style="width: 100%"
>
......@@ -306,7 +306,7 @@
<template slot-scope="scope">
<div
v-if='scope.row.type==0'
style="color: #ffa219;"
style="color: #fa9500;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==1'
......@@ -314,7 +314,7 @@
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==2'
style="color: #08BD9E;"
style="color: #00b47a;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==3'
......@@ -584,7 +584,6 @@ export default {
var reader = new FileReader();
reader.readAsText(file);
if (this.drlx == 3) {
console.log('333333')
that.action = '/api/upload/person'
reader.onload = function () {
const reg = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/
......@@ -592,7 +591,7 @@ export default {
that.$set(newlist[i], 'barcode', barcode[1])
}
} else if (this.drlx == 6) {
that.action = '/api/upload/person'
that.action = '/api/upload/case'
reader.onload = function () {
const reg = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/
let barcode = this.result.match(reg)
......@@ -813,12 +812,13 @@ export default {
this.nowSelectData = val;
},
checkRightAll (val) {
console.log('val', val)
console.log('val111', val)
this.nowSelectRightData = val;
},
// 选中
handelSelect () {
this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
this.nowSelectRightData = this.selectArr
this.handleRemoveTabList(this.nowSelectData, this.datas);
this.nowSelectData = [];
},
......
src/views/drFPTX/RAList.vue
......@@ -8,15 +8,18 @@
class='head'
v-if="showType==1"
>
<el-radio-group v-model="drlx">
<el-radio :label="3">人员</el-radio>
<el-radio :label="6">案件</el-radio>
<el-radio-group
v-model="dataType"
class="chooseType"
>
<el-radio :label="1">人员</el-radio>
<el-radio :label="2">案件</el-radio>
</el-radio-group>
<div class='search tmh'>
<div class='search barcode'>
<div class='item'> 条码号：</div>
<el-input
placeholder="请输入条码号"
v-model="tmh"
v-model="barcode"
clearable
>
</el-input>
......@@ -24,12 +27,11 @@
<div class='search ljfk'>
<div class='item'> 逻辑分库：</div>
<el-select
v-model="value"
clearable
v-model="logicDatabase"
placeholder="请选择逻辑分库"
>
<el-option
v-for="item in options"
v-for="item in logicDatabaseoptions"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -37,11 +39,11 @@
</el-option>
</el-select>
</div>
<div class='search rwh'>
<div class='search taskNumber'>
<div class='item'> 任务号：</div>
<el-input
placeholder="请输入任务号"
v-model="rwh"
v-model="taskNumber"
clearable
>
</el-input>
......@@ -49,12 +51,11 @@
<div class='search rkzt'>
<div class='item'> 入库状态：</div>
<el-select
v-model="value"
clearable
v-model="status"
placeholder="请选择入库状态"
>
<el-option
v-for="item in options"
v-for="item in statusoptions"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -77,24 +78,38 @@
class='head'
v-if="showType==2"
>
<div class='search tmh'>
<div class='search barcode'>
<div class='item'> 条码号：</div>
<el-input
placeholder="请输入条码号"
v-model="tmh"
v-model="barcode"
clearable
>
</el-input>
</div>
<div class='search ljfk'>
<div class='item'>查询类型：</div>
<el-select
v-model="queryType"
placeholder="请选择查询类型"
>
<el-option
v-for="item in queryTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class='search ljfk'>
<div class='item'> 逻辑分库：</div>
<el-select
v-model="value"
clearable
v-model="logicDatabase"
placeholder="请选择逻辑分库"
>
<el-option
v-for="item in options"
v-for="item in logicDatabaseoptions"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -102,24 +117,23 @@
</el-option>
</el-select>
</div>
<div class='search rwh'>
<!-- <div class='search taskNumber'>
<div class='item'> 任务号：</div>
<el-input
placeholder="请输入任务号"
v-model="rwh"
v-model="taskNumber"
clearable
>
</el-input>
</div>
</div> -->
<div class='search rkzt'>
<div class='item'> 入库状态：</div>
<el-select
v-model="value"
clearable
v-model="status"
placeholder="请选择入库状态"
>
<el-option
v-for="item in options"
v-for="item in statusoptions"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -127,7 +141,7 @@
</el-option>
</el-select>
</div>
<div class='search sjxz'>
<!-- <div class='search sjxz'>
<div class='item'> 时间选择：</div>
<el-date-picker
v-model="value1"
......@@ -136,7 +150,7 @@
end-placeholder="结束日期"
>
</el-date-picker>
</div>
</div> -->
</div>
<!-- 二 -->
<div class="buttons">
......@@ -150,7 +164,7 @@
</el-radio-group>
</div>
<div class='right'>
<el-button>筛选</el-button>
<el-button @click='search'>筛选</el-button>
</div>
</div>
......@@ -204,14 +218,135 @@
>清除</el-link>
</el-tag>
<!-- 五 -->
<div v-if="showType==1">
<el-table
max-height="500"
ref="multipleTable"
:data="tableDate1"
tooltip-effect="dark"
style="width: 100%"
row-key="sequenceNumber"
:tree-props="{children: 'pcImportRecordGrandchildren', hasChildren: 'hasChildren'}"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="auto"
v-if="isSelected"
>
</el-table-column>
<el-table-column
prop="taskNumber"
label="任务号"
width="200"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
width="300"
>
</el-table-column>
<el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="300"
>
</el-table-column>
<el-table-column
prop="dataType"
label="类型"
width="auto"
>
</el-table-column>
<el-table-column
prop="logicDatabase"
label="逻辑分库"
width="auto"
>
</el-table-column>
<el-table-column
prop="status"
label="状态"
width="auto"
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="100"
>
<template slot-scope="scope">
<div class="ops">
<el-tooltip
class="item"
effect="dark"
content="编辑"
placement="top"
:open-delay='500'
@click="handleClick(scope.row)"
>
<div
class="icon bj"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bj.svg"
alt=""
>
</div>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="复制数据"
placement="top"
:open-delay='500'
>
<div
class="icon bz"
@click='isShowFztmBtn(scope.row)'
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
>
</div>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="发查询"
placement="top"
:open-delay='500'
>
<div
class="icon look"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.svg"
alt=""
>
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
</div>
<el-table
max-height="550"
v-if="showType==2"
max-height="500"
ref="multipleTable"
:data="tableDate"
:data="tableDate2"
tooltip-effect="dark"
style="width: 100%"
row-key="sequenceNumber"
:tree-props="{children: 'pcImportRecordGrandchildren', hasChildren: 'hasChildren'}"
:tree-props="{children: 'affirmImportRecordGrandchildren', hasChildren: 'hasChildren'}"
@selection-change="handleSelectionChange"
>
<el-table-column
......@@ -233,19 +368,23 @@
>
</el-table-column>
<el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="300"
prop="queryType"
label="查询类型"
width="auto"
>
</el-table-column>
<el-table-column
prop="dataType"
label="类型"
width="auto"
prop="barcode"
label="人员编号/案事件编号"
width="300"
>
<template slot-scope="scope">
<div>{{scope.row.srcBarcode}}</div>
<div>{{scope.row.destBarcode}}</div>
</template>
</el-table-column>
<el-table-column
prop="dataType"
prop="logicDatabase"
label="逻辑分库"
width="auto"
>
......@@ -319,7 +458,6 @@
</div>
</template>
</el-table-column>
</el-table>
<!-- 六 -->
<div class="block">
......@@ -375,16 +513,51 @@ export default {
},
data () {
return {
drlx: 3,// 导入类型
tmh: '',// 条码号
options: [{
value: '选项1',
label: '黄金糕'
dataType: 1,// 导入类型
barcode: '',// 条码号
logicDatabaseoptions: [{ // 逻辑库
value: '1',
label: '人员逻辑库'
}],
value: '',// 逻辑库
value1: '',
rwh: '',// 任务号
showType: '1',
statusoptions: [
{ // 入库状态
value: '1',
label: '成功'
}, {
value: '0',
label: '失败'
}
],
status: null, // 入库状态
logicDatabase: '',// 逻辑库
value1: '', // 时间
taskNumber: '',// 任务号
showType: '1', // 1:人案 2：比中
queryType: '',// 比中类型
queryTypeOptions: [
{ // 比中类型
value: '0',
label: '查重'
},
{
value: '1',
label: '倒查'
},
{
value: '2',
label: '正查'
},
{
value: '3',
label: '串查'
},
],
tableDate1: [
], // 人员列表数据
tableDate2: [
], // 人员列表数据
......@@ -407,27 +580,66 @@ export default {
checkboxQuery: [], //滚动平面等筛选条件
}
},
tableDate: [
], // 人员列表数据
multipleSelection: [], // 表单选择项目
isShowTip: false,//批量操作提示
selectionData: [],
};
},
watch: {
showType (newNum, oldNum) {
// ...
console.log(newNum, 123)
this.search()
}
},
methods: {
// 获取全部人员列表请求
search () {
let reqUrl = null;
let reqParam = null;
if (this.showType == 1) {
reqUrl = "/api/record/import/pc/search"
reqParam = {
taskNumber: "", // 任务号
dataType: null, // 人员or案件
status: null,// 状态
barcode: '',// 条码号
logicDatabase: '',// 逻辑分库
}
reqParam.taskNumber = this.taskNumber
reqParam.dataType = Number(this.dataType)
// reqParam.status = Number(this.status)
reqParam.status = this.status != null ? Number(this.status) : null
reqParam.barcode = this.barcode
reqParam.logicDatabase = this.logicDatabase
} else if (this.showType == 2) {
// console.log('bizhong bizhong ')
reqUrl = "/api/record/import/affirm/search"
reqParam = {
status: null,// 状态
barcode: '',// 条码号
logicDatabase: '',// 逻辑分库
queryType: '',// 类型
}
reqParam.status = this.status != null ? Number(this.status) : null
reqParam.barcode = this.barcode
reqParam.logicDatabase = this.logicDatabase
reqParam.queryType = this.queryType
}
// console.info("请求===>", this.reqParam);
this.$axios
.get("/api/record/import/pc/search")
.post(reqUrl, reqParam)
.then(response => {
// console.info("查询结果===>", response);
if (response.data.code === 0) {
this.tableDate = response.data.ret.pcImportRecordChildren;
if (this.showType == 1) {
this.tableDate1 = response.data.ret.pcImportRecordChildren;
} else if (this.showType == 2) {
this.tableDate2 = response.data.ret.affirmImportRecordChildren;
}
// this.reqParam.page.total = response.data.ret.total;
console.info("查询结果===>", this.tableDate);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(response.data.message);
}
......@@ -628,9 +840,13 @@ export default {
display: flex;
align-items: center;
}
.tmh {
.chooseType {
margin-top: 3px;
margin-right: 24px;
}
.barcode {
// margin-left: 65px;
margin-left: 24px;
// margin-left: 24px;
.item {
width: 60px;
font-size: 14px;
......@@ -661,7 +877,7 @@ export default {
height: 32px;
}
}
.rwh {
.taskNumber {
margin-left: 24px;
.item {
width: 80px;
......@@ -722,11 +938,11 @@ export default {
/deep/.el-button {
width: 72px;
height: 32px;
background: #ecedf1;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #aeafb4;
color: #ffffff;
line-height: 22px;
}
}
......
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