冲突

liuyg

2021-11-10 61a386154bb1f5bab87d1e05de92316a53b5d6cf

冲突

 src/api/dispatch/dispatch.js

@@ -31,6 +31,14 @@
    })
}

export const saveDispatcher = (row) => {
    return request({
        url: '/api/dispatcher/saveDispatcher',
        method: 'post',
        data: row
    })
}

export const update = (row) => {
    return request({
        url: '/api/dispatcherUnit/submit',
@@ -81,7 +89,16 @@

export const update1 = (row) => {
    return request({
        url: '/api/dispatcher/submit',
        url: '/api/dispatcher/update',
        method: 'post',
        data: row
    })
}


export const updateDispatcher = (row) => {
    return request({
        url: '/api/dispatcher/updateDispatcher',
        method: 'post',
        data: row
    })

 src/api/social/social.js

@@ -2,75 +2,74 @@


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



export const getuseList = (id) => {
  return request({
    url: '/api/blade-user/detail',
    method: 'get',
    params: {
      id
    }
  })
    return request({
        url: '/api/blade-user/detail',
        method: 'get',
        params: {
            id
        }
    })
}


export const getList = (current, size, params) => {
  return request({
    url: '/api/social/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
    return request({
        url: '/api/social/list',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}

export const getDetail = (id) => {
  return request({
    url: '/api/social/detail',
    method: 'get',
    params: {
      id
    }
  })
    return request({
        url: '/api/social/detail',
        method: 'get',
        params: {
            id
        }
    })
}

export const remove = (ids) => {
  return request({
    url: '/api/social/remove',
    method: 'post',
    params: {
      ids,
    }
  })
    return request({
        url: '/api/social/remove',
        method: 'post',
        params: {
            ids,
        }
    })
}

export const add = (row) => {
  return request({
    url: '/api/social/save',
    method: 'post',
    data: row
  })
    return request({
        url: '/api/social/save',
        method: 'post',
        data: row
    })
}

export const update = (row) => {
  return request({
    url: '/api/social/submit',
    method: 'post',
    data: row
  })
}

    return request({
        url: '/api/social/submit',
        method: 'post',
        data: row
    })
}

 src/api/system/user.js

@@ -59,6 +59,17 @@
    })
}

export const getSecurityDispatcherTree = (deptId, status) => {
    return request({
        url: '/api/blade-user/security-dispatcher-tree',
        method: 'get',
        params: {
            deptId,
            status
        }
    })
}

export const remove = (ids) => {
    return request({
        url: '/api/blade-user/remove',
@@ -95,6 +106,15 @@
}


export const updateUser = (row) => {
    return request({
        url: '/api/blade-user/submit',
        method: 'post',
        data: row
    })
}


export const updatePaperTime = (row) => {
    return request({
        url: '/api/blade-user/updatePaperTime',

 src/views/dispatch/dispatch.vue

@@ -310,6 +310,7 @@
            searchSpan: 4,
            overHidden: true,
            labelWidth: 138,
            parent:false,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {

 src/views/dispatch/dispatchChildoperable.vue

@@ -25,13 +25,13 @@
<script>
import {
  getdata1,
  adddata1,
  update1,
  saveDispatcher,
  updateDispatcher,
  remove1,
  getDispatcherUnitByDeptId,
  overDispatcher,
} from "@/api/dispatch/dispatch";
import { update, getListByDeptId } from "@/api/system/user";
import { update, getSecurityDispatcherTree } from "@/api/system/user";
import { mapState } from "vuex";

export default {
@@ -39,7 +39,6 @@
    return {
      deptCategory: "",
      deptId: "",

      loading1: true, //派遣记录
      selectionList1: [],
      page1: {
@@ -130,16 +129,22 @@
            type: "tree",
            width: 70,
            labelWidth: 120,
            searchSpan: 3,
            search: true,
            hide: true,
            defaultExpandAll:true,
            // props: {
            //   label: "realName",
            //   value: "id",
            // },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/security-dispatcher-tree?deptId={{key}}`,
            dicData: [],
            props: {
              label: "realName",
              label: "name",
              value: "id",
            },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
            dicData: [],
            //不包含父节点值
            leafOnly:true,
            multiple: true,
            rules: [
              {
                required: true,
@@ -151,8 +156,10 @@
          {
            label: "保安员",
            prop: "securityName",
            type: "tree",
            // type: "tree",
            width: 70,
            searchSpan: 4,
            search: true,
            labelWidth: 120,
            addDisplay: false,
            editDisplay: false,
@@ -162,14 +169,13 @@
            //   value: "id",
            // },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
                required: true,
                message: "请选择保安",
                trigger: "blur",
              },
            ],
            // rules: [
            //   {
            //     required: true,
            //     message: "请选择保安",
            //     trigger: "blur",
            //   },
            // ],
          },

          {
@@ -353,7 +359,11 @@
      if (this.useifid != 266) {
        form["deptId"] = this.useifid;
      }
      adddata1(form).then(
      console.log(form,123456);
      form["ids"] = form.userIds.join(","),
      delete form.userIds; 
      console.log(form,321);
      saveDispatcher(form).then(
        (res) => {
          this.onLoad1(this.page1);
          this.$message({
@@ -376,7 +386,7 @@
      done();
    },
    searchReset1() {
      this.query = {};
      this.query1 = {};
      this.onLoad1(this.page1);
    },
    rowUpdate1(row, index, done, loading) {
@@ -387,7 +397,7 @@
      if (this.useifid != 266) {
        row["deptId"] = this.useifid;
      }
      update1(row).then(
      updateDispatcher(row).then(
        () => {
          this.onLoad1(this.page1);
          this.$message({
@@ -448,8 +458,19 @@
      this.onLoad1(this.page1, this.query1);
    },

    beforeOpen(done, type) {
    beforeOpen(done, type,row) {
      this.initFlag = true;
      if(type=="edit"){
        console.log(row,123);
        const userColumn = this.findObject(this.option1.column, "userIds");
        userColumn.multiple = false;
        userColumn.dicUrl = "/api/blade-user/security-dispatcher-tree?deptId="+this.userInfo.dept_id+"&id="+this.form.userIds+"&realName="+this.form.securityName;
      }
      if(type=="add"){
        const userColumn = this.findObject(this.option1.column, "userIds");
        userColumn.multiple = true;
        userColumn.dicUrl = "/api/blade-user/security-dispatcher-tree?deptId="+this.userInfo.dept_id;
      }
      done();
    },

@@ -485,13 +506,13 @@
          ...params,
          beginTime: releaseTimeRange[0],
          overTime: releaseTimeRange[1],
          ...this.query,
          ...this.query1,
        };
        values.releaseTimeRange = null;
      } else {
        values = {
          ...params,
          ...this.query,
          ...this.query1,
        };
      }

@@ -543,7 +564,7 @@
          );
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
        getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
        getSecurityDispatcherTree(that.userInfo.dept_id, 1).then((res) => {
          const userIdsColumn = that.findObject(this.option1.column, "userIds");
          userIdsColumn.dicData = res.data.data;
        });

 src/views/securityGuard/data.js

@@ -547,7 +547,7 @@
        prop: "cardid",
        search: true,
        searchLabelWidth: 90,
        searchSpan: 5,
        searchSpan: 4,
        minWidth: 140,
        display: false
    },
@@ -617,7 +617,7 @@
        search: true,
        searchLabelWidth: 90,
        minWidth: 105,
        searchSpan: 4,
        searchSpan: 3,
        addDisplay: false,
        editDisplay: false,
        // hide: true,
@@ -705,6 +705,8 @@
        slot: true,
        search: true,
        // searchValue: 7,
        editDisplay: false,
        addDisplay: false,
        searchSpan: 3,
        width: 69,
        dicData: [{
@@ -716,11 +718,6 @@
                value: 7,
            }
        ],
        rules: [{
            required: true,
            message: "请选择",
            trigger: "blur",
        }, ],
    },

    // {

 src/views/securityGuard/securityGuard.vue

@@ -526,7 +526,7 @@
              res: "data",
            },
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/blade-user/import-user?deptId=" + this.deptIds,
            action: "/api/blade-user/import-security?deptId=" + this.deptIds,
          },
          {
            label: "模板下载",
@@ -1083,7 +1083,7 @@
              res: "data",
            },
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/blade-user/import-user",
            action: "/api/blade-user/import-security",
          },
          // {
          //   label: "数据覆盖",
@@ -1176,7 +1176,7 @@
    "excelForm.isCovered"() {
      if (this.excelForm.isCovered !== "") {
        const column = this.findObject(this.excelOption.column, "excelFile");
        column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
        column.action = `/api/blade-user/import-security?isCovered=${this.excelForm.isCovered}`;
      }
    },
  },
@@ -1951,7 +1951,7 @@
              "excelFile"
            );
            importColumn.action =
              "/api/blade-user/import-user?deptId=" + this.deptIds;
              "/api/blade-user/import-security?deptId=" + this.deptIds;
          } else if (roleAlias == "公安管理员") {
            params["jurisdiction"] = that.userInfo.jurisdiction;
            var columnDept = that.findObject(that.option.column, "deptId");

 src/views/securityUnitChild/data.js

@@ -19,290 +19,300 @@


export var column = [{
    label: "",
    labelWidth: 20,
    type: 'title',
    prop: "title",
    span: 24,
    styles: {
        fontSize: '24px'
        label: "",
        labelWidth: 20,
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    {
        label: "企业名称",
        prop: "enterprisename",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    // {
    //     label: "统一社会信用代码",
    //     prop: "creditcode",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    {
        label: "法定代表人",
        prop: "representative",
        span: 11,
        labelWidth: 130,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入法定代表人",
            trigger: "blur",
        }, ],
    }, {
        label: "法定代表人电话",
        prop: "representativecell",
        span: 11,
        labelWidth: 130,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入法定代表人电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "联系人",
        prop: "contacts",
        span: 11,
        labelWidth: 130,
        disabled: true,
    }, {
        label: "联系电话",
        prop: "contactscell",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    // {
    //     label: "注册时间",
    //     prop: "establishtime",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "注册资本",
    //     prop: "registeredcapital",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "实缴资本",
    //     prop: "capital",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "组织机构代码",
    //     prop: "organizationcode",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "工商注册号",
    //     prop: "registrationnumber",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "纳税人识别号",
    //     prop: "identificationnumber",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    {
        label: "企业类型",
        prop: "stats",
        type: "tree",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    {
        label: "注册地址",
        prop: "address",
        span: 11,
        labelWidth: 130,
        disabled: true,
        // search: true,
    },
    // {
    //     label: "所属辖区",
    //     prop: "region",
    //     span: 11,
    //     labelWidth: 130,
    //     width: 110,
    //     overHidden: true,
    //     disabled: true,
    // },
    {
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        //父节点不能选
        parent: false,
        type: "tree",
        dicUrl: "/api//jurisdiction/lazy-trees",
        props: {
            label: "title",
            value: "id",
        },
        span: 11,
        labelWidth: 130,
        width: 110,
        overHidden: true,
        disabled: true,
        rules: [{
            required: false,
            message: "请选择所属辖区",
            trigger: "click",
        }, ],
    },
    {
        label: "所属行业",
        prop: "industry",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    {
        label: "登记机关",
        prop: "registration",
        // span: 11,
        labelWidth: 130,
        disabled: true,
        span: 11,
    },
    {
        label: "经营范围",
        prop: "business",
        span: 24,
        labelWidth: 130,
        width: 110,
        // overHidden: true,
        type: 'textarea',
        showWordLimit: true,
        disabled: true,
    }
},
{
    label: "企业名称",
    prop: "enterprisename",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
// {
//     label: "统一社会信用代码",
//     prop: "creditcode",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
{
    label: "法定代表人",
    prop: "representative",
    span: 11,
    labelWidth: 130,
    disabled: true,
}, {
    label: "法定代表人电话",
    prop: "representativecell",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
{
    label: "联系人",
    prop: "contacts",
    span: 11,
    labelWidth: 130,
    disabled: true,
}, {
    label: "联系电话",
    prop: "contactscell",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
// {
//     label: "注册时间",
//     prop: "establishtime",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "注册资本",
//     prop: "registeredcapital",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "实缴资本",
//     prop: "capital",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "组织机构代码",
//     prop: "organizationcode",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "工商注册号",
//     prop: "registrationnumber",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "纳税人识别号",
//     prop: "identificationnumber",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
{
    label: "企业类型",
    prop: "stats",
    type: "tree",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    span: 11,
    labelWidth: 130,
    disabled: true,
},
{
    label: "注册地址",
    prop: "address",
    span: 11,
    labelWidth: 130,
    disabled: true,
    // search: true,
},
// {
//     label: "所属辖区",
//     prop: "region",
//     span: 11,
//     labelWidth: 130,
//     width: 110,
//     overHidden: true,
//     disabled: true,
// },
{
    label: "所属辖区",
    prop: "jurisdiction",
    // multiple: true,
    type: "tree",
    dicUrl: "/api//jurisdiction/lazy-trees",
    props: {
        label: "title",
        value: "id",
    },
    span: 11,
    labelWidth: 130,
    width: 110,
    overHidden: true,
    disabled: true,
    rules: [{
        required: false,
        message: "请选择所属辖区",
        trigger: "click",
    },],
},
{
    label: "所属行业",
    prop: "industry",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
{
    label: "登记机关",
    prop: "registration",
    // span: 11,
    labelWidth: 130,
    disabled: true,
    span: 11,
},
{
    label: "经营范围",
    prop: "business",
    span: 24,
    labelWidth: 130,
    width: 110,
    // overHidden: true,
    type: 'textarea',
    showWordLimit: true,
    disabled: true,
}
]
export var column11 = [{
    label: "",
    labelWidth: 20,
    type: 'title',
    prop: "title",
    span: 24,
    styles: {
        fontSize: '24px'
    }
},
// {
//     label: "企业名称",
//     prop: "enterprisename",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
{
    label: "统一社会信用代码",
    prop: "creditcode",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
// {
//     label: "法定代表人",
//     prop: "representative",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "法定代表人电话",
//     prop: "representativecell",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
// {
//     label: "联系人",
//     prop: "contacts",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// }, {
//     label: "联系电话",
//     prop: "contactscell",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
{
    label: "注册时间",
    prop: "establishtime",
    span: 11,
    labelWidth: 130,
    disabled: true,
    type: "date",
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    // // 表单新增时是否禁止
    // addDisabled: false,
    // // 表单新增时是否可见
    // addDisplay: true,
    // // 表单新增时是否为查看模式
    // addDetail: false,
    // // 表单编辑时是否禁止
    // editDisabled: false,
    // // 表单编辑时是否可见
    // editDisplay: true,
    // // 表单编辑时是否为查看模式
    // editDetail: false,
    rules: [
        {
        label: "",
        labelWidth: 20,
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    // {
    //     label: "企业名称",
    //     prop: "enterprisename",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    {
        label: "统一社会信用代码",
        prop: "creditcode",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    // {
    //     label: "法定代表人",
    //     prop: "representative",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "法定代表人电话",
    //     prop: "representativecell",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    // {
    //     label: "联系人",
    //     prop: "contacts",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // }, {
    //     label: "联系电话",
    //     prop: "contactscell",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    {
        label: "注册时间",
        prop: "establishtime",
        span: 11,
        labelWidth: 130,
        disabled: true,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        // // 表单新增时是否禁止
        // addDisabled: false,
        // // 表单新增时是否可见
        // addDisplay: true,
        // // 表单新增时是否为查看模式
        // addDetail: false,
        // // 表单编辑时是否禁止
        // editDisabled: false,
        // // 表单编辑时是否可见
        // editDisplay: true,
        // // 表单编辑时是否为查看模式
        // editDetail: false,
        rules: [{
            required: true,
            message: "请选择注册时间",
            trigger: "blur",
        },
    ],
},
{
    label: "注册资本",
    prop: "registeredcapital",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
// {
//     label: "实缴资本",
//     prop: "capital",
//     span: 11,
//     labelWidth: 130,
//     disabled: true,
// },
{
    label: "组织机构代码",
    prop: "organizationcode",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
{
    label: "工商注册号",
    prop: "registrationnumber",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
{
    label: "纳税人识别号",
    prop: "identificationnumber",
    span: 11,
    labelWidth: 130,
    disabled: true,
},
        }, ],
    },
    {
        label: "注册资本",
        prop: "registeredcapital",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    // {
    //     label: "实缴资本",
    //     prop: "capital",
    //     span: 11,
    //     labelWidth: 130,
    //     disabled: true,
    // },
    {
        label: "组织机构代码",
        prop: "organizationcode",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    {
        label: "工商注册号",
        prop: "registrationnumber",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    {
        label: "纳税人识别号",
        prop: "identificationnumber",
        span: 11,
        labelWidth: 130,
        disabled: true,
    },
    // {
    //     label: "企业类型",
    //     prop: "stats",
@@ -382,119 +392,115 @@
    // }
]
export var column1 = [{
    label: "id",
    prop: "id",
    hide: true,
    addDisplay: false,
    editDisplay: false,
        label: "id",
        prop: "id",
        hide: true,
        addDisplay: false,
        editDisplay: false,

}, {
    label: "股东",
    prop: "shareholder",
    searchLabelWidth: 55,
    search: true,
    labelWidth: w,
    span: s,
}, {
    label: "持股比例(%)",
    prop: "shareholdingratio",
    labelWidth: w,
    span: s,
    rules: [
        {
    }, {
        label: "股东",
        prop: "shareholder",
        searchLabelWidth: 55,
        search: true,
        labelWidth: w,
        span: s,
    }, {
        label: "持股比例(%)",
        prop: "shareholdingratio",
        labelWidth: w,
        span: s,
        rules: [{
            required: true,
            validator: validatePassNumber,
            trigger: "blur",
        },
    ],
},
//  {
//     label: "最终受益股份",
//     prop: "beneficial",
// },
{
    label: "出资金额(万元)",
    prop: "capital",
    labelWidth: w,
    span: s,
    rules: [
        {
        }, ],
    },
    //  {
    //     label: "最终受益股份",
    //     prop: "beneficial",
    // },
    {
        label: "出资金额(万元)",
        prop: "capital",
        labelWidth: w,
        span: s,
        rules: [{
            required: true,
            validator: validatePassNumber,
            trigger: "blur",
        },
    ],
        }, ],

}, {
    label: "出资时间",
    prop: "capitaltime",
    type: "date",
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    labelWidth: w,
    span: s,
}, {
    label: "身份证",
    prop: "cardid",
    labelWidth: w,
    span: s,
    search: true
}, {
    label: "联系电话",
    prop: "cell",
    labelWidth: w,
    span: s,
}, {
    label: "统一社会信用代码",
    prop: "creditcode",
    hide: true,
    addDisplay: false,
    editDisplay: false,
    labelWidth: w,
    span: s,
},
    }, {
        label: "出资时间",
        prop: "capitaltime",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        labelWidth: w,
        span: s,
    }, {
        label: "身份证",
        prop: "cardid",
        labelWidth: w,
        span: s,
        search: true
    }, {
        label: "联系电话",
        prop: "cell",
        labelWidth: w,
        span: s,
    }, {
        label: "统一社会信用代码",
        prop: "creditcode",
        hide: true,
        addDisplay: false,
        editDisplay: false,
        labelWidth: w,
        span: s,
    },
]

export var column2 = [{
    label: "统一社会信用代码",
    prop: "creditcode",
    hide: true,
    addDisplay: false,
    editDisplay: false,
    labelWidth: w,
    span: s,
}, {
    label: "id",
    prop: "id",
    hide: true,
    addDisplay: false,
    editDisplay: false,
    labelWidth: w,
    span: s,
}, {
    label: "姓名",
    prop: "name",
    search: true,
    labelWidth: w,
    searchLabelWidth: 55,
    span: s,
}, {
    label: "职务",
    prop: "post",
    search: true,
    labelWidth: w,
    span: s,
}, {
    label: "身份证",
    prop: "cardid",
    labelWidth: w,
    span: s,
}, {
    label: "联系电话",
    prop: "cell",
    labelWidth: w,
    span: s,
}
        label: "统一社会信用代码",
        prop: "creditcode",
        hide: true,
        addDisplay: false,
        editDisplay: false,
        labelWidth: w,
        span: s,
    }, {
        label: "id",
        prop: "id",
        hide: true,
        addDisplay: false,
        editDisplay: false,
        labelWidth: w,
        span: s,
    }, {
        label: "姓名",
        prop: "name",
        search: true,
        labelWidth: w,
        searchLabelWidth: 55,
        span: s,
    }, {
        label: "职务",
        prop: "post",
        search: true,
        labelWidth: w,
        span: s,
    }, {
        label: "身份证",
        prop: "cardid",
        labelWidth: w,
        span: s,
    }, {
        label: "联系电话",
        prop: "cell",
        labelWidth: w,
        span: s,
    }
    //     , {
    //         label: "持股比例(%)",
    //         prop: "shareholdingratio",

 src/views/securityUnitChild/social.vue

@@ -147,10 +147,6 @@
                label: "女",
                value: 2,
              },
              {
                label: "未知",
                value: 3,
              },
            ],
            labelWidth: 110,
            addDisabled: true,
@@ -163,21 +159,21 @@
              },
            ],
          },
          {
            label: "民族",
            prop: "nation",
            addDisabled: true,
            editDisabled: true,
            width: 55,
            labelWidth: 110,
            rules: [
              {
                required: true,
                message: "请输入民族",
                trigger: "blur",
              },
            ],
          },
          // {
          //   label: "民族",
          //   prop: "nation",
          //   addDisabled: true,
          //   editDisabled: true,
          //   width: 55,
          //   labelWidth: 110,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入民族",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          // {
          //   label: "出生日期",
          //   labelWidth: 110,

 src/views/system/user.vue

@@ -189,6 +189,7 @@
  getUserPlatform,
  remove,
  update,
  updateUser,
  updatePlatform,
  add,
  grant,
@@ -330,43 +331,6 @@
            width: 130,
            display: false,
          },
          // {
          //   label: "所属部门",
          //   prop: "deptName",
          //   slot: true,
          //   display: false
          // },
          // {
          //   label: "用户平台",
          //   prop: "userTypeName",
          //   addDisplay:false,
          //   viewDisplay:false,
          //   editDisplay:false,
          //   slot: true,
          //   display: false
          // },
          // {
          //   label: "用户平台",
          //   type: "select",
          //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
          //   props: {
          //     label: "dictValue",
          //     value: "dictKey"
          //   },
          //   dataType: "number",
          //   search: true,
          //   hide: true,
          //   addDisplay:false,
          //   viewDisplay:false,
          //   editDisplay:false,
          //   display: false,
          //   prop: "userType",
          //   rules: [{
          //     required: true,
          //     message: "请选择用户平台",
          //     trigger: "blur"
          //   }]
          // },
        ],
        group: [
          {
@@ -395,7 +359,7 @@
                    trigger: "click",
                  },
                ],
                span: 24,
                span: 12,
              },
              {
                label: "登录账号",
@@ -408,23 +372,6 @@
                  },
                ],
              },
              // {
              //   label: "用户平台",
              //   type: "select",
              //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              //   props: {
              //     label: "dictValue",
              //     value: "dictKey"
              //   },
              //   dataType: "number",
              //   slot: true,
              //   prop: "userType",
              //   rules: [{
              //     required: true,
              //     message: "请选择用户平台",
              //     trigger: "blur"
              //   }]
              // },
              {
                label: "密码",
                prop: "password",
@@ -432,6 +379,7 @@
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                span: 12,
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
@@ -441,6 +389,7 @@
                prop: "password2",
                type: "password",
                hide: true,
                span: 12,
                editDisplay: false,
                viewDisplay: false,
                rules: [
@@ -456,18 +405,6 @@
            icon: "el-icon-s-order",
            column: [
              {
                label: "用户昵称",
                prop: "name",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入用户昵称",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "用户姓名",
                prop: "realName",
                rules: [
@@ -482,70 +419,6 @@
                    message: "姓名长度在2到5个字符",
                  },
                ],
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true,
              },
              {
                label: "电子邮箱",
                prop: "email",
                hide: true,
                overHidden: true,
              },
              {
                label: "用户性别",
                prop: "sex",
                type: "select",
                dicData: [
                  {
                    label: "男",
                    value: 1,
                  },
                  {
                    label: "女",
                    value: 2,
                  },
                  // {
                  //   label: "未知",
                  //   value: 3,
                  // },
                ],
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请选择性别",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "用户生日",
                type: "date",
                prop: "birthday",
                format: "yyyy-MM-dd hh:mm:ss",
                valueFormat: "yyyy-MM-dd hh:mm:ss",
                hide: true,
              },
              {
                label: "账号状态",
                prop: "statusName",
                hide: true,
                display: false,
              },
            ],
          },
          {
            label: "职责信息",
            labelWidth: "110",
            prop: "dutyInfo",
            icon: "el-icon-s-custom",
            column: [
              {
                label: "用户编号",
                prop: "code",
              },
              {
                label: "所属角色",
@@ -566,39 +439,59 @@
                  },
                ],
              },
              // {
              //   label: "所属部门",
              //   prop: "deptId",
              //   type: "tree",
              //   multiple: true,
              //   dicData: [],
              //   props: {
              //     label: "title"
              //   },
              //   checkStrictly: true,
              //   slot: true,
              //   rules: [{
              //     required: true,
              //     message: "请选择所属部门",
              //     trigger: "click"
              //   }]
              // },
              {
                label: "所属岗位",
                prop: "postId",
                type: "tree",
                multiple: true,
                dicData: [],
                props: {
                  label: "postName",
                  value: "id",
                },
                // rules: [{
                //   required: true,
                //   message: "请选择所属岗位",
                //   trigger: "click"
                // }],
                label: "警号",
                prop: "code",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入警号",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "身份证号码",
                prop: "cardid",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入身份证号码",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true,
              },
              {
                label: "用户性别",
                prop: "sex",
                type: "select",
                dicData: [
                  {
                    label: "男",
                    value: 1,
                  },
                  {
                    label: "女",
                    value: 2,
                  },
                ],
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请选择性别",
                    trigger: "blur",
                  },
                ],
              },
              
            ],
          },
        ],
@@ -857,10 +750,10 @@
        const column = this.findObject(this.option.group, "deptId");
        column.dicData = res.data.data;
      });
      getPostList(tenantId).then((res) => {
        const column = this.findObject(this.option.group, "postId");
        column.dicData = res.data.data;
      });
      // getPostList(tenantId).then((res) => {
      //   const column = this.findObject(this.option.group, "postId");
      //   column.dicData = res.data.data;
      // });
    },
    submitRole() {
      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -876,14 +769,12 @@
    rowSave(row, done, loading) {
      row.deptId = row.deptId;
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      console.log(row, "row");
      var params = {
        deptname: row.$deptId,
      };
      getJurisdiction(params).then((res) => {
        // console.log(res.data.data);
        // return;
        console.log(res.data,123);
        console.log(res.data.data,1234);
        if (res.data.msg != "暂无承载数据") {
          row.jurisdiction = res.data.data;
        } else {
@@ -910,8 +801,9 @@
    rowUpdate(row, index, done, loading) {
      row.deptId = row.deptId;
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      update(row).then(
      // row.postId = row.postId.join(",");
      delete row.postId;
      updateUser(row).then(
        () => {
          this.initFlag = false;
          this.onLoad(this.page);
@@ -1055,6 +947,11 @@
    },
    beforeOpen(done, type) {
      if (["edit", "view"].includes(type)) {
        if(this.userInfo.role_name!="公安管理员"){
          const column = this.findObject(this.option.group, "code");
          column.display = false;
        }
        
        getUser(this.form.id).then((res) => {
          this.form = res.data.data;
          if (this.form.hasOwnProperty("deptId")) {
@@ -1068,6 +965,12 @@
          }
        });
      }
      if (["add"].includes(type)) {
        if(this.userInfo.role_name!="公安管理员"){
          const column = this.findObject(this.option.group, "code");
          column.display = false;
        }
      }
      this.initFlag = true;
      done();
    },