访客白名单修改

src/views/base/whitelist/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="人员姓名" prop="name">
+      <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入人员姓名"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -17,8 +17,40 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="白名单类型" prop="whitelistType">
-        <el-select v-model="queryParams.whitelistType" placeholder="请选择白名单类型" clearable>
+      <el-form-item label="身份证号" prop="idCardNo">
+        <el-input
+          v-model="queryParams.idCardNo"
+          placeholder="请输入身份证号"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人脸照片地址，用于机器人侧照片比对" prop="faceImageUrl">
+        <el-input
+          v-model="queryParams.faceImageUrl"
+          placeholder="请输入人脸照片地址，用于机器人侧照片比对"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效开始时间，不填表示立即生效" prop="validStartTime">
+        <el-date-picker clearable
+          v-model="queryParams.validStartTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择有效开始时间，不填表示立即生效">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="有效结束时间，不填表示长期有效" prop="validEndTime">
+        <el-date-picker clearable
+          v-model="queryParams.validEndTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择有效结束时间，不填表示长期有效">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="人员类型" prop="whitelistType">
+        <el-select v-model="queryParams.whitelistType" placeholder="请选择人员类型" clearable>
           <el-option
             v-for="dict in whitelist__type"
             :key="dict.value"
@@ -88,9 +120,23 @@
     <el-table v-loading="loading" :data="whitelistList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="人员姓名" align="center" prop="name" />
+      <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="手机号" align="center" prop="mobile" />
-      <el-table-column label="白名单类型" align="center" prop="whitelistType">
+      <el-table-column label="身份证号" align="center" prop="idCardNo" />
+      <el-table-column label="人脸照片地址，用于机器人侧照片比对" align="center" prop="faceImageUrl" />
+      <el-table-column label="有效开始时间，不填表示立即生效" align="center" prop="validStartTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.validStartTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效结束时间，不填表示长期有效" align="center" prop="validEndTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.validEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="启用状态：0停用，1启用" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="人员类型" align="center" prop="whitelistType">
         <template #default="scope">
           <dict-tag :options="whitelist__type" :value="scope.row.whitelistType"/>
         </template>
@@ -100,8 +146,6 @@
           <dict-tag :options="source_type" :value="scope.row.sourceType"/>
         </template>
       </el-table-column>
-      <el-table-column label="启用状态：0停用，1启用" align="center" prop="status" />
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['base:whitelist:edit']">修改</el-button>
@@ -123,8 +167,8 @@
       <el-form ref="whitelistRef" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="人员姓名" prop="name">
-              <el-input v-model="form.name" placeholder="请输入人员姓名" />
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="form.name" placeholder="请输入姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -133,8 +177,43 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="白名单类型" prop="whitelistType">
-              <el-select v-model="form.whitelistType" placeholder="请选择白名单类型">
+            <el-form-item label="身份证号" prop="idCardNo">
+              <el-input v-model="form.idCardNo" placeholder="请输入身份证号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="人脸照片地址，用于机器人侧照片比对" prop="faceImageUrl">
+              <el-input v-model="form.faceImageUrl" placeholder="请输入人脸照片地址，用于机器人侧照片比对" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="有效开始时间，不填表示立即生效" prop="validStartTime">
+              <el-date-picker clearable
+                v-model="form.validStartTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择有效开始时间，不填表示立即生效">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="有效结束时间，不填表示长期有效" prop="validEndTime">
+              <el-date-picker clearable
+                v-model="form.validEndTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择有效结束时间，不填表示长期有效">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="人员类型" prop="whitelistType">
+              <el-select v-model="form.whitelistType" placeholder="请选择人员类型">
                 <el-option
                   v-for="dict in whitelist__type"
                   :key="dict.value"
@@ -156,11 +235,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <template #footer>
@@ -196,23 +270,27 @@ const data = reactive({
     pageSize: 10,
     name: undefined,
     mobile: undefined,
-    whitelistType: undefined,
-    sourceType: undefined,
+    idCardNo: undefined,
+    faceImageUrl: undefined,
+    validStartTime: undefined,
+    validEndTime: undefined,
     status: undefined,
+    whitelistType: undefined,
+    sourceType: undefined
   },
   rules: {
     name: [
-      { required: true, message: "人员姓名不能为空", trigger: "blur" }
+      { required: true, message: "姓名不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "启用状态：0停用，1启用不能为空", trigger: "change" }
     ],
     whitelistType: [
-      { required: true, message: "白名单类型不能为空", trigger: "change" }
+      { required: true, message: "人员类型不能为空", trigger: "change" }
     ],
     sourceType: [
       { required: true, message: "来源类型不能为空", trigger: "change" }
-    ],
-    status: [
-      { required: true, message: "启用状态：0停用，1启用不能为空", trigger: "change" }
-    ],
+    ]
   }
 })
 
@@ -240,12 +318,16 @@ function reset() {
     id: null,
     name: null,
     mobile: null,
-    whitelistType: null,
-    sourceType: null,
+    idCardNo: null,
+    faceImageUrl: null,
+    validStartTime: null,
+    validEndTime: null,
     status: null,
     remark: null,
     createTime: null,
-    updateTime: null
+    updateTime: null,
+    whitelistType: null,
+    sourceType: null
   }
   proxy.resetForm("whitelistRef")
 }