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 210 additions and 58 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/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/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(_ => { });
}
},
// 单选删除
delOne (val) {
......@@ -595,15 +600,19 @@ export default {
},
// 复制成功时的回调函数
onCopy (e) {
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjbh + "成功！"
message: "已复制到剪切板"
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
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,6 +678,9 @@ export default {
},
// 上传
submitUpload () {
if (this.nowSelectRightData.length == 0) {
this.$message.error('请选择要上传的文件')
} else {
// 创建一个空的FormData对象:
const formData = new FormData()
// 可以使用FormData.append来添加键/值对到表单里面；
......@@ -674,8 +689,6 @@ export default {
})
// 添加自定义参数，不传可删除
// formData.append('parentId', '49')
// formData.append('uploadType', '备料单')
// formData.append('versions', 'v4.0')
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
......@@ -683,26 +696,6 @@ export default {
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
// 自定义上传
// 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.$axios
// .post(this.action, formData, { headers: { 'Content-Type': 'multipart/form-data' }, loading: false })
this.dialogVisible = true;
this.$axios({
method: 'post',
......@@ -717,10 +710,22 @@ export default {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
this.selectArr = [] // 右边列表
this.datas = []// 左边表格数据项
this.nowSelectData = [] // 左边选中列表数据
this.nowSelectRightData = [] // 右边选中列表数据
} 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;
......@@ -730,6 +735,8 @@ export default {
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) {
if (this.multipleSelection.length != 0) {
this.$message({
type: "success",
// message: "复制条码号:" + this.ysxtAsjxgrybh + "成功！"
message: "已复制到剪切板",
});
}
},
// 复制失败时的回调函数
onError (e) {
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