提示

src/views/common/InscriptionUpLoadComponent.vue

@@ -1,7 +1,7 @@
 <!--文件上传组件-->
 <template>
 	<div :key="uploadKey">
-		<el-divider v-if="showDivider" content-position="left"><i class="el-icon-document"></i> <span style="color: red; font-size: 20px">*</span>{{dividerName}}<a style="color: red;font-size: 14px">  仅能上传“pdf、doc、docx、xls、xlsx”格式文件</a></el-divider>
+		<el-divider v-if="showDivider" content-position="left"><i class="el-icon-document"></i> <span style="color: red; font-size: 20px">*</span>{{dividerName}}<a style="color: red;font-size: 14px">  仅能上传“pdf、doc、docx、xls、xlsx”格式文件（“doc、docx、xls、xlsx” 格式文件可能会出现页码识别错误情况，建议上传pdf格式文档）</a></el-divider>
 		<el-upload ref="upload" style="display: inline-block; :show-header='status'" action=""
 				   :limit="999" :http-request="httpRequest"
 				   multiple

src/views/jy/knowledgeShare/InfoList.vue

@@ -19,7 +19,7 @@
       <vxe-toolbar :refresh="{query: refreshList}" custom>
         <template #buttons>
           <el-button v-if="hasPermission('knowledgeShare:InfoList:add')"  size="primary" icon="el-icon-plus" @click="add()">新建</el-button>
-          <el-button v-if="hasPermission('knowledgeShare:InfoList:del')"    size="primary" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+			<!--<el-button v-if="hasPermission('knowledgeShare:InfoList:del')"    size="primary" icon="el-icon-delete" @click="del()" :disabled="$refs.typeTable && $refs.typeTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
         </template>
       </vxe-toolbar>
 

src/views/jy/workContractInfo/JyWorkContractList.vue

@@ -150,7 +150,7 @@
 								<!--归档暂存修改-->
 								<el-button v-if="hasPermission('jy_work_contract:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === '1' ||scope.row.filedType === '3')" text type="primary"  @click="updateFiled(scope.row)">修改</el-button>
 								<!--管理员修改-->
-								<el-button v-if="hasPermission('admin:edit') && isJyAdmin" text type="primary"  @click="editForm(scope.row)">修改</el-button>
+								<el-button v-if="hasPermission('admin:edit') || isJyAdmin" text type="primary"  @click="editForm(scope.row)">修改</el-button>
 								<!--归档撤回-->
 								<el-button v-if="hasPermission('jy_work_contract:info:back') && scope.row.filedType === '2'  && scope.row.createId === $store.state.user.id" text type="primary"   @click="rebackFiled(scope.row)">撤回</el-button>
 								<!--              合同归档  审核-->
@@ -160,7 +160,7 @@
 								<!--							删除-->
 								<el-button v-if="hasPermission('jy_work_contract:info:del')&&(scope.row.filedType === '0' || scope.row.filedType === '1' || scope.row.filedType === '3') &&scope.row.createId === $store.state.user.id" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
 								<!--							管理员删除-->
-								<el-button v-if="hasPermission('admin:del') && isJyAdmin" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
+								<el-button v-if="hasPermission('admin:del') || isJyAdmin" text type="primary"  @click="deleteById(scope.row.id)">删除</el-button>
 							</div>
 							</template>
 					</vxe-column>