diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index 6af72e8d9..20b31fb67 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -250,10 +250,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        queryWrapper.and(query->{
-            query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
-                    .or().in("state",InventoryStateEnum.ISSUE.getValue());
-        });
+        //系统管理
+        boolean administrator = sysUserService.isAdministrator();
+        if(!administrator){
+            queryWrapper.and(query->{
+                query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
+                        .or().in("state",InventoryStateEnum.ISSUE.getValue());
+            });
+        }
 //        queryWrapper.or(query->{
 //            query.in("state",InventoryStateEnum.ISSUE.getValue());
 //        });
@@ -319,19 +323,19 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
         DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
         List<String> createByNameList =new ArrayList<>();
-        if (StringUtils.isNotBlank(baseEO.getCreateBy())) {
-            createByNameList = Arrays.asList(baseEO.getCreateBy().split(","));
-
-            if (CollectionUtils.isNotEmpty(createByNameList)){
-                if (!createByNameList.contains(loginUserName)) {
-                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                        throw new JeroBootException("当前用户非创建者,无法发布");
-                    } else {
-                        throw new JeroBootException("The current user is not the creator and cannot be issued.");
-                    }
-                }
-            }
-        }
+//        if (StringUtils.isNotBlank(baseEO.getCreateBy())) {
+//            createByNameList = Arrays.asList(baseEO.getCreateBy().split(","));
+//
+//            if (CollectionUtils.isNotEmpty(createByNameList)){
+//                if (!createByNameList.contains(loginUserName)) {
+//                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+//                        throw new JeroBootException("当前用户非创建者,无法发布");
+//                    } else {
+//                        throw new JeroBootException("The current user is not the creator and cannot be issued.");
+//                    }
+//                }
+//            }
+//        }
         Date now = new Date();
         UpdateWrapper<DummyInventoryBaseEO> baseWrapper=new UpdateWrapper<>();
         baseWrapper.set("state",dummyInventoryBaseEO.getState());
diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue
index ab2772555..cbab09ff6 100644
--- a/jero-web/src/components/OcrTable/index.vue
+++ b/jero-web/src/components/OcrTable/index.vue
@@ -21,11 +21,11 @@
 <!--             <span v-if="ol.text==$t('check')">-->
 <!--                     {{record.resultContent=='转换成功'&&record.syncState=='未同步'?ol.text:''}}-->
 <!--              </span>-->
-             <span v-if="ol.text==$t('download') && record.createBy == userData.username"
+             <span v-if="ol.text==$t('download') && (record.createBy == userData.username || administrators)"
                    v-has="'ocr:ocrRestful:downFile'">
                      {{record.resultContent=='转换成功'?ol.text:''}}
               </span>
-             <span v-if="ol.text==$t('delete') && record.createBy == userData.username" v-has="'ocr:ocrRecord:delete'">
+             <span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)" v-has="'ocr:ocrRecord:delete'">
                      {{ol.text}}
               </span>
            </a>
@@ -105,7 +105,8 @@
         searchParmes: {},
         loading: false,
         orderBy: '1',
