访客登记修改

src/views/base/visitorRecord/index.vue

@@ -25,16 +25,32 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="登记方式" prop="registerType">
-        <el-select v-model="queryParams.registerType" placeholder="请选择登记方式" clearable>
+      <el-form-item label="到访类型" prop="visitType">
+        <el-select v-model="queryParams.visitType" placeholder="请选择到访类型" clearable>
           <el-option
-            v-for="dict in visitor_register_type"
+            v-for="dict in visitor_visit_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="访客来源，如公司、单位、亲友、外卖、快递、供应商等" prop="visitorSource">
+        <el-input
+          v-model="queryParams.visitorSource"
+          placeholder="请输入访客来源，如公司、单位、亲友、外卖、快递、供应商等"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="来访事由，如业务接洽、走亲访友、酒店入住、配送、维修、参观等" prop="visitReason">
+        <el-input
+          v-model="queryParams.visitReason"
+          placeholder="请输入来访事由，如业务接洽、走亲访友、酒店入住、配送、维修、参观等"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="访客照片地址" prop="visitorPhoto">
         <el-input
           v-model="queryParams.visitorPhoto"
@@ -43,10 +59,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="关联预约单号" prop="appointmentNo">
+      <el-form-item label="关联预约单号，现场登记可为空" prop="appointmentNo">
         <el-input
           v-model="queryParams.appointmentNo"
-          placeholder="请输入关联预约单号"
+          placeholder="请输入关联预约单号，现场登记可为空"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -59,18 +75,18 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="来访时间/登记时间" prop="visitTime">
+      <el-form-item label="来访/登记时间" prop="visitTime">
         <el-date-picker clearable
           v-model="queryParams.visitTime"
           type="date"
           value-format="YYYY-MM-DD"
-          placeholder="请选择来访时间/登记时间">
+          placeholder="请选择来访/登记时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="来源类型" prop="sourceType">
-        <el-select v-model="queryParams.sourceType" placeholder="请选择来源类型" clearable>
+      <el-form-item label="登记方式" prop="registerType">
+        <el-select v-model="queryParams.registerType" placeholder="请选择登记方式" clearable>
           <el-option
-            v-for="dict in source_type"
+            v-for="dict in visitor_register_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -131,26 +147,27 @@
       <el-table-column label="访客姓名" align="center" prop="visitorName" />
       <el-table-column label="访客手机号" align="center" prop="mobile" />
       <el-table-column label="证件号码" align="center" prop="idCardNo" />
-      <el-table-column label="登记方式" align="center" prop="registerType">
+      <el-table-column label="到访类型" align="center" prop="visitType">
         <template #default="scope">
-          <dict-tag :options="visitor_register_type" :value="scope.row.registerType"/>
+          <dict-tag :options="visitor_visit_type" :value="scope.row.visitType"/>
         </template>
       </el-table-column>
+      <el-table-column label="访客来源，如公司、单位、亲友、外卖、快递、供应商等" align="center" prop="visitorSource" />
+      <el-table-column label="来访事由，如业务接洽、走亲访友、酒店入住、配送、维修、参观等" align="center" prop="visitReason" />
       <el-table-column label="访客照片地址" align="center" prop="visitorPhoto" />
-      <el-table-column label="关联预约单号" align="center" prop="appointmentNo" />
+      <el-table-column label="关联预约单号，现场登记可为空" align="center" prop="appointmentNo" />
       <el-table-column label="被访人/被访对象" align="center" prop="visitedPerson" />
-      <el-table-column label="来访时间/登记时间" align="center" prop="visitTime" width="180">
+      <el-table-column label="来访/登记时间" align="center" prop="visitTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.visitTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="登记结果：SUCCESS成功，FAIL失败，WHITELIST命中白名单" align="center" prop="resultStatus" />
-      <el-table-column label="来源类型" align="center" prop="sourceType">
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="登记方式" align="center" prop="registerType">
         <template #default="scope">
-          <dict-tag :options="source_type" :value="scope.row.sourceType"/>
+          <dict-tag :options="visitor_register_type" :value="scope.row.registerType"/>
         </template>
       </el-table-column>
