Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/views/property/greenPlantRentalManagement/chargeManagement/query-user-list.vue

@@ -30,7 +30,7 @@ async function queryUser(value: string, callback: any) {
   const options = res.rows.map((user) => ({
     label: user.userName,
     value: user.userName,
-    userId: user.userId,
+    userId: user.id,
     userName: user.userName,
   }));
   callback(options);
@@ -55,7 +55,7 @@ async function getUserInfo(val:number|string) {
   const user = await personInfo(val)
   if (user) {
     data.value = [{
-      userId: user.userId,
+      userId: user.id,
       userName: user.userName,
     }]
     emit('update:userInfo', data.value[0]);

apps/web-antd/src/views/property/visitorManagement/visitorTodo/index.vue

@@ -76,10 +76,10 @@ const [VisitorTodoModal, modalApi] = useVbenModal({
   connectedComponent: visitorTodoModal,
 });
 
-async function handleEdit(row: Required<VisitorManagementForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
-}
+// async function handleEdit(row: Required<VisitorManagementForm>) {
+//   modalApi.setData({ id: row.id });
+//   modalApi.open();
+// }
 </script>
 
 <template>
@@ -92,12 +92,12 @@ async function handleEdit(row: Required<VisitorManagementForm>) {
           >
             {{ $t('pages.common.info') }}
           </ghost-button>
-          <ghost-button
-            @click.stop="handleEdit(row)"
-            v-if="row.serveStatus === 0"
-          >
-            {{ '审核' }}
-          </ghost-button>
+<!--          <ghost-button-->
+<!--            @click.stop="handleEdit(row)"-->
+<!--            v-if="row.serveStatus === 0"-->
+<!--          >-->
+<!--            {{ '审核' }}-->
+<!--          </ghost-button>-->
         </Space>
       </template>
     </BasicTable>