|
@@ -130,7 +130,7 @@
|
|
class="martop25"
|
|
class="martop25"
|
|
style="float:right;"
|
|
style="float:right;"
|
|
icon="el-icon-circle-plus-outline"
|
|
icon="el-icon-circle-plus-outline"
|
|
- v-loading="saveloaing"
|
|
|
|
|
|
+
|
|
@click="saveSingInfo()">保存入库</el-button>
|
|
@click="saveSingInfo()">保存入库</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -337,8 +337,9 @@ export default {
|
|
data.sigRoleName = this.signInfoarr[0].dictValue;
|
|
data.sigRoleName = this.signInfoarr[0].dictValue;
|
|
data.type=6;
|
|
data.type=6;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ console.log(this.htmlData1,'this.htmlData11111');
|
|
data.colKey="__"+this.htmlData1.tr+"_"+this.htmlData1.td;
|
|
data.colKey="__"+this.htmlData1.tr+"_"+this.htmlData1.td;
|
|
|
|
+
|
|
data.tabId = this.pkeyId1;
|
|
data.tabId = this.pkeyId1;
|
|
data.colName= this.htmlData1.name;
|
|
data.colName= this.htmlData1.name;
|
|
|
|
|
|
@@ -368,6 +369,7 @@ export default {
|
|
})
|
|
})
|
|
if(isadd){
|
|
if(isadd){
|
|
data.show=false
|
|
data.show=false
|
|
|
|
+ data.colKey=this.htmlData1.keyname
|
|
this.setsignaTable.push(data);
|
|
this.setsignaTable.push(data);
|
|
}
|
|
}
|
|
}catch (e){
|
|
}catch (e){
|
|
@@ -436,10 +438,12 @@ export default {
|
|
|
|
|
|
},
|
|
},
|
|
saveClick(item){
|
|
saveClick(item){
|
|
- this.editRoleInfo()
|
|
|
|
|
|
+ console.log('保存');
|
|
|
|
+ this.editRoleInfo(item)
|
|
|
|
+
|
|
|
|
+
|
|
},
|
|
},
|
|
async editRoleInfo(){
|
|
async editRoleInfo(){
|
|
-
|
|
|
|
console.log(this.htmlData1,'this.htmlData.dqid1111111');
|
|
console.log(this.htmlData1,'this.htmlData.dqid1111111');
|
|
let obj={}
|
|
let obj={}
|
|
obj.colKey=this.colKey
|
|
obj.colKey=this.colKey
|
|
@@ -463,6 +467,7 @@ export default {
|
|
let arr=this.setsignaTable
|
|
let arr=this.setsignaTable
|
|
arr.forEach((ele)=>{
|
|
arr.forEach((ele)=>{
|
|
if(obj.id==ele.id){
|
|
if(obj.id==ele.id){
|
|
|
|
+ console.log(obj.colKey,'obj.colKey');
|
|
ele.colKey=obj.colKey
|
|
ele.colKey=obj.colKey
|
|
ele.excelId=obj.excelId
|
|
ele.excelId=obj.excelId
|
|
ele.pyzbx=obj.pyzbx
|
|
ele.pyzbx=obj.pyzbx
|
|
@@ -471,10 +476,16 @@ export default {
|
|
ele.sigRoleName=obj.sigRoleName
|
|
ele.sigRoleName=obj.sigRoleName
|
|
ele.type=obj.type
|
|
ele.type=obj.type
|
|
ele.tabId=obj.tabId
|
|
ele.tabId=obj.tabId
|
|
|
|
+ ele.show=false
|
|
|
|
+
|
|
}
|
|
}
|
|
})
|
|
})
|
|
- this.setsignaTable=arr
|
|
|
|
- this.saveSingInfo()
|
|
|
|
|
|
+ this.$nextTick(()=>{
|
|
|
|
+ this.setsignaTable=arr
|
|
|
|
+ })
|
|
|
|
+ this.$forceUpdate()
|
|
|
|
+ console.log(this.setsignaTable,'this.setsignaTable');
|
|
|
|
+ // this.saveSingInfo()
|
|
|
|
|
|
|
|
|
|
},
|
|
},
|
|
@@ -500,10 +511,12 @@ export default {
|
|
|
|
|
|
},
|
|
},
|
|
async saveSingInfo() {
|
|
async saveSingInfo() {
|
|
|
|
+ console.log(this.setsignaTable,'this.setsignaTable');
|
|
this.saveloaing=true
|
|
this.saveloaing=true
|
|
const {data: res} = await saveSig({dataInfo: this.setsignaTable,tabId:this.pkeyId1})
|
|
const {data: res} = await saveSig({dataInfo: this.setsignaTable,tabId:this.pkeyId1})
|
|
- this.saveloaing=false
|
|
|
|
|
|
+
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
|
|
+ this.saveloaing=false
|
|
//console.log(this.$parent)
|
|
//console.log(this.$parent)
|
|
this.$parent.getExcelHtml(this.pkeyId1);
|
|
this.$parent.getExcelHtml(this.pkeyId1);
|
|
this.getSingInfo()
|
|
this.getSingInfo()
|
|
@@ -512,6 +525,7 @@ export default {
|
|
message: "操作成功"
|
|
message: "操作成功"
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+ this.saveloaing=false
|
|
},
|
|
},
|
|
async getSingInfo() {
|
|
async getSingInfo() {
|
|
console.log(this.excelId,'this.excelId1111111');
|
|
console.log(this.excelId,'this.excelId1111111');
|