企业公司单位拆分 保安公司字段修改

liuyg

2021-08-20 f3b017a027cef808a4799d8cdd46ff9d89c59f47

企业公司单位拆分  保安公司字段修改

 public/favicon.png

 src/views/exam/performance.vue

@@ -53,7 +53,6 @@
                @click="handleImport"
                >实操成绩导入
              </el-button>
              
            </template>

            <template slot-scope="{ row }" slot="menu">
@@ -62,13 +61,11 @@
                size="mini"
                icon="el-icon-collection"
                class="start-kaoshi"
                :disabled="row.qualified==1"
                :disabled="row.qualified == 1"
                @click="securityPrint(row)"
                >保安证打印
              </el-button>
            </template>


          </avue-crud>

          <el-dialog
@@ -154,7 +151,7 @@
            search: true,
            searchSpan: 4,
            slot: true,
            viewDisplay:false,
            viewDisplay: false,
            // 表单新增时是否禁止
            addDisabled: false,
            // 表单新增时是否可见
@@ -174,7 +171,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
            overHidden: true,
          },
          {
            label: "用户名",
@@ -352,26 +349,28 @@
            ],
          },
          {
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              // 表单新增时是否禁止
              addDisabled: false,
              // 表单新增时是否可见
              addDisplay: true,
              // 表单新增时是否为查看模式
              addDetail: false,
              // 表单编辑时是否禁止
              editDisabled: true,
              // 表单编辑时是否可见
              editDisplay: true,
              // 表单编辑时是否为查看模式
              editDetail: false,
              rules: [{
                  required: true,
                  message: "请输入考试名称",
                  trigger: "blur"
              }]
            label: "总成绩",
            prop: "allGrade",
            slot: true,
            // 表单新增时是否禁止
            addDisabled: false,
            // 表单新增时是否可见
            addDisplay: true,
            // 表单新增时是否为查看模式
            addDetail: false,
            // 表单编辑时是否禁止
            editDisabled: true,
            // 表单编辑时是否可见
            editDisplay: true,
            // 表单编辑时是否为查看模式
            editDetail: false,
            rules: [
              {
                required: true,
                message: "请输入考试名称",
                trigger: "blur",
              },
            ],
          },
          {
            label: "是否合格",
@@ -532,11 +531,11 @@
    },

    questionBankRowUpdate(row, index, done, loading) {
      debugger;
      // debugger;
      update({
        theoryGrade: row.theoryGrade,
        learnGrade: row.learnGrade,
        examId:row.examId,
        examId: row.examId,
        id: row.id,
      }).then(
        () => {

 src/views/securityAnalysis/index.vue

@@ -74,11 +74,11 @@
        var d = [
          {
            value: a.bzc,
            name: "未审核",
            name: "审查情况正常",
          },
          {
            value: a.zc,
            name: "已审核",
            name: "审查情况异常",
          },
        ];

@@ -87,17 +87,17 @@
    },
    setEC1(d) {
      var option, data;
      if (d) {
        data = d;
      } else {
        data = [
          { value: 1048, name: "搜索引擎" },
          { value: 735, name: "直接访问" },
          { value: 580, name: "邮件营销" },
          { value: 484, name: "联盟广告" },
          { value: 300, name: "视频广告" },
        ];
      }
      // if (d) {
      data = d;
      // } else {
      //   data = [
      //     { value: 1048, name: "搜索引擎" },
      //     { value: 735, name: "直接访问" },
      //     { value: 580, name: "邮件营销" },
      //     { value: 484, name: "联盟广告" },
      //     { value: 300, name: "视频广告" },
      //   ];
      // }
      // console.log(data);
      option = {
        title: {
@@ -109,23 +109,25 @@
          trigger: "item",
        },
        legend: {
          orient: "vertical",
          left: "left",
          // orient: "vertical",
          // left: "left",
          x: "center",
          y: "90%",
        },
        series: [
          {
            // name: "访问来源",
            type: "pie",
            radius: "50%",
            // data: data,
            data: [
              { value: 1, name: "在逃人员" },
              { value: 3, name: "吸毒人员" },
              { value: 10, name: "刑释解教人员" },
              { value: 5, name: "社会闲散青少年" },
              { value: 11, name: "艾滋病人" },
              { value: 26, name: "其他人员" },
            ],
            data: data,
            // data: [
            //   { value: 1, name: "在逃人员" },
            //   { value: 3, name: "吸毒人员" },
            //   { value: 10, name: "刑释解教人员" },
            //   { value: 5, name: "社会闲散青少年" },
            //   { value: 11, name: "艾滋病人" },
            //   { value: 26, name: "其他人员" },
            // ],
            emphasis: {
              itemStyle: {
                shadowBlur: 10,
@@ -143,7 +145,7 @@
      var that = this;
      getinformationselectHold(this.deptid).then((res) => {
        var a = res.data.data[0];
        console.log(res);
        console.log(res, "持证情况");
        var d = [
          {
            value: a.wcz,
@@ -183,8 +185,10 @@
          trigger: "item",
        },
        legend: {
          orient: "vertical",
          left: "left",
          // orient: "vertical",
          // left: "left", x: "center",
          x: "center",
          y: "90%",
        },
        series: [
          {
@@ -255,11 +259,11 @@
        legend: {
          data: ["实操成绩", "理论成绩"],
        },
        toolbox: {
          feature: {
            saveAsImage: {},
          },
        },
        // toolbox: {
        //   feature: {
        //     saveAsImage: {},
        //   },
        // },
        grid: {
          left: "3%",
          right: "5%",
@@ -515,7 +519,7 @@
</script>

<style lang="scss">
$widths: 30%;
$widths: 20%;
.securityAnalysis {
  width: 100%;
  height: 100%;
@@ -528,7 +532,7 @@
  .securityAnalysiscenter,
  .securityAnalysisright {
    // border: 1px solid #000;
    width: 30%;
    width: 29%;
    height: 100%;
    box-sizing: border-box;
    display: flex;

 src/views/securityEquipment/car.vue

@@ -18,20 +18,20 @@
      >
        <template slot="menuLeft">
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
          <el-button
            type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
          </el-button>
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
        </template>
      </avue-crud>
@@ -106,6 +106,7 @@
        tip: false,
        index: true,
        searchSize: "mini",
        border: true,
        searchMenuSpan: 6,
        height: 583,
        menuWidth: 160,

 src/views/securityEquipment/equipments.vue

@@ -18,20 +18,20 @@
      >
        <template slot="menuLeft">
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
          <el-button
            type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
          </el-button>
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
          </el-button>
        </template>
      </avue-crud>
@@ -109,6 +109,7 @@
        height: 583,
        index: true,
        menuWidth: 160,
        border: true,
        align: "center",
        selection: true,
        column: column,

 src/views/securityEquipment/gun.vue

@@ -56,6 +56,7 @@
        index: true,
        menuWidth: 160,
        align: "center",
        border: true,
        selection: true,
        column: column,
      },

 src/views/securityGuard/data.js

@@ -1,314 +1,314 @@
//保安员基本信息
export var securityBaseInfoColumn = [{
        label: "",
        labelWidth: "20",
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    {
        label: "所属保安公司",
        prop: "deptId",
        type: "tree",
        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
        props: {
            label: "title",
            value: "id",
        },
        disabled: true,
        span: 24,
    },
    {
        label: "登录账号",
        prop: "account",
        disabled: true
    },
    {
        label: "用户姓名",
        prop: "realName",
        disabled: true,
    },
    {
        label: "用户昵称",
        prop: "name",
        disabled: true
    },
    {
        label: "手机号码",
        prop: "phone",
        disabled: true
    },
    {
        label: "电子邮箱",
        prop: "email",
        disabled: true
    },
    {
        label: "身份证号",
        prop: "cardid",
        disabled: true
    },
    {
        label: "籍贯",
        prop: "nativeplace",
        disabled: true
    },
    {
        label: "民族",
        prop: "nation",
        disabled: true
    },
    {
        label: "是否持证",
        prop: "hold",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
        props: {
            label: "dictValue",
            value: "dictKey",
        },
        type: "select",
        disabled: true
    },
    {
        label: "保安员证编号",
        prop: "securitynumber",
        disabled: true
    },
    {
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        type: "tree",
        dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
        props: {
            label: "title",
            value: "id",
        },
        disabled: true
    },
    {
        label: "最高学历",
        prop: "education",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        slot: true,
        disabled: true
    },
    {
        label: "政治面貌",
        prop: "politicaloutlook",
        disabled: true
    },
    {
        label: "身高",
        prop: "height",
        disabled: true
    },
    {
        label: "联系地址",
        prop: "address",
        disabled: true
    },
    {
        label: "户口所在地",
        prop: "registered",
        disabled: true
    },
    {
        label: "入职时间",
        prop: "rtime",
        type: 'date',
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        disabled: true
    },
    {
        label: "用户性别",
        prop: "sex",
        type: "select",
        dicData: [{
                label: "男",
                value: 1
            },
            {
                label: "女",
                value: 2
            },
            {
                label: "未知",
                value: 3
            }
        ],
        disabled: true
    },
    {
        label: "用户生日",
        type: "date",
        prop: "birthday",
        disabled: true
    label: "",
    labelWidth: "20",
    type: 'title',
    prop: "title",
    span: 24,
    styles: {
        fontSize: '24px'
    }
},
{
    label: "所属保安公司",
    prop: "deptId",
    type: "tree",
    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
    // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
    props: {
        label: "title",
        value: "id",
    },
    disabled: true,
    span: 24,
},
{
    label: "登录账号",
    prop: "account",
    disabled: true
},
{
    label: "用户姓名",
    prop: "realName",
    disabled: true,
},
{
    label: "用户昵称",
    prop: "name",
    disabled: true
},
{
    label: "手机号码",
    prop: "phone",
    disabled: true
},
{
    label: "电子邮箱",
    prop: "email",
    disabled: true
},
{
    label: "身份证号",
    prop: "cardid",
    disabled: true
},
{
    label: "籍贯",
    prop: "nativeplace",
    disabled: true
},
{
    label: "民族",
    prop: "nation",
    disabled: true
},
{
    label: "是否持证",
    prop: "hold",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
    props: {
        label: "dictValue",
        value: "dictKey",
    },
    type: "select",
    disabled: true
},
{
    label: "保安员证编号",
    prop: "securitynumber",
    disabled: true
},
{
    label: "所属辖区",
    prop: "jurisdiction",
    // multiple: true,
    type: "tree",
    dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
    props: {
        label: "title",
        value: "id",
    },
    disabled: true
},
{
    label: "最高学历",
    prop: "education",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    dataType: "number",
    slot: true,
    disabled: true
},
{
    label: "政治面貌",
    prop: "politicaloutlook",
    disabled: true
},
{
    label: "身高",
    prop: "height",
    disabled: true
},
{
    label: "联系地址",
    prop: "address",
    disabled: true
},
{
    label: "户口所在地",
    prop: "registered",
    disabled: true
},
{
    label: "入职时间",
    prop: "rtime",
    type: 'date',
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    disabled: true
},
{
    label: "用户性别",
    prop: "sex",
    type: "select",
    dicData: [{
        label: "男",
        value: 1
    },
    {
        label: "女",
        value: 2
    },
    {
        label: "未知",
        value: 3
    }
    ],
    disabled: true
},
{
    label: "用户生日",
    type: "date",
    prop: "birthday",
    disabled: true
}


]


export var securityBaseInfoColumns = [{
        label: "所属保安单位",
        prop: "tenantId",
        type: "tree",
        dicUrl: "/api/blade-system/tenant/select",
        props: {
            label: "tenantName",
            value: "tenantId"
        },
        disabled: true,
        span: 24,
    label: "所属保安单位",
    prop: "tenantId",
    type: "tree",
    dicUrl: "/api/blade-system/tenant/select",
    props: {
        label: "tenantName",
        value: "tenantId"
    },
    disabled: true,
    span: 24,
},
{
    label: "登录账号",
    prop: "account",
    disabled: true
},
{
    label: "用户姓名",
    prop: "realName",
    rules: [{
        required: true,
        message: "请输入用户姓名",
        trigger: "blur"
    }, {
        min: 2,
        max: 5,
        message: '姓名长度在2到5个字符'
    }]
},
{
    label: "用户昵称",
    prop: "name"
},
{
    label: "手机号码",
    prop: "phone",
    overHidden: true,
    rules: [{
        required: true,
        message: "请输入手机号",
        trigger: "blur"
    }]
},
{
    label: "电子邮箱",
    prop: "email",
    hide: true,
    overHidden: true
},
{
    label: "身份证号",
    prop: "cardid",
    hide: true,
    overHidden: true,
    rules: [{
        required: true,
        message: "请输入身份证号",
        trigger: "blur"
    }]
},
{
    label: "籍贯",
    prop: "nativeplace",
    hide: true,
    overHidden: true
},
{
    label: "民族",
    prop: "nation",
    hide: true,
    overHidden: true
},
{
    label: "最高学历",
    prop: "education",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    dataType: "number",
    slot: true,
    rules: [{
        required: true,
        message: "请选择学历",
        trigger: "blur"
    }]
},
{
    label: "政治面貌",
    prop: "politicaloutlook",
    hide: true,
    overHidden: true
},
{
    label: "身高",
    prop: "height",
    hide: true,
    overHidden: true
},
{
    label: "联系地址",
    prop: "address",
    hide: true,
    overHidden: true
},
{
    label: "户口所在地",
    prop: "registered",
    hide: true,
    overHidden: true
},
{
    label: "入职时间",
    prop: "rtime",
    type: 'date',
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    hide: true,
    overHidden: true
},
{
    label: "用户性别",
    prop: "sex",
    type: "select",
    dicData: [{
        label: "男",
        value: 1
    },
    {
        label: "登录账号",
        prop: "account",
        disabled: true
        label: "女",
        value: 2
    },
    {
        label: "用户姓名",
        prop: "realName",
        rules: [{
            required: true,
            message: "请输入用户姓名",
            trigger: "blur"
        }, {
            min: 2,
            max: 5,
            message: '姓名长度在2到5个字符'
        }]
    },
    {
        label: "用户昵称",
        prop: "name"
    },
    {
        label: "手机号码",
        prop: "phone",
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入手机号",
            trigger: "blur"
        }]
    },
    {
        label: "电子邮箱",
        prop: "email",
        hide: true,
        overHidden: true
    },
    {
        label: "身份证号",
        prop: "cardid",
        hide: true,
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入身份证号",
            trigger: "blur"
        }]
    },
    {
        label: "籍贯",
        prop: "nativeplace",
        hide: true,
        overHidden: true
    },
    {
        label: "民族",
        prop: "nation",
        hide: true,
        overHidden: true
    },
    {
        label: "最高学历",
        prop: "education",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        slot: true,
        rules: [{
            required: true,
            message: "请选择学历",
            trigger: "blur"
        }]
    },
    {
        label: "政治面貌",
        prop: "politicaloutlook",
        hide: true,
        overHidden: true
    },
    {
        label: "身高",
        prop: "height",
        hide: true,
        overHidden: true
    },
    {
        label: "联系地址",
        prop: "address",
        hide: true,
        overHidden: true
    },
    {
        label: "户口所在地",
        prop: "registered",
        hide: true,
        overHidden: true
    },
    {
        label: "入职时间",
        prop: "rtime",
        type: 'date',
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        hide: true,
        overHidden: true
    },
    {
        label: "用户性别",
        prop: "sex",
        type: "select",
        dicData: [{
                label: "男",
                value: 1
            },
            {
                label: "女",
                value: 2
            },
            {
                label: "未知",
                value: 3
            }
        ],
        hide: true
    },
    {
        label: "用户生日",
        type: "date",
        prop: "birthday",
        hide: true
        label: "未知",
        value: 3
    }
    ],
    hide: true
},
{
    label: "用户生日",
    type: "date",
    prop: "birthday",
    hide: true
}
]


@@ -445,154 +445,196 @@


export var securityFormPageColumn = [{
        label: "姓名",
        prop: "realName",
        search: true,
        searchSpan: 4,
        searchLabelWidth: 50,
        display: false
    label: "姓名",
    prop: "realName",
    search: true,
    searchSpan: 3,
    width: 60,
    searchLabelWidth: 50,
    display: false
},
{
    label: "所属保安公司",
    searchLabelWidth: "110",
    // prop: "deptName",
    prop: "deptId",
    type: "tree",
    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
    props: {
        label: "title",
        value: "id",
    },
    slot: true,
    searchSpan: 5,
    display: false,
    search: true,
    width: 260
},
{
    label: "性别",
    prop: "sex",
    width: 55,
    type: "select",
    dicData: [{
        label: "男",
        value: 1,
    },
    {
        label: "性别",
        prop: "sex",
        type: "select",
        dicData: [{
                label: "男",
                value: 1,
            },
            {
                label: "女",
                value: 2,
            },
            {
                label: "未知",
                value: 3,
            },
        ],
        display: false
        label: "女",
        value: 2,
    },
    {
        label: "未知",
        value: 3,
    },
    ],
    display: false
},
{
    label: "身份证号码",
    prop: "cardid",
    search: true,
    searchLabelWidth: 90,
    searchSpan: 4,
    width: 140,

    {
        label: "籍贯",
        prop: "nativeplace",
        display: false
    display: false
},

{
    label: "籍贯",
    prop: "nativeplace",
    hide: true,
    display: false
},
{
    label: "民族",
    prop: "nation",
    hide: true,
    width: 55,
    display: false
},

{
    label: "出生日期",
    prop: "birthday",
    type: "date",
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    display: false
},
{
    label: "年龄",
    prop: "age",
    width: 55,
    display: false
},
{
    label: "学历",
    prop: "education",
    display: false,
    width: 90,
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    {
        label: "民族",
        prop: "nation",
        display: false
    type: "select",
    // hide: true,
    rules: [{
        required: true,
        message: "请选择学历",
        trigger: "blur"
    }],
},
{
    label: "联系电话",
    prop: "phone",
    width: 100,
    display: false
},
{
    label: "健康状态",
    prop: "healstats",
    display: false
},
{
    label: "保安证编号",
    prop: "securitynumber",
    search: true,
    searchLabelWidth: 90,
    width: 105,
    searchSpan: 4,
    addDisplay: false,
    editDisplay: false,
    // hide: true,
},
{
    label: "入职时间",
    prop: "rtime",
    hide: true,
    display: false
},

{
    label: "是否持证",
    prop: "hold",
    slot: true,
    search: true,
    searchSpan: 3,
    width: 69,
    display: false,
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    {
        label: "出生日期",
        prop: "birthday",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        display: false
    type: "select",
    rules: [{
        required: true,
        message: "请选择",
        trigger: "blur"
    }],
},

// {
//     label: "入职时间",
//     prop: "rtime",
//     type: "datetime",
//     format: "yyyy-MM-dd",
//     valueFormat: "yyyy-MM-dd",
//     searchRange: true,
//     searchSpan: 6,
//     hide: true,
//     addDisplay: false,
//     editDisplay: false,
//     viewDisplay: false,
//     search: true,
//     rules: [{
//         required: true,
//         message: "请输入时间",
//         trigger: "blur"
//     }]
// },
{
    label: "在职状态",
    prop: "status",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    {
        label: "学历",
        prop: "education",
        display: false,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        type: "select",
        hide: true,
        rules: [{
            required: true,
            message: "请选择学历",
            trigger: "blur"
        }],
    },
    {
        label: "联系电话",
        prop: "phone",
        display: false
    },
    {
        label: "邮箱",
        prop: "email",
        display: false,
        width: 150
    },
    {
        label: "入职时间",
        prop: "rtime",
        display: false
    },
    {
        label: "保安公司名称",
        searchLabelWidth: "110",
        // prop: "deptName",
        prop: "deptId",
        type: "tree",
        // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        props: {
            label: "title",
            value: "id",
        },
        slot: true,
        searchSpan: 6,
        display: false,
        search: true,
        width: 260
    },
    {
        label: "是否持证",
        prop: "hold",
        slot: true,
        display: false,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        type: "select",
        rules: [{
            required: true,
            message: "请选择",
            trigger: "blur"
        }],
    },
    // {
    //     label: "入职时间",
    //     prop: "rtime",
    //     type: "datetime",
    //     format: "yyyy-MM-dd",
    //     valueFormat: "yyyy-MM-dd",
    //     searchRange: true,
    //     searchSpan: 6,
    //     hide: true,
    //     addDisplay: false,
    //     editDisplay: false,
    //     viewDisplay: false,
    //     search: true,
    //     rules: [{
    //         required: true,
    //         message: "请输入时间",
    //         trigger: "blur"
    //     }]
    // },
    {
        label: "在职状态",
        prop: "status",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        display: false,
        searchSpan: 4,
        search: true,
        rules: [{
            required: true,
            message: "请选择在职状态",
            trigger: "blur"
        }]
    },
    dataType: "number",
    display: false,
    hide: true,
    searchSpan: 3,
    width: 80,
    search: true,
    rules: [{
        required: true,
        message: "请选择在职状态",
        trigger: "blur"
    }]
},
]

 src/views/securityGuard/securityGuard.vue

@@ -107,7 +107,7 @@
              >导出
            </el-button>
          </template>
 

          <template slot-scope="{ type, size, row }" slot="menu">
            <!-- <el-button
                style="display:none"
@@ -125,12 +125,12 @@
              >离职登记
            </el-button>
          </template>
 

          <template slot-scope="{ row }" slot="sex">
            <el-tag v-if="row.sex == 1">男</el-tag>
            <el-tag v-if="row.sex == 2">女</el-tag>
          </template>
 

          <template slot-scope="{ row }" slot="tenantName">
            <el-tag>{{ row.tenantName }}</el-tag>
          </template>
@@ -161,7 +161,7 @@
            :props="props"
          >
          </el-tree>
 

          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
            <el-button type="primary" @click="submitRole">确 定</el-button>
@@ -262,7 +262,7 @@
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";
import { mapState } from "vuex";
 

export default {
  data() {
    const validatePass = (rule, value, callback) => {
@@ -311,7 +311,7 @@
          },
        ],
      },
 

      form: {},
      search: {},
      roleBox: false,
@@ -377,9 +377,12 @@
        calcHeight: 80,
        tip: false,
        searchShow: true,

        indexWidth: 55,
        searchMenuSpan: 6,
        border: false,
        stripe: true,
        border: true,

        align: "center",
        index: true,
        delBtnText: "注销",
@@ -401,7 +404,7 @@
                prop: "deptId",
                type: "tree",
                // dicUrl:
                  // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
                // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
                // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
                props: {
                  label: "title",
@@ -486,12 +489,12 @@
                row: true,
                prop: "myPicture",
              },
 

              // {
              //   label: "编号",
              //   prop: "code",
              // },
 

              {
                label: "所属辖区",
                prop: "jurisdiction",
@@ -624,6 +627,10 @@
              {
                label: "政治面貌",
                prop: "politicaloutlook",
              },
              {
                label: "健康状态",
                prop: "healstats",
              },
              {
                label: "身高",
@@ -926,18 +933,14 @@
      userInfo: (state) => state.user.userInfo,
    }),
  },
  beforeCreate() {
    
  },
  created() {
 
  },
  beforeCreate() {},
  created() {},
  mounted() {
    // this.option.column[0].hide = true
    // 非保安单位模式默认加载管理组数据
    if (!website.tenantMode) {
          this.initData(website.tenantId);
        }
      this.initData(website.tenantId);
    }
  },
  methods: {
    handleImport1() {
@@ -952,7 +955,7 @@
    handleTemplate1() {
      window.open(`/api/examSubjectChoices/export-template`);
    },
 

    //行点击事件
    rowClick(row) {
      this.$router.push({
@@ -1295,28 +1298,36 @@
            const column = that.findObject(that.option.column, "deptId");
            column.search = false;
            const deptColumn = that.findObject(that.option.group, "deptId");
            deptColumn.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            deptColumn.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            //禁止编辑
            deptColumn.disabled = true;
            deptColumn.value = that.userInfo.dept_id;
            that.isSecurity = true;
            //如果是保安公司管理员
            params["deptId"] = that.userInfo.dept_id;
          }else if (roleAlias == "公安管理员") {
          } else if (roleAlias == "公安管理员") {
            params["jurisdiction"] = that.userInfo.jurisdiction;
            var columnDept = that.findObject(that.option.column, "deptId");
            columnDept.dicUrl = 
                "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
            columnDept.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
            var ColumnDeptUpdate = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate.dicUrl = 
                "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
          }else{
            ColumnDeptUpdate.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
          } else {
            var columnDept1 = that.findObject(that.option.column, "deptId");
            columnDept1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate1 = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            columnDept1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate1 = that.findObject(
              that.option.group,
              "deptId"
            );
            ColumnDeptUpdate1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
          }
 

          let values = {
            ...params,
          };
@@ -1325,20 +1336,25 @@
            roleAlias: "111",
            ...that.query,
          };
 

          that.loading = true;
          getList(page.currentPage, page.pageSize, values).then((res) => {
            const data = res.data.data;
            that.page.total = data.total;
            var d = data.records;
            var date = new Date();
            var datayear = date.getFullYear();
            for (const key in d) {
              var year = d[key].cardid.slice(6, 10);
              d[key]["age"] = +datayear - +year;
              // d[key].securitynumber = "赣洪202100009";
            }
            that.data = data.records;
            that.loading = false;
            that.selectionClear();
          });
        });
      });
      
 
      
    },
    platformRowUpdate(row, index, done, loading) {
      updatePlatform(row.id, row.userType, row.userExt).then(
@@ -1413,11 +1429,11 @@
.box {
  height: 800px;
}
 

.el-scrollbar {
  height: 100%;
}
 

.box .el-scrollbar__wrap {
  overflow: scroll;
}

 src/views/securityGuard/securityGuardRegistration.vue

@@ -480,7 +480,7 @@
            });
          });
          this.loading = false;
          debugger;
          //debugger;
          done();
        },
        (error) => {

 src/views/securityUnit/data.js

@@ -87,16 +87,16 @@
        label: "法定代表人",
        labelWidth: 160,
        prop: "representative",
        width: 80,
        width: 110,
        search: true,
        searchSpan: 4,
        searchLabelWidth: 100
    },
    {
        label: "法人电话",
        label: "法定代表人电话",
        labelWidth: 160,
        prop: "representativecell",
        width: 98,
        width: 120,
        // search: true,
        searchSpan: 4,
        searchLabelWidth: 100

 src/views/securityUnit/index.vue

@@ -36,16 +36,6 @@
            >新增</el-button
          >
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport1"
            >批量导入
          </el-button>
        </template>
        <template slot="menuLeft">
          <el-button
            type="danger"
            size="small"
            plain
@@ -53,6 +43,14 @@
            @click="handleDelete"
            >删 除
          </el-button>
          <el-button
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport1"
            >批量导入
          </el-button>
        </template>
      </avue-crud>
      <div class="lod" v-show="forms != -1">

 src/views/securityUnit/localCompany.vue

@@ -284,6 +284,7 @@
        searchMenuSpan: 6,
        height: 583,
        menuWidth: 220,
        border: true,
        align: "center",
        selection: true,
        column: column,

 src/views/securityUnit/securityTraining.vue

@@ -281,6 +281,8 @@
        // card: true,
        tip: false,
        searchSize: "mini",
        border: true,

        searchMenuSpan: 6,
        height: 583,
        menuWidth: 220,

 src/views/securityUnit/selfRecruitedSecurityGuard.vue

@@ -285,6 +285,8 @@
        height: 583,
        menuWidth: 220,
        align: "center",
        border: true,

        selection: true,
        column: column,
      },

 src/views/securityUnit/transRegionalcompany.vue

@@ -286,6 +286,8 @@
        height: 583,
        menuWidth: 220,
        align: "center",
        border: true,

        selection: true,
        column: column,
      },

 src/views/securityUnitChild/index.vue

@@ -56,20 +56,20 @@
        >
          <template slot="menuLeft">
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport"
              >批量导入
            </el-button>
            <el-button
              type="danger"
              size="small"
              plain
              icon="el-icon-delete"
              @click="handleDelete1"
              >删 除
            </el-button>
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport"
              >批量导入
            </el-button>
          </template>
        </avue-crud>
@@ -93,14 +93,6 @@
        >
          <template slot="menuLeft">
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport1"
              >批量导入
            </el-button>
            <el-button
              type="danger"
              size="small"
              plain
@@ -108,6 +100,14 @@
              @click="handleDelete2"
              >删 除
            </el-button>
            <el-button
              type="success"
              size="small"
              plain
              icon="el-icon-upload2"
              @click="handleImport1"
              >批量导入
            </el-button>
          </template>
        </avue-crud>
      </basic-container>

 src/views/talk/talk.vue

@@ -1,30 +1,44 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="page"
               :permission="permissionList"
               :before-open="beforeOpen"
               v-model="form"
               ref="crud"
               @row-update="rowUpdate"
               @row-save="rowSave"
               @row-del="rowDel"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
    <avue-crud
      :option="option"
      :table-loading="loading"
      :data="data"
      :page.sync="page"
      :permission="permissionList"
      :before-open="beforeOpen"
      v-model="form"
      ref="crud"
      @row-update="rowUpdate"
      @row-save="rowSave"
      @row-del="rowDel"
      @search-change="searchChange"
      @search-reset="searchReset"
      @selection-change="selectionChange"
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
      @on-load="onLoad"
    >
      <template slot-scope="{ disabled, size }" slot="realNameSearch">
        <el-input
          placeholder="姓名"
          :disabled="disabled"
          :size="size"
          style="width: 200px"
          v-on:input="inputs(findName)"
          v-model="findName"
        ></el-input>
      </template>
      <template slot="menuLeft">
        <el-button type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.talk_delete"
                   @click="handleDelete">删 除
        <el-button
          type="danger"
          size="small"
          icon="el-icon-delete"
          plain
          v-if="permission.talk_delete"
          @click="handleDelete"
          >删 除
        </el-button>
      </template>
    </avue-crud>
@@ -32,235 +46,281 @@
</template>

<script>
  import {getList, getDetail, add, update, remove} from "@/api/talk/talk";
  import {mapGetters} from "vuex";
import { getList, getDetail, add, update, remove } from "@/api/talk/talk";
import { mapGetters } from "vuex";

  export default {
    data() {
      return {
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        selectionList: [],
        option: {
          height:'auto',
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
          column: [
            {
              label: "标题",
              prop: "title",
              search: true,
              rules: [{
export default {
  data() {
    var id = this.$store.getters.userInfo.dept_id;
    console.log(id);
    return {
      findName: "",
      form: {},
      query: {},
      loading: true,
      page: {
        pageSize: 10,
        currentPage: 1,
        total: 0,
      },
      selectionList: [],
      option: {
        height: "auto",
        calcHeight: 30,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        searchShowBtn: false,
        index: true,
        viewBtn: true,
        selection: true,
        dialogClickModal: false,
        column: [
          {
            label: "标题",
            prop: "title",
            search: true,
            searchLabelWidth: 45,
            rules: [
              {
                required: true,
                message: "请输入标题",
                trigger: "blur"
              }]
            },
            {
              label: "谈话对象",
              search: true,
              prop: "realName",
              type: "tree",
              props: {
                label: "realName",
                value: "id",
                trigger: "blur",
              },
              dicUrl: `/api/blade-user/selectInr?deptid=`+this.$store.getters.userInfo.dept_id,
              rules: [{
                required: true,
                message: "请输入谈话对象",
                trigger: "blur"
              }]
            },
            {
              label: "谈话内容",
              prop: "talkcontent",
              rules: [{
            ],
          },
          {
            label: "谈话对象",
            prop: "realName",
            search: true,
            // type: "tree",
            searchslot: true,
            // dicUrl: `/api/blade-user/selectInr?deptid=` + id,
            // props: {
            //   label: "realName",
            //   value: "id",
            // },
            // rules: [
            //   {
            //     required: true,
            //     message: "请输入谈话对象",
            //     trigger: "blur",
            //   },
            // ],
          },
          {
            label: "谈话内容",
            prop: "talkcontent",
            rules: [
              {
                required: true,
                message: "请输入谈话内容",
                trigger: "blur"
              }]
            },
            {
              label: "谈话时间",
              prop: "talktime",
              type: "date",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              rules: [{
                trigger: "blur",
              },
            ],
          },
          {
            label: "谈话时间",
            prop: "talktime",
            type: "date",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            rules: [
              {
                required: true,
                message: "请输入谈话时间",
                trigger: "blur"
              }]
            },
            {
              label: "结论",
              prop: "conclusion",
              rules: [{
                trigger: "blur",
              },
            ],
          },
          {
            label: "结论",
            prop: "conclusion",
            rules: [
              {
                required: true,
                message: "请输入结论",
                trigger: "blur"
              }]
            },
            {
              label: "评价",
              prop: "evaluate",
              rules: [{
                trigger: "blur",
              },
            ],
          },
          {
            label: "评价",
            prop: "evaluate",
            rules: [
              {
                required: true,
                message: "请输入评价",
                trigger: "blur"
              }]
            },
          ]
        },
        data: []
                trigger: "blur",
              },
            ],
          },
        ],
      },
      data: [],
    };
  },
  computed: {
    ...mapGetters(["permission", "userInfo"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.talk_add, false),
        viewBtn: this.vaildData(this.permission.talk_view, false),
        delBtn: this.vaildData(this.permission.talk_delete, false),
        editBtn: this.vaildData(this.permission.talk_edit, false),
      };
    },
    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.talk_add, false),
          viewBtn: this.vaildData(this.permission.talk_view, false),
          delBtn: this.vaildData(this.permission.talk_delete, false),
          editBtn: this.vaildData(this.permission.talk_edit, false)
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    ids() {
      let ids = [];
      this.selectionList.forEach((ele) => {
        ids.push(ele.id);
      });
      return ids.join(",");
    },
    methods: {
      rowSave(row, done, loading) {
        add(row).then(() => {
          row.deptid=this.$store.getters.userInfo.dept_id
  },
  methods: {
    // searchChange(params, done) {
    //   console.log(params);
    //   done();
    // this.$message.success(JSON.stringify(params));
    // },
    rowSave(row, done, loading) {
      add(row).then(
        () => {
          row.deptid = this.$store.getters.userInfo.dept_id;
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          loading();
          window.console.log(error);
        });
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
        }
      );
    },
    rowUpdate(row, index, done, loading) {
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          loading();
          console.log(error);
        }
      );
    },
    rowDel(row) {
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          return remove(row.id);
        })
        .then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
    },
    handleDelete() {
      if (this.selectionList.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
      }
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          return remove(this.ids);
        })
          .then(() => {
            return remove(row.id);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
        .then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
      },
      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.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }
        done();
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
      },
      selectionChange(list) {
        this.selectionList = list;
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      currentChange(currentPage){
        this.page.currentPage = currentPage;
      },
      sizeChange(pageSize){
        this.page.pageSize = pageSize;
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
          this.$refs.crud.toggleSelection();
        });
    },
    beforeOpen(done, type) {
      if (["edit", "view"].includes(type)) {
        getDetail(this.form.id).then((res) => {
          this.form = res.data.data;
        });
      }
    }
  };
      done();
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
    },
    searchChange(params, done) {
      console.log(params);
      // this.query = params;
      // this.page.currentPage = 1;
      // this.onLoad(this.page, params);
      done();
    },
    inputs(val) {
      console.log(val);
    },
    selectionChange(list) {
      this.selectionList = list;
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      this.loading = true;
      // console.log(1);
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query)
      ).then((res) => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;
        console.log(this.data);
        this.loading = false;
        this.selectionClear();
      });
    },
  },
};
</script>

<style>
<style lang="scss" scoped>
.avue-form__menu--center .el-button {
  float: left !important;
}

.avue-form__menu--center .el-button:nth-child(1) {
  margin-left: 30px !important;
}
</style>