src/api/manager/AdjustForm.js

@@ -89,7 +89,7 @@ export const remove = (ids,tabId) => {
 
 export const getSignDetail = (params) => {
   return request({
-    url: '/api/blade-manager/textdictinfo/detail',
+    url: '/api/blade-manager/textdictinfo/getTedtdictInfoById',
     method: 'get',
     params
   })

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

@@ -57,9 +57,9 @@
           偏移位X：
         </el-col>
         <el-col :span="18">
-        
+
             <avue-input v-model="pyzbx" placeholder="横坐标，负代表左移，正代表右移，偏移量50大概等于一厘米"  type="number"></avue-input>
-       
+
         </el-col>
       </el-row>
 
@@ -68,9 +68,9 @@
           偏移位Y：
         </el-col>
         <el-col :span="18">
-       
+
             <avue-input v-model="pyzby" placeholder="纵坐标，负代表下移，正代表上移，偏移量50大概等于一厘米"  type="number"></avue-input>
-     
+
         </el-col>
       </el-row>
 
@@ -120,9 +120,9 @@
           <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  v-loading="isEditLoaing">保存</span>
-     
+
             <span style="color:red;cursor: pointer;" v-on:click="deleteTableSig(key,item.id,item)">删除</span>
-           
+
           </td>
         </tr>
         </tbody>
@@ -202,7 +202,7 @@ export default {
           if(obj.type==2){
             this.radio=obj.parentRoleId
              await this.roleTypeChang()
-         
+
           }else{
             this.radio=''
             await this.signTypeChang()
@@ -212,7 +212,7 @@ export default {
                     this.sigRoleName=ele.dictValue
                 }
              })
-          
+
           }
         }else{
           this.radio=''
@@ -223,8 +223,8 @@ export default {
           this.pyzby=0
         }
        }, 1000);
-   
-        
+
+
         // todo
       },
       deep: true
@@ -238,7 +238,7 @@ export default {
             }
           })
         }
-        
+
       }
     }
   },
