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

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

@@ -10,7 +10,7 @@
       label="clothSetName"
       id="clothSetId"
       width="300px"
-      :show-all="false"
+      :show-all="true"
       :request-api="userManageClothApi.getList"
       @change="changeTreeFilter"
     >
@@ -171,13 +171,16 @@ function changeTreeFilter(val: number | string) {
 }
 // 获取列表
 const getList = (clothSetId:any)=>{
-  if(!clothSetId) return false
+  // if(!clothSetId) return false
   userManageClothApi.page({clothSetId:clothSetId}).then((resp:any)=>{
     if(resp.code == 200){
       tableData.value = resp.data
     }
   })
 }
+onMounted(() => {
+  getList(clothSetId.value)
+})
 </script>
 <style scoped lang="scss">
 .table-box {

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

@@ -56,11 +56,6 @@
             <s-input v-model="userInfo.phone"></s-input>
           </s-form-item>
         </el-col>
-        <el-col :span="12">
-          <s-form-item label="扩展字段" prop="extData">
-            <s-input v-model="userInfo.extData"></s-input>
-          </s-form-item>
-        </el-col>
       </el-row>
     </div>
   </div>

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

@@ -103,10 +103,6 @@ const columns: ColumnProps<SysUserPersonnel.SysUserPerInfo>[] = [
     prop: "age",
     label: "年龄"
   },
-  {
-    prop: "personSetName",
-    label: "所属班级",
-  },
   { prop: "operation", label: "操作", width: 250, fixed: "right" }
 ];
 const viewHeadImage = (scope: any) => {

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

@@ -72,11 +72,6 @@
             <s-input v-model="userInfo.phone"></s-input>
           </s-form-item>
         </el-col>
-        <el-col :span="12">
-          <s-form-item label="扩展字段" prop="extData">
-            <s-input v-model="userInfo.extData"></s-input>
-          </s-form-item>
-        </el-col>
       </el-row>
     </div>
   </div>