-        orderByField: ''
+        orderByField: '',
+        administrators:false
       }
     },
     mounted() {
@@ -131,6 +132,14 @@
       this.getData()
       this.getTableList()
       this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     beforeDestroy(){
       eventBUs.$off('searchQuery')
diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue
index baf0b1142..434f7052a 100644
--- a/jero-web/src/components/SplitTable/index.vue
+++ b/jero-web/src/components/SplitTable/index.vue
@@ -18,7 +18,7 @@
 <!--              <span class="text">-->
              <!--                     {{ol.text}}-->
              <!--              </span>-->
-             <span v-if="ol.text==$t('backDocument')&&record.flag==0 && record.createBy == userData.username"
+             <span v-if="ol.text==$t('backDocument') && record.flag==0 && (record.createBy == userData.username || administrators)"
                    class="text"
                    v-has="'split:sarFileSplitInfo:bind'">
                      {{ol.text}}
@@ -27,7 +27,7 @@
                     v-has="'split:sarFileSplitItems:page'">
                      {{ol.text}}
              </span>
-              <span v-if="ol.text==$t('delete') && record.createBy == userData.username"
+              <span v-if="ol.text==$t('delete') && (record.createBy == userData.username || administrators)"
                     v-has="'split:sarFileSplitInfo:delete'">
                      {{ol.text}}
              </span>
@@ -109,7 +109,8 @@
         loading: false,
         orderBy: '1',
         userData: {},
-        orderByField: ''
+        orderByField: '',
+        administrators:false,
       }
     },
     mounted() {
@@ -141,6 +142,14 @@
       this.getData()
       this.getTableList()
       this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     beforeDestroy() {
       eventBUs.$off('searchQuery')
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 32a5c2c11..3e26365cf 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -125,14 +125,16 @@
                         </span>
                       </a-select-option>
                     </a-select>
-                    <a-button class="box-button-index"
-                              :title="$t('addStandardInformation')"
-                              type="primary" @click="bringInDocumentInformationClick">
-                      {{$t('addStandardInformation')}}
-                    </a-button>
                   </a-form-model-item>
                 </div>
               </a-col>
+              <a-col :span="8">
+                <a-button class="box-button-index"
+                          :title="$t('addStandardInformation')"
+                          type="primary" @click="bringInDocumentInformationClick">
+                  {{$t('addStandardInformation')}}
+                </a-button>
+              </a-col>
             </a-row>
             <a-row :gutter="24">
               <a-col :span="24" style="height: 380px">
@@ -799,8 +801,9 @@
     width: 120px;
     overflow: hidden;
     padding: 0 0;
-    float: right;
+    /*float: right;*/
     text-align: center;
+    margin-top: 2px;
   }
 
   ::v-deep .box-button-index span {
@@ -843,8 +846,9 @@
   }
 
   .box-input-index {
-    width: calc(100% - 130px);
+    /*width: calc(100% - 130px);*/
     display: inline-block;
+    width: 100%;
     height: 48px;
     margin-right: 10px;
   }
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index 3c4cbfda3..d329acfc3 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -65,16 +65,16 @@
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="edit(record)"
               v-has="'dummyInventoryBase:deleteBatch'"
-              v-if="record.createBy == userData.username"
+              v-if="record.createBy == userData.username || administrators"
               :disabled="record.state == 1?true:false">{{$t('edit')}}</a>
            <a class="text-operation"
-              v-if="record.createBy == userData.username"
+              v-if="record.createBy == userData.username || administrators"
               v-has="'dummyInventoryBase:issue'"
               @click="withdraw(record)">
              {{record.state == 2 ? $t('release') : $t('withdraw')}}
            </a>
            <a class="text-operation" :disabled="record.state == 1?true:false"
-              v-if="record.createBy == userData.username"
+              v-if="record.createBy == userData.username || administrators"
               v-has="'dummyInventoryBase:deleteBatch'"
               @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
            <a class="text-operation"
@@ -84,7 +84,7 @@
            </a>
            <a class="text-operation" :disabled="record.state == 1?true:false"
               v-has="'dummyInventoryBase:deleteBatch'"
-              v-if="record.createBy == userData.username"
+              v-if="record.createBy == userData.username || administrators"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
@@ -244,13 +244,21 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
-        queryParam: {}
-
+        queryParam: {},
+        administrators:false,
       }
     },
     mounted() {
       this.getList()
       this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index 9066f1762..c05bcabbd 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -107,7 +107,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index ef8d4b8d1..df1fc8781 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -356,7 +356,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index 3b8473872..ecdb62caa 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -389,7 +389,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue
index 385c860df..f95b8c6a1 100644
--- a/jero-web/src/views/processCenter/components/examineInformation.vue
+++ b/jero-web/src/views/processCenter/components/examineInformation.vue
@@ -223,7 +223,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index c86a652cb..ff7b18e69 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -231,7 +231,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue
index 8c0e6669a..c32129ffe 100644
--- a/jero-web/src/views/processCenter/components/projectInformation.vue
+++ b/jero-web/src/views/processCenter/components/projectInformation.vue
@@ -111,7 +111,7 @@
     line-height: 80px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 48adc3d86..4fa35d3fa 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -127,7 +127,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index fc760921f..f9614c226 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -312,7 +312,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue
index 846990863..be337f0b4 100644
--- a/jero-web/src/views/processCenter/components/standardContent.vue
+++ b/jero-web/src/views/processCenter/components/standardContent.vue
@@ -116,7 +116,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index 8c64c8228..8495f0393 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -110,7 +110,7 @@
     line-height: 40px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 7f592203a..cc0b76f8f 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -335,7 +335,7 @@
             })
           } else {
             this.loading = false
-            this.$message.warning(this.$t('operationFailed'))
+            this.$message.warning(res.message)
           }
         })
       }
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index c19d1eb3c..39f9a28f5 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -263,7 +263,7 @@
             }
           } else {
             this.loading = false
-            this.$message.warning(this.$t('operationFailed'))
+            this.$message.warning(res.message)
           }
         })
       },
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 1695db0be..3b2fc6174 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -199,7 +199,7 @@
             })
           } else {
             this.loading = false
-            this.$message.warning(this.$t('operationFailed'))
+            this.$message.warning(res.message)
           }
         })
       }
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 92f24d749..3c4c0a20c 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -362,7 +362,7 @@
             this.edit()
           } else {
             this.loading = false
-            this.$message.warning(this.$t('operationFailed'))
+            this.$message.warning(res.message)
           }
         })
       },
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index 18212626b..3dc752b3b 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -5,7 +5,7 @@
         {{$t('basicInformationOfParameters')}}
       </div>
       <div class="header-tight">
