dbff093e by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents afd2c3d3 d017add8
......@@ -329,12 +329,14 @@
type: String,
default: "15vh",
},
'bsm':String
bsm: {
type: String,
default: "",
},
},
data() {
return {
update:false,
// bsm:'',
gyfs: '',
tableData: [],
gyfsList:[],
......@@ -499,7 +501,7 @@
updateQlrDlrFr(this.formData).then((res)=>{
if(res.code===200){
this.$message.success("修改完成!");
this.getQlrInfo();
this.getQlrInfo(this.bsm);
this.update=false;
this.dialogVisible = false;
}
......@@ -510,7 +512,7 @@
this.tableData.push(this.formData);
Object.assign(this.$data, this.$options.data())
this.dialogVisible = false;
this.getQlrInfo();
this.getQlrInfo(this.bsm);
}
})
}
......@@ -572,7 +574,7 @@
deleteQlrDlrFrByQlrbsm(qlrbsms).then((res)=>{
if(res.code===200){
this.$message.success("删除完成!")
this.getQlrInfo();
this.getQlrInfo(this.bsm);
}
})
} else {
......@@ -614,8 +616,8 @@
});
}
},
getQlrInfo(){
getQlrInfoByGlbsm(this.bsm).then((res)=>{
getQlrInfo(bsm){
getQlrInfoByGlbsm(bsm).then((res)=>{
if(res.code){
if(res.result!=null){
this.tableData=res.result;
......@@ -633,7 +635,7 @@
this.gyfsList = this.$store.state.gyfsList;
},
mounted() {
this.getQlrInfo();
this.getQlrInfo(this.bsm);
if(this.$store.state.gyfsList.length>0){
this.gyfs=this.$store.state.gyfsList[0].bsm;
}
......@@ -711,7 +713,6 @@
this.$refs.zjzlbsm.$el.style.border = '';
}
},
// "formData.gyfsbsm":function (val) {
// let ddsy = '';
// for(let i = 0;i<this.gyfsList.length;i++){
......
......@@ -263,7 +263,7 @@ export default {
zddm: "",
zl: "",
pageNo: 1,
pageSize: 12,
pageSize: 15,
type:'add',
},
Data: [],
......@@ -369,7 +369,7 @@ export default {
zddm: "",
zl: "",
pageNo: 1,
pageSize: 12
pageSize: 15
};
this.getData(this.queryData);
},
......
......@@ -380,6 +380,7 @@
getQjZdjbxxDetailById,
updateQjZdjbxx,
} from "@api/zd";
import { Message } from 'element-ui';
export default {
inject: ['getRightTree'],
......@@ -753,48 +754,52 @@
type: "warning",
});
} else {
updateQjZdjbxx(this.formData)
.then((res) => {
if (res.code == 200) {
console.log(res);
if (this.$refs.qlrxxModule.getQlgyfsData() == 'PSHGSBDCQJDC000000000000DC340020' && this.$refs.qlrxxModule.getQlrxxData().length < 2 ) {
Message.error('当前权利人共有方式至少需要添加两名权利人')
}else{
updateQjZdjbxx(this.formData)
.then((res) => {
if (res.code == 200) {
console.log(res);
this.$message({
message: '保存成功',
type: "success",
});
// 保存成功再次查询
this.getZdjbxxData(this.$store.state.zdbsm);
} else {
this.$message({
message: res.message,
type: "warning",
});
}
})
.catch((error) => {
this.$message({
message: '保存成功',
type: "success",
message: error.message+",查看日志,联系管理员",
type: "error",
});
// 保存成功再次查询
this.getZdjbxxData(this.$store.state.zdbsm);
});
//保存到空间库里面
var self = this;
for (var key in this.geoAttributes) {
if (key == "BSM") {
self.geoAttributes[key] = this.$store.state.zdbsm
} else if (key == 'QLSDFS') {
var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else {
this.$message({
message: res.message,
type: "warning",
});
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
})
.catch((error) => {
this.$message({
message: error.message+",查看日志,联系管理员",
type: "error",
});
});
//保存到空间库里面
var self = this;
for (var key in this.geoAttributes) {
if (key == "BSM") {
self.geoAttributes[key] = this.$store.state.zdbsm
} else if (key == 'QLSDFS') {
var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
var qlsdfs = qlsdfsList.filter(item => {
return item.bsm == value;
})
self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
} else {
var formKay = key.toLowerCase();
self.geoAttributes[key] = self.formData[formKay];
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
console.log("属性保存完成!!");
});
}
self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
console.log("属性保存完成!!");
});
}
} else {
this.$message({
......@@ -922,7 +927,8 @@
this.$store.state.zddm = val;
},
zdbsm: function (val) {
this.getZdjbxxData(val)
this.getZdjbxxData(val);
this.$refs.qlrxxModule.getQlrInfo(val);
this.curZdbsm = val;
},
"formData.bdcdyh": function (val) {
......