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

zhengpz

2021-08-27 27c0c8c3769d5725b201ed897ca1ec2ff27a4e86

 src/views/securityCompany/computents/service.vue

@@ -31,7 +31,7 @@
        addBtn: false,
        selection: true,
        menu: false,

        border: true,
        align: "center",
        height: "auto",
        calcHeight: 270,
@@ -46,13 +46,6 @@
        menuWidth: 156,

        column: [
          // {
          //   label: "id",
          //   prop: "id",
          //   hide: true,
          //   editDisplay: false,
          //   addDisplay: false,
          // },
          {
            label: "姓名",
            prop: "name",
@@ -66,55 +59,11 @@
              },
            ],
          },
          // {
          //   label: "身份证号",
          //   prop: "cardid",
          //   // rules: [
          //   //   {
          //   //     required: true,
          //   //     message: "请输入编号",
          //   //     trigger: "blur",
          //   //   },
          //   // ],
          //   // search: true,
          // }, //上面不显示
          {
            label: "派遣单位",
            prop: "dispatcherCompany",
            search: true,
            // rules: [
            //   {
            //     required: true,
            //     message: "请输入规格",
            //     trigger: "blur",
            //   },
            // ],
            // search: true,
          },
          // {
          //   label: "保安公司",
          //   prop: "deptName",
          //   // rules: [
          //   //   {
          //   //     required: true,
          //   //     message: "请输入规格",
          //   //     trigger: "blur",
          //   //   },
          //   // ],
          //   // search: true,
          // },
          // {
          //   label: "派遣人",
          //   prop: "dispatcher",
          //   // rules: [
          //   //   {
          //   //     required: true,
          //   //     message: "请输入规格",
          //   //     trigger: "blur",
          //   //   },
          //   // ],
          //   // search: true,
          // },
          {
            label: "派遣时间",
            prop: "dispatchertime",