新增公司功能提交

src/api/system/dept.js

@@ -5,7 +5,7 @@ export function listDept(query) {
     return request({
         url: '/system/dept/list',
         method: 'get',
-    params: query
+        params: query,
     })
 }
 
@@ -13,7 +13,7 @@ export function listDept(query) {
 export function listDeptExcludeChild(deptId) {
     return request({
         url: '/system/dept/list/exclude/' + deptId,
-    method: 'get'
+        method: 'get',
     })
 }
 
@@ -21,7 +21,7 @@ export function listDeptExcludeChild(deptId) {
 export function getDept(deptId) {
     return request({
         url: '/system/dept/' + deptId,
-    method: 'get'
+        method: 'get',
     })
 }
 
@@ -30,7 +30,7 @@ export function addDept(data) {
     return request({
         url: '/system/dept',
         method: 'post',
-    data: data
+        data: data,
     })
 }
 
@@ -39,7 +39,7 @@ export function updateDept(data) {
     return request({
         url: '/system/dept',
         method: 'put',
-    data: data
+        data: data,
     })
 }
 
@@ -47,7 +47,7 @@ export function updateDept(data) {
 export function delDept(deptId) {
     return request({
         url: '/system/dept/' + deptId,
-    method: 'delete'
+        method: 'delete',
     })
 }
 
@@ -56,11 +56,11 @@ export function apiGetPartTree() {
     return request({
         url: '/material/select/getPartTree',
         method: 'post',
-    data:{}
+        data: {},
     })
 }
 
-
+// 新增公司
-
+export const addCompanyApi = (data) => {
-
+    return request.post('/system/dept/addCompany', data)
-
+}

src/views/nw-login.vue

@@ -51,7 +51,7 @@
                             <el-form-item
                                 prop="textCode"
                                 class="code-container"
-                                v-if="loginForm.username === 'adm'"
+                                v-if="loginForm.username === 'adminBns'"
                             >
                                 <el-input
                                     v-model="loginForm.textCode"

src/views/system/dept/index.vue

@@ -1,6 +1,12 @@
 <template>
     <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+        >
             <el-form-item label="部门名称" prop="deptName">
                 <el-input
                     v-model="queryParams.deptName"
@@ -10,7 +16,12 @@
                 />
             </el-form-item>
             <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" filterable placeholder="部门状态" clearable>
+                <el-select
+                    v-model="queryParams.status"
+                    filterable
+                    placeholder="部门状态"
+                    clearable
+                >
                     <el-option
                         v-for="dict in dict.type.sys_normal_disable"
                         :key="dict.value"
@@ -20,12 +31,35 @@
                 </el-select>
             </el-form-item>
             <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
             </el-form-item>
         </el-form>
 
         <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <!-- 超级管理员所属 -->
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAddCompany"
+                    v-if="userId == 1"
+                    >新增公司</el-button
+                >
+            </el-col>
             <el-col :span="1.5">
                 <el-button
                     type="primary"
@@ -34,7 +68,8 @@
                     size="mini"
                     @click="handleAdd"
                     v-hasPermi="['system:dept:add']"
-        >新增</el-button>
+                    >新增部门</el-button
+                >
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -43,9 +78,13 @@
                     icon="el-icon-sort"
                     size="mini"
                     @click="toggleExpandAll"
-        >展开/折叠</el-button>
+                    >展开/折叠</el-button
+                >
             </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
         </el-row>
 
         <el-table
@@ -56,19 +95,39 @@
             :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+            <el-table-column
-      <el-table-column prop="orderNum" label="排序" width="200"></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 slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+                    <dict-tag
+                        :options="dict.type.sys_normal_disable"
+                        :value="scope.row.status"
+                    />
                 </template>
             </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+            <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                width="200"
+            >
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
             </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
@@ -76,14 +135,16 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
+                        >修改</el-button
+                    >
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-plus"
                         @click="handleAdd(scope.row)"
                         v-hasPermi="['system:dept:add']"
-          >新增</el-button>
+                        >新增</el-button
+                    >
                     <el-button
                         v-if="scope.row.parentId != 0"
                         size="mini"
@@ -91,49 +152,84 @@
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
+                        >删除</el-button
+                    >
                 </template>
             </el-table-column>
         </el-table>
 
         <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="600px"
+            append-to-body
+        >
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-row>
                     <el-col :span="24" v-if="form.parentId !== 0">
                         <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" placeholder="选择上级部门" />
+                            <treeselect
+                                v-model="form.parentId"
+                                :options="deptOptions"
+                                :normalizer="normalizer"
+                                noChildrenText="没有数据了"
+                                noOptionsText="没有数据"
+                                noResultsText="没有搜索结果"
+                                placeholder="选择上级部门"
+                                @select="treeChange"
+                            />
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+                            <el-input
+                                v-model="form.deptName"
+                                placeholder="请输入部门名称"
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+                            <el-input-number
+                                v-model="form.orderNum"
+                                controls-position="right"
+                                :min="0"
+                            />
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+                            <el-input
+                                v-model="form.leader"
+                                placeholder="请输入负责人"
+                                maxlength="20"
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" onkeyup="this.value = this.value.replace(/[^\d]/g,'');"/>
+                            <el-input
+                                v-model="form.phone"
+                                placeholder="请输入联系电话"
+                                maxlength="11"
+                                onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
+                            />
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+                            <el-input
+                                v-model="form.email"
+                                placeholder="请输入邮箱"
+                                maxlength="50"
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -143,7 +239,8 @@
                                     v-for="dict in dict.type.sys_normal_disable"
                                     :key="dict.value"
                                     :label="dict.value"
-                >{{dict.label}}</el-radio>
+                                    >{{ dict.label }}</el-radio
+                                >
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
@@ -154,16 +251,100 @@
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
+
+        <!-- 新增公司 -->
+        <el-dialog
+            title="添加公司"
+            :visible.sync="addCompanyVisible"
+            width="70%"
+            append-to-body
+            :before-close="closeAddCompanyDialog"
+        >
+            <el-table border :data="companyList">
+                <el-table-column
+                    type="index"
+                    label="序号"
+                    width="80"
+                    align="center"
+                />
+                <el-table-column label="公司名称" align="center">
+                    <template slot-scope="scope">
+                        <el-input
+                            placeholder="请输入公司名称"
+                            clearable
+                            v-model.trim="scope.row.deptName"
+                            :ref="`deptName_${scope.$index}`"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column label="统一社会信用代码" align="center">
+                    <template slot-scope="scope">
+                        <el-input
+                            placeholder="请输入统一社会信用代码"
+                            clearable
+                            v-model.trim="scope.row.socialCreditCode"
+                            :ref="`socialCreditCode_${scope.$index}`"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column label="企业代号" align="center">
+                    <template slot-scope="scope">
+                        <el-input
+                            placeholder="请输入企业代号"
+                            clearable
+                            v-model.trim="scope.row.enterpriseOwnershipCode"
+                            :ref="`enterpriseOwnershipCode_${scope.$index}`"
+                        />
+                    </template>
+                </el-table-column>
+
+                <el-table-column label="操作" align="center" width="180">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            @click="addRows"
+                            icon="el-icon-plus"
+                            v-if="scope.$index === 0"
+                            >新增</el-button
+                        >
+                        <el-button
+                            type="text"
+                            @click="delRows(scope.$index)"
+                            icon="el-icon-delete"
+                            style="color: #f56c6c"
+                            v-if="scope.$index !== 0"
+                            >删除</el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div slot="footer" class="dialog-footer">
+                <el-button size="mini" type="primary" @click="submitCompany"
+                    >确 定</el-button
+                >
+                <el-button size="mini" @click="closeAddCompanyDialog"
+                    >取 消</el-button
+                >
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import {
-import Treeselect from "@riophae/vue-treeselect";
+    listDept,
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+    getDept,
+    delDept,
+    addDept,
+    updateDept,
+    listDeptExcludeChild,
+    addCompanyApi,
+} from '@/api/system/dept'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "Dept",
+    name: 'Dept',
     dicts: ['sys_normal_disable'],
     components: { Treeselect },
     data() {
@@ -177,7 +358,7 @@ export default {
             // 部门树选项
             deptOptions: [],
             // 弹出层标题
-      title: "",
+            title: '',
             // 是否显示弹出层
             open: false,
             // 是否展开，默认全部展开
@@ -187,65 +368,89 @@ export default {
             // 查询参数
             queryParams: {
                 deptName: undefined,
-        status: undefined
+                status: undefined,
             },
             // 表单参数
             form: {},
             // 表单校验
             rules: {
                 parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
+                    {
+                        required: true,
+                        message: '上级部门不能为空',
+                        trigger: 'blur',
+                    },
                 ],
                 deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+                    {
+                        required: true,
+                        message: '部门名称不能为空',
+                        trigger: 'blur',
+                    },
                 ],
                 orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
+                    {
+                        required: true,
+                        message: '显示排序不能为空',
+                        trigger: 'blur',
+                    },
                 ],
                 email: [
                     {
-            type: "email",
+                        type: 'email',
-            message: "请输入正确的邮箱地址",
+                        message: '请输入正确的邮箱地址',
-            trigger: ["blur", "change"]
+                        trigger: ['blur', 'change'],
-          }
+                    },
                 ],
                 phone: [
                     {
                         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
+                        message: '请输入正确的手机号码',
-            trigger: "blur"
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            // 新增公司弹框
+            addCompanyVisible: false,
+            // 新增公司数据源
+            companyList: [
+                {
+                    deptName: '',
+                    socialCreditCode: '',
+                    enterpriseOwnershipCode: '',
+                },
+            ],
+            userId: sessionStorage.getItem('userId'),
         }
-        ]
-      }
-    };
     },
     created() {
-    this.getList();
+        this.getList()
     },
     methods: {
         /** 查询部门列表 */
         getList() {
-      this.loading = true;
+            this.loading = true
-      listDept(this.queryParams).then(response => {
+            listDept(this.queryParams).then((response) => {
-        this.deptList = this.handleTree(response.data, "deptId");
+                this.deptList = this.handleTree(response.data, 'deptId')
-        this.loading = false;
+                this.loading = false
-      });
+                // console.log(this.deptList, '树节点数据---')
+            })
         },
         /** 转换部门数据结构 */
         normalizer(node) {
             if (node.children && !node.children.length) {
-        delete node.children;
+                delete node.children
             }
             return {
                 id: node.deptId,
                 label: node.deptName,
-        children: node.children
+                children: node.children,
-      };
+            }
         },
         // 取消按钮
         cancel() {
-      this.open = false;
+            this.open = false
-      this.reset();
+            this.reset()
         },
         // 表单重置
         reset() {
@@ -257,80 +462,175 @@ export default {
                 leader: undefined,
                 phone: undefined,
                 email: undefined,
-        status: "0"
+                status: '0',
-      };
+            }
-      this.resetForm("form");
+            this.resetForm('form')
         },
         /** 搜索按钮操作 */
         handleQuery() {
-      this.getList();
+            this.getList()
         },
         /** 重置按钮操作 */
         resetQuery() {
-      this.resetForm("queryForm");
+            this.resetForm('queryForm')
-      this.handleQuery();
+            this.handleQuery()
         },
         /** 新增按钮操作 */
         handleAdd(row) {
-      this.reset();
+            this.reset()
             if (row != undefined) {
-        this.form.parentId = row.deptId;
+                this.form.parentId = row.deptId
+                this.form.companyId = row.companyId
             }
-      this.open = true;
+            this.open = true
-      this.title = "添加部门";
+            this.title = '添加部门'
-      listDept().then(response => {
+            listDept().then((response) => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
+                this.deptOptions = this.handleTree(response.data, 'deptId')
-      });
+            })
         },
         /** 展开/折叠操作 */
         toggleExpandAll() {
-      this.refreshTable = false;
+            this.refreshTable = false
-      this.isExpandAll = !this.isExpandAll;
+            this.isExpandAll = !this.isExpandAll
             this.$nextTick(() => {
-        this.refreshTable = true;
+                this.refreshTable = true
-      });
+            })
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
-      this.reset();
+            this.reset()
-      getDept(row.deptId).then(response => {
+            getDept(row.deptId).then((response) => {
-        this.form = response.data;
+                this.form = response.data
-        this.open = true;
+                this.open = true
-        this.title = "修改部门";
+                this.title = '修改部门'
-      });
+            })
-      listDeptExcludeChild(row.deptId).then(response => {
+            listDeptExcludeChild(row.deptId).then((response) => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
+                this.deptOptions = this.handleTree(response.data, 'deptId')
-      });
+            })
         },
         /** 提交按钮 */
         submitForm: function () {
-      this.$refs["form"].validate(valid => {
+            this.$refs['form'].validate((valid) => {
                 if (valid) {
                     if (this.form.deptId != undefined) {
-            updateDept(this.form).then(response => {
+                        updateDept(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
+                            this.$modal.msgSuccess('修改成功')
-              this.open = false;
+                            this.open = false
-              this.getList();
+                            this.getList()
-            });
+                        })
                     } else {
-            addDept(this.form).then(response => {
+                        addDept(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
+                            this.$modal.msgSuccess('新增成功')
-              this.open = false;
+                            this.open = false
-              this.getList();
+                            this.getList()
-            });
+                        })
                     }
                 }
-      });
+            })
         },
         /** 删除按钮操作 */
         handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
