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

liuyg

2021-11-25 59b044f6e98af14dd84779f91de6909f893451c0

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

 src/views/desk/notice.vue

@@ -221,14 +221,14 @@
                        label: "通知内容",
                        prop: "content",
                        component: "AvueUeditor",
                        options: {
                            action: "/api/blade-resource/oss/endpoint/put-file",
                            props: {
                                res: "data",
                                url: "link",
                            },
                        },
                        hide: true,
                        // options: {
                        //     action: "/api/blade-resource/oss/endpoint/put-file",
                        //     props: {
                        //         res: "data",
                        //         url: "link",
                        //     },
                        // },
                        hide: false,
                        minRows: 6,
                        span: 24,
                    },
@@ -436,6 +436,8 @@
                const { releaseTimeRange } = this.query;
                params["jurisdiction"] = this.jurisdiction;
                params["type"] = 1;

                
                let values = {
                    ...params,
                };

 src/views/securityAnalysis/child/examination.vue

@@ -52,7 +52,7 @@
        column: [
          {
            label: "姓名",
            prop: "securityName",
            prop: "realName",
            disabled: true,
            search: true,
          },

 src/views/securityEquipment/car.js

@@ -1,178 +1,178 @@
var DIC = [{
  label: '招聘中',
  value: 1,
    label: '招聘中',
    value: 1,
}, {
  label: '停止招聘',
  value: 2,
    label: '停止招聘',
    value: 2,
}]

export var column = [
  // {
  //     label: "id",
  //     prop: "id",
  //     hide: true,
  //     editDisplay: false,
  //     addDisplay: false
  // },
  {
    label: "车牌号码",
    prop: "carNumber",
    searchSpan: 3,
    search: true,
    rules: [{
      required: true,
      message: "请输入车牌号码",
      trigger: "blur"
    }]
  },
  {
    label: "号码种类",
    prop: "numberType",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=carNumberType",
    search: true,
    type: "select",
    props: {
      label: "dictValue",
      value: "dictKey"
    // {
    //     label: "id",
    //     prop: "id",
    //     hide: true,
    //     editDisplay: false,
    //     addDisplay: false
    // },
    {
        label: "车牌号码",
        prop: "carNumber",
        searchSpan: 3,
        search: true,
        rules: [{
            required: true,
            message: "请输入车牌号码",
            trigger: "blur"
        }]
    },
    dataType: "number",
    searchSpan: 3,
    rules: [{
      required: true,
      message: "请输入号码种类",
      trigger: "blur"
    }],
  }, //上面不显示
  {
    label: "车辆类型",
    prop: "carType",
    rules: [{
      required: true,
      message: "请输入车辆类型",
      trigger: "blur"
    }],
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
    search: true,
    searchSpan: 3,
    type: "select",
    props: {
      label: "dictValue",
      value: "dictKey"
    {
        label: "号码种类",
        prop: "numberType",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carNumberType",
        search: true,
        type: "select",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 3,
        rules: [{
            required: true,
            message: "请输入号码种类",
            trigger: "blur"
        }],
    }, //上面不显示
    {
        label: "车辆类型",
        prop: "carType",
        rules: [{
            required: true,
            message: "请输入车辆类型",
            trigger: "blur"
        }],
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
        search: true,
        searchSpan: 3,
        type: "select",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
    }, {
        label: "车辆型号",
        prop: "mode",
        // search: true,
        width: 110,
        overHidden: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入车辆型号",
            trigger: "blur"
        }]
    },
    dataType: "number",
  }, {
    label: "车辆型号",
    prop: "mode",
    // search: true,
    width: 110,
    overHidden: true,
    // search: true,
    rules: [{
      required: true,
      message: "请输入车辆型号",
      trigger: "blur"
    }]
  },
  {
    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",
    props: {
      label: "title",
      value: "id"
    {
        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",
        props: {
            label: "title",
            value: "id"
        },
        type: "select",
    },
    type: "select",
  },
  {
    label: "责任人",
    prop: "personInCharge",
    rules: [{
      required: true,
      message: "请输入责任人",
      trigger: "blur"
    }]
  },
  {
    label: "厂商",
    prop: "brand",
    // search: true,
    width: 110,
    overHidden: true,
    search: true,
    rules: [{
      required: true,
      message: "请输入厂商",
      trigger: "blur"
    }],
    searchSpan: 4,
  },
  {
    label: "出厂日期",
    prop: "dateForProduction",
    type: "date",
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    searchSpan: 4,
    overHidden: true,
    rules: [{
      required: true,
      message: "请输入出厂日期",
      trigger: "blur"
    }]
  },
  {
    label: "环保标志",
    prop: "umweltsatz",
    // search: true,
    width: 110,
    overHidden: true,
    // search: true,
    rules: [{
      required: true,
      message: "请输入环保标志(如:国IV)",
      trigger: "blur"
    }],
    searchSpan: 4,
  },
  {
    label: "行驶情况",
    prop: "drivingConditions",
    // search: true,
    width: 110,
    hide: true,
    // search: true,
    searchSpan: 4,
  },
  {
    label: "车辆图片",
    type: "upload",
    listType: "picture-img",
    propsHttp: {
      res: "data",
      url: "link",
    {
        label: "责任人",
        prop: "personInCharge",
        rules: [{
            required: true,
            message: "请输入责任人",
            trigger: "blur"
        }]
    },
    canvasOption: {
      text: " ",
      ratio: 0.1,
    {
        label: "厂商",
        prop: "brand",
        // search: true,
        width: 110,
        overHidden: true,
        search: true,
        rules: [{
            required: true,
            message: "请输入厂商",
            trigger: "blur"
        }],
        searchSpan: 4,
    },
    action: "/api/blade-resource/oss/endpoint/put-file",
    tip: "只能上传单张车辆图片，且不超过500kb",
    span: 10,
    // row: true,
    prop: "picture",
  },
    {
        label: "出厂日期",
        prop: "dateForProduction",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        searchSpan: 4,
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入出厂日期",
            trigger: "blur"
        }]
    },
    {
        label: "环保标志",
        prop: "umweltsatz",
        // search: true,
        width: 110,
        overHidden: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入环保标志(如:国IV)",
            trigger: "blur"
        }],
        searchSpan: 4,
    },
    {
        label: "行驶情况",
        prop: "drivingConditions",
        // search: true,
        width: 110,
        hide: false,
        // search: true,
        searchSpan: 4,
    },
    {
        label: "车辆图片",
        type: "upload",
        listType: "picture-img",
        propsHttp: {
            res: "data",
            url: "link",
        },
        canvasOption: {
            text: " ",
            ratio: 0.1,
        },
        action: "/api/blade-resource/oss/endpoint/put-file",
        tip: "只能上传单张车辆图片，且不超过500kb",
        span: 10,
        // row: true,
        prop: "picture",
    },

]
]

 src/views/securityEquipment/equipments.js