-      <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:visitorRecord:edit']">修改</el-button>
@@ -187,25 +204,35 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="登记方式" prop="registerType">
-              <el-select v-model="form.registerType" placeholder="请选择登记方式">
+            <el-form-item label="到访类型" prop="visitType">
+              <el-select v-model="form.visitType" placeholder="请选择到访类型">
                 <el-option
-                  v-for="dict in visitor_register_type"
+                  v-for="dict in visitor_visit_type"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="parseInt(dict.value)"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="访客来源，如公司、单位、亲友、外卖、快递、供应商等" prop="visitorSource">
+              <el-input v-model="form.visitorSource" placeholder="请输入访客来源，如公司、单位、亲友、外卖、快递、供应商等" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="来访事由，如业务接洽、走亲访友、酒店入住、配送、维修、参观等" prop="visitReason">
+              <el-input v-model="form.visitReason" placeholder="请输入来访事由，如业务接洽、走亲访友、酒店入住、配送、维修、参观等" />
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="访客照片地址" prop="visitorPhoto">
               <el-input v-model="form.visitorPhoto" placeholder="请输入访客照片地址" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="关联预约单号" prop="appointmentNo">
-              <el-input v-model="form.appointmentNo" placeholder="请输入关联预约单号" />
+            <el-form-item label="关联预约单号，现场登记可为空" prop="appointmentNo">
+              <el-input v-model="form.appointmentNo" placeholder="请输入关联预约单号，现场登记可为空" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -214,32 +241,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="来访时间/登记时间" prop="visitTime">
+            <el-form-item label="来访/登记时间" prop="visitTime">
               <el-date-picker clearable
                 v-model="form.visitTime"
                 type="date"
                 value-format="YYYY-MM-DD"
-                placeholder="请选择来访时间/登记时间">
+                placeholder="请选择来访/登记时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="来源类型" prop="sourceType">
-              <el-select v-model="form.sourceType" placeholder="请选择来源类型">
+            <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="registerType">
+              <el-select v-model="form.registerType" placeholder="请选择登记方式">
                 <el-option
-                  v-for="dict in source_type"
+                  v-for="dict in visitor_register_type"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="parseInt(dict.value)"
+                  :value="dict.value"
                 ></el-option>
               </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>
@@ -256,7 +283,7 @@
 import { listVisitorRecord, getVisitorRecord, delVisitorRecord, addVisitorRecord, updateVisitorRecord } from "@/api/base/visitorRecord"
 
 const { proxy } = getCurrentInstance()
-const { visitor_register_type, source_type } = useDict('visitor_register_type', 'source_type')
+const { visitor_register_type, visitor_visit_type } = useDict('visitor_register_type', 'visitor_visit_type')
 
 const visitorRecordList = ref([])
 const open = ref(false)
@@ -276,21 +303,22 @@ const data = reactive({
     visitorName: undefined,
     mobile: undefined,
     idCardNo: undefined,
-    registerType: undefined,
+    visitType: undefined,
+    visitorSource: undefined,
+    visitReason: undefined,
     visitorPhoto: undefined,
     appointmentNo: undefined,
     visitedPerson: undefined,
     visitTime: undefined,
-    resultStatus: undefined,
-    sourceType: undefined,
+    registerType: undefined
   },
   rules: {
+    visitType: [
+      { required: true, message: "到访类型不能为空", trigger: "change" }
+    ],
     registerType: [
       { required: true, message: "登记方式不能为空", trigger: "change" }
-    ],
-    sourceType: [
-      { required: true, message: "来源类型不能为空", trigger: "change" }
-    ],
+    ]
   }
 })
 
@@ -319,15 +347,17 @@ function reset() {
     visitorName: null,
     mobile: null,
     idCardNo: null,
-    registerType: null,
+    visitType: null,
+    visitorSource: null,
+    visitReason: null,
     visitorPhoto: null,
     appointmentNo: null,
     visitedPerson: null,
     visitTime: null,
-    resultStatus: null,
-    sourceType: null,
     remark: null,
-    createTime: null
+    createTime: null,
+    updateTime: null,
+    registerType: null
   }
   proxy.resetForm("visitorRecordRef")
 }