Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/system/Company.vue

@@ -51,41 +51,43 @@
             <el-dialog title="修改公司信息" :visible.sync="upDataVisible" width="50%" :before-close="handleClose">
                 <div>
                     <div>
-                        <el-input placeholder="请输入内容" v-model="updata.CompanyName" style="width: 50%;">
-                            <template slot="prepend">公司名称:</template>
-                        </el-input>
-                        <el-input placeholder="请输入内容" v-model="updata.CompanyCode" style="width: 40%;">
-                            <template slot="prepend">公司Codel:</template>
-                        </el-input>
+                        <el-form :model="updata" :rules="rules" ref="updata" label-width="100px" class="demo-ruleForm">
+                            <el-form-item label="公司名称" prop="CompanyName">
+                                <el-input placeholder="请输入内容" v-model="updata.CompanyName">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="公司Codel" prop="CompanyCode">
+                                <el-input placeholder="请输入内容" v-model="updata.CompanyCode">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="公司地址" prop="Address">
+                                <el-input placeholder="请输入内容" v-model="updata.Address">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="公司负责人" prop="ParentDepId">
+                                <el-select v-model="valueUserValue" placeholder="请选择负责人">
+                                    <el-option v-for="item in optionsUsers" :key="item.value" :label="item.label"
+                                        :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="负责人电话" prop="Tel">
+                                <el-input placeholder="请输入内容" v-model="updata.Tel">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="上级公司" prop="ParentDepId">
+                                <el-select v-model="valueCompanyValue" placeholder="请选择负责人">
+                                    <el-option v-for="item in optionsCompanys" :key="item.value" :label="item.label"
+                                        :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="备注" prop="Remark">
+                                <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="updata.Remark"
+                                    style="width: 80%;"></el-input>
+                            </el-form-item>
+                        </el-form>
                     </div>
-                    <div style="margin-top: 5px;">
-                        <el-input placeholder="请输入内容" v-model="updata.Address" style="width: 91%;">
-                            <template slot="prepend">公司地址:</template>
-                        </el-input>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <el-select v-model="valueUserValue" filterable placeholder="请选择负责人">
-                            <el-option v-for="item in optionsUsers" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                        <el-input placeholder="请输入内容" v-model="updata.Tel" style="width: 40%;">
-                            <template slot="prepend">负责人联系方式:</template>
-                        </el-input>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <el-select v-model="valueCompanyValue" filterable placeholder="请选择上级公司">
-                            <el-option v-for="item in optionsCompanys" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <div>备注:</div>
-                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="updata.Remark"
-                            style="width: 80%;"></el-input>
-                    </div>
-
                 </div>
                 <span slot="footer" class="dialog-footer">
                     <el-button @click="upDataVisible = false">取 消</el-button>
@@ -96,41 +98,43 @@
             <el-dialog title="添加公司" :visible.sync="addDataVisible" width="50%" :before-close="handleClose">
                 <div>
                     <div>