@@ -36,6 +36,16 @@
            // search: true,
    },
    {
        label: "规格",
        prop: "specifications",
        rules: [{
                required: true,
                message: "请输入规格",
                trigger: "blur"
            }]
            // search: true,
    },
    {
        label: "数量",
        prop: "num",
        rules: [{
@@ -47,49 +57,46 @@
        width: 70,
    },
    {
      label: "装备类型",
      search: true,
      searchSpan: 4,
      prop: "type",
      slot: true,
      type: "select",
      rules: [
        {
          required: true,
          message: "请选择装备类型",
          trigger: "blur",
        },
      ],
      dicData: [
        {
          label: "交通工具",
          value: 1,
        },
        {
          label: "通讯设备",
          value: 2,
        },
        {
          label: "非杀伤性防卫器材",
          value: 3,
        },
        {
          label: "人体安全防护器材",
          value: 4,
        },
        {
          label: "救生器材",
          value: 5,
        },
        {
          label: "训练器材",
          value: 6,
        },
        {
          label: "其他器材",
          value: 7,
        },
      ],
        label: "装备类型",
        search: true,
        searchSpan: 4,
        prop: "type",
        slot: true,
        type: "select",
        rules: [{
            required: true,
            message: "请选择装备类型",
            trigger: "blur",
        }, ],
        dicData: [{
                label: "交通工具",
                value: 1,
            },
            {
                label: "通讯设备",
                value: 2,
            },
            {
                label: "非杀伤性防卫器材",
                value: 3,
            },
            {
                label: "人体安全防护器材",
                value: 4,
            },
            {
                label: "救生器材",
                value: 5,
            },
            {
                label: "训练器材",
                value: 6,
            },
            {
                label: "其他器材",
                value: 7,
            },
        ],
    },
    {
        label: "所属保安公司",
@@ -167,4 +174,4 @@
            trigger: "blur"
        }]
    }
]
]

 src/views/securityUnitChild/data.js

