From f2a74b0b28b74dc29be85ec8e6328bdd262f84b9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 14:35:58 +0800
Subject: [PATCH] 地址配置修改

---
 src/views/securityGuard/data.js |  715 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 430 insertions(+), 285 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index 042946a..62cfded 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -1,26 +1,26 @@
 //保安员基本信息
 export var securityBaseInfoColumn = [{
-    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: "所属保安公司",
+    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",
+      value: "id"
     },
     disabled: true,
-    span: 24,
+    span: 24
   },
   {
     label: "登录账号",
@@ -30,7 +30,7 @@
   {
     label: "用户姓名",
     prop: "realName",
-    disabled: true,
+    disabled: true
   },
   {
     label: "用户昵称",
@@ -68,7 +68,7 @@
     dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
     props: {
       label: "dictValue",
-      value: "dictKey",
+      value: "dictKey"
     },
     type: "select",
     disabled: true
@@ -86,7 +86,7 @@
     dicUrl: "/api/jurisdiction/lazy-tree",
     props: {
       label: "title",
-      value: "id",
+      value: "id"
     },
     disabled: true
   },
@@ -126,7 +126,7 @@
   {
     label: "入职时间",
     prop: "rtime",
-    type: 'date',
+    type: "date",
     format: "yyyy-MM-dd",
     valueFormat: "yyyy-MM-dd",
     disabled: true
@@ -136,9 +136,9 @@
     prop: "sex",
     type: "select",
     dicData: [{
-        label: "男",
-        value: 1
-      },
+      label: "男",
+      value: 1
+    },
       {
         label: "女",
         value: 2
@@ -156,23 +156,20 @@
     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",
@@ -185,11 +182,13 @@
       required: true,
       message: "请输入用户姓名",
       trigger: "blur"
-    }, {
-      min: 2,
-      max: 5,
-      message: '姓名长度在2到5个字符'
-    }]
+    },
+      {
+        min: 2,
+        max: 5,
+        message: "姓名长度在2到5个字符"
+      }
+    ]
   },
   {
     label: "用户昵称",
@@ -278,7 +277,7 @@
   {
     label: "入职时间",
     prop: "rtime",
-    type: 'date',
+    type: "date",
     format: "yyyy-MM-dd",
     valueFormat: "yyyy-MM-dd",
     hide: true,
@@ -289,9 +288,9 @@
     prop: "sex",
     type: "select",
     dicData: [{
-        label: "男",
-        value: 1
-      },
+      label: "男",
+      value: 1
+    },
       {
         label: "女",
         value: 2
@@ -309,8 +308,7 @@
     prop: "birthday",
     hide: true
   }
-]
-
+];
 
 //从业记录
 export var practitionersColumn = [{
@@ -319,99 +317,130 @@
   hide: true,
   editDisplay: false,
   addDisplay: false
-}, {
-  label: '单位名称',
-  prop: "companyname",
-  formslot: true,
-}, {
-  label: '部门',
-  prop: "department",
-  formslot: true,
-}, {
-  label: '岗位',
-  prop: "post",
-  formslot: true,
-}, {
-  label: '岗位职责',
-  prop: "responsibilities",
-  formslot: true,
-}, {
-  label: '入职时间',
-  type: 'date',
-  format: "yyyy-MM-dd",
-  valueFormat: "yyyy-MM-dd",
-  prop: "entrytime",
-  formslot: true,
-}, {
-  label: '离职时间',
-  type: 'date',
-  format: "yyyy-MM-dd",
-  valueFormat: "yyyy-MM-dd",
-  prop: "departuretime",
-  formslot: true,
-}, {
-  label: '离职原因',
-  prop: "leaving",
-  formslot: true,
-}]
+},
+  {
+    label: "企业名称",
+    prop: "companyname",
+    formslot: true,
+    rules: [{
+      required: true,
+      message: "请选择企业名称",
+      trigger: "blur"
+    }]
+  },
+  {
+    label: "部门",
+    prop: "department",
+    formslot: true
+  },
+  {
+    label: "岗位",
+    prop: "post",
+    formslot: true
+  },
+  {
+    label: "岗位职责",
+    prop: "responsibilities",
+    formslot: true
+  },
+  {
+    label: "入职时间",
+    type: "date",
+    format: "yyyy-MM-dd",
+    valueFormat: "yyyy-MM-dd",
+    prop: "entrytime",
+    formslot: true,
+    rules: [{
+      required: true,
+      message: "请选择入职时间",
+      trigger: "blur"
+    }]
+  },
+  {
+    label: "离职时间",
+    type: "date",
+    format: "yyyy-MM-dd",
+    valueFormat: "yyyy-MM-dd",
+    prop: "departuretime",
+    formslot: true,
+    rules: [{
+      required: true,
+      message: "请选择离职时间",
+      trigger: "blur"
+    }]
+  },
+  {
+    label: "离职原因",
+    prop: "leaving",
+    formslot: true
+  }
+];
 
 export var practitionersColumns = [{
   width: 200,
-  label: '单位名称',
+  label: "企业名称",
   prop: "companyname",
-  formslot: true,
-}, {
-  width: 200,
-  label: '部门',
-  prop: "department",
-  formslot: true,
-}, {
-  width: 200,
-  label: '岗位',
-  prop: "post",
-  formslot: true,
-}, {
-  width: 200,
-  label: '岗位职责',
-  prop: "responsibilities",
-  formslot: true,
-}, {
-  width: 200,
-  label: '入职时间',
-  type: 'date',
-  format: "yyyy-MM-dd",
-  valueFormat: "yyyy-MM-dd",
-  prop: "entryTime",
-  formslot: true,
-}, {
-  width: 200,
-  label: '离职时间',
-  type: 'date',
-  format: "yyyy-MM-dd",
-  valueFormat: "yyyy-MM-dd",
-  prop: "departureTime",
-  formslot: true,
-}, {
-  width: 200,
-  label: '离职原因',
-  prop: "leaving",
-  formslot: true,
-}]
+  formslot: true
+},
+  {
+    width: 200,
+    label: "部门",
+    prop: "department",
+    formslot: true
+  },
+  {
+    width: 200,
+    label: "岗位",
+    prop: "post",
+    formslot: true
+  },
+  {
+    width: 200,
+    label: "岗位职责",
+    prop: "responsibilities",
+    formslot: true
+  },
+  {
+    width: 200,
+    label: "入职时间",
+    type: "date",
+    format: "yyyy-MM-dd",
+    valueFormat: "yyyy-MM-dd",
+    prop: "entryTime",
+    formslot: true
+  },
+  {
+    width: 200,
+    label: "离职时间",
+    type: "date",
+    format: "yyyy-MM-dd",
+    valueFormat: "yyyy-MM-dd",
+    prop: "departureTime",
+    formslot: true
+  },
+  {
+    width: 200,
+    label: "离职原因",
+    prop: "leaving",
+    formslot: true
+  }
+];
 
 //表现
 export var trackRecordColumn = [{
-    label: "id",
-    prop: "id",
-    hide: true,
-    editDisplay: false,
-    addDisplay: false
-  }, {
-    label: '时间',
-    type: 'date',
+  label: "id",
+  prop: "id",
+  hide: true,
+  editDisplay: false,
+  addDisplay: false
+},
+  {
+    label: "时间",
+    type: "date",
     format: "yyyy-MM-dd",
     valueFormat: "yyyy-MM-dd",
     prop: "time",
-    formslot: true,
+    formslot: true
   },
   // {
   //     label: '工作态度',
@@ -419,11 +448,12 @@
   //     formslot: true,
   // },
   {
-    label: '工作表现',
+    label: "工作表现",
     prop: "achievements",
-    formslot: true,
-  }, {
-    label: '表现评定',
+    formslot: true
+  },
+  {
+    label: "表现评定",
     prop: "score",
     type: "select",
     // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
@@ -432,9 +462,9 @@
     //     value: "dictKey"
     // },
     dicData: [{
-        label: "优秀",
-        value: 0
-      },
+      label: "优秀",
+      value: 0
+    },
       {
         label: "良好",
         value: 1
@@ -446,7 +476,7 @@
       {
         label: "差",
         value: 3
-      },
+      }
     ],
     dataType: "number",
     slot: true,
@@ -461,80 +491,67 @@
   //     prop: "departmentName",
   //     formslot: true,
   // }
-]
-
+];
 
 export var securityFormPageColumn = [{
-    label: "姓名",
-    prop: "realName",
-    search: true,
-    searchSpan: 3,
-    width: 60,
-    searchLabelWidth: 50,
-    display: false
-  },
+  label: "姓名",
+  prop: "realName",
+  search: true,
+  searchSpan: 3,
+  width: 65,
+  searchLabelWidth: 50,
+  display: false
+},
   // {
