Merge remote-tracking branch 'company/master' into company-master

- 调整操作列宽度为 200，固定在右侧
- 移除操作按钮的图标
- 添加 cantEdit 条件判断，控制表单的显示
- 删除多余的空行和无效代码

ruoyi-ui/src/views/system/member/index.vue

@@ -308,11 +308,10 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
+      <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" width="200" label="操作">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['system:personalmember:edit']"
-            icon="el-icon-download"
             size="mini"
             type="text"
             @click="downWord(scope.row)"
@@ -320,16 +319,14 @@
           </el-button>
           <el-button
             v-hasPermi="['system:member:check']"
-            icon="el-icon-edit"
             size="mini"
             type="text"
             @click="handleUpdate(scope.row)"
           >审核
           </el-button>
           <el-button
-            v-if="scope.row.dataSources == 1"
+           
             v-hasPermi="['system:member:edit']"
-            icon="el-icon-edit"
             size="mini"
             type="text"
             @click="handleUpdate(scope.row,1)"
@@ -337,7 +334,6 @@
           </el-button>
           <el-button
             v-hasPermi="['system:member:remove']"
-            icon="el-icon-delete"
             size="mini"
             type="text"
             @click="handleDelete(scope.row)"
@@ -511,7 +507,7 @@
         </el-form-item>
 
       </el-form>
-      <el-form ref="forms" :model="forms" :rules="rules" class="m-form">
+      <el-form v-if="cantEdit" ref="forms" :model="forms" :rules="rules" class="m-form">
         <el-form-item label="审核状态" prop="approvalStatus">
           <el-radio-group v-model="forms.approvalStatus" :disabled="false">
             <el-radio

ruoyi-ui/src/views/system/personalmember/index.vue

@@ -314,11 +314,10 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+      <el-table-column align="center" fixed="right" class-name="small-padding fixed-width" width="200" label="操作">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['system:personalmember:edit']"
-            icon="el-icon-download"
             size="mini"
             type="text"
             @click="downWord(scope.row)"
@@ -326,16 +325,14 @@
           </el-button>
           <el-button
             v-hasPermi="['system:personalmember:check']"
-            icon="el-icon-edit"
             size="mini"
             type="text"
             @click="handleUpdate(scope.row)"
           >审核
           </el-button>
           <el-button
-            v-if="scope.row.dataSources == 1"
+            
             v-hasPermi="['system:member:edit']"
-            icon="el-icon-edit"
             size="mini"
             type="text"
             @click="handleUpdate(scope.row,1)"
@@ -343,7 +340,6 @@
           </el-button>
           <el-button
             v-hasPermi="['system:personalmember:remove']"
-            icon="el-icon-delete"
             size="mini"
             type="text"
             @click="handleDelete(scope.row)"
@@ -534,7 +530,7 @@
           <!--        <el-input v-model="form.myMainWorkExperience" placeholder="请输入内容" type="textarea"/>-->
         </el-form-item>
       </el-form>
-      <el-form ref="forms" :model="forms" :rules="rules" class="m-form">
+      <el-form v-if="cantEdit" ref="forms" :model="forms" :rules="rules" class="m-form">
         <el-form-item label="审核状态" prop="approvalStatus">
           <el-radio-group v-model="forms.approvalStatus" :disabled="false">
             <el-radio