@@ -8,268 +8,268 @@
var w = 160,
    s = 12;
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,
    }, {
        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: "region",
        // multiple: true,
        type: "tree",
        dicUrl: "/api/jurisdiction/lazy-tree",
        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: "region",
    // multiple: true,
    type: "tree",
    dicUrl: "/api/jurisdiction/lazy-tree",
    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,
},
{
    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: "",
        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,
    },
    {
        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",
@@ -349,104 +349,111 @@
    // }
]
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,
},
//  {
//     label: "最终受益股份",
//     prop: "beneficial",
// },
{
    label: "出资金额(万元)",
    prop: "capital",
    labelWidth: w,
    span: s,
}, {
    label: "出资时间",
    prop: "capitaltime",
    type: "date",
    format: "yyyy-MM-dd hh:mm:ss",
    valueFormat: "timestamp",
    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: "shareholder",
        searchLabelWidth: 55,
        search: true,
        labelWidth: w,
        span: s,
    }, {
        label: "持股比例(%)",
        prop: "shareholdingratio",
        labelWidth: w,
        span: s,
    },
    //  {
    //     label: "最终受益股份",
    //     prop: "beneficial",
    // },
    {
        label: "出资金额(万元)",
        prop: "capital",
        labelWidth: w,
        span: s,
    }, {
        label: "出资时间",
        prop: "capitaltime",
        type: "date",
        format: "yyyy-MM-dd hh:mm:ss",
        valueFormat: "timestamp",
        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: "age",
        addDisplay: false,
        editDisplay: false,
        labelWidth: w,
        span: s,
    }
    //     , {
    //         label: "持股比例(%)",
    //         prop: "shareholdingratio",

 src/views/securityUnitChild/index.vue

@@ -754,7 +754,7 @@
    },
    rowUpdate2(row, index, done, loading) {
      console.log(row);
      delete row.shareholdingratio;
      // delete row.shareholdingratio;
      update2(row).then(
        () => {
          this.onLoad2(this.page2);

 src/views/system/user.vue

@@ -1016,6 +1016,7 @@
    onLoad(page, params = {}) {
      this.loading = true;
      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
      params['status'] = 1;
      getList(
        page.currentPage,
        page.pageSize,

 vue.config.js

@@ -30,12 +30,12 @@
                // target: 'http://localhost:83',
                // target: 'http://192.168.0.114:83',//钟日健W
                // target: 'http://192.168.0.106:83',//曾杭W
                // target: 'http://localhost:81',
                target: 'http://localhost:83',
                // target: 'http://192.168.0.115:83',//原W
                // target: 'http://localhost:81', //原W
                // target: 'http://192.168.0.115:83',//原W
                // target: 'http://192.168.0.107:83',//唐N
                target: 'http://192.168.0.112:83',//唐N
                // target: 'http://192.168.0.112:83',//唐N
                //远程演示服务地址,可用于直接启动项目
                ws: true,
                pathRewrite: {
@@ -44,4 +44,4 @@
            }
        }
    }
};
};