单位信息修改，智能统计修改

Administrator

2021-12-29 775f1801d87d90fa5517095a7d195f4146490290

单位信息修改，智能统计修改

 public/img/top/shield.png

 src/page/index/top/index.vue

@@ -18,7 +18,7 @@
      </span>
    </div>
    <div class="top-bar__right">
      <el-tooltip
      <!-- <el-tooltip
        v-if="showColor"
        effect="dark"
        :content="$t('navbar.color')"
@@ -27,7 +27,7 @@
        <div class="top-bar__item">
          <top-color></top-color>
        </div>
      </el-tooltip>
      </el-tooltip> -->
      <!-- <el-tooltip
        v-if="showDebug"
        effect="dark"
@@ -82,7 +82,7 @@
          <top-drive></top-drive>
        </div>
      </el-tooltip>
      <el-tooltip
      <!-- <el-tooltip
        effect="dark"
        :content="$t('navbar.notice')"
        placement="bottom"
@@ -90,7 +90,7 @@
        <div class="top-bar__item top-bar__item--show">
          <top-notice></top-notice>
        </div>
      </el-tooltip>
      </el-tooltip> -->
      <!-- 中英文 -->
      <!-- <el-tooltip
        effect="dark"

 src/views/licenseApproval/securityGuard.vue