-  //     label: "温馨提示",
-  //     prop: "realName1",
-  //     hide: true,
-  //     addDisplay: true,
-  //     editDisplay: false,
-  //     span: 24,
-  //     value: "账号为身份证号码,密码为身份证后六位",
-
-  //     addDisabled: true
-  //     // search: true,
-  //     // searchSpan: 3,
-  //     // width: 60,
-  //     // searchLabelWidth: 50,
+  //   label: "企业名称",
+  //   searchLabelWidth: 75,
+  //   // prop: "deptName",
+  //   prop: "deptId",
+  //   type: "tree",
+  //   // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+  //   props: {
+  //     label: "title",
+  //     value: "id"
+  //   },
+  //   // hide: true,
+  //   slot: true,
+  //   searchSpan: 5,
+  //   display: false,
+  //   search: true,
+  //   minWidth: 160
   // },
   {
-    label: "所属保安公司",
-    searchLabelWidth: "110",
+    label: "从业单位",
+    searchLabelWidth: 75,
     // prop: "deptName",
-    prop: "deptId",
-    type: "tree",
-    dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
-    props: {
-      label: "title",
-      value: "id",
-    },
+    prop: "unitName",
+    // type: "tree",
+    // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+    // props: {
+    //   label: "title",
+    //   value: "id"
+    // },
     // hide: true,
     slot: true,
     searchSpan: 5,
     display: false,
     search: true,
-    minWidth: 260
+    minWidth: 160
   },
