Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

Administrator

2021-10-13 9451b4e919cbe946e4fbe5233805af4619763489

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

 public/img/bg/img-logo.png

 src/api/securityCompany/securityCompany.js

@@ -38,6 +38,19 @@
//     })
// }

export const getdatas = (current, size, params) => {
    return request({
        url: '/api/dispatcherUnit/page',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}


export const getListeservice = (current, size, params, deptId) => {
    return request({
        url: '/api/dispatcher/page',

 src/styles/element-ui.scss

@@ -620,3 +620,7 @@
.company-box .avue-form__menu--center {
  width: 300px;
}

.el-date-picker__header-label {
  color: #fff !important;
}

 src/views/qualificationExamination/qualificationExamination.vue

@@ -1,8 +1,8 @@
/*
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-10 16:06:14
 * @Last Modified by: liu
 * @Last Modified time: 2021-10-11 14:54:11
 * menu-name 监管信息
 */
<template>
@@ -93,23 +93,44 @@
            minWidth: 110,
            overHidden: true,
          },

          {
            label: "性别",
            prop: "sexName",
            width: 56,
            // type: "select",
            // labelWidth: 120,
            // // display: false,
            // dicData: dic,
            // // props: {
            // //   label: "label",
            // //   value: "value",
            // // },
            // searchSpan: 5,
            // search: true,
            // width: 120,
            prop: "sex",
            width: 55,
            slot: true,
            type: "select",
            dicData: [
              {
                label: "男",
                value: 1,
              },
              {
                label: "女",
                value: 2,
              },
              {
                label: "未知",
                value: 3,
              },
            ],
            display: false,
          },
          // {
          //   label: "性别",
          //   prop: "sexName",
          //   width: 56,
          //   // type: "select",
          //   // labelWidth: 120,
          //   // // display: false,
          //   // dicData: dic,
          //   // // props: {
          //   // //   label: "label",
          //   // //   value: "value",
          //   // // },
          //   // searchSpan: 5,
          //   // search: true,
          //   // width: 120,
          // },
          {
            label: "身份证号",
            prop: "cardid",

 src/views/securityCompany/companyDetails.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-25 11:25:05
 * @Last Modified time: 2021-09-28 16:49:13
 * menu-name 保安公司详细资料
 */
<template>
@@ -248,7 +248,11 @@
              <punish :forms="forms" v-if="seestaff"></punish>
            </el-tab-pane>
            <el-tab-pane label="服务对象" name="eighth">
              <service :form="forms" v-if="seestaff"></service>
              <service
                :form="forms"
                v-if="seestaff"
                :refresh="seestaff3"
              ></service>
            </el-tab-pane>
            <!-- <el-tab-pane label="其他附件" name="eighth">
              <enclosure :form="form"></enclosure>
@@ -398,7 +402,7 @@
            label: "身份证",
            prop: "cardid",
            labelWidth: w,
            span: s,
            // span: s,
            search: true,
          },
          {
@@ -494,6 +498,7 @@

      seestaff: false,
      seestaff2: false,
      seestaff3: true,
    };
  },
  created() {
@@ -587,6 +592,8 @@
        this.manageSearchReset();
      } else if (tab.index == 5) {
        this.seestaff2 = !this.seestaff2;
      } else if (tab.index == 7) {
        this.seestaff3 = !this.seestaff3;
      } else {
        this.getFromData({
          currentPage: 1,

 src/views/securityCompany/computents/service.vue

@@ -20,16 +20,17 @@
</template>

<script>
import { getListeservice } from "@/api/securityCompany/securityCompany";
import { getdatas } from "@/api/securityCompany/securityCompany";
import { mapGetters } from "vuex";
export default {
  props: ["form"],
  props: ["form", "refresh"],
  data() {
    return {
      serviceOption: {
        // 操作栏多余按钮去除
        delBtn: false,
        editBtn: false,
        searchShowBtn: false,
        // searchShowBtn: false,
        addBtn: false,
        selection: true,
        menu: false,
@@ -38,7 +39,7 @@
        height: "auto",
        calcHeight: 270,
        tip: false,
        searchShow: false,
        // searchShow: false,
        searchMenuSpan: 4,
        index: false,
        viewBtn: true,
@@ -46,108 +47,236 @@
        dialogClickModal: false,
        // 操作栏宽度
        menuWidth: 156,
        height: 600,
        height: 510,
        column: [
          //派遣服务公司登记
          {
            label: "姓名",
            label: "派遣单位名称",
            prop: "name",
            // search: true,
            searchSpan: 3,
            rules: [
              {
                required: true,
                message: "请输入姓名",
                trigger: "blur",
              },
            ],
          },
          {
            label: "派遣单位",
            prop: "dispatcherCompany",
            search: true,
          },
          {
            label: "派遣时间",
            prop: "dispatchertime",
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            searchSpan: 4,
            // search: true,
            searchLabelWidth: 110,
            overHidden: true,
            searchSpan: 5,
            width: 210,
            // span: 12,
            labelWidth: 138,
            rules: [
              {
                required: true,
                message: "请输入时间",
                message: "请输入名称",
                trigger: "click",
              },
            ],
            // width: 70,
            // rules: [
            //   {
            //     required: true,
            //     message: "请输入型号",
            //     trigger: "blur",
            //   },
            // ],
            // search: true,
          },
          {
            label: "结束时间",
            label: "保安公司",
            prop: "deptId",
            type: "tree",
            overHidden: true,
            dicUrl: "",
            props: {
              label: "title",
              value: "id",
            },
            // hide: true,
            // hide: !website.tenantMode,
            // addDisplay: website.tenantMode,
            // editDisplay: website.tenantMode,
            // viewDisplay: website.tenantMode,
            rules: [
              {
                required: true,
                message: "请选择保安公司",
                trigger: "click",
              },
            ],
            labelWidth: 138,
            width: 230,
            searchLabelWidth: 80,
            // search: true,
            searchSpan: 4,
            // editDisplay: false,
            // addDisplay: false,
            // hide: true,
            // span: 11,
          },
          {
            label: "保安服务类型",
            prop: "serveType",
            // search: true,
            searchLabelWidth: 110,
            searchSpan: 4,
            overHidden: true,
            // span: 12,
            labelWidth: 138,
          },
          // {
          //   label: "合同生效时间",
          //   prop: "releaseTimeRange",
          //   type: "date",
          //   format: "yyyy-MM-dd",
          //   valueFormat: "yyyy-MM-dd",
          //   searchValue: [this.getStartTime(), this.getEndTime()],
          //   searchRange: true,
          //   searchSpan: 5,
          //   searchLabelWidth: 110,
          //   hide: true,
          //   addDisplay: false,
          //   editDisplay: false,
          //   viewDisplay: false,
          //   search: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入时间",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "所属辖区",
            prop: "jurisdiction",
            // hide: true,
            searchLabelWidth: 80,
            // search: true,
            searchSpan: 4,
            overHidden: true,
            labelWidth: 138,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {
              label: "title",
              value: "id",
            },
            checkStrictly: true,
            slot: true,
            rules: [
              {
                required: true,
                message: "请选择所属辖区",
                trigger: "click",
              },
            ],
          },
          // {
          //   label: "所属辖区",
          //   prop: "jurisdictionName",
          //   // multiple: true,
          //   searchLabelWidth: 80,
          //   addDisplay: false,
          //   editDisplay: false,
          //   viewDisplay: false,
          //   overHidden: true,
          //   labelWidth: 138,
          //   type: "tree",
          //   dicUrl: "/api/jurisdiction/lazy-tree",
          //   props: {
          //     label: "title",
          //     value: "id",
          //   },
          //   checkStrictly: true,
          //   slot: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请选择所属辖区",
          //       trigger: "click",
          //     },
          //   ],
          // },
          // {
          //   label: " 派遣人数",
          //   prop: "num",
          //   labelWidth: 138,
          // },
          // {
          //   label: "合同生效时间",
          //   prop: "releaseTimeRange",
          //   type: "date",
          //   format: "yyyy-MM-dd",
          //   valueFormat: "yyyy-MM-dd",
          //   searchValue: [this.getStartTime(), this.getEndTime()],
          //   // searchRange: true,
          //   searchSpan: 5,
          //   searchLabelWidth: 110,
          //   hide: true,
          //   value: [this.getStartTime(), this.getEndTime()],
          //   // addDisplay: false,
          //   // editDisplay: false,
          //   // viewDisplay: false,
          //   range: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入时间",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "合同开始时间",
            prop: "startTime",
            labelWidth: 138,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            rules: [
              {
                required: true,
                message: "请选择开始时间",
                trigger: "click",
              },
            ],
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "合同结束时间",
            prop: "endTime",
            labelWidth: 138,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            searchSpan: 4,
            // search: true,
            overHidden: true,
            rules: [
              {
                required: true,
                message: "请输入时间",
                message: "请选择结束时间",
                trigger: "click",
              },
            ],
            // width: 70,
            // rules: [
            //   {
            //     required: true,
            //     message: "请输入型号",
            //     trigger: "blur",
            //   },
            // ],
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "派遣地址",
            prop: "dispatcheraddress",
            // rules: [
            //   {
            //     required: true,
            //     message: "请输入组织机构",
            //     trigger: "blur",
            //   },
            // ],
            // overHidden: true,
            // // addDisplay: true,
            // // editDisplay: true,
            // // viewDisplay: true,
            // // searchSpan: 5,
            // dicUrl:
            //   "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            // props: {
            //   label: "title",
            //   value: "id",
            // },
            // // search: true,
            // type: "select",
            // // rules: [{
            // //     required: true,
            // //     message: "请选择学历",
            // //     trigger: "blur"
            // // }],
            label: " 负责人",
            prop: "linkman",
            labelWidth: 138,
            rules: [
              {
                required: true,
                message: "请输入负责人",
                trigger: "click",
              },
            ],
          },
          {
            label: "负责人联系方式",
            prop: "phone",
            labelWidth: 138,
            width: 110,
            rules: [
              {
                required: true,
                message: "请输入联系方式",
                trigger: "click",
              },
              // {
              //   validator: phones,
              //   trigger: ["change", "blur"],
              // },
            ],
          },
        ],
      },
@@ -161,10 +290,51 @@
      },
      serviceQuery: {},
      serviceSelectionList: [],
      departmentids: "",
    };
  },
  watch: {
    refresh() {
      this.$refs.serviceCrud.refreshTable();
      this.$refs.serviceCrud.doLayout();
    },
  },
  created() {
    var that = this;
    // console.log(this.form);
    this.departmentids = {
      deptId: this.form.departmentid,
    };
    if (this.userInfo.role_name == "保安公司管理员") {
      const deptColumn = this.findObject(this.serviceOption.column, "deptId");
      deptColumn.search = false;
      deptColumn.addDisplay = false;
      deptColumn.editDisplay = false;
      deptColumn.viewDisplay = false;
      deptColumn.hide = true;
      this.departmentids = {
        deptId: this.userInfo.dept_id,
      };
    }
    //公安局进入
    if (this.userInfo.role_name == "公安管理员") {
      that.serviceOption.column[1].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
        that.userInfo.jurisdiction;
      this.departmentids = {
        jurisdiction: this.userInfo.jurisdiction,
      };
    } else {
      that.serviceOption.column[1].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
      that.serviceOption.column[1].value = this.form.departmentid;
    }
  },
  mounted() {
    this.serviceOnLoad(this.servicePage);
  },
  computed: {
    ...mapGetters(["userInfo"]),
  },
  methods: {
    equipmentSizerefresh() {
@@ -173,11 +343,15 @@
    serviceOnLoad(page, params = {}) {
      // console.log(this.form.departmentid, "serviceData");
      this.serviceLoading = true;
      getListeservice(
      params = {
        ...params,
        ...this.departmentids,
      };
      // console.log(params);
      getdatas(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.serviceQuery),
        this.form.departmentid
        Object.assign(params, this.serviceQuery)
      ).then((res) => {
        const data = res.data.data;


 src/views/securityCompany/computents/staff.vue

@@ -95,20 +95,21 @@
            searchSpan: 4,
            searchLabelWidth: 110,
            search: true,
            // width: 210,
          },
          {
            label: "身份证号",
            prop: "cardid",
            slot: true,
            display: false,
            width: 138,
            // width: 138,
          },
          {
            label: "联系方式",
            prop: "phone",
            slot: true,
            display: false,
            width: 92,
            // width: 110,
          },
          {
            label: "联系地址",
@@ -122,7 +123,7 @@
            prop: "rtime",
            slot: true,
            display: false,
            width: 82,
            // width: 210,
          },
          {
            label: "所属角色",
@@ -183,16 +184,16 @@
            dicData: [
              {
                label: "是",
                value: "0",
              },
              {
                label: "否",
                value: "1",
              },
              {
                label: "已吊销",
                label: "否",
                value: "2",
              },
              {
                label: "已吊销",
                value: "3",
              },
            ],
            slot: true,
            display: false,

 src/views/securityGuardManagement/register.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-18 09:42:02
 * @Last Modified time: 2021-10-11 10:40:12
 * menu-name 保安员注册查询
 */
<template>
@@ -443,7 +443,7 @@
            prop: "realName",
            search: true,
            searchSpan: 3,
            width: 60,
            width: 65,
            searchLabelWidth: 50,
            display: false,
          },
@@ -616,7 +616,7 @@
            slot: true,
            search: true,
            searchSpan: 3,
            width: 72,
            width: 100,
            display: false,
            dicData: [
              {

 src/views/system/user.vue

@@ -794,6 +794,7 @@
      row.deptId = row.deptId.join(",");
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      delete row.rtime;
      update(row).then(
        () => {
          this.initFlag = false;