@@ -129,7 +129,7 @@
        ref="licence"
      >
        <div class="licence" id="licence" v-if="dialogVisible">
          <div class="licence-head">备案回执</div>
          <div class="licence-head">备案证</div>
          <div class="head-tid">
            编号
            <span class="fontStyle">{{

 src/views/securityAnalysis/child/certificate.vue

@@ -10,6 +10,7 @@
      :data="data1"
      :page.sync="page1"
      :table-loading="loading1"
       @sort-change="sortChange"
      @on-load="getPractitionersPageInfo(page1)"
      @search-change="searchChange"
      @search-reset="searchReset"
@@ -38,6 +39,8 @@
      search = false;
    }
    return {
      sort: "",
      sortName: "",
      securityid1: "",
      ExperienceVisible: false,
      loading1: true,
@@ -84,6 +87,7 @@
            // prop: "deptName",
            prop: "deptId",
            type: "tree",
            sort:true,
            dicUrl: dicUrl,
            props: {
              label: "title",
@@ -176,6 +180,11 @@
            ],
          },
          {
            label: "保安证编号",
            prop: "securitynumber",
            disabled: true,
          },
          {
            label: "发证时间",
            prop: "paperTime",
            disabled: true,
@@ -185,6 +194,35 @@
    };
  },
  methods: {
    //排序
    sortChange(value) {
      // console.log(value, 51151515);
      if (value.order == "ascending") {
        this.sort = "asc";
      }
      if (value.order == "descending") {
        this.sort = "desc";
      }
      this.sortName = value.prop;
      //字段匹配
      if (value.prop == "sexs") {
        this.sortName = "sex";
      }
      if (value.prop == "examinationType") {
        this.sortName = "examination_type";
      }
      if (value.prop == "userType") {
        this.sortName = "user_type";
      }
      this.onLoad(this.page, this.query);
    },
    //清空按钮
    selectionClear() {
      // this.selectionList = [];
      this.sort = "";
      this.sortName = "";
      // this.$refs.crud.toggleSelection();
    },
    getPractitionersPageInfo(page, params = {}) {
      if (this.card.jurisdiction == 1372091709474910209) {
        this.card.jurisdiction = "";

 src/views/securityAnalysis/child/dispatch.vue

@@ -191,11 +191,7 @@
              },
            ],
          },
          // {
          //   label: " 派遣人数",
          //   prop: "num",
          //   labelWidth: 118,
          // },
          
          {
            label: "合同开始时间",
            prop: "startTime",
@@ -219,6 +215,12 @@
            // overHidden: true
          },
          {
            label: " 派遣人数",
            prop: "snum",
            labelWidth: 118,
            width:90
          },
          {
            label: " 负责人",
            prop: "linkman",
            labelWidth: 118,

 src/views/securityUnit/selfRecruitedSecurityGuard.vue

@@ -218,7 +218,7 @@
            },
            rules: [
              {
                required: true,
                required: false,
                message: "请选择所属辖区",
                trigger: "click",
              },
@@ -439,7 +439,6 @@
    rowUpdate(row, index, done, loading) {
      delete row.tenantid;
      delete row.regstsat;
      console.log(row, 0);
      update(row).then(
        () => {
          this.onLoad(this.page);

 src/views/securityUnitChild/data.js

@@ -186,6 +186,320 @@

]

export var filialeColumn = [{
        label: "",
        labelWidth: 20,
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    {
        label: "企业名称",
        prop: "enterprisename",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        //父节点不能选
        parent: false,
        type: "tree",
        dicUrl: "/api//jurisdiction/lazy-trees",
        props: {
            label: "title",
            value: "id",
        },
        span: 12,
        labelWidth: 145,
        width: 110,
        overHidden: true,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择所属辖区",
            trigger: "click",
        }, ],
    },
    {
        label: "分公司负责人",
        prop: "representative",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入分公司负责人",
            trigger: "blur",
        }, ],
    }, {
        label: "分公司负责人电话",
        prop: "representativecell",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入分公司负责人电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "联系人",
        prop: "contacts",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系人",
            trigger: "blur",
        }, ],
    }, {
        label: "联系电话",
        prop: "contactscell",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "企业属性",
        prop: "stats",
        type: "tree",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业属性",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册地址",
        prop: "address",
        span: 12,
        labelWidth: 145,
        disabled: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入注册地址",
            trigger: "blur",
        }, ],
    },
    {
        label: "办公地址",
        prop: "industry",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择办公地址",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务区域",
        labelWidth: 145,
        prop: "fregion",
        display: false,
        rules: [{
            required: true,
            message: "请输入服务区域",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务时间",
        labelWidth: 145,
        prop: "ftime",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        display: false,
        rules: [{
            required: true,
            message: "请选择服务时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "登记机关",
        prop: "registration",
        // span: 11,
        labelWidth: 145,
        disabled: true,
        span: 12,
        rules: [{
            required: true,
            message: "请输入登记机关",
            trigger: "blur",
        }, ],
    },

]

//自招保安单位基本信息
export var selfColumn = [{
        label: "",
        labelWidth: 20,
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    {
        label: "企业名称",
        prop: "enterprisename",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        //父节点不能选
        parent: false,
        type: "tree",
        dicUrl: "/api//jurisdiction/lazy-trees",
        props: {
            label: "title",
            value: "id",
        },
        span: 12,
        labelWidth: 145,
        width: 110,
        overHidden: true,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择所属辖区",
            trigger: "click",
        }, ],
    },
    {
        label: "联系人",
        prop: "contacts",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系人",
            trigger: "blur",
        }, ],
    }, {
        label: "联系电话",
        prop: "contactscell",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "企业属性",
        prop: "stats",
        type: "tree",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业属性",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册地址",
        prop: "address",
        span: 12,
        labelWidth: 145,
        disabled: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入注册地址",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务区域",
        labelWidth: 145,
        prop: "fregion",
        rules: [{
            required: true,
            message: "请输入服务区域",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务时间",
        labelWidth: 145,
        prop: "ftime",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择服务时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "登记机关",
        prop: "registration",
        // span: 11,
        labelWidth: 145,
        disabled: true,
        span: 12,
        rules: [{
            required: true,
            message: "请输入登记机关",
            trigger: "blur",
        }, ],
    },

]

export var businessColumn = [{
        label: "总公司工商信息",
        labelWidth: "110",
@@ -741,6 +1055,141 @@
        }, ],
    },
]
export var lincenceTrainColumn = [{
        label: "",
        labelWidth: 20,
        type: "title",
        prop: "title",
        span: 24,
        styles: {
            fontSize: "24px",
        },
    },
    {
        label: "名称",
        prop: "unitName",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "住所",
        prop: "address",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入住所",
            trigger: "blur",
        }, ],
    },
    {
        label: "法定代表人",
        prop: "legalPeople",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入法定代表人",
            trigger: "blur",
        }, ],
    },
    {
        label: "批准文号",
        prop: "approvalNumber",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入批准文号",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证机关",
        prop: "licenceIssuingUnit",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入发证机关",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证时间",
        prop: "licenceIssuingTime",
        span: 12,
        labelWidth: 130,
        disabled: false,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择发证时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证编号",
        prop: "code",
        span: 12,
        labelWidth: 130,
        disabled: false,
        row: false,
        rules: [{
            required: true,
            message: "请输入许可证编号",
            trigger: "blur",
        }, ],
    },
    {
        label: "培训内容",
        prop: "content",
        type: "textarea",
        span: 24,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入培训内容",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证图片",
        prop: "url",
        type: "upload",
        listType: "picture-img",
        span: 12,
        propsHttp: {
            res: "data",
        },
        canvasOption: {
            text: "",
            ratio: 1.0,
        },
        labelWidth: 130,
        tip: "只能上传jpg/png格式图片，且不超过2Mb",
        action: "/api/blade-resource/oss/endpoint/put-files",
        disabled: false,
        rules: [{
            required: true,
            message: "请上传许可证图片",
            trigger: "blur",
        }, ],
    },
]