-                        <el-input placeholder="请输入内容" v-model="adddata.CompanyName" style="width: 50%;">
-                            <template slot="prepend">公司名称:</template>
-                        </el-input>
-                        <el-input placeholder="请输入内容" v-model="adddata.CompanyCode" style="width: 40%;">
-                            <template slot="prepend">公司Codel:</template>
-                        </el-input>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <el-input placeholder="请输入内容" v-model="adddata.Address" style="width: 91%;">
-                            <template slot="prepend">公司地址:</template>
-                        </el-input>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <el-select v-model="valueUserValue" filterable placeholder="请选择负责人">
-                            <el-option v-for="item in optionsUsers" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                        <el-input placeholder="请输入内容" v-model="adddata.Tel" style="width: 40%;">
-                            <template slot="prepend">负责人联系方式:</template>
-                        </el-input>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <el-select v-model="valueCompanyValue" filterable placeholder="请选择上级公司">
-                            <el-option v-for="item in optionsCompanys" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </div>
-                    <div style="margin-top: 5px;">
-                        <div>备注:</div>
-                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="adddata.Remark"
-                            style="width: 80%;"></el-input>
+                        <el-form :model="adddata" :rules="rules" ref="adddata" label-width="100px" class="demo-ruleForm">
+                            <el-form-item label="公司名称" prop="CompanyName">
+                                <el-input placeholder="请输入内容" v-model="adddata.CompanyName">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="公司Codel" prop="CompanyCode">
+                                <el-input placeholder="请输入内容" v-model="adddata.CompanyCode">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="公司地址" prop="Address">
+                                <el-input placeholder="请输入内容" v-model="adddata.Address">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="公司负责人" prop="ParentDepId">
+                                <el-select v-model="valueUserValue" placeholder="请选择负责人">
+                                    <el-option v-for="item in optionsUsers" :key="item.value" :label="item.label"
+                                        :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="负责人电话" prop="Tel">
+                                <el-input placeholder="请输入内容" v-model="adddata.Tel">
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="上级公司" prop="ParentDepId">
+                                <el-select v-model="valueCompanyValue" placeholder="请选择负责人">
+                                    <el-option v-for="item in optionsCompanys" :key="item.value" :label="item.label"
+                                        :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="备注" prop="Remark">
+                                <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="adddata.Remark"
+                                    style="width: 80%;"></el-input>
+                            </el-form-item>
+                        </el-form>
                     </div>
-
                 </div>
                 <span slot="footer" class="dialog-footer">
                     <el-button @click="addDataVisible = false">取 消</el-button>
@@ -146,6 +150,18 @@ import { co, el } from '@fullcalendar/core/internal-common';
 import { del } from 'vue';
 export default {
     data() {
+        var isnumber = (rule, value, callback) => {
+            debugger
+            var reg = "^[1]+[2,3,4,5,6,7,8,9]+\d{9}";//小数点左边最高16位，小数点右边最多4位
+            if (reg.test(value)) {
+                callback();
+            } else if (value == "" && value == null && value == undefined) {
+                callback(new Error("请输入加价百分比"));
+            } else {
+                callback(new Error("输入正确的数字,小数点后可1到2位"));
+            }
+
+        };
         return {
 
             tableDatas: [],
@@ -186,7 +202,26 @@ export default {
                 value: 0,
                 label: '请选择上级公司'
             }],
-            valueCompanyValue: 0
+            valueCompanyValue: 0,
+            //验证
+
+            rules: {
+                CompanyName: [
+                    { required: true, message: '请输入公司名称', trigger: 'blur' },
+                ],
+                CompanyCode: [
+                    { required: true, message: '请输入公司Code', trigger: 'blur' },
+                ],
+                Address: [
+                    { required: true, message: '公司地址不能为空', trigger: 'change' }
+                ],
+                ContactUserId: [
+                    { required: true, message: '公司地址不能为空', trigger: 'change' }
+                ],
+                Tel: [
+                    { validator: isnumber, message: '请输入正确的手机号', trigger: 'change' }
+                ],
+            },
         }
     },
     methods: {
@@ -297,6 +332,7 @@ export default {
                             type: 'success'
                         });
                         that.upDataVisible = false
+                        that.company();
                     } else {
                         that.$message.error('保修改失败！');
                     }
@@ -404,17 +440,18 @@ export default {
                         message: '添加成功！',
                         type: 'success'
                     });
+                    debugger
                     that.addDataVisible = false;
