Merge branch 'dev' into hyx_2024-10-9_tongbu

2、解决form-data重复提交corp_id bug

src/views/PersonManager/user/components/add.vue

@@ -1089,6 +1089,7 @@ export default {
                 }
               }
             }
+            formData.delete('CORPINFO_ID')
             formData.append('CORPINFO_ID', JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID)
             upload(
               '/user/' + this.dialogType,

src/views/PersonManager/user/components/list.vue

@@ -140,7 +140,7 @@
                 <template v-show="loginUser.ACCOUNT_TYPE === '0'">
                   <el-button v-show="edit && row.ACCOUNT_TYPE == '1'" type="success" icon="el-icon-edit" size="mini" @click="handleUserEdit(row)">编辑</el-button>
                   <el-button v-show="edit" type="success" icon="el-icon-refresh" size="mini" @click="resetPwd(row.USER_ID)">重置密码</el-button>
-                  <el-button v-if="del && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button>
+                  <el-button v-if="false && del && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button>
                   <el-button v-if="row.ISUSE == 1 && row.ACCOUNT_TYPE == '1'" type="success" icon="el-icon-check" size="mini" @click="enableORDisable('0', row)">启用</el-button>
                   <el-button v-if="row.ISUSE == 0 && row.ACCOUNT_TYPE == '1'" type="danger" icon="el-icon-close" size="mini" @click="enableORDisable('1', row)">禁用</el-button>
                 </template>