电子签修改

src/views/exctab/ElementIdentification/template/electronicSignature.vue

@@ -117,8 +117,13 @@
           <td>{{item.sigRoleName}}</td>
           <td>{{item.pyzbx}}</td>
           <td>{{item.pyzby}}</td>
-          <td align="center"><span style="color:red;cursor: pointer;" v-on:click="deleteTableSig(key)">删除</span></td>
-          <td align="center"><span style="color:red;cursor: pointer;" >编辑</span></td>
+          <td align="center">
+            <span style="color:#409EFF;;cursor: pointer;margin-right: 5px;" @click="editClick(item)" v-if="item.show===false">编辑</span>
+            <span style="color:green;;cursor: pointer;margin-right: 5px;" @click="saveClick(item)" v-else>保存</span>
+     
+            <span style="color:red;cursor: pointer;" v-on:click="deleteTableSig(key,item.id,item)">删除</span>
+           
+          </td>
         </tr>
         </tbody>
       </table>
@@ -168,12 +173,12 @@ export default {
       isCansave:false,
       colKey:'',
       colName:'',
+      sigRoleName:''
     }
   },
   watch: {
     'htmlData1': {
       handler(val) {
-       console.log(val,'val');
        setTimeout(async() => {
         if(val.obj){
           let obj=val.obj
@@ -182,22 +187,37 @@ export default {
           this.pyzbx=obj.pyzbx
           this.pyzby=obj.pyzby
           this.sigRoleId=obj.sigRoleId
-          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
           if(obj.type==2){
             this.radio=obj.parentRoleId
-            await this.roleTypeChang()
-      
+             await this.roleTypeChang()
+         
           }else{
             this.radio=''
-            this.signInfo=obj.sigRoleId
             await this.signTypeChang()
+            this.signInfo=obj.sigRoleId
+            this.options.forEach((ele)=>{
+                if(ele.dictKey=== this.signInfo){
+                    this.sigRoleName=ele.dictValue
+                }
+             })
+          
           }
         }else{
           this.radio=''
           this.roleInfo=''
+          this.signInfo=''
+          this.signType=''
+          this.pyzbx=0
+          this.pyzby=0
         }
        }, 1000);
    
@@ -255,6 +275,12 @@ export default {
           return item
         }
       })
+    },
+        //角色改变
+        changeRole(e){
+      this.sigRoleName=e.label
+      this.sigRoleId=e.value
+ 
     },
     async addRoleInfo(){
       var isadd = true;
@@ -326,20 +352,80 @@ export default {
           }
         })
         if(isadd){
+          data.sh=false
           this.setsignaTable.push(data);
         }
       }catch (e){
         throw e;
       }
     },