export var column11 = [{
        label: "",

 src/views/securityUnitChild/index.vue

@@ -112,10 +112,13 @@
import {
  column11,
  column,
  filialeColumn,
  selfColumn,
  lincenceColumn,
  businessColumn,
  lincenceGroupColumn,
  lincenceGroupColumns
  lincenceGroupColumns,
  lincenceTrainColumn
} from "./data";
import {
  getOncedata,
@@ -124,7 +127,7 @@
  submit,
  getLicenceDetail,
  licenceSubmit,
  submitGroup
  submitGroup,
} from "@/api/securityUnit/securityUnit";
import manager from "./manager.vue";
import shareholder from "./shareholder.vue";
@@ -313,18 +316,17 @@
        row["id"] = that.licenceObj.id;
      }

      if(this.stats=="1"){
      if (this.stats == "1") {
        row["type"] = 2;
      }else{
      } else {
        row["type"] = 1;
      }
      

      if (row.id) {
        row["updateUser"] = this.userInfo.Id;
      } else {
        row["createUser"] = this.userInfo.Id;
      }
      // console.log(row);
      licenceSubmit(row).then(
        () => {
          this.$message({
@@ -439,59 +441,9 @@
    //获取许可证信息
    getLicenceInfo() {
      var that = this;
      if (this.stats == "1") {
        //培训学校
        const contentcolumn = this.findObject(
          this.licenceOption.column,
          "content"
        );
        const registerCapitalcolumn = this.findObject(
          this.licenceOption.column,
          "registerCapital"
        );
        const urlcolumn = this.findObject(this.licenceOption.column, "url");
        const codecolumn = this.findObject(this.licenceOption.column, "code");
        //表单控制
        contentcolumn.label = "培训内容";
        contentcolumn.rules = [
          {
            required: true,
            message: "请输入培训内容",
            trigger: "blur",
          },
        ];
        urlcolumn.label = "培训许可证图片";
        urlcolumn.rules = [
          {
            required: true,
            message: "请上传培训许可证图片",
            trigger: "blur",
          },
        ];
        codecolumn.label = "培训许可证编号";
        codecolumn.rules = [
          {
            required: true,
            message: "请上传培训许可证编号",
            trigger: "blur",
          },
        ];
        registerCapitalcolumn.display = false;
        //获取许可证信息
        getLicenceDetail(this.deptId).then((res) => {
          that.licenceObj = res.data.data;
        });
      } else{
        if(this.userInfo.role_name=="保安公司管理员" ||
        this.userInfo.role_name=="分公司管理员" ||
        this.userInfo.role_name=="培训公司管理员"){
          //其他单位
          getLicenceDetail(this.deptId).then((res) => {
            that.licenceObj = res.data.data;
          });
        }
        
      }
      getLicenceDetail(this.deptId).then((res) => {
        that.licenceObj = res.data.data;
      });
    },
    //tag 防重复处理
    tagTraim() {
@@ -515,21 +467,37 @@
    //编辑状态控制
    editController() {
      var that = this;
      if (this.stats == "1") {
        //培训学校
        this.licenceOption.column = lincenceTrainColumn;
      }else{
        this.licenceOption.column = lincenceColumn;
      }

      //基本信息列控制
      if (this.stats == "4") {
        //分公司
        this.optionBase.column = filialeColumn;
      }else if(this.stats == "0"){
        //自招保安单位
        this.optionBase.column = selfColumn;
      }else{
        //学校，本市保安公司
        this.optionBase.column = column;
      }

      //获取当前登录人员的角色信息
      var roleIds = this.userInfo.role_id.split(",");
      roleIds.forEach((roleId) => {
        getRoleDetail(roleId).then((res) => {
          var roleAlias = res.data.data.roleAlias;
      // var roleIds = this.userInfo.role_id.split(",");
      // roleIds.forEach((roleId) => {
      //   getRoleDetail(roleId).then((res) => {
      //     var roleAlias = res.data.data.roleAlias;
          var roleAlias = this.userInfo.role_name;
          var d = that.optionBase.column;
          var e = that.option01.column;
          var f = that.businessOption.group;
          var g = f[0].column;
          var h = f[1].column;
          var aa = that.licenceGroupOption.group;
          var a1 = aa[0].column;
          var a2 = aa[1].column;
          var bb = that.licenceOption.column;
          // console.log(g, 33333);
          //控制按钮，编辑状态
          if (
            roleAlias == "保安公司管理员" ||
@@ -539,7 +507,6 @@
            that.optionBase.submitBtn = true;
            that.businessOption.submitBtn = true;
            that.option01.submitBtn = true;
            that.licenceGroupOption.submitBtn = true;
            that.licenceOption.submitBtn = true;
            for (var k in d) {
              d[k].disabled = false;
@@ -553,20 +520,13 @@
            for (var m in h) {
              h[m].disabled = false;
            }
            for (var m in a1) {
              a1[m].disabled = false;
            }
            for (var m in a2) {
              a2[m].disabled = false;
            }
            for (var m in bb) {
              bb[m].disabled = false;
            for (var mm in bb) {
              bb[mm].disabled = false;
            }
          } else {
            that.optionBase.submitBtn = false;
            that.option01.submitBtn = false;
            that.businessOption.submitBtn = false;
            that.licenceGroupOption.submitBtn = false;
            that.licenceOption.submitBtn = false;
            for (var a in d) {
              d[a].disabled = true;
@@ -580,18 +540,12 @@
            for (var z in h) {
              h[z].disabled = true;
            }
            for (var z in a1) {
              a1[z].disabled = true;
            }
            for (var z in a2) {
              a2[z].disabled = true;
            }
            for (var z in bb) {
              bb[z].disabled = true;
            for (var zz in bb) {
              bb[zz].disabled = true;
            }
          }
        });
      });
        // });
      // });
    },
    //获取保安公司数据
    getdatas(data) {
@@ -615,48 +569,6 @@
          that.creditcode = row.creditcode;
        }
        that.overHtp = true;
        if (data.stats == "0") {
          //自招保安单位
          const industrycolumn = this.findObject(
            this.optionBase.column,
            "industry"
          );
          const representativecolumn = this.findObject(
            this.optionBase.column,
            "representative"
          );
          const representativecellcolumn = this.findObject(
            this.optionBase.column,
            "representativecell"
          );
          const fregioncolumn = this.findObject(
            this.optionBase.column,
            "fregion"
          );
          const ftimecolumn = this.findObject(this.optionBase.column, "ftime");

          //法人及电话，办公地址不可见
          industrycolumn.display = false;
          representativecolumn.display = false;
          representativecellcolumn.display = false;
          //服务区域，时间可见
          fregioncolumn.display = true;
          ftimecolumn.display = true;
        }
        if (data.stats == "4") {
          //分公司
          const representativecolumn = this.findObject(
            this.optionBase.column,
            "representative"
          );
          const representativecellcolumn = this.findObject(
            this.optionBase.column,
            "representativecell"
          );
          //法人及电话不可见
          representativecolumn.label = "分公司负责人";
          representativecellcolumn.label = "分公司负责人电话";
        }
      } else {
        that.objBase.enterprisename = "未选择查询单位";
      }
@@ -724,7 +636,6 @@
          if (that.businessObj.id == -1) {
            that.businessObj.id = null;
          }
          // console.log(that.businessObj,1234546);
        });
      }
      if (stats == "1") {

 vue.config.js

@@ -27,8 +27,8 @@
        proxy: {
            '/api': {
                // 本地服务接口地址
                // target: 'http://localhost:81',
                target: 'http://192.168.0.114: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.107:81',//唐N