fix: 冲突解决

src/assets/js/http.js

@@ -384,5 +384,5 @@ function startLoading() {
 }
 
 function endLoading() {
-  loading.close();
+    loading.close()
 }

src/views/projectFront/laborManage/visitRecord.vue

@@ -105,6 +105,31 @@
           label="访客身份证号"
           align="center"
         ></el-table-column>
+        <el-table-column
+          prop="visitUnit"
+          label="来访人单位"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="takeName"
+          label="接送人姓名"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="takePhone"
+          label="接送人手机号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="takeUnit"
+          label="接送人单位"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="takeJob"
+          label="接送人职务"
+          align="center"
+        ></el-table-column>
         <el-table-column
           prop="reason"
           label="访问事由"