-                    this.adddata.CreateUserId = 0
-                    this.adddata.CompanyCode = ""
-                    this.adddata.CompanyName = ""
-                    this.adddata.Address = ""
-                    this.adddata.ContactUserId = 0
-                    this.adddata.Tel = ""
-                    this.adddata.ParentCompanyId = 0
-                    this.adddata.Remark = ""
-                    this.valueUserValue = 0
-                    this.valueCompanyValue = 0
+                    that.adddata.CreateUserId = 0
+                    that.adddata.CompanyCode = ""
+                    that.adddata.CompanyName = ""
+                    that.adddata.Address = ""
+                    that.adddata.ContactUserId = 0
+                    that.adddata.Tel = ""
+                    that.adddata.ParentCompanyId = 0
+                    that.adddata.Remark = ""
+                    that.valueUserValue = 0
+                    that.valueCompanyValue = 0
                     that.company();
                 } else {
                     that.$message.error('添加失败！');

src/components/system/Department.vue

@@ -0,0 +1,476 @@
+<template>
+    <div>
+
+        <div class="communal-list">
+            <div class="communal-title">
+                <div>部门列表</div>
+                <div class="communal-box">
+                    <el-input @input="Inquireclick()" placeholder="请输入内容" v-model="input" clearable>
+                    </el-input>
+                    <el-button @click="Inquireclick()" type="primary"><i class="icon-sousuo"></i></el-button>
+                    <el-button @click="addDepartment()" type="primary">新增</el-button>
+                </div>
+            </div>
+            <template>
+                <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
+                    style="width: 100%">
+                    <el-table-column prop="num" label="序 号" width="55">
+                        <template slot-scope="scope">
+                            {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="depCode" label="部门Code" width="100">
+                    </el-table-column>
+                    <el-table-column prop="depName" label="部门名称" width="200">
+                    </el-table-column>
+                    <el-table-column prop="companyName" label="所属公司" width="220">
+                    </el-table-column>
+                    <el-table-column prop="parentDepName" label="上级部门" width="100">
+                    </el-table-column>
+                    <el-table-column prop="remark" label="备注" width="240">
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                        <template slot-scope="scope">
+                            <el-button size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
+                            <el-button size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+            <div class="block">
+                <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page="currentPage" :page-sizes="[10, 15, 20]" :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next" :total="tableDatas.length">
+                </el-pagination>
+            </div>
+        </div>
+        <el-dialog title="添加部门" :visible.sync="addDepVisible" width="30%" :before-close="handleClose">
+            <div>
+                <el-form :model="addData" :rules="rules" ref="addData" label-width="100px" class="demo-ruleForm">
+                    <el-form-item label="部门code" prop="DepCode">
+                        <el-input placeholder="请输入内容" v-model="addData.DepCode">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="部门名称" prop="DepName">
+                        <el-input placeholder="请输入内容" v-model="addData.DepName">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="所属公司" prop="CompanyId">
+                        <el-select v-model="addData.CompanyId" filterable placeholder="请选择所属公司" @change="handleChange">
+                            <el-option v-for="item in optionsCompanys" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="上级部门" prop="ParentDepId">
+                        <el-select v-model="addData.ParentDepId" placeholder="请选择上级部门">
+                            <el-option v-for="item in optionsDepartment" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="备 注" prop="Remark">
+                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="addData.Remark"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="addDepVisible = false">取 消</el-button>
+                <el-button type="primary" @click="Addbtn">确 定</el-button>
+            </span>
+        </el-dialog>
+        <el-dialog title="修改部门" :visible.sync="upDepVisible" width="30%" :before-close="handleClose">
+            <div>
+                <el-form :model="upData" :rules="rules" ref="addData" label-width="100px" class="demo-ruleForm">
+                    <el-form-item label="部门code" prop="DepCode">
+                        <el-input placeholder="请输入内容" v-model="upData.DepCode">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="部门名称" prop="DepName">
+                        <el-input placeholder="请输入内容" v-model="upData.DepName">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="所属公司" prop="CompanyId">
+                        <el-select v-model="upData.CompanyId" filterable placeholder="请选择所属公司" @change="handleChange">
+                            <el-option v-for="item in optionsCompanys" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="上级部门" prop="ParentDepId">
+                        <el-select v-model="upData.ParentDepId" placeholder="请选择上级部门">
+                            <el-option v-for="item in optionsDepartment" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="备 注" prop="Remark">
+                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="upData.Remark"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="upDepVisible = false">取 消</el-button>
+                <el-button type="primary" @click="upDateBtn">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { co, el } from '@fullcalendar/core/internal-common';
+import { del } from 'vue';
+export default {
+    data() {
+        return {
+
+            tableDatas: [],
+            tableData: [],
+            currentPage: 1, // 当前页码
+            pageSize: 15,// 每页的数据条数
+            input: '',
+            token: '',
+            userId: 0,
+            addDepVisible: false,
+            upDepVisible: false,
+            upData: {
+                Id: 0,
+                CompanyId: 0,
+                DepCode: "",
+                DepName: "",
+                ParentDepId: 0,
+                Remark: ""
+            },
+            //添加参数
+            addData: {
+                CompanyId: 0,
+                DepCode: "",
+                DepName: "",
+                ParentDepId: 0,
+                CreateUserId: this.userId,
+                Remark: ""
+            },
+
+            rules: {
+                DepCode: [
+                    { required: true, message: '请输入部门Code', trigger: 'blur' },
+                ],
+                DepName: [
+                    { required: true, message: '请输入部门名称', trigger: 'blur' },
+                ],
+                CompanyValue: [
+                    { required: true, message: '请选择所属公司', trigger: 'change' }
+                ],
+            },
+            optionsDepartment: [{
+                value: 0,
+                label: '请选择上级部门'
+            }],
+            ParentDepId: 0,
+            optionsCompanys: [{
+                value: 0,
+                label: '请选择所属公司'
+            }],
+            CompanyId: 0
+        }
+    },
+    methods: {
+        //每页条数改变时触发 选择一页显示多少行
+        handleSizeChange(val) {
+            this.currentPage = 1;
+            this.pageSize = val;
+        },
+        //当前页改变时触发 跳转其他页
+        handleCurrentChange(val) {
+            this.currentPage = val;
+
+        },
+        Department() {
+            var url = "http://localhost:5256/api/System/QueryDepartmentList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    CompanyId: 0
+                }
+            }).then(function (res) {
+                debugger
+                console.log(res)
+
+                if (res.data.code == 200) {
+                    debugger
+                    debugger
+                    that.tableDatas = res.data.data;
+                    that.tableData = that.tableDatas
+                    that.tableDatas.forEach(function (item, index) {
+                        that.optionsDepartment.push({
+                            value: item.id,
+                            label: item.depName
+                        });
+                    });
+                }
+            })
+        },
+        //公司下拉框绑定
+        company() {
+            var url = "http://localhost:5256/api/System/getCompanyList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                }
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    debugger
+                    res.data.data.forEach(function (item, index) {
+                        that.optionsCompanys.push({
+                            value: item.id,
+                            label: item.companyName
+                        });
+                    });
+
+                }
+            })
+        },
+        handleChange(event) {
+            debugger
+            var comId = event;
+            const that = this;
+            that.optionsDepartment = [{
+                value: 0,
+                label: '请选择上级部门'
+            }]
+
+            that.tableDatas.forEach(function (item, index) {
+                if (item.companyId == comId && comId != 0) {
+                    that.optionsDepartment.push({
+                        value: item.id,
+                        label: item.depName
+                    });
+                } else if (comId == 0) {
+                    that.optionsDepartment.push({
+                        value: item.id,
+                        label: item.depName
+                    });
+                }
+            });
+
+
+        },
+        Inquireclick() {
+            var newarr = [];
+            if (this.input == "") {
+                newarr = this.tableData;
+            } else {
+                for (var i = 0; i < this.tableData.length; i++) {
+                    if (this.tableData[i].depName.indexOf(this.input) != -1) {
+                        newarr.push(this.tableData[i]);
+                    }
+                    if (this.tableData[i].companyName.indexOf(this.input) != -1) {
+                        newarr.push(this.tableData[i]);
+                    }
+                }
+            }
+            this.tableDatas = newarr;
+        },
+        //#region  修改操作
+        upDate(index, row) {
+            debugger
+            this.upDepVisible = true;
+            this.upData.Id = row.id
+            this.upData.CompanyId = row.companyId
+            this.upData.DepCode = row.depCode
+            this.upData.DepName = row.depName
+            this.upData.ParentDepId = row.parentDepId
+            this.upData.Remark = row.remark
+        },
+        upDateBtn() {
+            debugger
+            var that = this
+            that.upData.CreateUserId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+            if (that.upData.DepName == "" || that.upData.DepName == undefined) {
+                that.$message.error("部门名称不能为空");
+                return
+            }
+            if (that.upData.DepCode == "") {
+                that.$message.error("部门code不能为空");
+                return
+            }
+            if (that.upData.CompanyId == 0) {
+                that.$message.error("请选择所属公司");
+                return
+            }
+            var url = "http://localhost:5256/api/System/EditDepartment"
+
+            that.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: that.upData
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    that.$message({
+                        message: '修改成功',
+                        type: 'success'
+                    });
+                    that.upDepVisible = false;
+                    that.Department();
+                } else {
+                    that.$message.error('修改失败！');
+                }
+            })
+
+        },
+        //关闭修改框
+        handleClose(done) {
+            done();
+        },
+        //#endregion
+        del(index, row) {
+            debugger
+            this.$confirm('此操作将取消订单, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                var url = "http://localhost:5256/api/System/DelDepartment"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data: {
+                        Id: row.id,
+                    }
+                }).then(function (res) {
+                    console.log(res)
+                    debugger
+                    if (res.data.code == 200) {
+                        that.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                        that.Department();
+                    } else {
+                        that.$message.error("删除失败，请稍后重试");
+                    }
+                })
+
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+
+        },
+        //#region 添加
+        addDepartment() {
+            this.addDepVisible = true
+
+        },
+        Addbtn() {
+            debugger
+            var that = this
+            that.addData.CreateUserId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+            if (that.addData.DepName == "" || that.addData.DepName == undefined) {
+                that.$message.error("部门名称不能为空");
+                return
+            }
+            if (that.addData.DepCode == "") {
+                that.$message.error("部门code不能为空");
+                return
+            }
+            if (that.addData.CompanyId == 0) {
+                that.$message.error("请选择所属公司");
+                return
+            }
+            var url = "http://localhost:5256/api/System/AddDepartment"
+
+            that.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: that.addData
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    that.$message({
+                        message: '添加成功！',
+                        type: 'success'
+                    });
+                    that.addDepVisible = false;
+                    that.Department();
+                    that.addData.CompanyId = 0;
+                    that.addData.DepCode = "";
+                    that.addData.DepName = "";
+                    that.addData.ParentDepId = 0;
+                    that.addData.CreateUserId = this.userId;
+                    that.addData.Remark = "";
+                } else {
+                    that.$message.error('添加失败！');
+                }
+            })
+        },
+        //#endregion
+
+    },
+    mounted() {
+        debugger
+        this.token = JSON.parse(localStorage.getItem('userinif')).token;
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        console.log(this.token)
+        this.Department();
+        this.company();
+    }
+}
+</script>
+<style>
+.communal-list {
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+}
+
+.communal-title {
+    display: flex;
+    font-size: 17px;
+    font-weight: 600;
+    color: #555;
+    margin-top: 8px;
+    margin-bottom: 2px;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.communal-box {
+    display: flex;
+}
+
+.communal-box>button {
+    margin-left: 10px;
+    padding: 8px 20px;
+}
+</style>

src/components/system/User.vue

@@ -0,0 +1,444 @@
+<template>
+    <div>
+
+        <div class="communal-list">
+            <div class="communal-title">
+                <div>员工列表</div>
+                <div class="communal-box">
+                    <el-input @input="Inquireclick()" placeholder="公司/部门/岗位/姓名" v-model="input" clearable>
+                    </el-input>
+                    <el-button @click="Inquireclick()" type="primary"><i class="icon-sousuo"></i></el-button>
+                </div>
+            </div>
+            <template>
+                <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
+                    style="width: 100%">
+                    <el-table-column prop="num" label="序 号" width="55">
+                        <template slot-scope="scope">
+                            {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="number" label="工号" width="80">
+                    </el-table-column>
+                    <el-table-column prop="cnName" label="姓名" width="200">
+                    </el-table-column>
+                    <el-table-column prop="companyName" label="公司名称" width="220">
+                    </el-table-column>
+                    <el-table-column prop="depName" label="部门名称" width="100">
+                    </el-table-column>
+                    <el-table-column prop="jobName" label="职位" width="140">
+                    </el-table-column>
+                    <el-table-column prop="ext" label="分机号" width="60">
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号" width="180">
+                    </el-table-column>
+                    <el-table-column label="认识审核" prop="hrAudit" width="200">
+                        <template slot-scope="hrAudit">
+                            <span>{{ hrAudit.row.hrAudit == 1 ? "审核通过（正常使用）" : "未通过/未审核（不可用）" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                        <template slot-scope="scope">
+                            <el-button size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
+                            <el-button size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </template>
+            <div class="block">
+                <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page="currentPage" :page-sizes="[10, 15, 20]" :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next" :total="tableDatas.length">
+                </el-pagination>
+            </div>
+        </div>
+        <el-dialog title="修改员工" :visible.sync="upUserVisible" width="30%" :before-close="handleClose">
+            <div>
+                <el-form :model="upData" :rules="rules" ref="upData" label-width="100px" class="demo-ruleForm">
+                    <el-form-item label="姓名" prop="cnName">
+                        <el-input placeholder="" v-model="upData.cnName" :disabled="true">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="工号" prop="Number">
+                        <el-input placeholder="请输入内容" v-model="upData.Number">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="分机号" prop="Ext">
+                        <el-input placeholder="请输入内容" v-model="upData.Ext">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="公司" prop="CompanyId">
+                        <el-select v-model="upData.CompanyId" filterable placeholder="请选择公司" @change="companyChange">
+                            <el-option v-for="item in companyData" :key="item.id" :label="item.companyName"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="部门" prop="DepId">
+                        <el-select v-model="upData.DepId" filterable placeholder="请选择部门" @change="depChange">
+                            <el-option v-for="item in depData" :key="item.id" :label="item.depName" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="职位" prop="JobPostId">
+                        <el-select v-model="upData.JobPostId" filterable placeholder="请选择职位">
+                            <el-option v-for="item in JobData" :key="item.id" :label="item.jobName" :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="试用期" prop="UsePeriod">
+                        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="upData.UsePeriod"></el-input>
+                    </el-form-item>
+                    <el-form-item label="人事审核" prop="HrAudit">
+                        <el-select v-model="upData.HrAudit" filterable placeholder="请选择状态">
+                            <el-option v-for="item in HrAuditSelect" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="upUserVisible = false">取 消</el-button>
+                <el-button type="primary" @click="upBtn">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { co, el } from '@fullcalendar/core/internal-common';
+import { del } from 'vue';
+export default {
+    data() {
+        return {
+            rules: {
+                DepCode: [
+                    { required: true, message: '请输入部门Code', trigger: 'blur' },
+                ],
+                DepName: [
+                    { required: true, message: '请输入部门名称', trigger: 'blur' },
+                ],
+                CompanyValue: [
+                    { required: true, message: '请选择所属公司', trigger: 'change' }
+                ],
+            },
+            tableDatas: [],
+            tableData: [],
+            companyData: [],
+            depData: [],
+            JobData: [],
+            currentPage: 1, // 当前页码
+            pageSize: 15,// 每页的数据条数
+            input: '',
+            token: '',
+            userId: 0,
+            upUserVisible: false,
+            upData: {
+                Id: 0,
+                Number: '',
+                CompanyId: 0,
+                DepId: 0,
+                JobPostId: 0,
+                Ext: '',
+                UsePeriod: '',
+                HrAudit: 0
+            },
+            HrAuditSelect: [{
+                value: 0,
+                label: '未审核'
+            },
+            {
+                value: 1,
+                label: '已通过'
+            },
+            {
+                value: 2,
+                label: '已拒绝'
+            },]
+        }
+    },
+    methods: {
+        //每页条数改变时触发 选择一页显示多少行
+        handleSizeChange(val) {
+            this.currentPage = 1;
+            this.pageSize = val;
+        },
+        //当前页改变时触发 跳转其他页
+        handleCurrentChange(val) {
+            this.currentPage = val;
+
+        },
+        //部门数据查询
+        Department(companyId) {
+            var url = "http://localhost:5256/api/System/QueryDepartmentList"
+            var that = this
+            that.depData = [];
+            that.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    CompanyId: companyId
+                }
+            }).then(function (res) {
+                debugger
+                console.log(res)
+
+                if (res.data.code == 200) {
+                    that.depData = res.data.data;
+                }
+            })
+        },
+        //公司数据查询
+        company() {
+            var url = "http://localhost:5256/api/System/getCompanyList"
+            var that = this
+            that.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                }
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    that.companyData = res.data.data;
+                }
+            })
+        },
+        companyChange(event) {
+            this.upData.DepId = null;
+            this.upData.JobPostId = null;
+            this.Department(event)
+            this.Job(event, 0)
+        },
+        depChange(event) {
+            this.upData.JobPostId = null;
+            this.Job(this.upData.CompanyId, event)
+
+        },
+        //职位数据查询
+        Job(companyId, depId) {
+            var url = "http://localhost:5256/api/System/QueryJobPost"
+            var that = this
+            that.JobData = [];
+            that.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    CompanyId: companyId,
+                    DepId: depId
+                }
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    that.JobData = res.data.data;
+                }
+            })
+        },
+        user() {
+            var url = "http://localhost:5256/api/System/QueryUserList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                }
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    that.tableDatas = res.data.data;
+                    that.tableData = that.tableDatas
+                }
+            })
+        },
+        Inquireclick() {
+            var newarr = [];
+            if (this.input == "") {
+                newarr = this.tableData;
+            } else {
+                for (var i = 0; i < this.tableData.length; i++) {
+                    if (this.tableData[i].cnName.indexOf(this.input) != -1) {
+                        newarr.push(this.tableData[i]);
+                    }
+                    if (this.tableData[i].companyName.indexOf(this.input) != -1) {
+                        newarr.push(this.tableData[i]);
+                    }
+                    if (this.tableData[i].depName.indexOf(this.input) != -1) {
+                        newarr.push(this.tableData[i]);
+                    }
+                    if (this.tableData[i].jobName.indexOf(this.input) != -1) {
+                        newarr.push(this.tableData[i]);
+                    }
+                }
+            }
+            this.tableDatas = newarr;
+        },
+        //#region  修改操作
+        upDate(index, row) {
+
+            this.upUserVisible = true;
+            this.upData.cnName = row.cnName;
+            this.upData.Id = row.id;
+            this.upData.Number = row.number;
+            this.upData.CompanyId = row.companyId;
+            this.upData.DepId = row.depId;
+            this.upData.JobPostId = row.jobPostId;
+            this.upData.Ext = row.ext;
+            this.upData.UsePeriod = row.usePeriod;
+            this.upData.HrAudit = row.hrAudit;
+            this.Job(row.companyId, row.depId)
+        },
+        upBtn() {
+            debugger
+            var that = this
+            if (that.upData.DepId == "" || that.upData.DepId == undefined) {
+                that.$message.error("部门不能为空");
+                return
+            }
+            if (that.upData.CompanyId == "") {
+                that.$message.error("公司不能为空");
+                return
+            }
+            if (that.upData.JobPostId == "") {
+                that.$message.error("岗位不能为空");
+                return
+            }
+            if (that.upData.Number == "") {
+                that.$message.error("工号不能为空");
+                return
+            }
+            console.log(that.upData.Ext)
+            if (that.upData.Ext == null || that.upData.Ext == undefined) that.upData.Ext = ""
+            if (that.upData.UsePeriod == null || that.upData.UsePeriod == undefined) that.upData.UsePeriod = ""
+            var url = "http://localhost:5256/api/System/EditUser"
+
+            that.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: that.upData
+            }).then(function (res) {
+                console.log(res)
+                debugger
+                if (res.data.code == 200) {
+                    that.$message({
+                        message: '修改成功',
+                        type: 'success'
+                    });
+                    that.upUserVisible = false;
+                    that.user();
+                } else {
+                    that.$message.error('修改失败！');
+                }
+            })
+        },
+        //关闭修改框
+        handleClose(done) {
+            done();
+        },
+        //#endregion
+        del(index, row) {
+            debugger
+            this.$confirm('此操作将取消订单, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                var url = "http://localhost:5256/api/System/DelDepartment"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data: {
+                        Id: row.id,
+                    }
+                }).then(function (res) {
+                    console.log(res)
+                    debugger
+                    if (res.data.code == 200) {
+                        that.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                        that.Department();
+                    } else {
+                        that.$message.error("删除失败，请稍后重试");
+                    }
+                })
+
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '操作已取消！'
+                });
+            });
+
+        },
+        //#region 添加
+
+        //#endregion
+
+    },
+    mounted() {
+        debugger
+        this.token = JSON.parse(localStorage.getItem('userinif')).token;
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        console.log(this.token)
+        this.Department(0);
+        this.company();
+        //this.Job();
+        this.user();
+    }
+}
+</script>
+<style>
+.communal-list {
+    background-color: #fff;
+    padding: 10px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+}
+
+.communal-title {
+    display: flex;
+    font-size: 17px;
+    font-weight: 600;
+    color: #555;
+    margin-top: 8px;
+    margin-bottom: 2px;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.communal-box {
+    display: flex;
+}
+
+.communal-box>button {
+    margin-left: 10px;
+    padding: 8px 20px;
+}
+</style>

src/router/index.js

@@ -13,12 +13,14 @@ import Globalindex from '@/components/child/Globalindex'
 import Generalindex from '@/components/child/Generalindex'
 import AuthorityJob from '@/components/child/AuthorityJob'
 import Controltree from '@/components/child/Controltree'
+import Company from '@/components/system/Company'
 import AuthorityUser from '@/components/child/AuthorityUser'
 import Carguide from '@/components/OP/Carguide'
 import Groupedit from '@/components/OP/Groupedit'
 import OPgroup from '@/components/OP/OPgroup'
 import Tourguide from '@/components/OP/Tourguide'
-
+import Department from '@/components/system/Department'
+import User from '@/components/system/User'
 Vue.use(Router)
 
 export default new Router({
@@ -89,20 +91,32 @@ export default new Router({
           component: Controltree
         },
         {
-          path: '/home/Tourguide',
-          name: 'Tourguide',
-          component: Tourguide
+          path: '/home/Company',
+          name: 'Company',
+          component: Company
+        }, {
+          path: '/home/Department',
+          name: 'Department',
+          component: Department
         },
         {
+          path: '/home/Groupedit',
+          name: 'Groupedit',
+          component: Groupedit
+        }, {
           path: '/home/OPgroup',
           name: 'OPgroup',
           component: OPgroup
+        }, {
+          path: '/home/Tourguide',
+          name: 'Tourguide',
+          component: Tourguide
+        }, {
+          path: '/home/User',
+          name: 'User',
+          component: User
         },
-        {
-          path: '/home/Groupedit',
-          name: 'Groupedit',
-          component: Groupedit
-        }
+
       ]
     },
     {