-    async editRoleInfo(){
-      console.log('编辑电签');
+    async editClick (item){
+      console.log(item,'item');
+      item.show=true
+      console.log(this.htmlData1,'htmlData1');
+      const {data: res} = await getSignDetail({id: item.id})
+        if(res.code===200){
+              console.log(res,'res');
+              this.htmlData1.obj=res.data
+              let obj=this.htmlData1.obj
+              console.log(obj,'opbj');
+            if(obj){
+                console.log(obj,'obj');
+                this.htmlData1.name=obj.colName;
+                this.signType=obj.type.toString()
+                this.pyzbx=obj.pyzbx
+                this.pyzby=obj.pyzby
+                this.sigRoleId=obj.sigRoleId
+                this.sigRoleName=obj.sigRoleName
+                // 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
+
+                if(obj.type==2){
+                  this.radio=obj.parentRoleId
+                  await this.roleTypeChang()
+              
+                }else{
+                  this.radio=''
+                  await this.signTypeChang()
+                  this.signInfo=obj.sigRoleId
+                  this.options.forEach((ele)=>{
+                    if(ele.dictKey=== this.signInfo){
+                        this.sigRoleName=ele.dictValue
+                    }
+                  })
+                
+                }
+            }else{
+              this.radio=''
+              this.roleInfo=''
+              this.signInfo=''
+              this.signType=''
+              this.pyzbx=0
+              this.pyzby=0
+            }
+              
+       }
+       console.log( this.htmlData1,' this.htmlData1111');
+     
+    },
+    saveClick(item){
+      this.editRoleInfo()
+    },
+   async editRoleInfo(){
       this.isEditLoaing=true
       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
@@ -349,6 +435,7 @@ export default {
       obj.isDeleted=this.isDeleted
       if(this.signType==2){
         obj.parentRoleId=this.radio
+        console.log(this.sigRoleId,'this.sigRoleId');
         obj.sigRoleId=this.sigRoleId
         
       }else{
@@ -405,6 +492,9 @@ export default {
       )
       if (res.code === 200) {
         this.setsignaTable = res.data.records;
+        this.setsignaTable.forEach((ele)=>{
+          ele.show=false
+        })
       }
     }
   },

src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -244,6 +244,8 @@ export default {
               console.log(res,'res');
               this.htmlData.obj=res.data
              }
+      }else{
+        this.htmlData.obj=null
       }
       let target1
         if(tdEle){

src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -35,7 +35,7 @@
           签字角色：
         </el-col>
         <el-col :span="18">
-          <el-select v-model="roleInfo"  placeholder="请选择签字岗位" filterable >
+          <el-select v-model="roleInfo"  placeholder="请选择签字岗位" filterable  @change="changeRole">
             <el-option v-for="item in options" :key="item" :value="item" :label="item.label" ></el-option>
           </el-select>
         </el-col>
@@ -79,10 +79,7 @@
                    size="small"
                    icon="el-icon-circle-plus-outline"
                    @click="addRoleInfo()">添加列表</el-button> &nbsp;&nbsp;
-        <el-button type="primary"
-        size="small"
-        icon="el-icon-edit-outline"
-        @click="editRoleInfo()" v-loaing="isEditLoaing">编辑电签</el-button> &nbsp;&nbsp;
+
       </el-row>
 
 
@@ -117,7 +114,13 @@
           <td>{{item.sigRoleName}}</td>
           <td>{{item.pyzbx}}</td>
           <td>{{item.pyzby}}</td>
-          <td align="center"><span style="color:red;cursor: pointer;" v-on:click="deleteTableSig(key,item.id,item)">删除</span></td>
+          <td align="center">
+            <span style="color:#409EFF;;cursor: pointer;margin-right: 5px;" @click="editClick(item)" v-if="item.show===false">编辑</span>
+            <span style="color:green;;cursor: pointer;margin-right: 5px;" @click="saveClick(item)" v-else>保存</span>
+     
+            <span style="color:red;cursor: pointer;" v-on:click="deleteTableSig(key,item.id,item)">删除</span>
+           
+          </td>
         </tr>
         </tbody>
       </table>
@@ -127,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>
@@ -136,7 +139,7 @@
 
 <script>
 
-import {getRoleInfoByParentId, getRoleType, getSigList, saveSig,remove,updateDetail} from "../../../../../api/manager/AdjustForm";
+import {getRoleInfoByParentId, getRoleType, getSigList, saveSig,remove,updateDetail,getSignDetail} from "../../../../../api/manager/AdjustForm";
 import {findPfxType} from "../../../../../api/certificate/list";
 
 
@@ -170,14 +173,15 @@ export default {
       signId:'',
       isDeleted:'',
       parentRoleId:'',
-      isEditLoaing:false
+      isEditLoaing:false,
+      sigRoleName:'',
+      saveloaing:false
    
     }
   },
   watch: {
     'htmlData1': {
       handler(val) {
-       console.log(val,'val');
        setTimeout(async() => {
         if(val.obj){
           let obj=val.obj
@@ -186,7 +190,12 @@ export default {
           this.pyzbx=obj.pyzbx
           this.pyzby=obj.pyzby
           this.sigRoleId=obj.sigRoleId
-          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
@@ -198,11 +207,20 @@ export default {
             this.radio=''
             await this.signTypeChang()
             this.signInfo=obj.sigRoleId
+            this.options.forEach((ele)=>{
+                if(ele.dictKey=== this.signInfo){
+                    this.sigRoleName=ele.dictValue
+                }
+             })
           
           }
         }else{
           this.radio=''
           this.roleInfo=''
+          this.signInfo=''
+          this.signType=''
+          this.pyzbx=0
+          this.pyzby=0
         }
        }, 1000);
    
@@ -255,11 +273,23 @@ export default {
     },
     //签章类型改变e
     signInfoChang(e){
+      console.log(e,'e');
     this.signInfoarr=  this.options.filter(item=>{
         if(item.dictKey===e){
           return item
         }
       })
+      this.options.forEach((ele)=>{
+                if(ele.dictKey=== this.signInfo){
+                    this.sigRoleName=ele.dictValue
+                }
+       })
+    },
+    //角色改变
+    changeRole(e){
+      this.sigRoleName=e.label
+      this.sigRoleId=e.value
+ 
     },
     async addRoleInfo(){
       var isadd = true;
@@ -331,19 +361,80 @@ export default {
           }
         })
         if(isadd){
+          data.show=false
           this.setsignaTable.push(data);
         }
       }catch (e){
         throw e;
       }
     },
+    async editClick (item){
+      console.log(item,'item');
+      item.show=true
+      console.log(this.htmlData1,'htmlData1');
+      const {data: res} = await getSignDetail({id: item.id})
+        if(res.code===200){
+              console.log(res,'res');
+              this.htmlData1.obj=res.data
+              let obj=this.htmlData1.obj
+              console.log(obj,'opbj');
+            if(obj){
+                console.log(obj,'obj');
+                this.htmlData1.name=obj.colName;
+                this.signType=obj.type.toString()
+                this.pyzbx=obj.pyzbx
+                this.pyzby=obj.pyzby
+                this.sigRoleId=obj.sigRoleId
+                this.sigRoleName=obj.sigRoleName
+                // 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
+
+                if(obj.type==2){
+                  this.radio=obj.parentRoleId
+                  await this.roleTypeChang()
+              
+                }else{
+                  this.radio=''
+                  await this.signTypeChang()
+                  this.signInfo=obj.sigRoleId
+                  this.options.forEach((ele)=>{
+                    if(ele.dictKey=== this.signInfo){
+                        this.sigRoleName=ele.dictValue
+                    }
+                  })
+                
+                }
+            }else{
+              this.radio=''
+              this.roleInfo=''
+              this.signInfo=''
+              this.signType=''
+              this.pyzbx=0
+              this.pyzby=0
+            }
+              
+       }
+       console.log( this.htmlData1,' this.htmlData1111');
+     
+    },
+    saveClick(item){
+      this.editRoleInfo()
+    },
    async editRoleInfo(){
       this.isEditLoaing=true
       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
@@ -353,6 +444,7 @@ export default {
       obj.isDeleted=this.isDeleted
       if(this.signType==2){
         obj.parentRoleId=this.radio
+        console.log(this.sigRoleId,'this.sigRoleId');
         obj.sigRoleId=this.sigRoleId
         
       }else{
@@ -394,7 +486,9 @@ export default {
       
     },
     async saveSingInfo() {
+      this.saveloaing=true
       const {data: res} = await saveSig({dataInfo: this.setsignaTable,tabId:this.pkeyId1})
+      this.saveloaing=false
       if (res.code === 200) {
         //console.log(this.$parent)
         this.$parent.getExcelHtml(this.pkeyId1);
@@ -418,6 +512,9 @@ export default {
       )
       if (res.code === 200) {
         this.setsignaTable = res.data.records;
+        this.setsignaTable.forEach((ele)=>{
+          ele.show=false
+        })
       }
     }
   },