-        <a-button v-if="this.$route.query.studioEngineer == this.userInfo().id" class="box-button"
+        <a-button v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators" class="box-button"
                   style="line-height: 32px" @click="edit">
           {{$t('edit')}}
         </a-button>
@@ -93,7 +93,8 @@
         {{$t('regulatoryCertificationTaskPlan')}}
       </div>
       <div class="header-tight">
-        <a-button class="box-button" v-if="this.$route.query.studioEngineer == this.userInfo().id"
+        <a-button class="box-button"
+                  v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators"
                   style="line-height: 32px"
                   @click="settingClick">{{$t('setting')}}
         </a-button>
@@ -161,6 +162,7 @@
     data() {
       return {
         queryForm: {},
+        administrators:false,
         activeKey: this.$t('CurrentStatusOfTheProject'),
         url: {
           queryById: 'project/projectLibraryBase/queryById',
@@ -177,6 +179,14 @@
     mounted() {
       this.getForm()
       this.getSetting()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index c09c6e5c9..0e0329c86 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -173,7 +173,8 @@
         </div>
       </div>
       <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
-        <div @click="handleExport" v-has="'projectLawsInventory:exportData'" v-if="isRoleSwitching"
+        <div @click="handleExport" v-has="'projectLawsInventory:exportData'"
+             v-if="isRoleSwitching || formInlineRoleSwitching.roleSwitchingCode == '12'"
              class="operator-text">
           <a-icon type="export" :rotate="-90"/>
           {{ $t('export') }}
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 8de753c3c..a885f10b4 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -83,14 +83,14 @@
         </div>
         <div class="operator-text"
              v-has="'projectRelatedPersonnel:importExcel'"
-             v-if="this.$route.query.studioEngineer == this.userInfo().id">
+             v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators">
           <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'"
                       @getList="getPersonnelList"/>
         </div>
         <div class="operator-text"
              @click="batSettingClick"
              v-has="'projectRelatedPersonnel:setting'"
-             v-if="this.$route.query.studioEngineer == this.userInfo().id">
+             v-if="this.$route.query.studioEngineer == this.userInfo().id || administrators">
           <a-icon type="setting"/>
           {{$t('batSetting')}}
         </div>
@@ -388,13 +388,15 @@
           queryCertificationEngineer: '/project/projectRelatedPersonnel/queryCertificationEngineer'
         },
         selectedRowKeys: [],
-        dictOptionsValue: []
+        dictOptionsValue: [],
+        administrators: false
       }
     },
     computed: {
       columns() {
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
-        if (this.$route.query.studioEngineer != this.userInfo().id) {
+        if (this.$route.query.studioEngineer == this.userInfo().id || this.administrators) {
+        } else {
           for (var i = 0; i < columnResult.length; i++) {
             if (columnResult[i].title === this.$t('operation')) {
               columnResult.splice(i, 1)
@@ -441,6 +443,14 @@
       getData() {
         this.visible = true
         this.queryParam = {}
+        this.administrators = false
+        if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+          this.userInfo().userRoleList.forEach(res => {
+            if (res.roleCode == 'admin') {
+              this.administrators = true
+            }
+          })
+        }
         this.getList()
         this.queryCertificationEngineer()
       },
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 89c1b78a8..76b8eb34e 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -131,7 +131,7 @@
 <!--            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>-->
             <a class="text-operation"
                v-has="'projectLibraryBase:delete'"
-               v-if="record.createBy == userInfoQuery.username"
+               v-if="record.createBy == userInfoQuery.username || administrators"
                @click="deleteLib(record)">{{$t('deleteLib')}}</a>
           <!--          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
         </span>
@@ -246,12 +246,21 @@
           }
         ],
         userInfoQuery: {},
-        queryParam: {}
+        queryParam: {},
+        administrators: false
       }
     },
     mounted() {
       this.getList()
       this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 0864d5ce1..ddb2e7430 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -21,29 +21,32 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-<!--        v-if="!disabled"-->
+        <!--        v-if="!disabled"-->
         <a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" :disabled='isdisabled'
+          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]"
+                   :disabled='isdisabled'
                    :readOnly="!!model.id"/>
         </a-form-item>
-<!--        v-if="!model.id && !disabled"-->
+        <!--        v-if="!model.id && !disabled"-->
         <template>
-<!--          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'-->
-<!--                     v-decorator="[ 'password',validatorRules.password]"/>-->
-<!--          </a-form-item>-->
-<!--          v-if="!disabled"-->
-<!--          <a-form-item :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"-->
-<!--                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>-->
-<!--          </a-form-item>-->
+          <!--          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'-->
+          <!--                     v-decorator="[ 'password',validatorRules.password]"/>-->
+          <!--          </a-form-item>-->
+          <!--          v-if="!disabled"-->
+          <!--          <a-form-item :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"-->
+          <!--                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>-->
+          <!--          </a-form-item>-->
         </template>
-<!--        v-if="!disabled"-->
+        <!--        v-if="!disabled"-->
         <a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserName')" :disabled='isdisabled' v-decorator.trim="[ 'realname', validatorRules.realname]"/>
+          <a-input :placeholder="$t('enterUserName')" :disabled='isdisabled'
+                   v-decorator.trim="[ 'realname', validatorRules.realname]"/>
         </a-form-item>
         <a-form-item :label="$t('position')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input  type="textarea" style='height: 100px' :placeholder="$t('pleaseEnter')+$t('position')" :disabled='isdisabled' v-decorator.trim="[ 'jobTitle', validatorRules.jobTitle]"/>
+          <a-input type="textarea" style='height: 100px' :placeholder="$t('pleaseEnter')+$t('position')"
+                   :disabled='isdisabled' v-decorator.trim="[ 'jobTitle', validatorRules.jobTitle]"/>
         </a-form-item>
 
         <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -53,9 +56,9 @@
         <!--<a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
         <!--</a-form-item>-->
-<!--        v-show="!roleDisabled"-->
+        <!--        v-show="!roleDisabled"-->
         <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     >
+        >
           <a-select
             mode="multiple"
             style="width: 100%"
@@ -63,7 +66,7 @@
             :placeholder="$t('selectUserRole')"
             optionFilterProp="children"
             v-model="selectedRole"
-            :disabled='isdisabled'
+            :disabled='false'
             :getPopupContainer="(target) => target.parentNode">
             <a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
               {{ role.roleName }}
@@ -72,9 +75,9 @@
         </a-form-item>
 
         <!--部门分配-->
-<!--        v-show="!departDisabled && !disabled"-->
+        <!--        v-show="!departDisabled && !disabled"-->
         <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     >
+        >
           <a-input-search
             :placeholder="$t('ClickSelectDepartment')"
             v-model="checkedDepartNameString"
@@ -101,34 +104,34 @@
         <!--</a-form-item>-->
 
         <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-<!--        v-if="!disabled"-->
-<!--        <a-form-item  :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--          <a-radio-group-->
-<!--            v-model="identity"-->
-<!--            @change="identityChange">-->
-<!--            <a-radio value="1">{{$t('OrdinaryUsers')}}</a-radio>-->
-<!--            <a-radio value="2">{{$t('superior')}}</a-radio>-->
-<!--          </a-radio-group>-->
-<!--        </a-form-item>-->
-<!--        v-if="departIdShow==true && !disabled"-->
-<!--        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
-<!--                     >-->
-<!--          <a-select-->
-<!--            :disabled="disabled"-->
-<!--            mode="multiple"-->
-<!--            style="width: 100%"-->
-<!--            :placeholder="$t('selectResponsibleDepartment')"-->
-<!--            v-model="departIds"-->
-<!--            optionFilterProp="children"-->
-<!--            :getPopupContainer="(target) => target.parentNode"-->
-<!--            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"-->
-<!--          >-->
-<!--            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"-->
-<!--            >{{item.title}}-->
-<!--            </a-select-option-->
-<!--            >-->
-<!--          </a-select>-->
-<!--        </a-form-item>-->
+        <!--        v-if="!disabled"-->
+        <!--        <a-form-item  :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <a-radio-group-->
+        <!--            v-model="identity"-->
+        <!--            @change="identityChange">-->
+        <!--            <a-radio value="1">{{$t('OrdinaryUsers')}}</a-radio>-->
+        <!--            <a-radio value="2">{{$t('superior')}}</a-radio>-->
+        <!--          </a-radio-group>-->
+        <!--        </a-form-item>-->
+        <!--        v-if="departIdShow==true && !disabled"-->
+        <!--        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
+        <!--                     >-->
+        <!--          <a-select-->
+        <!--            :disabled="disabled"-->
+        <!--            mode="multiple"-->
+        <!--            style="width: 100%"-->
+        <!--            :placeholder="$t('selectResponsibleDepartment')"-->
+        <!--            v-model="departIds"-->
+        <!--            optionFilterProp="children"-->
+        <!--            :getPopupContainer="(target) => target.parentNode"-->
+        <!--            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"-->
+        <!--          >-->
+        <!--            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"-->
+        <!--            >{{item.title}}-->
+        <!--            </a-select-option-->
+        <!--            >-->
+        <!--          </a-select>-->
+        <!--        </a-form-item>-->
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
         <!--        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>-->
@@ -141,20 +144,21 @@
         <!--v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
         <!--:getCalendarContainer="node => node.parentNode"/>-->
         <!--</a-form-item>-->
-<!--        v-if="!disabled"-->
-<!--        <a-form-item :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--          <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')"-->
-<!--                    :getPopupContainer="(target) => target.parentNode">-->
-<!--            <a-select-option :value="1">{{$t('male')}}</a-select-option>-->
-<!--            <a-select-option :value="2">{{$t('female')}}</a-select-option>-->
-<!--          </a-select>-->
-<!--        </a-form-item>-->
-<!--        v-if="!disabled"-->
+        <!--        v-if="!disabled"-->
+        <!--        <a-form-item :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')"-->
+        <!--                    :getPopupContainer="(target) => target.parentNode">-->
+        <!--            <a-select-option :value="1">{{$t('male')}}</a-select-option>-->
+        <!--            <a-select-option :value="2">{{$t('female')}}</a-select-option>-->
+        <!--          </a-select>-->
+        <!--        </a-form-item>-->
+        <!--        v-if="!disabled"-->
         <a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]" :disabled='isdisabled'/>
+          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]"
+                   :disabled='isdisabled'/>
         </a-form-item>
