Merge remote-tracking branch 'origin/master'

src/api/company/company.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询company列表
+export function listCompany(queryParams) {
+  console.log("data是什么",queryParams)
+  return request({
+    url: '/company/company/list',
+    method: 'get',
+    params: queryParams
+  })
+}
+
+// 查询company详细
+export function getCompany(id) {
+  return request({
+    url: '/company/company/' + id,
+    method: 'get'
+  })
+}
+
+// 新增company
+export function addCompany(data) {
+  return request({
+    url: '/company/company',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改company
+export function updateCompany(data) {
+  return request({
+    url: '/company/company',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除company
+export function delCompany(id) {
+  return request({
+    url: '/company/company/' + id,
+    method: 'delete'
+  })
+}

src/utils/request.js

@@ -73,7 +73,6 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  debugger
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息

src/views/company/index.vue

@@ -0,0 +1,357 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['company:company:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['company:company:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['company:company:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="companyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="企业名称" align="center" prop="companyName" />
+      <el-table-column label="法定代表人" align="center" prop="legalRepresentative" />
+      <el-table-column label="企业成立时间" align="center" prop="companyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.companyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="业务范围" align="center" prop="sphereOfBusiness" />
+      <el-table-column label="注册地址" align="center" prop="registeredAddress" />
+      <el-table-column label="企业联系电话" align="center" prop="companyPhone" />
+      <el-table-column label="公司邮箱" align="center" prop="companyMailbox" />
+      <el-table-column label="公司营业执照" align="center" prop="businessLicense" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.businessLicense" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="税务登记证" align="center" prop="taxRegistrationCertificate" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.taxRegistrationCertificate" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="企业状态" align="center" prop="companyStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.companyStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="企业入驻时间" align="center" prop="enterTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enterTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否认证" align="center" prop="isAuthentication">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isAuthentication"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="认证时间" align="center" prop="authenticationTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.authenticationTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="服务等级" align="center" prop="serviceLevel" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['company:company:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['company:company:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改company对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="企业名称" prop="companyName">
+          <el-input v-model="form.companyName" placeholder="请输入企业名称" />
+        </el-form-item>
+        <el-form-item label="法定代表人" prop="legalRepresentative">
+          <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
+        </el-form-item>
+        <el-form-item label="企业成立时间" prop="companyTime">
+          <el-date-picker clearable
+            v-model="form.companyTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择企业成立时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="业务范围" prop="sphereOfBusiness">
+          <el-input v-model="form.sphereOfBusiness" placeholder="请输入业务范围" />
+        </el-form-item>
+        <el-form-item label="注册地址" prop="registeredAddress">
+          <el-input v-model="form.registeredAddress" placeholder="请输入注册地址" />
+        </el-form-item>
+        <el-form-item label="企业联系电话" prop="companyPhone">
+          <el-input v-model="form.companyPhone" placeholder="请输入企业联系电话" />
+        </el-form-item>
+        <el-form-item label="公司邮箱" prop="companyMailbox">
+          <el-input v-model="form.companyMailbox" placeholder="请输入公司邮箱" />
+        </el-form-item>
+        <el-form-item label="公司营业执照" prop="businessLicense">
+          <image-upload v-model="form.businessLicense"/>
+        </el-form-item>
+        <el-form-item label="税务登记证" prop="taxRegistrationCertificate">
+          <image-upload v-model="form.taxRegistrationCertificate"/>
+        </el-form-item>
+        <el-form-item label="企业状态" prop="companyStatus">
+          <el-radio-group v-model="form.companyStatus">
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="企业入驻时间" prop="enterTime">
+          <el-date-picker clearable
+            v-model="form.enterTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择企业入驻时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否认证" prop="isAuthentication">
+          <el-radio-group v-model="form.isAuthentication">
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="认证时间" prop="authenticationTime">
+          <el-date-picker clearable
+            v-model="form.authenticationTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择认证时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCompany, getCompany, delCompany, addCompany, updateCompany } from "@/api/company/company";
+import {getInfo} from "@/api/login";
+
+export default {
+  name: "Company",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // company表格数据
+      companyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptName:"",
+        roleKey:""
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+
+    /** 查询company列表 */
+    getList(){
+      getInfo().then(res=>{
+        console.log(res)
+        this.queryParams.deptName=res.data.user.dept.deptName
+        res.data.user.roles.forEach(role=>{
+          if (role.roleKey) {
+            this.queryParams.roleKey = role.roleKey; // 如果存在roleKey则赋值给queryParams
+          }
+        })
+        this.loading = true;
+        console.log("this.queryParams是什么===",this.queryParams)
+        listCompany(this.queryParams).then(response => {
+          this.companyList = response.data.rows;
+          this.total =response.data.total;
+          this.loading = false;
+        });
+      })
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        companyName: null,
+        legalRepresentative: null,
+        companyTime: null,
+        sphereOfBusiness: null,
+        registeredAddress: null,
+        companyPhone: null,
+        companyMailbox: null,
+        businessLicense: null,
+        taxRegistrationCertificate: null,
+        companyStatus: null,
+        enterTime: null,
+        isAuthentication: null,
+        authenticationTime: null,
+        serviceLevel: null,
+        remark: null,
+        foundName: null,
+        foundTime: null,
+        updateName: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加company";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getCompany(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改company";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCompany(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCompany(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除company编号为"' + ids + '"的数据项？').then(function() {
+        return delCompany(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('company/company/export', {
+        ...this.queryParams
+      }, `company_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/dept/index.vue

@@ -200,9 +200,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        parentId: [
-          {required: true, message: "上级部门不能为空", trigger: "blur"}
-        ],
         deptName: [
           {required: true, message: "部门名称不能为空", trigger: "blur"}
         ],