Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.WEB/src/api/interface/sys/usermanage/personnel.ts

@@ -58,7 +58,7 @@ export namespace SysUserPersonnel {
     /** 姓名 */
     name?: string;
     /** 年龄 */
-    age?: number | string;
+    age?: any;
     /** 性别 */
     gender?: string;
     /** 手机 */

SafeCampus.WEB/src/views/userManage/classManage/components/formClass/index.vue

@@ -97,6 +97,7 @@ async function handleSubmit() {
       await userManageClassManageApi
         .add(sysUserProps.record)
         .then(() => {
+          ElMessage.success("新增成功");
           sysUserProps.successful!(); //调用父组件的successful方法
         })
         .finally(() => {

SafeCampus.WEB/src/views/userManage/clothing/index.vue

@@ -160,13 +160,12 @@ const RefreshTable = () => {
   getList(clothSetId.value)
 }
 // 刷新表格+树
-const RefreshTree = () => {
-  getList(clothSetId.value)
-  treeFilter.value?.refresh(); //刷新树形筛选器
+const RefreshTree = async() => {
+  await getTree(); //刷新树形筛选器
+  await getList(clothSetId.value)
 }
 
 
-
 /** 服装库切换切换 */
 const clothSetId = ref<number | string>()
 function changeTreeFilter(val: number | string) {
@@ -183,10 +182,16 @@ const getList = (clothSetId:any)=>{
     }
   })
 }
-onMounted(async () => {
+const getTree =async ()=>{
   const { data }:any = await userManageClothApi.getList({});
   treeData.value = data;
-  clothSetId.value = data[0].clothSetId.toString()
+  if(!clothSetId.value ){
+    clothSetId.value = data[0].clothSetId.toString()
+  }
+  
+}
+onMounted(async () => {
+  await getTree()
   getList(clothSetId.value)
 })
 </script>

SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/form_basic.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="12">
           <s-form-item label="年龄" prop="age">
-            <s-input v-model="userInfo.age"></s-input>
+            <s-input v-model="userInfo.age" type="number" min="1"></s-input>
           </s-form-item>
         </el-col>
       </el-row>

SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue

@@ -65,6 +65,7 @@ function onOpen(props: FormProps.Base<SysUserPersonnel.SysUserPerInfo>) {
   if (props.record.personId) {
     //如果传了id，就去请求api获取record
     userManageKeyPersonApi.detail({ id: props.record.personId }).then((res: any) => {
+      if (!res.data.age) res.data.age = "";
       sysUserProps.record = res.data;
     });
   }

SafeCampus.WEB/src/views/userManage/keyPersonnel/index.vue

@@ -101,7 +101,10 @@ const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
   },
   {
     prop: "age",
-    label: "年龄"
+    label: "年龄",
+    render: scope => {
+      return scope.row.age ? scope.row.age : '--';
+    }
   },
   { prop: "operation", label: "操作", width: 250, fixed: "right" }
 ];

SafeCampus.WEB/src/views/userManage/personnel/components/form/form_basic.vue

@@ -151,11 +151,11 @@ const genderOptions = ref([
 ]);
 onMounted(async () => {
   departmentOptions.value = await getDepartmentList();
-  // 获取班级
-  classOptions.value = await getClassList("");
   // 初始化
   userInfo.value.gender = userInfo.value.gender ? userInfo.value.gender : genderOptions.value[0].value;
   if (userInfo.value.personId) {
+    majorOptions.value = await getMajorList(userInfo.value.depId);
+    classOptions.value = await getClassList(userInfo.value.majorId);
     if (userInfo.value.faces?.length > 0) {
       fileList.value = [
         ...JSON.parse(JSON.stringify(userInfo.value.faces)).map((item: any) => {
@@ -176,6 +176,9 @@ onMounted(async () => {
         })
       ];
     }
+  } else {
+    // 获取班级
+    classOptions.value = await getClassList("");
   }
   /* 监听系部、专业 */
   watch(

SafeCampus.WEB/src/views/userManage/personnel/index.vue

@@ -227,7 +227,7 @@ const RefreshTable = () => {
 /** 更多下拉菜单命令枚举 */
 enum cmdEnum {
   AddFace = "添加人脸",
-  UnderpantsUnBinding = "底库解绑"
+  UnderpantsUnBinding = "班级解绑"
 }
 /** 下拉菜单参数接口 */
 interface Command {
@@ -257,7 +257,7 @@ function handleCommand(command: Command) {
         personId:command.row.personId,
         personSetId: command.row.personSetId
       }).then(res=>{
-          ElMessage.success('底库解绑成功');
+          ElMessage.success('班级解绑成功');
           RefreshTable()
       })
       break;