-<!--        v-if="!disabled"-->
-<!--        :disabled="isDisabledAuth('user:form:phone')"-->
+        <!--        v-if="!disabled"-->
+        <!--        :disabled="isDisabledAuth('user:form:phone')"-->
         <a-form-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :placeholder="$t('enterMobileNumber')" :disabled='isdisabled'
                    v-decorator="[ 'telephone', validatorRules.telephone]"/>
@@ -173,11 +177,11 @@
     <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
 
     <div class="drawer-bootom-button" v-show="!disableSubmit">
-<!--      <a-popconfirm :title="$t('AreYouWantDiscardEditing')" @confirm="handleCancel" :okText="$t('determine')"-->
-<!--                    :cancelText="$t('cancel')">-->
-        <a-button style="margin-right: .8rem" @click="handleSubmit">{{$t('cancel')}}</a-button>
-<!--      </a-popconfirm>-->
-<!--      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>-->
+      <!--      <a-popconfirm :title="$t('AreYouWantDiscardEditing')" @confirm="handleCancel" :okText="$t('determine')"-->
+      <!--                    :cancelText="$t('cancel')">-->
+      <a-button style="margin-right: .8rem" @click="handleSubmit">{{$t('cancel')}}</a-button>
+      <!--      </a-popconfirm>-->
+      <a-button @click="handleSubmitOk" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
   </a-drawer>
 </template>
