|
|
@@ -182,7 +182,10 @@ export default {
|
|
|
watch: {
|
|
|
'htmlData1': {
|
|
|
handler(val) {
|
|
|
+ console.log(val,'val');
|
|
|
+
|
|
|
setTimeout(async() => {
|
|
|
+
|
|
|
if(val.obj){
|
|
|
let obj=val.obj
|
|
|
console.log(obj,'obj');
|
|
|
@@ -190,12 +193,8 @@ export default {
|
|
|
this.pyzbx=obj.pyzbx
|
|
|
this.pyzby=obj.pyzby
|
|
|
this.sigRoleId=obj.sigRoleId
|
|
|
- // this.colKey=obj.colKey
|
|
|
- if(this.htmlData1.keyname){
|
|
|
- this.colKey=this.htmlData1.keyname
|
|
|
- }else{
|
|
|
- this.colKey=obj.colKey
|
|
|
- }
|
|
|
+ this.colKey=obj.colKey
|
|
|
+
|
|
|
this.colName=obj.colName
|
|
|
this.signId=obj.id
|
|
|
this.isDeleted=obj.isDeleted
|
|
|
@@ -221,6 +220,7 @@ export default {
|
|
|
this.signType=''
|
|
|
this.pyzbx=0
|
|
|
this.pyzby=0
|
|
|
+ this.colKey=val.keyname
|
|
|
}
|
|
|
}, 1000);
|
|
|
|
|
|
@@ -398,13 +398,9 @@ export default {
|
|
|
this.pyzby=obj.pyzby
|
|
|
this.sigRoleId=obj.sigRoleId
|
|
|
this.sigRoleName=obj.sigRoleName
|
|
|
- // this.colKey=obj.colKey
|
|
|
+ this.colKey=obj.colKey
|
|
|
|
|
|
- if(this.htmlData1.keyname){
|
|
|
- this.colKey=this.htmlData1.keyname
|
|
|
- }else{
|
|
|
- this.colKey=obj.colKey
|
|
|
- }
|
|
|
+
|
|
|
this.colName=obj.colName
|
|
|
this.signId=obj.id
|
|
|
this.isDeleted=obj.isDeleted
|
|
|
@@ -422,6 +418,7 @@ export default {
|
|
|
this.sigRoleName=ele.dictValue
|
|
|
}
|
|
|
})
|
|
|
+
|
|
|
|
|
|
}
|
|
|
}else{
|
|
|
@@ -444,7 +441,6 @@ export default {
|
|
|
|
|
|
},
|
|
|
async editRoleInfo(){
|
|
|
- console.log(this.htmlData1,'this.htmlData.dqid1111111');
|
|
|
let obj={}
|
|
|
obj.colKey=this.colKey
|
|
|
obj.colName=this.colName
|
|
|
@@ -466,7 +462,7 @@ export default {
|
|
|
let arr=this.setsignaTable
|
|
|
arr.forEach((ele)=>{
|
|
|
if(obj.id==ele.id){
|
|
|
- ele.colKey=obj.colKey
|
|
|
+ ele.colKey=this.colKey
|
|
|
ele.excelId=obj.excelId
|
|
|
ele.pyzbx=obj.pyzbx
|
|
|
ele.pyzby=obj.pyzby
|
