Browse Source

bug修改

asd26269546 1 year ago
parent
commit
486b814822
2 changed files with 58 additions and 0 deletions
  1. 40 0
      src/views/publicModule/salesman/index.vue
  2. 18 0
      src/views/system/user2/index.vue

+ 40 - 0
src/views/publicModule/salesman/index.vue

@@ -106,6 +106,22 @@ const formOption = reactive({
 const formConfig = computed(() => {
   return [
     {
+      type: "treeSelect",
+      prop: "deptId",
+      label: "部门名称",
+      data: [],
+      disabled:true,
+    },
+    {
+      type: "input",
+      prop: "nickName",
+      label: "姓名",
+      required: true,
+      itemWidth: 50,
+      disabled:true,
+      itemType: "text",
+    },
+    {
       type: "input",
       prop: "userCode",
       label: "业务员代码",
@@ -116,6 +132,30 @@ const formConfig = computed(() => {
 const rules = ref({
   userCode: [{ required: true, message: "请输入业务员代码", trigger: "blur" }],
 });
+const recursive = (data) => {
+  data.map((item) => {
+    item.label = item.deptName;
+    item.id = item.deptId;
+    if (item.children) {
+      recursive(item.children);
+    } else {
+      item.children = [];
+    }
+  });
+};
+const getDept = () => {
+  proxy
+    .get("/tenantDept/list", {
+      pageNum: 1,
+      tenantId: sourceList.value.pagination.tenantId,
+    })
+    .then((message) => {
+      recursive(message.data);
+      formConfig.value[0].data = proxy.handleTree(message.data, "deptId");
+      console.log(formConfig.value[0].data);
+    });
+};
+getDept()
 const formData = reactive({
   data: {},
 });

+ 18 - 0
src/views/system/user2/index.vue

@@ -124,6 +124,24 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "系统用户",
+        prop: "userType",
+      },
+      render(userType) {
+        return userType == 1 ? "是" : "否";
+      },
+    },{
+      attrs: {
+        label: "角色",
+        prop: "sysRoleList",
+      },
+      render(sysRoleList) {
+        return sysRoleList.map((item) => item.roleName).join(",")
+      },
+    },
+    
+    {
+      attrs: {
         label: "手机号",
         prop: "phonenumber",
       },