@@ -189,7 +193,7 @@
   // 引入搜索部门弹出框的组件
   import departWindow from './DepartWindow'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
-  import { getAction } from '@/api/manage'
+  import { getAction, postAction } from '@/api/manage'
   import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
   import { disabledAuthFilter } from '@/utils/authFilter'
   import { duplicateCheck } from '@/api/api'
@@ -347,6 +351,25 @@
           }
         })
       },
+      handleSubmitOk() {
+        this.confirmLoading = true
+        let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
+        let param = {
+          ids: this.userId,
+          selectedroles: selectedRole.join(',')
+        }
+        postAction('/sys/user/setRole', param).then((res) => {
+          if (res.success) {
+            this.$emit('ok')
+            this.confirmLoading = false
+            this.visible = false
+            this.$message.success(res.message)
+          } else {
+            this.confirmLoading = false
+            this.$message.warning(res.message)
+          }
+        })
+      },
       refresh() {
         this.selectedDepartKeys = []
         this.checkedDepartKeys = []
@@ -383,7 +406,7 @@
         that.visible = true
         that.model = Object.assign({}, record)
         that.$nextTick(() => {
-          that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle','email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post'))
+          that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle', 'email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post'))
         })
         //身份为上级显示负责部门，否则不显示
         if (this.model.userIdentity == '2') {
@@ -728,7 +751,7 @@
   .drawer-bootom-button {
     position: absolute;
     bottom: -8px;
-    z-index:100;
+    z-index: 100;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
@@ -740,6 +763,6 @@
 </style>
 <style>
   .selectUserRole .ant-select-selection--multiple {
-    height: 100px!important;
+    height: 100px !important;
   }
 </style>
\ No newline at end of file