Skip to content

F
founder_vue
Commit 7c3ad644 by 米嘉伟
Options

进度条 UI调整

parent 2acfecdf
Showing with 150 additions and 66 deletions
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -11,9 +11,15 @@
clear="search-input"
placeholder="请输入条码，*支持模糊搜索"
v-model="reqParam.personStoreCustomSearch.barcode"
@keyup.enter.native="search"
maxlength="23"
show-word-limit
></el-input>
>
</el-input>
<i
class="el-icon-error"
v-if="reqParam.personStoreCustomSearch.barcode.length>0"
@click='empty'
></i>
<div
class="search-icon el-icon-search"
@click="search"
......@@ -59,7 +65,7 @@
<div
class="btn"
@click="isShowDcftpxBtn"
>导出FTPX</div>
>导出FPTX</div>
<div
class="btn"
@click="isShowGzBtn"
......@@ -118,6 +124,7 @@
>
</el-table-column>
<el-table-column
:formatter="idNumberFormat"
prop="idnumber"
label="身份证号"
width="180"
......@@ -172,6 +179,7 @@
prop="collectunitname"
label="捺印单位"
width="180"
:formatter="collectunitnameFormat"
>
</el-table-column>
......@@ -343,7 +351,7 @@
:type="type"
@closeGz="closeGz"
></gz>
<!-- 导出FTPX弹窗 -->
<!-- 导出FPTX弹窗 -->
<dcftpx
:isShowDcftpx="isShowDcftpx"
:rowData="rowData"
......@@ -380,7 +388,7 @@ import moment from "moment";
import tjddl from "./modules/tjddl.vue" // 添加到队列弹窗
import gz from "./modules/gz.vue" // 关注
import fztm from "./modules/fztm.vue" // 复制数据弹窗
import dcftpx from "./modules/dcftpx.vue" //导出FTPX弹窗
import dcftpx from "./modules/dcftpx.vue" //导出FPTX弹窗
import ggrytm from "./modules/ggrytm.vue"// 更改人员条码弹窗
import fcx from "./modules/fcx.vue" // 发查询弹窗
export default {
......@@ -398,7 +406,7 @@ export default {
isSelected: false,// 是否批量操作
isShowTjddl: false,// 添加到队列
isShowGz: false,// 关注
isShowDcftpx: false, // 导出FTPX
isShowDcftpx: false, // 导出FPTX
isShowGgrytm: false,// 更改人员条码
isShowFztm: false, //复制条码
isShowFcx: false, //发查询
......@@ -455,11 +463,27 @@ export default {
}
});
},
// 清空输入框
empty () {
this.reqParam.personStoreCustomSearch.barcode = ''
this.search()
},
// 身份证格式化
idNumberFormat (row) {
let showProp = null
row.idnumber ? showProp = row.idnumber : showProp = '---'
return showProp
},
//捺印单位格式化
collectunitnameFormat (row) {
let showProp = null
row.collectunitname ? showProp = row.collectunitname : showProp = '---'
return showProp
},
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "";
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
},
// 性别格式化
sexFormat (row, colnum) {
......@@ -473,6 +497,8 @@ export default {
showProp = '女'
} else if (sex == 9) {
showProp = '未说明的性别'
} else {
showProp = '---'
}
return showProp;
},
......@@ -538,9 +564,9 @@ export default {
console.log('添加到队列关闭', val)
this.isShowTjddl = val
},
// 导出FTPX
// 导出FPTX
isShowDcftpxBtn () { // 多行
console.log('导出FTPX')
console.log('导出FPTX')
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要关注的数据！");
} else {
......@@ -556,7 +582,7 @@ export default {
this.isShowDcftpx = true;
},
closeDcftpx (val) {
console.log('导出FTPX关闭', val)
console.log('导出FPTX关闭', val)
this.isShowDcftpx = val
},
// 关注
......@@ -789,6 +815,13 @@ export default {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.el-icon-error {
position: absolute;
left: 300px;
width: 14px;
height: 14px;
color: rgba(177, 182, 194, 0.8);
}
.search-icon {
border: 1px solid #006aff;
width: 40px;
......@@ -881,18 +914,16 @@ export default {
.right {
display: flex;
.send {
border: none;
background: #055fe7;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
&:hover {
background: #377fec;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
&:active {
background: #044cb9;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
}
}
......@@ -949,6 +980,9 @@ export default {
// margin-right: 120px;
}
}
/deep/.el-table th {
background-color: #f6f8fa;
}
/deep/.el-popover {
padding: 15px 20px !important;
}
......
src/views/AllPersonnelBase/modules/dcftpx.vue
<template>
<el-dialog
title="导出FTPX"
title="导出FPTX"
:visible.sync="dialogVisible"
width="875px"
append-to-body
......@@ -246,7 +246,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="保存路径：">
<el-input></el-input>
<el-input placeholder="请选择保存路径"></el-input>
<el-button type="text">浏览</el-button>
</el-form-item>
<el-form-item label="条码补值：">
......@@ -265,11 +265,15 @@
slot="footer"
class="dialog-footer"
>
<el-button @click="focus">确 定</el-button>
<!-- <el-button @click="focus">确 定</el-button>
<el-button
@click="dialogVisible = false"
type="primary"
>取 消</el-button>
>取 消</el-button> -->
<el-button
@click="focus"
type="primary"
>导出</el-button>
</span>
</el-dialog>
......@@ -349,12 +353,13 @@ export default {
// });
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -125,12 +125,13 @@ export default {
});
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -147,29 +147,46 @@ export default {
focus () {
let reqUrl = '';
if (this.type == 'ry') {
reqUrl = "/api/mypsn/add"
let newReqParams = { // 请求参数
pid: '',// 关注ID
barcode: '',//条码号
myPerson: {
comments: '',//备注
pid: '',// 关注ID
barcode: '',//条码号
}
};
let barCode = [];
let myPerson = [];
// reqUrl = "/api/mypsn/add"
// let newReqParams = { // 请求参数
// pid: '',// 关注ID
// barcode: '',//条码号
// myPerson: {
// comments: '',//备注
// pid: '',// 关注ID
// barcode: '',//条码号
// }
// };
// let barCode = [];
// let myPerson = [];
// for (let i = 0; i < this.rowData.length; i++) {
// myPerson.push(this.rowData[i].pid);
// barCode.push(this.rowData[i].barcode);
// }
// newReqParams.pid = myPerson[0];
// newReqParams.myPerson.pid = myPerson;
// newReqParams.barcode = barCode[0];
// newReqParams.myPerson.barcode = barCode;
// newReqParams.myPerson.comments = this.comments;
// this.reqParam = newReqParams
// console.log('关注人员ID', myPerson);
reqUrl = '/api/mypsn/mypsnAdd'
let newReqParams = {
personDoList: [],
comments: ''
}
newReqParams.comments = this.comments;
for (let i = 0; i < this.rowData.length; i++) {
myPerson.push(this.rowData[i].pid);
barCode.push(this.rowData[i].barcode);
let personDo = {
barcode: '',
pid: ''
}
personDo.barcode = this.rowData[i].barcode
personDo.pid = this.rowData[i].pid
newReqParams.personDoList.push(personDo)
}
newReqParams.pid = myPerson[0];
newReqParams.myPerson.pid = myPerson;
newReqParams.barcode = barCode[0];
newReqParams.myPerson.barcode = barCode;
newReqParams.myPerson.comments = this.comments;
console.log('关注人员ID', newReqParams);
this.reqParam = newReqParams
console.log('关注人员ID', myPerson);
} else if (this.type == 'aj') {
reqUrl = "/api/mycase/add"
let newReqParams = {
......@@ -245,12 +262,13 @@ export default {
return showProp;
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -213,12 +213,13 @@ export default {
},
handleClose (done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
this.dialogVisible = false;
})
.catch(_ => { });
this.dialogVisible = false;
// this.$confirm('确认关闭？')
// .then(_ => {
// done();
// this.dialogVisible = false;
// })
// .catch(_ => { });
}
}
};
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -11,9 +11,14 @@
clear="search-input"
placeholder="请输入条码，*支持模糊搜索"
v-model="reqParam.caseStoreCustomSearchReq.barcode"
@keyup.enter.native="search"
maxlength="23"
show-word-limit
></el-input>
<i
class="el-icon-error"
v-if="reqParam.caseStoreCustomSearchReq.barcode.length>0"
@click='empty'
></i>
<div
class="search-icon el-icon-search"
@click="search"
......@@ -109,6 +114,7 @@
prop="caseTypeNames"
label="案件类型"
width="220"
:formatter="caseTypeNamesFormat"
>
</el-table-column>
<el-table-column
......@@ -402,6 +408,11 @@ export default {
}
});
},
// 清空输入框
empty () {
this.reqParam.caseStoreCustomSearchReq.barcode = ''
this.search()
},
// 多选删除
delMore () {
// 检查table选择的数据 如果没有选择则不可以删除
......@@ -458,6 +469,12 @@ export default {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "";
},
// 案件类型格式化
caseTypeNamesFormat (row) {
let showProp = null
row.caseTypeNames ? showProp = row.caseTypeNames : showProp = '---'
return showProp
},
// 是否命案 格式化
killFlagFormat (row, colnum) {
let prop = colnum.property;
......@@ -708,6 +725,13 @@ const datas1 = [
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.el-icon-error {
position: absolute;
left: 300px;
width: 14px;
height: 14px;
color: rgba(177, 182, 194, 0.8);
}
.search-icon {
border: 1px solid #006aff;
width: 40px;
......@@ -800,18 +824,16 @@ const datas1 = [
.right {
display: flex;
.send {
border: none;
background: #055fe7;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
&:hover {
background: #377fec;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
&:active {
background: #044cb9;
box-shadow: 0px 6px 10px 2px rgba(18, 90, 201, 0.2);
}
}
}
......@@ -868,6 +890,9 @@ const datas1 = [
// margin-right: 120px;
}
}
/deep/.el-table th {
background-color: #f6f8fa;
}
/deep/.el-popover {
padding: 15px 20px !important;
}
......
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