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

spring

9 天以前 ff143d04206551a89b31a9fadfdb2de2f3ddc4e9

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

 src/views/system/dept/index.vue

@@ -1,17 +1,17 @@
<template>

   <div class="app-container">

      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">

         <el-form-item label="部门名称" prop="deptName">

         <el-form-item label="公司名称" prop="deptName">

            <el-input

               v-model="queryParams.deptName"

               placeholder="请输入部门名称"

               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 style="width: 200px">

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

               <el-option

                  v-for="dict in sys_normal_disable"

                  :key="dict.value"

@@ -55,7 +55,7 @@
         :default-expand-all="isExpandAll"

         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"

      >

         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>

         <el-table-column prop="deptName" label="公司名称" width="260"></el-table-column>

         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>

         <el-table-column prop="status" label="状态" width="100">

            <template #default="scope">

@@ -76,25 +76,25 @@
         </el-table-column>

      </el-table>



      <!-- 添加或修改部门对话框 -->

      <!-- 添加或修改公司对话框 -->

      <el-dialog :title="title" v-model="open" width="600px" append-to-body>

         <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">

            <el-row>

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

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

                  <el-form-item label="上级公司" prop="parentId">

                     <el-tree-select

                        v-model="form.parentId"

                        :data="deptOptions"

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

                        value-key="deptId"

                        placeholder="选择上级部门"

                        placeholder="选择上级公司"

                        check-strictly

                     />

                  </el-form-item>

               </el-col>

               <el-col :span="12">

                  <el-form-item label="部门名称" prop="deptName">

                     <el-input v-model="form.deptName" placeholder="请输入部门名称" />

                  <el-form-item label="公司名称" prop="deptName">

                     <el-input v-model="form.deptName" placeholder="请输入公司名称" />

                  </el-form-item>

               </el-col>

               <el-col :span="12">

@@ -118,7 +118,7 @@
                  </el-form-item>

               </el-col>

               <el-col :span="12">

                  <el-form-item label="部门状态">

                  <el-form-item label="公司状态">

                     <el-radio-group v-model="form.status">

                        <el-radio

                           v-for="dict in sys_normal_disable"

@@ -129,8 +129,8 @@
                  </el-form-item>

               </el-col>

              <el-col :span="12">

                <el-form-item label="部门编号" prop="deptNick">

                  <el-input v-model="form.deptNick" placeholder="请输入部门编号" maxlength="50" />

                <el-form-item label="公司编号" prop="deptNick">

                  <el-input v-model="form.deptNick" placeholder="请输入公司编号" maxlength="50" />

                </el-form-item>

              </el-col>

            </el-row>

@@ -167,18 +167,18 @@
    status: undefined

  },

  rules: {

    parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],

    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],

    parentId: [{ required: true, message: "上级公司不能为空", trigger: "blur" }],

    deptName: [{ required: true, message: "公司名称不能为空", trigger: "blur" }],

    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],

    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],

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

    deptNick: [{ required: true, message: "部门编号不能为空", trigger: "blur" }],

    deptNick: [{ required: true, message: "公司编号不能为空", trigger: "blur" }],

  },

})



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



/** 查询部门列表 */

/** 查询公司列表 */

function getList() {

  loading.value = true

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

@@ -230,7 +230,7 @@
    form.value.parentId = row.deptId

  }

  open.value = true

  title.value = "添加部门"

  title.value = "添加公司"

}



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

@@ -251,7 +251,7 @@
  getDept(row.deptId).then(response => {

    form.value = response.data

    open.value = true

    title.value = "修改部门"

    title.value = "修改公司"

  })

}