Skip to content

F
founder_vue
Commit df9a82fb by 张超军
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents ee986d75 97784027
Showing with 707 additions and 271 deletions
src/store/modules/layout.js
/*
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-11 17:54:45
* @LastEditTime: 2021-11-13 15:10:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\store\modules\user.js
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -22,7 +22,10 @@
v-if="reqParam.personStoreCustomSearch.ysxtAsjxgrybh.length > 0"
@click="empty"
></i>
<div class="search-icon el-icon-search" @click="search"></div>
<div
class="search-icon el-icon-search"
@click="search"
></div>
<el-radio-group
v-model="reqParam.personStoreCustomSearch.searchOptions"
@change="searchStyle"
......@@ -35,7 +38,10 @@
<!-- 三 -->
<div class="options">
<div class="left">
<div class="btn" @click="batch">批量操作</div>
<div
class="btn"
@click="batch"
>批量操作</div>
<el-checkbox-group
v-model="reqParam.personStoreCustomSearch.checkboxQuery"
@change="searchCheckList"
......@@ -47,7 +53,10 @@
</el-checkbox-group>
</div>
<div class="right">
<div class="btn" @click="isShowTjddlBtn">添加到队列</div>
<div
class="btn"
@click="isShowTjddlBtn"
>添加到队列</div>
<div
class="btn"
v-clipboard:copy="ysxtAsjxgrybh"
......@@ -57,10 +66,22 @@
>
复制条码
</div>
<div class="btn" @click="isShowDcftpxBtn">FPTX导出</div>
<div class="btn" @click="isShowGzBtn">关注</div>
<div class="btn" @click="delMore">删除</div>
<div class="btn send" @click="isShowFcxBtn">发查询</div>
<div
class="btn"
@click="isShowDcftpxBtn"
>FPTX导出</div>
<div
class="btn"
@click="isShowGzBtn"
>关注</div>
<div
class="btn"
@click="delMore"
>删除</div>
<div
class="btn send"
@click="isShowFcxBtn"
>发查询</div>
<button
:class="this.disabled ? 'btn disabled ' : 'btn new'"
@click="isShowXzryBtn"
......@@ -76,7 +97,10 @@
v-show="isShowTip"
>
<span v-html="'&nbsp;&nbsp;'"></span>
<i class="el-icon-info" style="color: #055fe7; font-size: 15px"></i>
<i
class="el-icon-info"
style="color: #055fe7; font-size: 15px"
></i>
已选择
<span style="color: #055fe7">{{ multipleSelection.length }}</span> 项​
<!-- <span v-html="'&nbsp;&nbsp;'"></span> -->
......@@ -86,8 +110,7 @@
:underline="false"
style="margin-left: 1.25rem"
@click="toggleSelection()"
>清除</el-link
>
>清除</el-link>
</el-tag>
<!-- 五 -->
<el-table
......@@ -106,11 +129,23 @@
:width="width33"
>
</el-table-column>
<el-table-column prop="ysxtAsjxgrybh" label="人员编号" :width="width1">
<el-table-column
prop="ysxtAsjxgrybh"
label="人员编号"
:width="width1"
>
</el-table-column>
<el-table-column prop="xm" label="姓名" :width="width2">
<el-table-column
prop="xm"
label="姓名"
:width="width2"
>
</el-table-column>
<el-table-column prop="zjhm" label="身份证号" :width="width3">
<el-table-column
prop="zjhm"
label="身份证号"
:width="width3"
>
</el-table-column>
<el-table-column
:formatter="dateTimeFormat"
......@@ -126,13 +161,29 @@
:formatter="xbdmFormat"
>
</el-table-column>
<el-table-column prop="rollcount" label="滚动" :width="width5">
<el-table-column
prop="rollcount"
label="滚动"
:width="width5"
>
</el-table-column>
<el-table-column prop="plancount" label="平面" :width="width5">
<el-table-column
prop="plancount"
label="平面"
:width="width5"
>
</el-table-column>
<el-table-column prop="plamcount" label="掌纹" :width="width5">
<el-table-column
prop="plamcount"
label="掌纹"
:width="width5"
>
</el-table-column>
<el-table-column prop="piccount" label="人像" :width="width5">
<el-table-column
prop="piccount"
label="人像"
:width="width5"
>
</el-table-column>
<el-table-column
prop="ifidcard"
......@@ -148,9 +199,16 @@
show-overflow-tooltip
>
</el-table-column>
<el-table-column fixed="right" label="操作" width="auto">
<el-table-column
fixed="right"
label="操作"
width="auto"
>
<template slot-scope="scope">
<div class="ops" @click="closeSelected">
<div
class="ops"
@click="closeSelected"
>
<el-tooltip
class="item"
effect="dark"
......@@ -159,8 +217,14 @@
:open-delay="500"
@click="handleClick(scope.row)"
>
<div class="icon bj" @click="handleClick(scope.row)">
<img src="../../assets/img/qbryk/bj.svg" alt="" />
<div
class="icon bj"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/bj.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
......@@ -170,7 +234,10 @@
placement="top"
:open-delay="500"
>
<div v-if="scope.row.collectstatus == 1" class="icon sc">
<div
v-if="scope.row.collectstatus == 1"
class="icon sc"
>
<el-popconfirm
placement="top-start"
:hide-icon="true"
......@@ -180,13 +247,25 @@
title="确认取消关注该数据吗？该操作无法撤消！"
>
<div slot="reference">
<img src="../../assets/img/qbryk/gz.svg" alt="" />
<img
src="../../assets/img/qbryk/gz.svg"
alt=""
/>
</div>
</el-popconfirm>
</div>
<div v-else class="icon sc">
<div class="icon sc" @click="isShowGzBtn1(scope.row)">
<img src="../../assets/img/qbryk/sc.svg" alt="" />
<div
v-else
class="icon sc"
>
<div
class="icon sc"
@click="isShowGzBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/sc.svg"
alt=""
/>
</div>
</div>
</el-tooltip>
......@@ -197,8 +276,14 @@
placement="top"
:open-delay="500"
>
<div class="icon gx" @click="isShowGgrytmBtn(scope.row)">
<img src="../../assets/img/qbryk/gx.svg" alt="" />
<div
class="icon gx"
@click="isShowGgrytmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/gx.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
......@@ -208,8 +293,14 @@
placement="top"
:open-delay="500"
>
<div class="icon look" @click="isShowFcxBtn1(scope.row)">
<img src="../../assets/img/qbryk/search.svg" alt="" />
<div
class="icon look"
@click="isShowFcxBtn1(scope.row)"
>
<img
src="../../assets/img/qbryk/search.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
......@@ -219,8 +310,14 @@
placement="top"
:open-delay="500"
>
<div class="icon bz" @click="isShowFztmBtn(scope.row)">
<img src="../../assets/img/qbryk/bz.svg" alt="" />
<div
class="icon bz"
@click="isShowFztmBtn(scope.row)"
>
<img
src="../../assets/img/qbryk/bz.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
......@@ -230,8 +327,14 @@
placement="top"
:open-delay="500"
>
<div class="icon print" @click="handleClick(scope.row)">
<img src="../../assets/img/qbryk/print.svg" alt="" />
<div
class="icon print"
@click="handleClick(scope.row)"
>
<img
src="../../assets/img/qbryk/print.svg"
alt=""
/>
</div>
</el-tooltip>
<el-tooltip
......@@ -250,7 +353,10 @@
title="确认要删除该数据吗？该操作无法撤消！"
>
<div slot="reference">
<img src="../../assets/img/qbryk/del.svg" alt="" />
<img
src="../../assets/img/qbryk/del.svg"
alt=""
/>
</div>
</el-popconfirm>
</el-tooltip>
......@@ -260,11 +366,9 @@
</el-table>
<!-- 六 -->
<div class="block">
<span class="record"
>共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{
<span class="record">共{{ reqParam.page.total }}条记录 第{{ reqParam.page.currPage }}/{{
Tpage
}}页</span
>
}}页</span>
<el-pagination
class="paging"
@size-change="handleSizeChange"
......@@ -322,7 +426,10 @@
>
</fcx>
<!-- 新增案件弹窗 -->
<xzry :isShowXzry="isShowXzry" @closeXzry="closeXzry"> </xzry>
<xzry
:isShowXzry="isShowXzry"
@closeXzry="closeXzry"
> </xzry>
</div>
</el-container>
</template>
......@@ -346,7 +453,7 @@ export default {
fcx,
xzry,
},
created() {
created () {
let w1 = 1920;
let w2 = window.innerWidth;
......@@ -357,9 +464,9 @@ export default {
this.width4 = (this.width4 * w2) / w1;
this.width5 = (this.width5 * w2) / w1;
},
data() {
data () {
return {
width33:"50",
width33: "50",
selectBoo: false,// 是否批量操作
width5: 80,
width4: 110,
......@@ -412,17 +519,17 @@ export default {
};
},
methods: {
cellClass(row){
if (row.columnIndex === 0) {
return 'disableheadselection'
}
},
closeSelected() {
cellClass (row) {
if (row.columnIndex === 0) {
return 'disableheadselection'
}
},
closeSelected () {
this.selectBoo = false;
this.toggleSelection();
},
// 获取全部人员列表请求
search() {
search () {
// console.info("请求===>", this.reqParam);
this.$axios
.post("/api/personstore/allperson", this.reqParam)
......@@ -438,30 +545,30 @@ export default {
});
},
// 保存选中的数据,row-key就是要指定一个key标识这一行的数据
getRowKeys(row) {
getRowKeys (row) {
return row.id;
},
// 清空输入框
empty() {
empty () {
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = "";
this.search();
},
// 新增案件操作
isShowXzryBtn() {
isShowXzryBtn () {
this.isShowXzry = true;
},
closeXzry(val) {
closeXzry (val) {
console.log("新增人员关闭", val);
this.isShowXzry = val;
this.search();
},
// 时间格式化
dateTimeFormat(row, colnum) {
dateTimeFormat (row, colnum) {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
},
// 性别格式化
xbdmFormat(row, colnum) {
xbdmFormat (row, colnum) {
let xbdm = row.xbdm;
let showProp = null;
if (xbdm == 0) {
......@@ -478,7 +585,7 @@ export default {
return showProp;
},
// 是否采集二代证格式化
ifidcardFormat(row, colnum) {
ifidcardFormat (row, colnum) {
let ifidcard = row.ifidcard;
let showProp = null;
if (ifidcard == 1) {
......@@ -491,20 +598,20 @@ export default {
return showProp;
},
// 搜索方式
searchStyle(val) {
searchStyle (val) {
// console.log(val, '搜索方式')
this.reqParam.page.searchOptions = val;
// console.log(this.reqParam.page.searchOptions)
},
//滚动平面等筛选条件
searchCheckList(val) {
searchCheckList (val) {
console.log(val, "筛选条件");
this.reqParam.page.checkboxQuery = val;
console.log(this.reqParam.page.checkboxQuery);
this.search();
},
// 复制条码号 获取选中条码值
getysxtAsjxgrybh() {
getysxtAsjxgrybh () {
let self = this;
this.ysxtAsjxgrybh = [];
if (this.multipleSelection.length === 0) {
......@@ -524,19 +631,25 @@ export default {
// }
},
// 复制成功时的回调函数
onCopy(e) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
onCopy (e) {
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError(e) {
this.$message.error("抱歉，复制条码号失败！");
onError (e) {
if (this.multipleSelection.length != 0) {
this.$message.error("抱歉，复制条码号失败！");
}
},
// 添加到队列
isShowTjddlBtn() {
isShowTjddlBtn () {
console.log("添加到队列");
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要添加到队列的数据！");
......@@ -546,12 +659,12 @@ export default {
this.isShowTjddl = true;
}
},
closeTjddl(val) {
closeTjddl (val) {
console.log("添加到队列关闭", val);
this.isShowTjddl = val;
},
// 导出FPTX
isShowDcftpxBtn() {
isShowDcftpxBtn () {
// 多行
console.log("导出FPTX");
......@@ -572,12 +685,12 @@ export default {
// this.isShowDcftpx = true;
// }
},
closeDcftpx(val) {
closeDcftpx (val) {
console.log("导出FPTX关闭", val);
this.isShowDcftpx = val;
},
// 关注
isShowGzBtn() {
isShowGzBtn () {
// 多行
console.log("关注");
let newarr = [];
......@@ -603,7 +716,7 @@ export default {
}
}
},
isShowGzBtn1(val) {
isShowGzBtn1 (val) {
// 单行
console.log(val, 123);
let rowVal = [];
......@@ -611,13 +724,13 @@ export default {
this.rowData = rowVal;
this.isShowGz = true;
},
closeGz(val) {
closeGz (val) {
console.log("关注关闭", val);
this.isShowGz = val;
this.search();
},
// 取消关注
qxgz(val) {
qxgz (val) {
// alert(val)
this.$axios
.delete("/api/mypsn/cancel", { params: { pids: val } })
......@@ -631,31 +744,31 @@ export default {
});
},
// 更改条码操作
isShowGgrytmBtn(val) {
isShowGgrytmBtn (val) {
console.log("更改条码", val);
this.rowData = val;
this.isShowGgrytm = true;
},
closeGgrytm(val) {
closeGgrytm (val) {
console.log("更改条码关闭", val);
this.isShowGgrytm = val;
this.search();
},
//复制条码列表操作
isShowFztmBtn(val) {
isShowFztmBtn (val) {
console.log("复制条码", val);
this.rowData = val;
this.isShowFztm = true;
},
closeFztm(val) {
closeFztm (val) {
console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val;
this.search();
},
//发查询操作(多行)
isShowFcxBtn() {
isShowFcxBtn () {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要发查询的数据！");
this.selectBoo = true;
......@@ -664,35 +777,46 @@ export default {
this.isShowFcx = true;
}
},
isShowFcxBtn1(val) {
isShowFcxBtn1 (val) {
console.log("单行人员发查询数据", val);
let rowVal = [];
rowVal.push(val);
this.rowData = rowVal;
this.isShowFcx = true;
},
closeFcx(val) {
closeFcx (val) {
console.log("发查询关闭", val);
this.isShowFcx = val;
// this.search()
},
// 多选删除
delMore() {
delMore () {
// 检查table选择的数据 如果没有选择则不可以删除
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要删除的数据！");
this.selectBoo = true;
return;
} else {
this.$confirm('是否确认删除？', '提示')
.then(_ => {
// 封装删除的psns为数组
let psns = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
psns.push(this.multipleSelection[i].id);
}
this.doDelete(psns);
})
.catch(_ => { });
}
// 封装删除的psns为数组
let psns = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
psns.push(this.multipleSelection[i].id);
}
this.doDelete(psns);
// // 封装删除的psns为数组
// let psns = [];
// for (let i = 0; i < this.multipleSelection.length; i++) {
// psns.push(this.multipleSelection[i].id);
// }
// this.doDelete(psns);
},
// 单选删除
delOne(val) {
delOne (val) {
console.log("删除数据");
// 将传入的psns转为数组
let psns = [];
......@@ -701,7 +825,7 @@ export default {
this.doDelete(psns);
},
// 请求删除接口
doDelete(psns) {
doDelete (psns) {
this.$axios
.post("/api/personstore/delete", { psns: psns })
.then((response) => {
......@@ -718,13 +842,13 @@ export default {
* @param {*}
* @return {*}
*/
batch() {
batch () {
this.disabled = !this.disabled;
this.selectBoo = !this.selectBoo;
this.toggleSelection();
// this.$set(this.multipleSelection, [])
},
cancel() {
cancel () {
alert(888);
},
/**
......@@ -732,7 +856,7 @@ export default {
* @param {*} row
* @return {*}
*/
handleClick(row) {
handleClick (row) {
this.closeSelected();
console.log(row);
this.$router.push("/ryzwbj/" + row.id + "/" + row.ysxtAsjxgrybh);
......@@ -742,7 +866,7 @@ export default {
* @param {*} val
* @return {*}
*/
handleSelectionChange(val) {
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
if (this.multipleSelection.length) {
......@@ -756,7 +880,7 @@ export default {
* @param {*} pageSize 每页条数
* @return {*}
*/
handleSizeChange(pageSize) {
handleSizeChange (pageSize) {
this.reqParam.page.pageSize = pageSize;
console.log("每页条数", this.reqParam.page.pageSize);
},
......@@ -765,7 +889,7 @@ export default {
* @param {*} page 当前页
* @return {*}
*/
handleCurrentChange(page) {
handleCurrentChange (page) {
this.reqParam.page.currPage = page;
console.log("当前页", this.reqParam.page.currPage);
this.search();
......@@ -775,7 +899,7 @@ export default {
* @param {*}
* @return {*}
*/
toggleSelection(rows) {
toggleSelection (rows) {
if (rows) {
rows.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row);
......@@ -792,13 +916,13 @@ export default {
* @param {*}
* @return {*}
*/
Tpage() {
Tpage () {
return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
);
},
},
mounted() {
mounted () {
this.search();
// zoom('AllPersonnelBase')
// window.addEventListener('resize', function () {
......@@ -808,6 +932,40 @@ export default {
};
</script>
<style lang="scss">
.el-message-box__message {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-message-box__btns {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
.el-popconfirm__main {
margin: 23px 24px 17px 24px;
font-size: 14px;
......@@ -848,10 +1006,10 @@ export default {
.el-popconfirm__action {
text-align: right;
}
.delSelection /deep/ .el-table-column--selection .cell{
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
.delSelection /deep/ .el-table-column--selection{
.delSelection /deep/ .el-table-column--selection {
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
......@@ -1123,8 +1281,8 @@ export default {
color: #333333;
}
/deep/ .disableheadselection > .cell .el-checkbox__inner {
display: none;
}
display: none;
}
/deep/.el-table th > .cell {
font-size: 14px;
font-family: MicrosoftYaHei;
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -513,10 +513,10 @@ export default {
return {
radio: 'true',
byzsArr: '', // 本月总数(5个等级数组)
byzs: '1000',// 该类型下本月总数
sytsArr: '',// 剩余条数
syts: '300', //该类型下剩余条数
bcxh: '1', //本次消耗
byzs: null,// 该类型下本月总数
sytsArr: null,// 剩余条数
syts: null, //该类型下剩余条数
bcxh: null, //本次消耗
checkAll_mbljk: false, // 目标逻辑库全选
checkedTargets: [], // 选定目标逻辑库
targets_ry: targetOptions_ry, // 目标逻辑库（人员）
......@@ -1050,7 +1050,7 @@ export default {
console.info("555发查询剩余条数返回列表===>", response);
} else {
// this.$message.error(response.data.message);
this.$message.error('获取发查询剩余条数失败');
this.$message.error('555获取发查询剩余条数失败');
}
});
......@@ -1060,6 +1060,9 @@ export default {
</script>
<style lang="scss" scoped>
/deep/.el-form-item__error {
top: 24px;
}
/deep/.el-collapse-item__arrow {
margin-left: 5px;
}
......
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -33,11 +33,12 @@
prop='barcode'
>
<el-input
class="inputBh"
v-model.trim="ruleForm.barcode"
placeholder="请增加条码号"
maxlength='23'
maxlength='22'
show-word-limit
></el-input>
><template slot="prepend">{{this.type=='ry'?'R':'A'}}</template></el-input>
</el-form-item>
</el-form>
<div class='tip1'>提示：</div>
......@@ -125,14 +126,14 @@ export default {
reqUrl = '/api/personstore/copy'
Object.assign(this.reqParam, this.rowData);
delete this.reqParam.id;
this.reqParam.ysxtAsjxgrybh = this.ruleForm.barcode;
this.reqParam.ysxtAsjxgrybh = 'R' + this.ruleForm.barcode;
console.log(this.reqParam, '人员复制数据')
} else if (this.type == 'aj') {
reqUrl = '/api/casestore/copyBarcode'
let caseBase = {}
Object.assign(caseBase, this.rowData);
delete caseBase.id;
caseBase.ysxtAsjbh = this.ruleForm.barcode
caseBase.ysxtAsjbh = 'A' + this.ruleForm.barcode
this.reqParam.caseBase = caseBase
console.log(this.reqParam, '案件复制数据')
}
......@@ -166,6 +167,16 @@ export default {
</script>
<style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
/deep/.el-dialog {
border-radius: 6px;
font-family: MicrosoftYaHei;
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -39,11 +39,12 @@
prop='barcode'
>
<el-input
class="inputBh"
v-model.trim="reqParam.barcode"
placeholder="请修改条码号"
maxlength='23'
maxlength='22'
show-word-limit
></el-input>
><template slot="prepend">{{this.type=='ry'?'R':'A'}}</template></el-input>
</el-form-item>
</el-form>
<div class='tip1'>提示：</div>
......@@ -130,12 +131,12 @@ export default {
if (this.type == 'ry') {
reqUrl = '/api/personstore/updateBarcode'
newReqParams.id = this.rowData.id
newReqParams.ysxtAsjxgrybh = this.reqParam.barcode
newReqParams.ysxtAsjxgrybh = 'R' + this.reqParam.barcode
} else if (this.type == 'aj') {
reqUrl = 'api/casestore/updateBarcode'
let caseBase = {}
caseBase.id = this.rowData.id
caseBase.ysxtAsjbh = this.reqParam.barcode
caseBase.ysxtAsjbh = 'A' + this.reqParam.barcode
newReqParams.caseBase = caseBase
}
......@@ -171,6 +172,16 @@ export default {
</script>
<style lang="scss" scoped>
.inputBh {
/deep/.el-input-group__prepend {
width: 40px;
text-align: center;
padding: 0;
}
/deep/.el-input__inner {
width: 224px;
}
}
/deep/.el-dialog {
border-radius: 6px;
}
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -105,7 +105,7 @@
>确 定</el-button>
<el-button
class="cancelBtn"
@click="dialogVisible = false"
@click="handleClose"
type="primary"
>取 消</el-button>
......@@ -235,6 +235,7 @@ export default {
return showProp;
},
handleClose (done) {
this.comments = '';
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -377,16 +377,15 @@ export default {
caseBase: ""
}
reqParam.caseBase = this.ruleForm
let defaultArr = 'A'
let defaultValue = 'K'
reqParam.personDo.ysxtAsjbh = defaultArr.concat(this.ruleForm.ysxtAsjbh)
reqParam.personDo.xckybh = defaultValue.concat(this.ruleForm.xckybh)
reqParam.caseBase.ysxtAsjbh = 'A' + this.ruleForm.ysxtAsjbh
reqParam.caseBase.xckybh = 'K' + this.ruleForm.xckybh
this.$axios
.post("/api/casestore/caseadd", reqParam)
.then(response => {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
this.$router.push('/ajzwbj/' + 'xz' + '/' + this.ruleForm.ysxtAsjbh)
} else {
this.$message.error("新增失败");
}
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -24,7 +24,10 @@
<!-- 二 -->
<el-row>
<el-col :span="12">
<el-form-item label="人员编号：" prop="ysxtAsjxgrybh">
<el-form-item
label="人员编号："
prop="ysxtAsjxgrybh"
>
<el-input
class="inputBh"
v-model.trim="ruleForm.ysxtAsjxgrybh"
......@@ -36,7 +39,10 @@
</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="请输入警综人员编号"
......@@ -50,7 +56,10 @@
<!-- 三 -->
<el-row>
<el-col :span="12">
<el-form-item label="案事件相关人员编号：" prop="asjxgrybh">
<el-form-item
label="案事件相关人员编号："
prop="asjxgrybh"
>
<el-input
v-model.trim="ruleForm.asjxgrybh"
placeholder="请输入案事件相关人员编号"
......@@ -61,7 +70,10 @@
</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="请输入指掌纹卡编号"
......@@ -75,13 +87,22 @@
<!-- 四 -->
<el-row>
<el-col :span="12">
<el-form-item label="采集信息原因：" prop="cjxxyydm">
<el-form-item
label="采集信息原因："
prop="cjxxyydm"
>
<el-select
v-model="ruleForm.cjxxyydm"
placeholder="根据代码自动匹配"
>
<el-option label="1" value="1"></el-option>
<el-option label="2" value="2"></el-option>
<el-option
label="1"
value="1"
></el-option>
<el-option
label="2"
value="2"
></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -96,7 +117,10 @@
<!-- 六 -->
<el-row>
<el-col :span="12">
<el-form-item label="姓名：" prop="xm">
<el-form-item
label="姓名："
prop="xm"
>
<el-input
v-model.trim="ruleForm.xm"
placeholder="请输入姓名"
......@@ -121,15 +145,30 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item label="性别：" prop="xbdm">
<el-select v-model="ruleForm.xbdm" placeholder="请选择性别">
<el-option label="男" value="1"></el-option>
<el-option label="女" value="0"></el-option>
<el-form-item
label="性别："
prop="xbdm"
>
<el-select
v-model="ruleForm.xbdm"
placeholder="请选择性别"
>
<el-option
label="男"
value="1"
></el-option>
<el-option
label="女"
value="0"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出生日期：" prop="csrq">
<el-form-item
label="出生日期："
prop="csrq"
>
<el-date-picker
type="date"
placeholder="请选择出生日期"
......@@ -145,18 +184,42 @@
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item label="国籍：" prop="gjdm">
<el-select v-model="ruleForm.gjdm" placeholder="请选择国籍">
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
<el-form-item
label="国籍："
prop="gjdm"
>
<el-select
v-model="ruleForm.gjdm"
placeholder="请选择国籍"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="民族：" prop="mzdm">
<el-select v-model="ruleForm.mzdm" placeholder="请选择民族">
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
<el-form-item
label="民族："
prop="mzdm"
>
<el-select
v-model="ruleForm.mzdm"
placeholder="请选择民族"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -164,15 +227,30 @@
<!-- 九 -->
<el-row>
<el-col :span="12">
<el-form-item label="证件类型：" prop="cyzjdm">
<el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">
<el-option label="户口" value="1"></el-option>
<el-option label="身份证" value="2"></el-option>
<el-form-item
label="证件类型："
prop="cyzjdm"
>
<el-select
v-model="ruleForm.cyzjdm"
placeholder="请选择证件类型"
>
<el-option
label="户口"
value="1"
></el-option>
<el-option
label="身份证"
value="2"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="证件号码：" prop="zjhm">
<el-form-item
label="证件号码："
prop="zjhm"
>
<el-input
v-model.trim="ruleForm.zjhm"
placeholder="请输入证件号码"
......@@ -185,18 +263,30 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="户籍地行政区：" prop="hjdzXzqhdm">
<el-form-item
label="户籍地行政区："
prop="hjdzXzqhdm"
>
<el-select
v-model="ruleForm.hjdzXzqhdm"
placeholder="请选择户籍地行政区"
>
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="户籍地址：" prop="hjdzDzmc">
<el-form-item
label="户籍地址："
prop="hjdzDzmc"
>
<el-input
v-model="ruleForm.hjdzDzmc"
placeholder="请输入户籍地址"
......@@ -209,18 +299,30 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="现住址行政区：" prop="xzzXzqhdm">
<el-form-item
label="现住址行政区："
prop="xzzXzqhdm"
>
<el-select
v-model="ruleForm.xzzXzqhdm"
placeholder="请选择现住址行政区"
>
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="现住址：" prop="xzzDzmc">
<el-form-item
label="现住址："
prop="xzzDzmc"
>
<el-input
v-model.trim="ruleForm.xzzDzmc"
placeholder="请输入现住址"
......@@ -258,14 +360,17 @@
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox
>
>全选</el-checkbox>
<div style="margin: 15px 0"></div>
<el-checkbox-group
v-model="checkedTargets"
@change="handleCheckedTargetsChange"
>
<el-checkbox v-for="city in targets" :label="city" :key="city">{{
<el-checkbox
v-for="city in targets"
:label="city"
:key="city"
>{{
city
}}</el-checkbox>
</el-checkbox-group>
......@@ -279,7 +384,10 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item label="捺印单位：" prop="nydwGajgmc">
<el-form-item
label="捺印单位："
prop="nydwGajgmc"
>
<el-input
v-model="ruleForm.nydwGajgmc"
placeholder="请输入捺印单位名称"
......@@ -291,7 +399,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="捺印人姓名：" prop="nyryXm">
<el-form-item
label="捺印人姓名："
prop="nyryXm"
>
<el-input
v-model="ruleForm.nyryXm"
placeholder="请输入捺印人姓名"
......@@ -305,7 +416,10 @@
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item label="捺印时间：" prop="nysj">
<el-form-item
label="捺印时间："
prop="nysj"
>
<el-date-picker
type="datetime"
placeholder="请输入捺印时间"
......@@ -318,7 +432,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="捺印人身份证号：" prop="nyryGmsfhm">
<el-form-item
label="捺印人身份证号："
prop="nyryGmsfhm"
>
<el-input
v-model="ruleForm.nyryGmsfhm"
placeholder="请输入捺印人身份证号"
......@@ -335,7 +452,10 @@
<el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="捺印人联系电话：" prop="nyryLxdh">
<el-form-item
label="捺印人联系电话："
prop="nyryLxdh"
>
<el-input
v-model="ruleForm.nyryLxdh"
placeholder="请输入捺印人联系电话"
......@@ -349,9 +469,15 @@
</el-form>
<el-divider></el-divider>
<!-- 十 -->
<span slot="footer" class="dialog-footer">
<span
slot="footer"
class="dialog-footer"
>
<el-button @click="submitForm('ruleForm')">提交并新增指掌纹</el-button>
<el-button @click="resetForm('ruleForm')" type="primary">取 消</el-button>
<el-button
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
</span>
</el-dialog>
</template>
......@@ -375,7 +501,7 @@ export default {
default: false,
},
},
data() {
data () {
return {
dialogVisible: false, // 弹窗状态
labelPosition: "left", // 数据项对齐方式
......@@ -482,40 +608,40 @@ export default {
},
};
},
mounted() {
mounted () {
this.dialogVisible = this.isShowXzry;
},
watch: {
isShowXzry(newVal, oldVal) {
isShowXzry (newVal, oldVal) {
this.dialogVisible = newVal;
},
dialogVisible(val) {
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) {
submitForm (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let reqParam = {
personDo: "",
};
reqParam.personDo = this.ruleForm;
let defaultArr = 'R'
reqParam.personDo.ysxtAsjxgrybh = defaultArr.concat(this.ruleForm.ysxtAsjxgrybh)
reqParam.personDo.ysxtAsjxgrybh = 'R' + this.ruleForm.ysxtAsjxgrybh
this.$axios
.post("/api/personstore/personadd", reqParam)
.then((response) => {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
} else {
this.$message.error("新增失败");
}
......@@ -525,19 +651,19 @@ export default {
}
});
},
resetForm(formName) {
resetForm (formName) {
this.$refs[formName].resetFields();
this.dialogVisible = false;
},
handleClose(done) {
handleClose (done) {
this.dialogVisible = false;
this.$refs[formName].resetFields();
},
handleCheckAllChange(val) {
handleCheckAllChange (val) {
this.checkedTargets = val ? targetOptions : [];
this.isIndeterminate = false;
},
handleCheckedTargetsChange(value) {
handleCheckedTargetsChange (value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.targets.length;
this.isIndeterminate =
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -503,13 +503,18 @@ export default {
this.$message.error("请选择需要删除的数据！");
this.selectBoo = true
return;
} else {
this.$confirm('是否确认删除？', '提示')
.then(_ => {
// 封装删除的psns为数组
let ids = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
ids.push(this.multipleSelection[i].id);
}
this.doDelete(ids.toString());
})
.catch(_ => { });
}
// 封装删除的psns为数组
let ids = [];
for (let i = 0; i < this.multipleSelection.length; i++) {
ids.push(this.multipleSelection[i].id);
}
this.doDelete(ids.toString());
},
// 单选删除
delOne (val) {
......@@ -595,15 +600,19 @@ export default {
},
// 复制成功时的回调函数
onCopy (e) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjbh + "成功！"
message: "已复制到剪切板"
});
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
this.$message.error("抱歉，复制条码号失败！");
if (this.multipleSelection.length != 0) {
this.$message.error("抱歉，复制条码号失败！");
}
},
// 添加到队列
isShowTjddlBtn () {
......@@ -823,6 +832,79 @@ const datas1 = [
},
];
</script>
<style lang='scss'>
.el-message-box__message {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-message-box__btns {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
.el-popconfirm__main {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-popconfirm__action {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
</style>
<style scoped lang="scss">
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
......
src/views/Home.vue
......@@ -247,6 +247,10 @@ export default {
cachePageName = "";
}
this.$store.commit("layout/resetcachePageName", cachePageName);
this.$store.commit("layout/delcachePageName", 'ryzwbj');
this.$store.commit("layout/delcachePageName", 'ajzwbj');
console.log(1111222222211111,this.$store.state.layout.cachePageName)
},
/**
* @description: 调回任务管理
......@@ -322,7 +326,6 @@ export default {
routeName: newValue.name,
});
} else {
console.log(7777777111111111111111111)
let obj = {
name: newValue.meta.title,
path: newValue.path,
......@@ -332,9 +335,6 @@ export default {
this.paths.findIndex((i) => i.routeName == newValue.name) === -1
) {
this.paths.push(obj);
}else{
this.paths.findIndex((i) => i.routeName == newValue.name) === -1
console.log(obj)
}
}
}
......
src/views/drFPTX/Index.vue
......@@ -522,6 +522,12 @@ export default {
// 导入成功,跳转详情
goList () {
if (this.drlx == 3 || this.drlx == 6) {
this.dialogVisible = false
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.$router.push({
path: '/RAList',
query: {
......@@ -529,6 +535,12 @@ export default {
}
})
} else if (this.drlx == 9) {
this.dialogVisible = false
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
this.$router.push({
path: '/RAList',
query: {
......@@ -666,70 +678,65 @@ export default {
},
// 上传
submitUpload () {
// 创建一个空的FormData对象:
const formData = new FormData()
// 可以使用FormData.append来添加键/值对到表单里面；
this.nowSelectRightData.forEach((file) => {
formData.append('file', file.raw)
})
// 添加自定义参数，不传可删除
// formData.append('parentId', '49')
// formData.append('uploadType', '备料单')
// formData.append('versions', 'v4.0')
if (this.nowSelectRightData.length == 0) {
this.$message.error('请选择要上传的文件')
} else {
// 创建一个空的FormData对象:
const formData = new FormData()
// 可以使用FormData.append来添加键/值对到表单里面；
this.nowSelectRightData.forEach((file) => {
formData.append('file', file.raw)
})
// 添加自定义参数，不传可删除
// formData.append('parentId', '49')
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
// console.log('this.nowSelectRightData', this.nowSelectRightData)
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
// console.log('this.nowSelectRightData', this.nowSelectRightData)
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
this.dialogVisible = true;
this.$axios({
method: 'post',
url: this.action,
data: formData,
loading: false
}).then(res => {
if (res.data.code === 0) {
// this.tableDate = response.data.ret.list;
// this.reqParam.page.total = response.data.ret.total;
if (this.drlx == 3 || this.drlx == 6) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
// 自定义上传
// axios
// .post(this.upload.url, formData, { headers: { 'Content-Type': 'multipart/form-data', Authorization: getToken() } })
// .then(response => {
// if (response.code == 200) {
// this.upload.open = false;
// this.upload.isUploading = false;
// this.$refs.upload.clearFiles();
// this.msgSuccess('上传成功！');
// } else {
// this.$message.error(response.msg);
// }
// })
// .catch(error => {
// this.$message.error('上传失败！');
// });
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
// this.$axios
// .post(this.action, formData, { headers: { 'Content-Type': 'multipart/form-data' }, loading: false })
this.dialogVisible = true;
this.$axios({
method: 'post',
url: this.action,
data: formData,
loading: false
}).then(res => {
if (res.data.code === 0) {
// this.tableDate = response.data.ret.list;
// this.reqParam.page.total = response.data.ret.total;
if (this.drlx == 3 || this.drlx == 6) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
} else if (this.drlx == 9) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
} else if (this.drlx == 9) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
console.info("查询结果===>", res);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
console.info("查询结果===>", res);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
}
});
});
}
},
// 删除文件
......@@ -817,10 +824,26 @@ export default {
},
// 选中
handelSelect () {
console.log('重复文件过滤', this.nowSelectData)
// if (this.selectArr.length > 0) {
// for (var i = 0; i <= this.selectArr.length; i++) {
// // 重复文件过滤
// let existFile = this.nowSelectData.slice(0, this.nowSelectData.length - 1).find(f => f.name === this.selectArr[i].name)
// console.log('existFile', existFile)
// if (existFile) {
// this.$message.error('当前文件已经存在!');
// this.nowSelectData.pop()
// }
// }
// }
// this.checkRightAll(this.nowSelectData)
// this.nowSelectRightData.push(this.nowSelectData)
this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
this.nowSelectRightData = this.selectArr
// this.nowSelectRightData = this.selectArr
this.handleRemoveTabList(this.nowSelectData, this.datas);
this.nowSelectData = [];
},
......
src/views/drFPTX/RAList.vue
......@@ -179,6 +179,7 @@
</el-radio-group>
</div>
<div class="right">
<el-button @click="clear">清空</el-button>
<el-button @click="search">筛选</el-button>
</div>
</div>
......@@ -236,7 +237,7 @@
<!-- 五 -->
<div v-if="showType == 1">
<el-table
max-height="700"
max-height="500"
ref="multipleTable"
:data="tableDate1"
tooltip-effect="dark"
......@@ -250,26 +251,27 @@
>
<el-table-column
type="selection"
width="70"
width="auto"
v-if="isSelected"
>
</el-table-column>
<el-table-column
prop="taskNumber"
label="任务号"
width="350"
width="220"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
width="400"
width="300"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="350"
width="300"
>
</el-table-column>
<el-table-column
......@@ -357,7 +359,7 @@
<el-table
v-if="showType == 2"
max-height="700"
max-height="500"
ref="multipleTable"
:data="tableDate2"
tooltip-effect="dark"
......@@ -378,13 +380,14 @@
<el-table-column
prop="taskNumber"
label="任务号"
width="350"
width="220"
>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
width="400"
width="300"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
......@@ -396,7 +399,7 @@
<el-table-column
prop="barcode"
label="人员编号/案事件编号"
width="350"
width="300"
>
<template slot-scope="scope">
<div>{{ scope.row.srcBarcode }}</div>
......@@ -638,6 +641,7 @@ export default {
// ...
console.log(newNum, 123);
this.search();
this.clear()
},
},
mounted () {
......@@ -711,6 +715,15 @@ export default {
}
});
},
clear () {
this.taskNumber = ""; // 任务号
this.dataType = null; // 人员or案件
this.status = null; // 状态
this.barcode = ""; // 条码号
this.logicDatabase = "";// 逻辑分库
this.queryType = "";// 类型
this.search()
},
// 格式化参数
getParam () {
if (this.startEndDate !== null) {
......@@ -745,15 +758,19 @@ export default {
},
// 复制成功时的回调函数
onCopy (e) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
this.$message.error("抱歉，复制条码号失败！");
if (this.multipleSelection.length != 0) {
this.$message.error("抱歉，复制条码号失败！");
}
},
// 添加到队列
isShowTjddlBtn () {
......@@ -922,11 +939,16 @@ export default {
},
mounted () {
this.search();
console.log(this.$route.query.id, 'this.$route.query.id')
this.showType = this.$route.query.id || "1";
},
};
</script>
<style scoped lang="scss">
/deep/.el-table--scrollable-x .el-table__body-wrapper {
height: 500px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
......
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