-  // {
-  //     label: "所属保安公司",
-  //     searchLabelWidth: "110",
-  //     prop: "deptName",
-  //     // 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,
-  //     minWidth: 260
-  // },
   {
     label: "性别",
-    prop: "sex",
-    width: 80,
+    prop: "sexs",
+    sortable: true,
+    width: 75,
     type: "select",
     dicData: [{
-        label: "男",
-        value: 1,
-      },
+      label: "男",
+      value: 1
+    },
       {
         label: "女",
-        value: 2,
-      },
+        value: 2
+      }
       // {
       //     label: "未知",
       //     value: 3,
@@ -547,11 +564,18 @@
     prop: "cardid",
     search: true,
     searchLabelWidth: 90,
-    searchSpan: 5,
-    minWidth: 140,
+    searchSpan: 4,
+    width: 164,
     display: false
   },
-
+  {
+    label: "照片",
+    prop: "avatar",
+    type: "upload",
+    listType: "picture-img",
+    width: 60,
+    display: false
+  },
   {
     label: "籍贯",
     prop: "nativeplace",
@@ -565,7 +589,6 @@
     width: 55,
     display: false
   },
-
   {
     label: "出生日期",
     prop: "birthday",
@@ -573,36 +596,37 @@
     format: "yyyy-MM-dd",
     valueFormat: "yyyy-MM-dd",
     display: false,
-    hide: true,
+    hide: true
   },
   {
     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"
-    },
-    type: "select",
-    // hide: true,
-    rules: [{
-      required: true,
-      message: "请选择学历",
-      trigger: "blur"
-    }],
-  },
+  // {
+  //     label: "学历",
+  //     prop: "education",
+  //     display: false,
+  //     width: 90,
+  //     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",
-    minWidth: 100,
+    minWidth: 108,
     display: false
   },
   {
@@ -616,10 +640,11 @@
     prop: "securitynumber",
     search: true,
     searchLabelWidth: 90,
-    minWidth: 105,
+    sortable: true,
+    width: 123,
     searchSpan: 4,
     addDisplay: false,
-    editDisplay: false,
+    editDisplay: false
     // hide: true,
   },
   {
@@ -628,99 +653,84 @@
     hide: true,
     display: false
   },
-  // {
-  //     label: "是否派遣",
-  //     prop: "dispatch",
-  //     // hide: true,
-  //     type: 'select',
-  //     // display: false,
-  //     dicData: [
-  //         {
-  //             label: '未派遣',
-  //             value: 1
-  //         }, {
-  //             label: '已派遣',
-  //             value: 0
-  //         }
-  //     ]
-  // },
   {
-    label: '是否派遣',
-    prop: 'dispatch',
-    type: 'select',
+    label: "是否派遣",
+    prop: "dispatch",
+    type: "select",
+    sortable: true,
     editDisplay: false,
+    searchLabelWidth: 75,
+    search: true,
+    width: 110,
+    searchSpan: 3,
     addDisplay: false,
     dicData: [{
-      label: '未派遣',
-      value: '1'
-    }, {
-      label: '已派遣',
-      value: '0'
-    }]
+      label: "全部",
+      value: "2"
+    },
+      {
+        label: "已派遣",
+        value: "0"
+      },
+      {
+        label: "未派遣",
+        value: "1"
+      }
+    ]
   },
   {
     label: "是否持证",
     prop: "hold",
     slot: true,
+    sortable: true,
+    searchLabelWidth: 75,
     search: true,
     searchSpan: 3,
-    width: 69,
+    width: 110,
     type: "select",
     dicData: [{
-        label: "是",
-        value: "1",
-      },
+      label: "是",
+      value: "1"
+    },
       {
         label: "否",
-        value: "2",
+        value: "2"
       },
       {
         label: "已吊销",
-        value: "3",
-      },
+        value: "3"
+      }
     ],
     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: "userType",
