duy 1 năm trước cách đây
mục cha
commit
858f544281

+ 46 - 39
src/views/exctab/ElementIdentification/template/electronicSignature.vue

@@ -134,7 +134,7 @@
                  style="float:right;"
                  icon="el-icon-circle-plus-outline"
                  :disabled="isCansave"
-                 v-loading="saveloaing"
+              
                  @click="saveSingInfo()">保存入库</el-button> &nbsp;&nbsp;
     </div>
   </div>
@@ -364,6 +364,7 @@ export default {
         })
         if(isadd){
           data.show=false
+          data.colName=this.htmlData1.keyname
           this.setsignaTable.push(data);
         }
       }catch (e){
@@ -434,45 +435,50 @@ export default {
       this.editRoleInfo()
     },
     async editRoleInfo(){
-    
-    console.log(this.htmlData1,'this.htmlData.dqid1111111');
-    let obj={}
-    obj.colKey=this.colKey
-    obj.colName=this.colName
-    obj.sigRoleName=this.sigRoleName
-    obj.tabId=this.pkeyId1
-    obj.excelId=this.excelId
-    obj.type=this.signType
-    obj.pyzbx=this.pyzbx
-    obj.pyzby=this.pyzby
-    obj.id=this.signId
-    obj.isDeleted=this.isDeleted
-    if(this.signType==2){
-      obj.parentRoleId=this.radio
-      console.log(this.sigRoleId,'this.sigRoleId');
-      obj.sigRoleId=this.sigRoleId
+      console.log(this.htmlData1,'this.htmlData.dqid1111111');
+      let obj={}
+      obj.colKey=this.colKey
+      obj.colName=this.colName
+      obj.sigRoleName=this.sigRoleName
+      obj.tabId=this.pkeyId1
+      obj.excelId=this.excelId
+      obj.type=this.signType
+      obj.pyzbx=this.pyzbx
+      obj.pyzby=this.pyzby
+      obj.id=this.signId
+      obj.isDeleted=this.isDeleted
+      if(this.signType==2){
+        obj.parentRoleId=this.radio
+        console.log(this.sigRoleId,'this.sigRoleId');
+        obj.sigRoleId=this.sigRoleId
+        
+      }else{
+        obj.sigRoleId=this.signInfo
+      }
+        let arr=this.setsignaTable
+        arr.forEach((ele)=>{
+          if(obj.id==ele.id){
+            ele.colKey=obj.colKey
+            ele.excelId=obj.excelId
+            ele.pyzbx=obj.pyzbx
+            ele.pyzby=obj.pyzby
+            ele.sigRoleId=obj.sigRoleId
+            ele.sigRoleName=obj.sigRoleName
+            ele.type=obj.type
+            ele.tabId=obj.tabId
+            ele.show=false
+           
+          }
+        })
+        this.$nextTick(()=>{
+          this.setsignaTable=arr
+        })
+        this.$forceUpdate()
+        console.log(this.setsignaTable,'this.setsignaTable');
+        // this.saveSingInfo()
+       
       
-    }else{
-      obj.sigRoleId=this.signInfo
-    }
-      let arr=this.setsignaTable
-      arr.forEach((ele)=>{
-        if(obj.id==ele.id){
-          ele.colKey=obj.colKey
-          ele.excelId=obj.excelId
-          ele.pyzbx=obj.pyzbx
-          ele.pyzby=obj.pyzby
-          ele.sigRoleId=obj.sigRoleId
-          ele.sigRoleName=obj.sigRoleName
-          ele.type=obj.type
-          ele.tabId=obj.tabId
-        }
-      })
-      this.setsignaTable=arr
-      this.saveSingInfo()
-     
-    
-  },
+    },
    async deleteTableSig (key) {//删除数据
         this.setsignaTable.splice(key,1);
         this.isCansave=true
@@ -500,6 +506,7 @@ export default {
           message: "操作成功"
         });
       }
+      this.saveloaing=false
     },
     async getSingInfo() {
       const {data: res} = await getSigList(

+ 21 - 7
src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

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