|
@@ -23,7 +23,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<p class="border-left-8">主对象
|
|
|
- <span>限制条件:对象类型的范围(包括:XXXX类型,XXXX类型)</span></p>
|
|
|
+ <span>{{MainObject}}</span></p>
|
|
|
<label>所属建筑楼层:</label>
|
|
|
<el-select disabled v-model="buildValue">
|
|
|
<el-option
|
|
@@ -58,7 +58,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<p class="border-left-8">从对象
|
|
|
- <span>(包括:XXXX类型,XXXX类型)</span></p>
|
|
|
+ <span>{{FromObject}}</span></p>
|
|
|
<label>所属建筑楼层:</label>
|
|
|
<el-select disabled v-model="buildValue">
|
|
|
<el-option
|
|
@@ -222,7 +222,7 @@
|
|
|
<addRelationShip
|
|
|
ref="addShipComponent"
|
|
|
:values="values"
|
|
|
- @addShip="addShip"
|
|
|
+ @update="update"
|
|
|
/>
|
|
|
<editRelationShip
|
|
|
ref="editShipComponent"
|
|
@@ -242,6 +242,8 @@
|
|
|
name: "index",
|
|
|
data() {
|
|
|
return {
|
|
|
+ MainObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('MainObject')}类型)`,
|
|
|
+ FromObject: `(限制条件:对象类型的范围(包括:${localStorage.getItem('FromObject')}类型)`,
|
|
|
pageSizes: [10, 20, 50, 100],
|
|
|
pageSize: 50,
|
|
|
currentPage: 1,
|
|
@@ -317,6 +319,7 @@
|
|
|
}]
|
|
|
}],
|
|
|
tableData: [],
|
|
|
+
|
|
|
loading: false,
|
|
|
needMergeArr: ['Name', 'LocalId', 'LocalName', 'CADID','btn'],
|
|
|
rowMergeArrs: {}
|
|
@@ -428,22 +431,31 @@
|
|
|
console.log(res, '==object==')
|
|
|
})
|
|
|
},
|
|
|
- addShip(index) {
|
|
|
- let that = this
|
|
|
- relAdd(index).then(res => {
|
|
|
- if (res.data.Result === "failure") {
|
|
|
- this.$message.error(res.data.Message);
|
|
|
- return false
|
|
|
- } else if (res.data.Result === "success") {
|
|
|
- this.$message.success(res.data.Message);
|
|
|
- this.init()
|
|
|
- that.$refs.addShipComponent.addShipDialog = false
|
|
|
- that.$refs.addShipComponent.codeValue = ''
|
|
|
- that.$refs.addShipComponent.ruleForm.codeList = [{value:''}]
|
|
|
- that.$refs.addShipComponent.ruleForm.main = ''
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
+ // addShip(index) {
|
|
|
+ // let that = this
|
|
|
+ // relAdd(index).then(res => {
|
|
|
+ // if (res.data.Result === "failure") {
|
|
|
+ // if(res.data.ErrorType == 1) {
|
|
|
+ // this.mainError = res.data.Message
|
|
|
+ // debugger
|
|
|
+ // } else if(res.data.ErrorType == 2) {
|
|
|
+ //
|
|
|
+ // } else {
|
|
|
+ // debugger
|
|
|
+ // this.$message.error(res.data.Message);
|
|
|
+ //
|
|
|
+ // }
|
|
|
+ //
|
|
|
+ // } else if (res.data.Result === "success") {
|
|
|
+ // this.$message.success(res.data.Message);
|
|
|
+ // this.init()
|
|
|
+ // that.$refs.addShipComponent.addShipDialog = false
|
|
|
+ // that.$refs.addShipComponent.codeValue = ''
|
|
|
+ // that.$refs.addShipComponent.ruleForm.codeList = [{value:''}]
|
|
|
+ // that.$refs.addShipComponent.ruleForm.main = ''
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // },
|
|
|
//分页更换size
|
|
|
handleSizeChange(val) {
|
|
|
this.currentPage = 1;
|
|
@@ -455,12 +467,17 @@
|
|
|
this.currentPage = val;
|
|
|
this.init()
|
|
|
},
|
|
|
+ update() {
|
|
|
+ this.init()
|
|
|
+ },
|
|
|
lookOver(index, row) {
|
|
|
+
|
|
|
console.log(index, row)
|
|
|
|
|
|
// this.$refs.editShipComponent.editShipDialog = true
|
|
|
},
|
|
|
deleteObject(index, row) {
|
|
|
+
|
|
|
let param = {
|
|
|
"FromId": row.Id,
|
|
|
"RelType": localStorage.getItem('RelManualType'),
|