-    // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
-    // props: {
-    //   label: "dictValue",
-    //   value: "dictKey",
-    // },
-    type: "select",
-    slot: true,
-    search: true,
-    searchSpan: 3,
-    width: 69,
-    dicData: [{
-        label: "已制证",
-        value: 6,
-      },
-      {
-        label: "未制证",
-        value: 7,
-      }
-    ],
-    rules: [{
-      required: true,
-      message: "请选择",
-      trigger: "blur",
-    }, ],
-  },
+  // {
+  //   label: "是否制证",
+  //   prop: "userType",
+  //   type: "select",
+  //   sortable: true,
+  //   slot: true,
+  //   search: true,
+  //   // searchValue: 7,
+  //   editDisplay: false,
+  //   addDisplay: false,
+  //   searchSpan: 3,
+  //   width: 110,
+  //   dicData: [{
+  //       label: "已制证",
+  //       value: 6
+  //     },
+  //     {
+  //       label: "未制证",
+  //       value: 7
+  //     }
+  //   ]
+  // },
 
   // {
   //     label: "发证日期",
@@ -741,6 +751,57 @@
   //     //     trigger: "blur"
   //     // }]
   // },
+  {
+    label: "有无照片",
+    prop: "isAvatar",
+    type: "select",
+    search: true,
+    minWidth: 105,
+    searchSpan: 3,
+    addDisplay: false,
+    editDisplay: false,
+    hide: true,
+    display: false,
+    dicData: [{
+      label: "全部",
+      value: 3
+    },
+      {
+        label: "有",
+        value: 1
+      },
+      {
+        label: "无",
+        value: 2
+      }
+    ]
+  },
+  {
+    label: "是否采集指纹",
+    prop: "isFingerprint",
+    type: "select",
+    search: true,
+    searchLabelWidth: 110,
+    minWidth: 105,
+    searchSpan: 4,
+    addDisplay: false,
+    editDisplay: false,
+    hide: true,
+    display: false,
+    dicData: [{
+      label: "全部",
+      value: 3
+    },
+      {
+        label: "是",
+        value: 1
+      },
+      {
+        label: "否",
+        value: 2
+      }
+    ]
+  },
   {
     label: "在职状态",
     prop: "status",
@@ -763,4 +824,88 @@
       trigger: "blur"
     }]
   },
-]
+  {
+    label: "审查状态",
+    prop: "examinationType",
+    type: "select",
+    sortable: true,
+    display: false,
+    searchSpan: 3,
+    search: true,
+    hide: true,
+    width: 110,
+    dicData: [{
+      label: "全部",
+      value: 6
+    },
+      {
+        label: "正常",
+        value: "0"
+      },
+      {
+        label: "异常",
+        value: "1"
+      }
+    ]
+  },
+  {
+    label: "审核状态",
+    prop: "auditStatus",
+    type: "select",
+    sortable: true,
+    display: false,
+    searchSpan: 3,
+    search: true,
+    width: 110,
+    dicData: [
+      {
+        label: "全部",
+        value: ""
+      },
+      {
+        label: "待审批",
+        value: 10,
+      },
+      {
+        label: "审批通过",
+        value: 1
+      },
+      {
+        label: "审批不通过",
+        value: 2
+      }
+    ]
+  },
+  {
+    label: "证书申请状态",
+    searchLabelWidth: 110,
+    prop: "accreditationStatus",
+    type: "select",
+    display: false,
+    searchSpan: 3,
+    search: true,
+    width: 110,
+    dicData: [
+      {
+        label: "全部",
+        value: ""
+      },
+      {
+        label: "未申请",
+        value: '-1',
+      },
+      {
+        label: "待审批",
+        value: '1',
+      },
+      {
+        label: "审批通过",
+        value: '2'
+      },
+      {
+        label: "审批不通过",
+        value: '3'
+      }
+    ]
+  }
+];

--
Gitblit v1.9.3