Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -436,9 +436,9 @@ export default {
|
|||||||
bpnId: this.$route.query.bpnId
|
bpnId: this.$route.query.bpnId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let mes = JSON.parse(res.mes);
|
let mes = JSON.parse(res.mes);
|
||||||
this.dataList = mes.dataList;
|
this.dataList = mes.dataList || mes.json.standardInfoList;
|
||||||
this.roleForm = mes.roleForm;
|
this.roleForm = mes.roleForm || mes.json.roleForm;
|
||||||
this.commentText = mes.commentText;
|
this.commentText = mes.commentText || mes.json.commentText;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//点击新增事件
|
//点击新增事件
|
||||||
@@ -609,6 +609,7 @@ export default {
|
|||||||
this.$message.warning('请完善人员信息')
|
this.$message.warning('请完善人员信息')
|
||||||
} else {
|
} else {
|
||||||
if(!this.submitFlag){
|
if(!this.submitFlag){
|
||||||
|
console.log('第一次提交');
|
||||||
this.$refs['roleForm'].validate((valid) => {
|
this.$refs['roleForm'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.isSubmit = true
|
this.isSubmit = true
|
||||||
@@ -647,6 +648,7 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}else{
|
}else{
|
||||||
|
console.log('修改后提交');
|
||||||
this.$refs["roleForm"].validate((valid) => {
|
this.$refs["roleForm"].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
let specialJson = {
|
let specialJson = {
|
||||||
|
|||||||
Reference in New Issue
Block a user