Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

shuishen

2021-09-17 d5b656af4c0e7e062d1bedb39e1612e99566341f

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

 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-17 15:15:53
 * @Last Modified time: 2021-09-17 16:46:18
 * menu-name 保安公司详细资料
 */
<template>
@@ -212,7 +212,7 @@
                </el-row>

                <el-row>
                  <el-col span="12">
                  <!-- <el-col span="12">
                    <el-form-item label="实缴资金">
                      <el-input
                        disabled="true"
@@ -220,21 +220,16 @@
                        autocomplete="off"
                      ></el-input>
                    </el-form-item>
                  </el-col>
                  </el-col> -->
                  <el-col span="12">
                    <el-col span="12">
                      <el-form-item label="注册时间">
                        <el-input
                          disabled="true"
                          v-model="form.establishtime"
                          autocomplete="off"
                        ></el-input>
                      </el-form-item>
                    </el-col>
                    <el-form-item label="注册时间">
                      <el-input
                        disabled="true"
                        v-model="form.establishtime"
                        autocomplete="off"
                      ></el-input>
                    </el-form-item>
                  </el-col>
                </el-row>

                <el-row>
                  <el-col span="12">
                    <el-form-item label="工商注册号">
                      <el-input
@@ -245,6 +240,18 @@
                    </el-form-item>
                  </el-col>
                </el-row>

                <!-- <el-row>
                  <el-col span="12">
                    <el-form-item label="工商注册号">
                      <el-input
                        disabled="true"
                        v-model="form.registrationnumber"
                        autocomplete="off"
                      ></el-input>
                    </el-form-item>
                  </el-col>
                </el-row> -->
              </el-form>
            </el-tab-pane>
            <el-tab-pane label="投资人信息" name="third">
@@ -573,7 +580,10 @@
      // })
    } else {
      this.form = this.$route.query;
      // console.log(this.$route.query, "this.$route.query.");
      // console.log(this.form, "obj1");
      this.businessLicenseUrl = this.form.businessLicense;
      this.licenceUrl = this.form.licence;
    }
    // usejurisdiction().then((res) => {
    //   const data = res.data.data;
@@ -667,7 +677,6 @@
    },
    investorOnLoad(page, params = {}) {
      this.investorLoading = true;
      console.log(this.form, "form");
      getInvestorList(
        page.currentPage,
        page.pageSize,

 src/views/securityGuardManagement/registerOnce.vue

@@ -1,31 +1,17 @@
/*
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-10 15:41:13
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-17 17:13:04
 * menu-name 保安员注册查询
 */
<template>
  <div>
    <el-row class="registersss">
      <el-col :span="spanLeft">
        <div class="box">
          <el-scrollbar>
            <basic-container>
              <avue-tree
                :option="treeOption"
                :data="treeData"
                @node-click="nodeClick"
              />
            </basic-container>
          </el-scrollbar>
        </div>
      </el-col>
      <el-col :span="spanRight">
        <basic-container>
          <avue-crud
            :option="option"
            :search.sync="search"
            :table-loading="loading"
            :data="data"
            ref="crud"
@@ -41,24 +27,6 @@
            @size-change="sizeChange"
            @refresh-change="refreshChange"
          >
            <!-- @on-load="onLoad" -->
            <!-- @row-click="handleRowClick" -->
            <!-- <template slot-scope="{row}"
                              slot="tenantName">
                        <el-tag>{{row.tenantName}}</el-tag>
                    </template>
                    <template slot-scope="{row}"
                              slot="roleName">
                        <el-tag>{{row.roleName}}</el-tag>
                    </template>
                    <template slot-scope="{row}"
                              slot="deptName">
                        <el-tag>{{row.deptName}}</el-tag>
                    </template>
                    <template slot-scope="{row}"
                              slot="userTypeName">
                        <el-tag>{{row.userTypeName}}</el-tag>
                    </template> -->
            <template slot-scope="{ row }" slot="deptId">
              <el-tag
                class="rowClickSelf"
@@ -298,36 +266,8 @@
        deptTree: [],
      },

      treeDeptId: "",
      jurisdiction: "",
      treeData: [],
      treeOption: {
        nodeKey: "id",
        defaultExpandAll: true,
        lazy: true,
        treeLoad: function (node, resolve) {
          const parentId = node.level === 0 ? 0 : node.data.id;
          getDeptLazyTree(parentId).then((res) => {
            resolve(
              res.data.data.map((item) => {
                return {
                  ...item,
                  leaf: !item.hasChildren,
                };
              })
            );
          });
        },
        addBtn: false,
        menu: false,
        size: "small",
        props: {
          labelText: "标题",
          label: "title",
          value: "value",
          children: "children",
        },
      },

      option: {
        // 操作栏多余按钮去除
        delBtn: false,
@@ -374,7 +314,7 @@
            searchSpan: 5,
            display: false,
            overHidden: true,
            search: true,
            // search: true,
            width: 280,
          },
          {
@@ -764,17 +704,6 @@
      };
      this.dialogVisible = true;
    },
    nodeClick(data) {
      //   this.treeDeptId = data.id;
      // console.log(data, 55555);
      if (data.title != "南昌市公安局") {
        this.jurisdiction = data.id;
      } else {
        this.jurisdiction = "";
      }
      this.page.currentPage = 1;
      this.onLoad(this.page);
    },
    initData(tenantId) {
      getRoleTree(tenantId).then((res) => {
        const column = this.findObject(this.option.group, "roleId");
@@ -877,13 +806,12 @@
      this.loading = true;
      params["jurisdiction"] = this.jurisdiction;
      if (this.departmentid) {
        deptId = this.departmentid;
        params["deptId"] = this.departmentid;
      }
      getListSecurity(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query),
        deptId
        Object.assign(params, this.query)
      ).then((res) => {
        const data = res.data.data;
        this.page.total = data.total;
@@ -901,7 +829,6 @@
        this.selectionClear();
      });
    },

    platformSelectionClear() {
      this.platformSelectionList = [];
      this.$refs.platformCrud.toggleSelection();