+            this.$modal
-        return delDept(row.deptId);
+                .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
-      }).then(() => {
+                .then(function () {
-        this.getList();
+                    return delDept(row.deptId)
-        this.$modal.msgSuccess("删除成功");
+                })
-      }).catch(() => {});
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        /** 树节点选择事件 */
+        treeChange(val) {
+            this.form.companyId = val.companyId
+        },
+        /** 新增公司 */
+        handleAddCompany() {
+            console.log('新增公司！！')
+            this.addCompanyVisible = true
+        },
+        /** 新增行 */
+        addRows() {
+            const rows = {
+                deptName: '',
+                socialCreditCode: '',
+                enterpriseOwnershipCode: '',
             }
+            this.companyList.push(rows)
+        },
+        /** 删除行 */
+        delRows(index) {
+            this.companyLis = this.companyList.splice(index, 1)
+        },
+        /** 确定 */
+        async submitCompany() {
+            // 判断公司名称是否为空
+            let isNull = false
+            try {
+                this.companyList.map((e, v) => {
+                    if (!e.deptName) {
+                        this.$message.error('请输入公司名称！')
+                        this.$refs[`deptName_${v}`][0].focus()
+                        isNull = true
+                        throw new Error()
+                    }
+                    if (!e.socialCreditCode) {
+                        this.$message.error('请输入统一社会信用代码！')
+                        this.$refs[`socialCreditCode_${v}`][0].focus()
+                        isNull = true
+                        throw new Error()
+                    }
+                    if (!e.enterpriseOwnershipCode) {
+                        this.$message.error('请输入企业代号！')
+                        this.$refs[`enterpriseOwnershipCode_${v}`][0].focus()
+                        isNull = true
+                        throw new Error()
+                    }
+                })
+            } catch (error) {}
+            if (isNull) return
+            // 判断已有的公司名称是否重复
+            const seen = {}
+            const uniqueCompanyList = this.companyList.reduce((acc, item) => {
+                const name = item.deptName
+                if (!seen[name]) {
+                    seen[name] = true
+                    acc.push(item)
+                }
+                return acc
+            }, [])
+
+            if (uniqueCompanyList.length < this.companyList.length) {
+                this.$message.error('公司名称不可重复添加！')
+                return
+            }
+            let list = [...this.companyList]
+            const res = await addCompanyApi(list)
+            if (res.code == 200) {
+                this.$message.success('新增成功！')
+                this.getList()
+                this.companyList = [
+                    {
+                        deptName: '',
+                        socialCreditCode: '',
+                        enterpriseOwnershipCode: '',
+                    },
+                ]
+                this.addCompanyVisible = false
+            }
+        },
+        /** 关闭新增公司弹框 */
+        closeAddCompanyDialog() {
+            this.addCompanyVisible = false
+            this.companyList = [
+                {
+                    deptName: '',
+                    socialCreditCode: '',
+                    enterpriseOwnershipCode: '',
+                },
+            ]
+        },
+    },
 }
-};
 </script>