@@ -283,7 +283,7 @@ export default {
         changeRole(e){
       this.sigRoleName=e.label
       this.sigRoleId=e.value
- 
+
     },
     async addRoleInfo(){
       var isadd = true;
@@ -344,15 +344,6 @@ export default {
 
       try {
         this.setsignaTable.forEach(val => {
-          if(val.colName == this.htmlData1.name){ // 位置只能添加一个
-            this.$message({
-              type: "error",
-              message: "位置只能配置一个电签"
-            });
-            isadd = false;
-            throw new Error('位置只能配置一个电签')
-          }
-
           if(val.colName === this.htmlData1.name && val.sigRoleId === this.roleInfo.value){
             this.$message({
               type: "error",
@@ -372,12 +363,14 @@ export default {
       }
     },
     async editClick (item){
-      console.log(item,'item');
+      console.log(item,'item111');
+      debugger;
       this.setsignaTable.forEach((ele)=>{
         ele.show=false
       })
       item.show=true
-      console.log(this.htmlData1,'htmlData1');
+      console.log(this.htmlData1,'htmlData1]2222');
+
       const {data: res} = await getSignDetail({id: item.id})
         if(res.code===200){
               console.log(res,'res');
@@ -392,7 +385,7 @@ 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
@@ -406,7 +399,7 @@ export default {
                 if(obj.type==2){
                   this.radio=obj.parentRoleId
                   await this.roleTypeChang()
-              
+
                 }else{
                   this.radio=''
                   await this.signTypeChang()
@@ -416,7 +409,7 @@ export default {
                         this.sigRoleName=ele.dictValue
                     }
                   })
-                
+
                 }
             }else{
               this.radio=''
@@ -426,10 +419,10 @@ export default {
               this.pyzbx=0
               this.pyzby=0
             }
-              
+
        }
        console.log( this.htmlData1,' this.htmlData1111');
-     
+
     },
     saveClick(item){
       this.editRoleInfo()
@@ -451,7 +444,7 @@ export default {
         obj.parentRoleId=this.radio
         console.log(this.sigRoleId,'this.sigRoleId');
         obj.sigRoleId=this.sigRoleId
-        
+
       }else{
         obj.sigRoleId=this.signInfo
       }
@@ -467,7 +460,7 @@ export default {
             ele.type=obj.type
             ele.tabId=obj.tabId
             ele.show=false
-           
+
           }
         })
         this.$nextTick(()=>{
@@ -476,8 +469,8 @@ export default {
         this.$forceUpdate()
         console.log(this.setsignaTable,'this.setsignaTable');
         // this.saveSingInfo()
-       
-      
+
+
     },
    async deleteTableSig (key) {//删除数据
         this.setsignaTable.splice(key,1);
@@ -504,7 +497,7 @@ export default {
         this.saveloaing=false
       }, 1500);
       const {data: res} = await saveSig({dataInfo: this.setsignaTable,tabId:this.pkeyId1})
-   
+
       if (res.code === 200) {
         //console.log(this.$parent)
         this.$parent.getExcelHtml(this.pkeyId1);
@@ -513,7 +506,7 @@ export default {
           message: "操作成功"
         });
       }
-   
+
     },
     async getSingInfo() {
       const {data: res} = await getSigList(

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

@@ -380,13 +380,12 @@ 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;
 
-
       data.pyzbx = this.pyzbx;
       data.pyzby = this.pyzby;
 
@@ -396,24 +395,15 @@ export default {
       data.timeName = times.timeName;
       data.timeColKey = times.timeColKey;
 
+      debugger;
       try {
         this.setsignaTable.forEach(val => {
-          if (val.colName == this.htmlData1.name) { // 位置只能添加一个
-            this.$message({
-              type: "error",
-              message: "位置只能配置一个电签"
-            });
-            isadd = false;
-            throw new Error('位置只能配置一个电签')
-          }
-
-          if (val.colName === this.htmlData1.name && val.sigRoleId === this.roleInfo.value) {
+          if (val.sigRoleId == data.sigRoleId && val.colName == data.colName) {
             this.$message({
               type: "error",
-              message: "数据已添加列表中"
+              message: "一个位置只能配置一个岗位"
             });
             isadd = false;
-            throw new Error('位置只能配置一个电签');
           }
         })
         if (isadd) {
@@ -426,22 +416,23 @@ export default {
       }
     },
     async editClick(item) {
-      console.log(item, 'item');
-
+      console.log(item, 'item222');
       this.setsignaTable.forEach((ele) => {
         ele.show = false
       })
       item.show = true
-      console.log(this.htmlData1, 'htmlData1');
+      console.log(this.htmlData1, 'htmlData222');
       const {data: res} = await getSignDetail({id: item.id, tabId: this.pkeyId1})
       if (res.code === 200) {
         console.log(res, 'res');
         this.htmlData1.obj = res.data
+        debugger
         let obj = this.htmlData1.obj
         console.log(obj, 'opbj');
         if (obj) {
           console.log(obj, 'obj');
           this.htmlData1.name = obj.colName;
+          this.htmlData1.keyname = obj.colKey;
           this.signType = obj.type.toString()
           this.pyzbx = obj.pyzbx
           this.pyzby = obj.pyzby
@@ -492,6 +483,7 @@ export default {
     },
     saveClick(item) {
       console.log('保存');
+      debugger;
       this.editRoleInfo(item)
     },
     async editRoleInfo() {

src/views/system/user.vue

@@ -688,8 +688,8 @@ export default {
                   trigger: "blur"
                 }, {
                   min: 2,
-                  max: 15,
-                  message: '姓名长度在2到15个字符'
+                  max: 20,
+                  message: '姓名长度在2到5个字符'
                 }]
               },
               {