Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-05-26 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/views/system/dept/index.vue

@@ -6,11 +6,12 @@
               v-model="queryParams.deptName"

               placeholder="请输入部门名称"

               clearable

               style="width: 200px"

               @keyup.enter="handleQuery"

            />

         </el-form-item>

         <el-form-item label="状态" prop="status">

            <el-select v-model="queryParams.status" placeholder="部门状态" clearable>

            <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">

               <el-option

                  v-for="dict in sys_normal_disable"

                  :key="dict.value"

@@ -68,25 +69,9 @@
         </el-table-column>

         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

            <template #default="scope">

               <el-button

                  type="text"

                  icon="Edit"

                  @click="handleUpdate(scope.row)"

                  v-hasPermi="['system:dept:edit']"

               >修改</el-button>

               <el-button

                  type="text"

                  icon="Plus"

                  @click="handleAdd(scope.row)"

                  v-hasPermi="['system:dept:add']"

               >新增</el-button>

               <el-button

                  v-if="scope.row.parentId != 0"

                  type="text"

                  icon="Delete"

                  @click="handleDelete(scope.row)"

                  v-hasPermi="['system:dept:remove']"

               >删除</el-button>

               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>

               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>

               <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>

            </template>

         </el-table-column>

      </el-table>

@@ -97,11 +82,13 @@
            <el-row>

               <el-col :span="24" v-if="form.parentId !== 0">

                  <el-form-item label="上级部门" prop="parentId">

                     <tree-select

                        v-model:value="form.parentId"

                        :options="deptOptions"

                        :objMap="{ value: 'deptId', label: 'deptName', children: 'children' }"

                     <el-tree-select

                        v-model="form.parentId"

                        :data="deptOptions"

                        :props="{ value: 'deptId', label: 'deptName', children: 'children' }"

                        value-key="deptId"

                        placeholder="选择上级部门"

                        check-strictly

                     />

                  </el-form-item>

               </el-col>

@@ -136,7 +123,7 @@
                        <el-radio

                           v-for="dict in sys_normal_disable"

                           :key="dict.value"

                           :label="dict.value"

                           :value="dict.value"

                        >{{ dict.label }}</el-radio>

                     </el-radio-group>

                  </el-form-item>

@@ -154,19 +141,19 @@
</template>



<script setup name="Dept">

import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";

import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept"



const { proxy } = getCurrentInstance();

const { sys_normal_disable } = proxy.useDict("sys_normal_disable");

const { proxy } = getCurrentInstance()

const { sys_normal_disable } = proxy.useDict("sys_normal_disable")



const deptList = ref([]);

const open = ref(false);

const loading = ref(true);

const showSearch = ref(true);

const title = ref("");

const deptOptions = ref([]);

const isExpandAll = ref(true);

const refreshTable = ref(true);

const deptList = ref([])

const open = ref(false)

const loading = ref(true)

const showSearch = ref(true)

const title = ref("")

const deptOptions = ref([])

const isExpandAll = ref(true)

const refreshTable = ref(true)



const data = reactive({

  form: {},

@@ -181,23 +168,25 @@
    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],

    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]

  },

});

})



const { queryParams, form, rules } = toRefs(data);

const { queryParams, form, rules } = toRefs(data)



/** 查询部门列表 */

function getList() {

  loading.value = true;

  loading.value = true

  listDept(queryParams.value).then(response => {

    deptList.value = proxy.handleTree(response.data, "deptId");

    loading.value = false;

  });

    deptList.value = proxy.handleTree(response.data, "deptId")

    loading.value = false

  })

}



/** 取消按钮 */

function cancel() {

  open.value = false;

  reset();

  open.value = false

  reset()

}



/** 表单重置 */

function reset() {

  form.value = {

@@ -209,79 +198,86 @@
    phone: undefined,

    email: undefined,

    status: "0"

  };

  proxy.resetForm("deptRef");

  }

  proxy.resetForm("deptRef")

}



/** 搜索按钮操作 */

function handleQuery() {

  getList();

  getList()

}



/** 重置按钮操作 */

function resetQuery() {

  proxy.resetForm("queryRef");

  handleQuery();

  proxy.resetForm("queryRef")

  handleQuery()

}



/** 新增按钮操作 */

async function handleAdd(row) {

  reset();

  await listDept().then(response => {

    deptOptions.value = proxy.handleTree(response.data, "deptId");

  });

function handleAdd(row) {

  reset()

  listDept().then(response => {

    deptOptions.value = proxy.handleTree(response.data, "deptId")

  })

  if (row != undefined) {

    form.value.parentId = row.deptId;

    form.value.parentId = row.deptId

  }

  open.value = true;

  title.value = "添加部门";

  open.value = true

  title.value = "添加部门"

}



/** 展开/折叠操作 */

function toggleExpandAll() {

  refreshTable.value = false;

  isExpandAll.value = !isExpandAll.value;

  refreshTable.value = false

  isExpandAll.value = !isExpandAll.value

  nextTick(() => {

    refreshTable.value = true;

  });

    refreshTable.value = true

  })

}



/** 修改按钮操作 */

async function handleUpdate(row) {

  reset();

  await listDeptExcludeChild(row.deptId).then(response => {

    deptOptions.value = proxy.handleTree(response.data, "deptId");

  });

function handleUpdate(row) {

  reset()

  listDeptExcludeChild(row.deptId).then(response => {

    deptOptions.value = proxy.handleTree(response.data, "deptId")

  })

  getDept(row.deptId).then(response => {

    form.value = response.data;

    open.value = true;

    title.value = "修改部门";

  });

    form.value = response.data

    open.value = true

    title.value = "修改部门"

  })

}



/** 提交按钮 */

function submitForm() {

  proxy.$refs["deptRef"].validate(valid => {

    if (valid) {

      if (form.value.deptId != undefined) {

        updateDept(form.value).then(response => {

          proxy.$modal.msgSuccess("修改成功");

          open.value = false;

          getList();

        });

          proxy.$modal.msgSuccess("修改成功")

          open.value = false

          getList()

        })

      } else {

        addDept(form.value).then(response => {

          proxy.$modal.msgSuccess("新增成功");

          open.value = false;

          getList();

        });

          proxy.$modal.msgSuccess("新增成功")

          open.value = false

          getList()

        })

      }

    }

  });

  })

}



/** 删除按钮操作 */

function handleDelete(row) {

  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {

    return delDept(row.deptId);

    return delDept(row.deptId)

  }).then(() => {

    getList();

    proxy.$modal.msgSuccess("删除成功");

  }).catch(() => {});

    getList()

    proxy.$modal.msgSuccess("删除成功")

  }).catch(() => {})

}



getList();

getList()

</script>