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

Administrator

2021-08-22 e926916dc724ff9d57ff201fb7509d55ad1983e7

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

 src/api/securityUnit/securityUnit.js

@@ -13,6 +13,20 @@
  })
}

export const getOncedata = (params) => {
  return request({
    url: '/api/information/detail',
    // url: 'http://192.168.0.104:80/information/page',
    method: 'get',
    params: {
      ...params,
      // current,
      // size,
    }
  })
}


export const adddata = (row) => {
  return request({
    url: '/api/information/save',

 src/styles/element-ui.scss

@@ -253,3 +253,10 @@
    top: 40px;
    left: 0;
}

.securityGuard .avue-form__menu {
    position: relative;
    width: 100%;
    display: flex;
    flex-direction: row-reverse;
}

 src/views/approvalOflicenseFiling/permit.vue

New file
@@ -0,0 +1,10 @@
<template>
  <div>保安公司许可申请 ----正在搭建</div>
</template>

<script>
export default {};
</script>

<style>
</style>

 src/views/approvalOflicenseFiling/record.vue

New file
@@ -0,0 +1,10 @@
<template>
  <div>保安单位备案申请 ----正在搭建</div>
</template>

<script>
export default {};
</script>

<style>
</style>

 src/views/approvalOflicenseFiling/recordk.vue

New file
@@ -0,0 +1,10 @@
<template>
  <div>跨区域经营备案申请 ----正在搭建</div>
</template>

<script>
export default {};
</script>

<style>
</style>

 src/views/approvalOflicenseFiling/revoke.vue

New file
@@ -0,0 +1,10 @@
<template>
  <div>自招保安单位撤销备案申请 ----正在搭建</div>
</template>

<script>
export default {};
</script>

<style>
</style>

 src/views/dispatch/data.js

File was deleted

 src/views/dispatch/dispatch.vue

@@ -65,7 +65,6 @@
</template> 

<script>
import { data, column, column1 } from "./data";
import {
  getdata,
  adddata,
@@ -122,58 +121,144 @@
        menuWidth: 160,
        align: "center",
        selection: true,
        column: column,
        // group: [
        //   {
        //     label: "基础信息",
        //     prop: "baseInfo",
        //     icon: "el-icon-user-solid",
        //     column: [
        //       {
        //         label: "所属保安单位",
        //         prop: "tenantId",
        //         type: "tree",
        //         dicUrl: "/api/blade-system/tenant/select",
        //         props: {
        //           label: "tenantName",
        //           value: "tenantId",
        //         },
        column: [
          //派遣服务公司登记
          {
            label: "派遣单位名称",
            prop: "name",
            search: true,
            searchLabelWidth: 110,
            searchSpan: 4,
            // span: 12,
            labelWidth: 118,
          },
          {
            label: "保安公司",
            prop: "deptId",
            type: "tree",
            dicUrl:
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            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",
        //           },
        //         ],
        //         span: 24,
        //       },
        //     ],
        //   },
        // ],
            rules: [
              {
                required: true,
                message: "请选择保安公司",
                trigger: "click",
      },
      // loading1: true, //派遣记录
      // selectionList1: [],
      // page1: {
      //   pageSize: 10,
      //   currentPage: 1,
      //   total: 0,
      // },
      // query1: {},
      // data1: [],
      // option1: {
      //   card: true,
      //   searchSize: "mini",
      //   searchMenuSpan: 6,
      //   height: 547,
      //   menuWidth: 160,
      //   align: "center",
      //   selection: true,
      //   column: column1,
      // },
            ],
            labelWidth: 118,
            width: 200,
            searchLabelWidth: 80,
            search: true,
            searchSpan: 4,
            // editDisplay: false,
            // addDisplay: false,
            // hide: true,
            // span: 11,
          },
          {
            label: "保安服务类型",
            prop: "serveType",
            // search: true,
            searchLabelWidth: 110,
            searchSpan: 4,
            // span: 12,
            labelWidth: 118,
          },
          {
            label: "合同生效时间",
            prop: "releaseTimeRange",
            type: "datetime",
            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",
            // multiple: true,
            searchLabelWidth: 80,
            search: true,
            searchSpan: 4,
            labelWidth: 118,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
            props: {
              label: "title",
              value: "id",
            },
            checkStrictly: true,
            slot: true,
            rules: [
              {
                required: true,
                message: "请选择所属行政区",
                trigger: "click",
              },
            ],
          },
          {
            label: " 派遣人数",
            prop: "num",
            labelWidth: 118,
          },
          {
            label: "合同开始时间",
            prop: "startTime",
            labelWidth: 118,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "合同结束时间",
            prop: "endTime",
            labelWidth: 118,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: " 负责人",
            prop: "linkman",
            labelWidth: 118,
          },
          {
            label: "负责人联系方式",
            prop: "phone",
            labelWidth: 118,
          },
        ],
      },
    };
  },
  computed: {
@@ -326,20 +411,61 @@
        // params: { row: row.identificationnumber },
      });
    },
    getStartTime() {
      if (
        this.$route.query.startTime != undefined &&
        this.$route.query.startTime != null &&
        this.$route.query.startTime != ""
      ) {
        return this.$route.query.startTime;
      }
      return "";
    },
    getEndTime() {
      if (
        this.$route.query.endTime != undefined &&
        this.$route.query.endTime != null &&
        this.$route.query.endTime != ""
      ) {
        return this.$route.query.endTime;
      }
      return "";
    },
    onLoad(page, params = {}) {
      var that = this;
      this.loading = true;

      var values;
      const { releaseTimeRange } = this.query;
      if (releaseTimeRange) {
        values = {
          ...params,
          beginTime: releaseTimeRange[0],
          overTime: releaseTimeRange[1],
          ...this.query,
        };
        // values.releaseTimeRange = null;
      } else {
        values = {
          ...params,
          ...this.query,
        };
      }

      console.log(values);

      getdata(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query)
        // Object.assign(params, this.query)
        values
      ).then((res) => {
        // console.log(res);
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;
        for (var k in this.data) {
          this.data[k]["deptId"] = that.userInfo.dept_id;
          // this.data[k]["deptId"] = that.userInfo.dept_id;
          this.data[k]["tenantName"] = that.userInfo.user_name;
        }
        window.localStorage.setItem("paqiandataS", JSON.stringify(this.data));

 src/views/dispatch/dispatchChildoperable.vue

@@ -1,41 +1,6 @@
<template>
  <basic-container>
    <div class="dispatchChildoperable">
      <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs> -->
      <!-- <span v-if="typeTABS.prop === 'tab1'"> -->
      <!-- <avue-crud
        :option="option"
        :data="data"
        :page.sync="page"
        ref="crudrec"
        @on-load="onLoad"
        :table-loading="loading"
        @row-save="rowSave"
        @search-change="searchChange"
        @search-reset="searchReset"
        @row-update="rowUpdate"
        @row-del="rowDel"
        @selection-change="selectionChange"
        @refresh-change="refreshChange"
      >
        <template slot="menuLeft">
          <el-button
            type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
          </el-button>
        </template>
      </avue-crud> -->
      <!-- <avue-form ref="form" v-model="obj0" :option="option0"> -->
      <!-- <template slot-scope="scope" slot="menuForm">
          <el-button @click="tip">自定义按钮</el-button>
        </template> -->
      <!-- </avue-form>
    </span>
    <span v-else-if="typeTABS.prop === 'tab2'"> -->
      <avue-crud
        :option="option1"
        :data="data1"
@@ -50,93 +15,19 @@
        @selection-change="selectionChange1"
        @refresh-change="refreshChange1"
      >
        <!-- <template slot="menuLeft">
          <el-button
            type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete1"
            >删 除
          </el-button>
        </template> -->
      </avue-crud>
      <!-- </span> -->
      <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
    </div>
  </basic-container>
</template> 

<script>
// import { column, column1 } from "./data";
import {
  // getdata,
  // adddata,
  // update,
  // remove,
  getdata1,
  adddata1,
  update1,
  remove1,
} from "@/api/dispatch/dispatch";
import { getdata1, adddata1, update1, remove1 } from "@/api/dispatch/dispatch";
import { getDept } from "@/api/system/dept";

export default {
  data() {
    let baseUrl = "https://cli.avuejs.com/api/area";
    return {
      // typeTABS: {}, //标签页
      // optionTABS: {
      //   column: [
      //     {
      //       // icon: "el-icon-info",
      //       label: "派遣服务公司详情",
      //       prop: "tab1",
      //     },
      //     {
      //       // icon: "el-icon-info",
      //       label: "派遣记录",
      //       prop: "tab2",
      //     },
      //     // {
      //     //   icon: "el-icon-info",
      //     //   label: "选项卡3",
      //     //   prop: "tab3",
      //     // },
      //   ],
      // },

      // id: "", //记录归属id
      // //基本信息
      // //保安单位信息表单
      // obj0: {
      //   // title: "我是头部标题",
      // },
      // option0: {
      //   emptyBtn: false,
      //   submitBtn: false,
      //   gutter: 30,
      //   column: column,
      // },
      // loading: true, //派遣服务公司登记
      // selectionList: [],
      // page: {
      //   pageSize: 10,
      //   currentPage: 1,
      //   total: 0,
      // },
      // query: {},
      // data: [],
      // option: {
      //   card: true,
      //   searchSize: "mini",
      //   searchMenuSpan: 6,
      //   height: 547,
      //   menuWidth: 160,
      //   align: "center",
      //   selection: true,
      //   column: column,
      // },
      deptCategory: "",
      deptId: "",

@@ -158,84 +49,63 @@
        searchMenuSpan: 8,
        height: 623,
        cellBtn: false,
        delBtnText: "结束派遣",
        editBtnText: "变更派遣",
        // addBtn: false,
        // menuWidth: 160,
        align: "center",
        selection: true,
        column: [
          // 派遣服务公司登记
          // {
          //     label: "id",
          //     prop: "id",
          //     // search: true,
          //     // searchSpan: 4,
          //     // overHidden: true,
          //     // hide: true,
          //     // editDisplay: false,
          //     // addDisplay: false
          // },
          // {
          //   label: "保安公司",
          //   prop: "deptId",
          //   labelWidth: 120,
          //   searchLabelWidth: 120,
          //   searchSpan: 4,
          //   dicUrl:
          //     "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
          //   props: {
          //     label: "title",
          //     value: "id",
          //   },
          //   search: true,
          //   overHidden: true,
          //   type: "select",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入保安公司",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "派遣单位",
            prop: "dispatcherCompany",
            // addDisplay: false,
            // editDisplay: false,
            // search: true,
            // labelWidth: 120,
            // searchSpan: 4,
            width: 180,
            addDisplay: false,
            editDisplay: false,
          },
          {
            label: "派遣单位",
            prop: "dispatcherUnitId",
            labelWidth: 120,
            searchLabelWidth: 80,
            dicUrl: "/api/dispatcherUnit/page-tree",
            props: {
              label: "name",
              value: "id",
            },
            hide: true,
            searchSpan: 4,
            search: true,
            overHidden: true,
            type: "tree",
            rules: [
              {
                required: true,
                message: "请输入派遣单位",
                trigger: "blur",
              },
            ],
          },
          // {
          //   label: "派遣单位",
          //   prop: "dispatcherUnitId",
          //   labelWidth: 120,
          //   searchLabelWidth: 120,
          //   dicUrl: "/api/dispatcherUnit/page-tree",
          //   props: {
          //     label: "name",
          //     value: "id",
          //   },
          //   hide: true,
          //   searchSpan: 4,
          //   search: true,
          //   overHidden: true,
          //   type: "tree",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入保安公司",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "保安公司",
            prop: "deptId",
            search: true,
            labelWidth: 120,
            type: "select",
            cascaderItem: ["securityName"],
            searchSpan: 4,
            cascaderItem: ["name"],
            props: {
              label: "title",
              value: "id",
            },
            width: 180,
            dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
            rules: [
              {
@@ -247,8 +117,11 @@
          },
          {
            label: "保安员",
            prop: "securityName",
            prop: "name",
            type: "select",
            width: 70,
            labelWidth: 120,
            searchSpan: 3,
            search: true,
            // cell: true,
            // hide: true,
@@ -266,47 +139,6 @@
            ],
          },

          // {
          //   width: 120,
          //   label: "保安人名称",
          //   prop: "area",
          //   cell: true,
          //   props: {
          //     label: "name",
          //     value: "code",
          //   },
          //   type: "select",
          //   dicUrl: `${baseUrl}/getArea/{{key}}`,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请选择地区",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          // {
          //   label: "保安人名称",
          //   prop: "name",
          //   search: true,
          //   searchSpan: 4,
          //   labelWidth: 120,
          //   searchLabelWidth: 120,
          //   // overHidden: true
          //   type: "tree",
          //   dicUrl: "/api/blade-user/page-security",
          //   props: {
          //     label: "realName",
          //     value: "postId",
          //   },
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入保安人名称",
          //       trigger: "click",
          //     },
          //   ],
          // },
          {
            label: "身份证",
            prop: "cardid",
@@ -335,8 +167,8 @@
            label: "派遣时间",
            prop: "dispatchertime",
            type: "date",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            searchSpan: 5,
            // search: true,
@@ -354,8 +186,8 @@
            label: "结束时间",
            prop: "endTime",
            type: "date",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            overHidden: true,
            rules: [
@@ -406,40 +238,11 @@
            // searchSpan: 4,
            // overHidden: true
          },
          // {
          //     label: "派遣单位",
          //     // prop: "dispatcherCompany",
          //     prop: "tenantName",
          //     type: "tree",
          //     dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
          //     props: {
          //         label: "title",
          //         value: "id"
          //     },
          //     // hide: !website.tenantMode,
          //     // addDisplay: website.tenantMode,
          //     // editDisplay: website.tenantMode,
          //     // viewDisplay: website.tenantMode,
          //     rules: [{
          //         required: true,
          //         message: "请输入派遣单位",
          //         trigger: "click"
          //     }],
          // search: true,
          // searchSpan: 4,
          // overHidden: true
          // },
        ],
      },
    };
  },
  computed: {
    // ids() {
    //   let ids = [];
    //   this.selectionList.forEach((ele) => {
    //     ids.push(ele.id);
    //   });
    //   return ids.join(",");
    // },
    ids1() {
      let ids1 = [];
@@ -462,129 +265,6 @@
      }
      // this.$message.success(JSON.stringify(column));
    },
    //派遣服务公司登记
    // sizeChange(val) {
    //   this.page1.currentPage = 1;
    //   this.page1.pageSize = val;
    //   // this.getData();
    //   this.onLoad(this.page, this.query);
    //   //   this.$message.success("行数" + val);
    // },
    // currentChange(val) {
    //   this.page1.currentPage = val;
    //   // this.getData();
    //   this.onLoad(this.page, this.query);
    //   //   this.$message.success("页码" + val);
    // },
    // rowSave(form, done, loading) {
    //   var that = this;
    //   var form = this.data[0];
    //   delete form.id;
    //   for (var k = 0; k < 13; k++) {
    //     adddata(form).then(
    //       (res) => {
    //         this.onLoad(this.page);
    //         this.$message({
    //           type: "success",
    //           message: "操作成功!",
    //         });
    //         done();
    //       },
    //       (error) => {
    //         window.console.log(error);
    //         loading();
    //       }
    //     );
    //   }
    // },
    // searchChange(params, done) {
    //   this.query = params;
    //   this.page.currentPage = 1;
    //   this.onLoad(this.page, params);
    //   done();
    // },
    // searchReset() {
    //   this.query = {};
    //   this.onLoad(this.page);
    // },
    // rowUpdate(row, index, done, loading) {
    //   console.log(row);
    //   update(row).then(
    //     () => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       done();
    //     },
    //     (error) => {
    //       window.console.log(error);
    //       loading();
    //     }
    //   );
    // },
    // rowDel(row) {
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove(row.id);
    //     })
    //     .then(() => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //     });
    // },
    // selectionChange(list) {
    //   this.selectionList = list;
    // },
    // handleDelete() {
    //   if (this.selectionList.length === 0) {
    //     this.$message.warning("请选择至少一条数据");
    //     return;
    //   }
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove(this.ids);
    //     })
    //     .then(() => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       this.$refs.crudrec.toggleSelection();
    //     });
    // },
    // refreshChange() {
    //   this.onLoad(this.page, this.query);
    // },
    // onLoad(page, params = {}) {
    //   this.loading = true;
    //   getdata(
    //     page.currentPage,
    //     page.pageSize,
    //     Object.assign(params, this.query)
    //   ).then((res) => {
    //     // console.log(res);
    //     const data = res.data.data;
    //     this.page.total = data.total;
    //     this.data = data.records;
    //     console.log(this.data);
    //     this.loading = false;
    //   });
    // },
    //派遣服务公司登记

    //派遣记录
    sizeChange1(val) {
@@ -601,15 +281,6 @@
      //   this.$message.success("页码" + val);
    },
    rowSave1(form, done, loading) {
      // var that = this;
      // var form = this.data1[0];
      // delete form.id;
      // for (var k = 0; k < 13; k++) {
      // form["deptId"] = form.tenantName;
      // form["tenantName"] = form.$tenantName;
      // form["dispatcherUnitId"] = this.id;
      // console.log(form);

      adddata1(form).then(
        (res) => {
          this.onLoad1(this.page1);
@@ -637,10 +308,6 @@
      this.onLoad1(this.page1);
    },
    rowUpdate1(row, index, done, loading) {
      // row["deptId"] = row.tenantName;
      // row["tenantName"] = row.$tenantName;
      // row["dispatcherUnitId"] = this.id;
      // console.log(row, "row");
      update1(row).then(
        () => {
          this.onLoad1(this.page1);
@@ -728,12 +395,6 @@
    //
    onLoad1(page, params = {}) {
      this.loading1 = true;
      // params["cardid"] = this.cardid;
      // params["name"] = this.name;
      // params["dispatcherCompany"] = this.dispatcherCompany;
      // params["dispatcherUnitId"] = this.id;
      // console.log(params, "get");
      // console.log(page);
      var values;
      const { releaseTimeRange } = this.query1;
      if (releaseTimeRange) {
@@ -768,12 +429,6 @@
      });
    },
    //派遣记录
    // saveLock(name, val) {
    //   localStorage.setItem(name, val);
    // },
    // readLock(name) {
    //   return localStorage.getItem(name);
    // },
  },
  mounted() {
    this.onLoad1(this.page1, this.query1);
@@ -811,27 +466,6 @@
    //   this.obj0.name = " 未选择派遣单位";
    // }
  },
  // onLoad(page, params = {}) {
  //   this.deptId = JSON.parse(
  //       window.localStorage.getItem("saber-userInfo")
  //     ).content.dept_id;

  //     //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
  //     var that = this;
  //     getDept(this.deptId).then((res) => {
  //       var deptCategory = res.data.data.deptCategory;
  //       deptCategory == 1
  //         ? (that.deptCategory = true)
  //         : (that.deptCategory = false);

  //       if (that.deptCategory) {
  //         params["deptId"] = this.deptId;
  //       }
  //       let values = {
  //         ...params,
  //       };
  //    })
  // }
};
</script>


 src/views/dispatchChild/data.js

@@ -52,6 +52,30 @@
    //     disabled: true,
    // },
    {
        label: "保安员",
        prop: "name",
        type: "tree",
        // width: 70,
        labelWidth: 120,
        searchSpan: 3,
        multiple: true,
        search: true,
        // cell: true,
        // hide: true,
        props: {
            label: "realName",
            value: "id",
        },
        dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
        rules: [
            {
                required: true,
                message: "请选择保安",
                trigger: "blur",
            },
        ],
    },
    {
        label: "联系人",
        prop: "linkman",
        span: 11,
@@ -97,21 +121,43 @@
    //     // editDisplay: false,
    //     // addDisplay: false
    // },
    // {
    //     label: "保安公司",
    //     prop: "deptId",
    //     labelWidth: 120,
    //     searchLabelWidth: 120,
    //     searchSpan: 4,
    //     dicUrl:
    //         "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
    //     props: {
    //         label: "title",
    //         value: "id",
    //     },
    //     search: true,
    //     overHidden: true,
    //     type: "select",
    //     rules: [
    //         {
    //             required: true,
    //             message: "请输入保安公司",
    //             trigger: "blur",
    //         },
    //     ],
    // },
    {
        label: "保安公司",
        prop: "deptId",
        search: true,
        labelWidth: 120,
        searchLabelWidth: 120,
        type: "select",
        searchSpan: 4,
        dicUrl:
            "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        cascaderItem: ["name"],
        props: {
            label: "title",
            value: "id",
        },
        search: true,
        overHidden: true,
        type: "select",
        width: 180,
        dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
        rules: [
            {
                required: true,
@@ -144,19 +190,46 @@
        rules: [
            {
                required: true,
                message: "请输入保安公司",
                message: "请输入派遣单位",
                trigger: "blur",
            },
        ],
    },

    {
        label: "保安人名称",
        label: "保安员",
        prop: "name",
        search: true,
        searchSpan: 4,
        searchLabelWidth: 120
        addDisplay: false,
        editDisplay: false,
        // .
        // overHidden: true
    }, {
    },

    // {
    //     label: "保安员",
    //     prop: "name",
    //     type: "select",
    //     width: 70,
    //     labelWidth: 120,
    //     searchSpan: 3,
    //     search: true,
    //     hide: true,
    //     // cell: true,
    //     // hide: true,
    //     props: {
    //         label: "realName",
    //         value: "id",
    //     },
    //     dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
    //     rules: [
    //         {
    //             required: true,
    //             message: "请选择保安",
    //             trigger: "blur",
    //         },
    //     ],
    // },
    {
        label: "身份证",
        prop: "cardid",
        // search: true,
@@ -174,8 +247,8 @@
        label: "派遣时间",
        prop: "dispatchertime",
        type: "date",
        format: "yyyy-MM-dd hh:mm:ss",
        valueFormat: "timestamp",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        search: true,
        searchSpan: 4,
        // overHidden: true
@@ -183,8 +256,8 @@
        label: "结束时间",
        prop: "endTime",
        type: "date",
        format: "yyyy-MM-dd hh:mm:ss",
        valueFormat: "timestamp",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        // search: true,
        // searchSpan: 5,
        // overHidden: true

 src/views/dispatchChild/index.vue

@@ -114,26 +114,6 @@
        gutter: 30,
        column: column,
      },
      // loading: true, //派遣服务公司登记
      // selectionList: [],
      // page: {
      //   pageSize: 10,
      //   currentPage: 1,
      //   total: 0,
      // },
      // query: {},
      // data: [],
      // option: {
      //   card: true,
      //   searchSize: "mini",
      //   searchMenuSpan: 6,
      //   height: 547,
      //   menuWidth: 160,
      //   align: "center",
      //   selection: true,
      //   column: column,
      // },

      loading1: true, //派遣记录
      selectionList1: [],
      page1: {
@@ -153,7 +133,7 @@
        height: 563,
        // menuWidth: 160,
        align: "center",
        // selection: true,
        selection: true,
        column: column1,
        cellBtn: false,
        addBtn: false,
@@ -184,134 +164,11 @@
        // this.onLoad(this.page);
      } else if (column.prop == "tab2") {
        // this.loading = false;
        console.log(document.getElementsByClassName("el-card__body")[0]);
        // console.log(document.getElementsByClassName("el-card__body")[0]);
        this.onLoad1(this.page1); //第二个表格不会自动执行
      }
      // this.$message.success(JSON.stringify(column));
    },
    //派遣服务公司登记
    // sizeChange(val) {
    //   this.page1.currentPage = 1;
    //   this.page1.pageSize = val;
    //   // this.getData();
    //   this.onLoad(this.page, this.query);
    //   //   this.$message.success("行数" + val);
    // },
    // currentChange(val) {
    //   this.page1.currentPage = val;
    //   // this.getData();
    //   this.onLoad(this.page, this.query);
    //   //   this.$message.success("页码" + val);
    // },
    // rowSave(form, done, loading) {
    //   var that = this;
    //   var form = this.data[0];
    //   delete form.id;
    //   for (var k = 0; k < 13; k++) {
    //     adddata(form).then(
    //       (res) => {
    //         this.onLoad(this.page);
    //         this.$message({
    //           type: "success",
    //           message: "操作成功!",
    //         });
    //         done();
    //       },
    //       (error) => {
    //         window.console.log(error);
    //         loading();
    //       }
    //     );
    //   }
    // },
    // searchChange(params, done) {
    //   this.query = params;
    //   this.page.currentPage = 1;
    //   this.onLoad(this.page, params);
    //   done();
    // },
    // searchReset() {
    //   this.query = {};
    //   this.onLoad(this.page);
    // },
    // rowUpdate(row, index, done, loading) {
    //   console.log(row);
    //   update(row).then(
    //     () => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       done();
    //     },
    //     (error) => {
    //       window.console.log(error);
    //       loading();
    //     }
    //   );
    // },
    // rowDel(row) {
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove(row.id);
    //     })
    //     .then(() => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //     });
    // },
    // selectionChange(list) {
    //   this.selectionList = list;
    // },
    // handleDelete() {
    //   if (this.selectionList.length === 0) {
    //     this.$message.warning("请选择至少一条数据");
    //     return;
    //   }
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove(this.ids);
    //     })
    //     .then(() => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       this.$refs.crudrec.toggleSelection();
    //     });
    // },
    // refreshChange() {
    //   this.onLoad(this.page, this.query);
    // },
    // onLoad(page, params = {}) {
    //   this.loading = true;
    //   getdata(
    //     page.currentPage,
    //     page.pageSize,
    //     Object.assign(params, this.query)
    //   ).then((res) => {
    //     // console.log(res);
    //     const data = res.data.data;
    //     this.page.total = data.total;
    //     this.data = data.records;
    //     console.log(this.data);
    //     this.loading = false;
    //   });
    // },
    //派遣服务公司登记

    //派遣记录
    sizeChange1(val) {
@@ -449,6 +306,10 @@
        const data = res.data.data;
        this.page1.total = data.total;
        this.data1 = data.records;
        // for (var k in this.data1) {
        //   this.data1[k].securityName = this.data1[k].securityName.split(",");
        //   this.data1[k].securityName = this.data1[k].securityName.join(" | ");
        // }
        console.log(this.data1, 1);
        this.loading1 = false;
      });

 src/views/recruitmentManagement/index.vue

@@ -59,6 +59,7 @@
        searchSize: "mini",
        searchMenuSpan: 6,
        height: 583,
        border: true,
        menuWidth: 210,
        align: "center",
        selection: true,

 src/views/securityAnalysis/index.vue

@@ -188,7 +188,7 @@
          // orient: "vertical",
          // left: "left", x: "center",
          x: "center",
          y: "90%",
          y: "83%",
        },
        series: [
          {
@@ -408,8 +408,10 @@
          trigger: "item",
        },
        legend: {
          orient: "vertical",
          left: "left",
          // orient: "vertical",
          // left: "left",
          x: "center",
          y: "90%",
        },
        series: [
          {
@@ -472,8 +474,10 @@
          trigger: "item",
        },
        legend: {
          orient: "vertical",
          left: "left",
          // orient: "vertical",
          // left: "left",
          x: "center",
          y: "83%",
        },
        series: [
          {

 src/views/securityEquipment/car.js

@@ -63,16 +63,19 @@
        }]
    },
    {
        label: "保安公司",
        label: "所属保安公司",
        prop: "deptId",
        rules: [{
            required: true,
            message: "请输入保安公司",
            trigger: "blur"
        }],
        search: true,
        // addDisplay: true,
        // editDisplay: true,
        // viewDisplay: true,
        searchSpan: 4,
        searchLabelWidth: 110,
        overHidden: true,
        // searchSpan: 4,
        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",

 src/views/securityEquipment/equipments.js

@@ -61,13 +61,26 @@
        // search: true,
    },
    {
        label: "保安公司",
        label: "数量",
        prop: "num",
        rules: [{
            required: true,
            message: "请输入数量",
            trigger: "blur"
        }]
        // search: true,
    },
    {
        label: "所属保安公司",
        prop: "deptId",
        searchSpan: 4,
        searchLabelWidth: 110,
        rules: [{
            required: true,
            message: "请输入组织机构",
            trigger: "blur"
        }],
        search: true,
        overHidden: true,
        // addDisplay: true,
        // editDisplay: true,

 src/views/securityEquipment/gun.js

@@ -69,8 +69,11 @@
        search: true,
    },
    {
        label: "保安公司",
        label: "所属保安公司",
        prop: "deptId",
        search: true,
        searchSpan: 4,
        searchLabelWidth: 110,
        labelWidth: 160,
        rules: [{
            required: true,

 src/views/securityGuard/securityGuard.vue

@@ -27,7 +27,6 @@
          @row-update="rowUpdate"
          :row-style="rowStyle"
          @row-save="rowSave"
          @row-click="rowClick"
          :before-open="beforeOpen"
          :page.sync="page"
          @search-change="searchChange"
@@ -110,14 +109,13 @@
          </template>

          <template slot-scope="{ type, size, row }" slot="menu">
            <!-- <el-button
                style="display:none"
                icon="el-icon-edit"
            <el-button
              icon="el-icon-s-custom"
                :size="size"
                :type="type"
                @click.stop="addOrUpdateHandle(row.id)"
                >修改
              </el-button> -->
              @click.stop="rowClick(row)"
              >查看
            </el-button>
            <el-button
              icon="el-icon-edit"
              :size="size"
@@ -140,7 +138,11 @@
            <el-tag v-if="row.sex == 1">男</el-tag>
            <el-tag v-if="row.sex == 2">女</el-tag>
          </template>

          <template slot-scope="{ row }" slot="deptId">
            <el-tag class="rowClickSelf" @click="rowClickSelf(row.deptId)">{{
              row.$deptId
            }}</el-tag>
          </template>
          <template slot-scope="{ row }" slot="tenantName">
            <el-tag>{{ row.tenantName }}</el-tag>
          </template>
@@ -396,6 +398,7 @@
        align: "center",
        index: true,
        delBtnText: "注销",
        menuWidth: 276,
        selection: true,
        viewBtn: true,
        defaultExpandAll: true,
@@ -968,9 +971,17 @@

    //行点击事件
    rowClick(row) {
      // console.log(row, 111);
      this.$router.push({
        path: "/securityGuardDetail",
        query: { row: JSON.stringify(row) },
      });
    },
    rowClickSelf(row) {
      console.log(row, "baoan");
      this.$router.push({
        path: "/securityUnitChild",
        query: { fromSecunityGuardId: row },
      });
    },
    nodeClick(data) {
@@ -1461,7 +1472,7 @@
};
</script>
 
<style>
<style lang="scss" scoped>
.box {
  height: 800px;
}
@@ -1473,4 +1484,9 @@
.box .el-scrollbar__wrap {
  overflow: scroll;
}
.rowClickSelf {
  &:hover {
    cursor: pointer;
  }
}
</style>

 src/views/securityUnit/armedEscort.vue

New file
@@ -0,0 +1,10 @@
<template>
  <div>武装压运公司</div>
</template>

<script>
export default {};
</script>

<style>
</style>

 src/views/securityUnitChild/index.vue

@@ -156,6 +156,7 @@
<script>
import { column, column1, column2 } from "./data";
import {
  getOncedata,
  // getdata,
  // adddata,
  // update,
@@ -423,130 +424,6 @@
        this.onLoad2(this.page2); //第二个表格不会自动执行
      }
    },
    // //保安单位基本信息  改成表单
    // sizeChange(val) {
    //   this.page1.currentPage = 1;
    //   this.page1.pageSize = val;
    //   // this.getData();
    //   this.onLoad(this.page, this.query);
    //   //   this.$message.success("行数" + val);
    // },
    // currentChange(val) {
    //   this.page1.currentPage = val;
    //   // this.getData();
    //   this.onLoad(this.page, this.query);
    //   //   this.$message.success("页码" + val);
    // },
    // rowSave(form, done, loading) {
    //   // var that = this;
    //   //   var form = this.data[0];
    //   //   delete form.id;
    //   //   for (var k = 0; k < 13; k++) {
    //   adddata(form).then(
    //     () => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       done();
    //     },
    //     (error) => {
    //       window.console.log(error);
    //       loading();
    //     }
    //   );
    //   //   }
    // },
    // searchChange(params, done) {
    //   this.query = params;
    //   this.page.currentPage = 1;
    //   this.onLoad(this.page, params);
    //   done();
    // },
    // searchReset() {
    //   this.query = {};
    //   this.onLoad(this.page);
    // },
    // rowUpdate(row, index, done, loading) {
    //   delete row.tenantid;
    //   console.log(row, 0);
    //   update(row).then(
    //     () => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       done();
    //     },
    //     (error) => {
    //       window.console.log(error);
    //       loading();
    //     }
    //   );
    // },
    // rowDel(row) {
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove(row.id);
    //     })
    //     .then(() => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //     });
    // },
    // selectionChange(list) {
    //   this.selectionList = list;
    // },
    // handleDelete() {
    //   if (this.selectionList.length === 0) {
    //     this.$message.warning("请选择至少一条数据");
    //     return;
    //   }
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove(this.ids);
    //     })
    //     .then(() => {
    //       this.onLoad(this.page);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       this.$refs.crudrec.toggleSelection();
    //     });
    // },
    // refreshChange() {
    //   this.onLoad(this.page, this.query);
    // },
    // onLoad(page, params = {}) {
    //   this.loading = true;
    //   getdata(
    //     page.currentPage,
    //     page.pageSize,
    //     Object.assign(params, this.query)
    //   ).then((res) => {
    //     // console.log(res);
    //     const data = res.data.data;
    //     this.page.total = data.total;
    //     this.data = data.records;
    //     console.log(this.data);
    //     this.loading = false;
    //   });
    // },
    //保安单位基本信息

    //派遣记录
    sizeChange1(val) {
@@ -832,17 +709,20 @@
    },
  },
  mounted() {
    this.typeTABS = this.optionTABS.column[0];
    var that = this;
    var doit = (a) => {
      that.typeTABS = that.optionTABS.column[0];
    var row = {};
    if (this.readLock("danweidata") != null) {
      row = JSON.parse(this.readLock("danweidata"));
      // this.obj0.title = row.enterprisename;
      if (that.readLock("danweidata") != null) {
        row = JSON.parse(that.readLock("danweidata"));
        // that.obj0.title = row.enterprisename;
        // console.log(row, "row");
      for (var k in row) {
        this.obj0[k] = row[k];
          that.obj0[k] = row[k];
      }
      this.creditcode = row.creditcode;
      if (this.readLock("danweidataS") != null) {
        var b = JSON.parse(this.readLock("danweidataS"));
        that.creditcode = row.creditcode;
        if (that.readLock("danweidataS") != null && a == 1) {
          var b = JSON.parse(that.readLock("danweidataS"));
        var i = 0;
        for (var k in b) {
          if (b[k].enterprisename == row.enterprisename) {
@@ -854,21 +734,56 @@
        } else {
          // console.log("已删除");

          this.obj0 = {};
          this.obj0.enterprisename = row.enterprisename + "该公司已删除";
            that.obj0 = {};
            that.obj0.enterprisename = row.enterprisename + "该公司已删除";
          window.localStorage.removeItem("danweidata");
          this.creditcode = "";
            that.creditcode = "";
        }
      }
    } else {
      // console.log("no");
      this.obj0.enterprisename = "未选择查询单位";
        that.obj0.enterprisename = "未选择查询单位";
      }
    };
    var flag = false,
      i = 0,
      ind = null;
    this.$store.state.tags.tagList.forEach((item, index) => {
      if (item.label == "保安单位详情") {
        if (flag == false) {
          ind = index;
          flag = true;
        }
        i++;
      }
    });
    if (i > 1) {
      this.$store.state.tags.tagList.splice(ind, 1);
    }

    var fromSecunityGuardId = this.$route.query.fromSecunityGuardId;
    // var fromSecunityGuardId = this.$route.query;
    if (fromSecunityGuardId != undefined) {
      var value = {
        departmentid: fromSecunityGuardId,
      };
      getOncedata(value).then((res) => {
        // console.log(res.data.data, "get");
        window.localStorage.setItem(
          "danweidata",
          JSON.stringify(res.data.data)
        );
        doit();
      });
      // return;
    } else {
      doit(1);
    }
  },
  watch: {
    chuzitime() {
    // chuzitime() {
      // console.log(this.chuzitime, "chuzitime");
    },
    // },
  },
};
</script>

 vue.config.js

@@ -27,13 +27,12 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost',
        target: 'http://192.168.0.109:81',//钟W
        // target: 'http://localhost:81',
        target: 'http://192.168.0.114:81',//钟日健W
        // target: 'http://localhost:81',//原W
        // target: 'http://192.168.0.108:81',//原W
        // target: 'http://192.168.0.109:81',//唐N
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',
        ws: true,
        pathRewrite: {
          '^/api': '/'