af-mobile-client-vue3 1.3.77 → 1.3.79

package/src/services/v3Api.ts

@@ -67,15 +67,38 @@ function getLeafNodesByCondition(type, nodes, parent = null) {
 }
 
 function transformData(inputData) {
+  if (!inputData || !Array.isArray(inputData))
+    return []
+
   function transform(node) {
+    if (!node || typeof node !== 'object')
+      return {}
+
+    let children = []
+    if (node.children) {
+      if (Array.isArray(node.children)) {
+        children = node.children.map(transform)
+      }
+      else if (typeof node.children === 'object') {
+        // 检查是否是空标记
+        if (node.children.empty === true) {
+          children = []
+        }
+        else if (node.children.id || node.children.name) {
+          // 如果是单个节点对象
+          children = [transform(node.children)]
+        }
+      }
+    }
+
     return {
-      label: node.name,
-      value: node.id,
+      label: node.name || '',
+      value: node.id ?? null,
       f_organization_id: node.f_organization_id,
       f_department_id: node.f_department_id,
-      parentid: node.parentid,
+      parentid: node.parentid || node.parentId || node.parent_id || null,
       orgid: node.orgid,
-      children: node.children ? node.children.map(transform) : [],
+      children,
     }
   }
 
@@ -83,7 +106,7 @@ function transformData(inputData) {
 }
 
 function getResData(params, toCallback) {
-  const data = { userId: params.userid, roleName: params.roleName }
+  const data = { userId: params.userid, roleName: params.roleName, filter: params.filter, filterType: params.filterType }
   if (params.source === '获取分公司') {
     runLogic('getOrgBySearch', data, 'af-system').then(res => toCallback(res))
   }

package/src/utils/mobileUtil.ts

@@ -1,3 +1,5 @@
+import { showConfirmDialog } from 'vant'
+
 interface Param {
   funcName: string // 注册列表中的对应函数的key
   param: Record<string, unknown> // 入参json格式
@@ -36,3 +38,73 @@ export class mobileUtil {
     }
   }
 }
+
+export class mobileTools {
+  // 打电话
+  static callPhone(phone: any) {
+    mobileUtil.execute({
+      funcName: 'makePhoneCall',
+      param: { phoneNumber: phone.user_phone },
+      callbackFunc: (result: any) => {
+      },
+    })
+  }
+
+  // 定位-导航
+  static mapInfoView(map: any) {
+    const { f_lng, f_lat, f_address } = map
+    // 判断是否有精确的经纬度坐标
+    if (f_lng && f_lat && !Number.isNaN(Number.parseFloat(f_lng)) && !Number.isNaN(Number.parseFloat(f_lat))) {
+      // 有精确坐标，直接使用经纬度导航
+      const navigationParam = {
+        lat: Number.parseFloat(f_lat),
+        lng: Number.parseFloat(f_lng),
+        name: f_address || '目标位置',
+      }
+
+      mobileUtil.execute({
+        funcName: 'openMapNavigation',
+        param: navigationParam,
+        callbackFunc: (result: any) => {
+          console.log('精确坐标导航结果===', result)
+        },
+      })
+    }
+    else {
+      // 没有精确坐标，检查是否有地址
+      if (!f_address) {
+        // 没有地址，直接提示
+        showConfirmDialog({
+          title: '导航提示',
+          message: '未检测到地址，无法进行导航',
+          confirmButtonText: '确定',
+          showCancelButton: false,
+        })
+        return
+      }
+
+      // 有地址，提示用户是否使用地址导航
+      showConfirmDialog({
+        title: '导航提示',
+        message: `该档案中未维护精确坐标，是否继续使用(${f_address})进行导航？`,
+        confirmButtonText: '确定导航',
+        cancelButtonText: '取消',
+      }).then(() => {
+        // 用户确认，使用地址导航
+        const addressParam = {
+          address: f_address,
+        }
+
+        mobileUtil.execute({
+          funcName: 'openMapNavigation',
+          param: addressParam,
+          callbackFunc: (result: any) => {
+          },
+        })
+      }).catch(() => {
+        // 用户取消导航
+        console.log('用户取消导航')
+      })
+    }
+  }
+}

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

package/src/views/component/XCellListView/index.vue

@@ -1,19 +1,27 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
+
+// 多选操作配置
+const multiSelectActions = ref([
+  { name: '批量审核', key: 'batchAudit', color: '#000000', icon: 'passed' },
+])
+
+const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
-// const idKey = ref('o_id')
+const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('ceshiCRUD')
-const serviceName = ref('af-safecheck')
+const configName = ref('lngChargeAuditMobileCRUD')
+const serviceName = ref('af-gaslink')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -46,16 +54,16 @@ const serviceName = ref('af-safecheck')
 // }
 
 // 跳转到表单——以表单组来渲染纯表单
-// function toDetail(item) {
-//   router.push({
-//     name: 'XFormGroupView',
-//     query: {
-//       id: item[idKey.value],
-//       // id: item.rr_id,
-//       // o_id: item.o_id,
-//     },
-//   })
-// }
+function toDetail(item) {
+  router.push({
+    name: 'XFormView',
+    query: {
+      id: item[idKey.value],
+      // id: item.rr_id,
+      // o_id: item.o_id,
+    },
+  })
+}
 
 // 新增功能
 // function addOption(totalCount) {
@@ -84,20 +92,39 @@ const serviceName = ref('af-safecheck')
 // }
 
 // 删除功能
-// function deleteRow(result) {
-//   emit('deleteRow', result.o_id)
-// }
-// const fixQueryForm = ref({
-//   f_operator_id: '487184754014158848',
-// })
+function deleteRow(result) {
+  emit('deleteRow', result.o_id)
+}
+
+// 多选操作处理
+function handleMultiSelectAction(action: string, selectedItems: any[], selectedItemsArray: any[]) {
+  console.log('多选操作:', action, selectedItems, selectedItemsArray)
+}
+
+// 选择变化处理
+function handleSelectionChange(selectedItems: any[]) {
+  console.log('选择变化，当前选中:', selectedItems.length, '个项目')
+  // 可以在这里更新UI状态，比如显示选中数量等
+}
+
+// 数据加载完成后处理 @after-load
+function afterLoad(result) {
+  console.log('afterLoad:', result)
+}
 </script>
 
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
       <XCellList
-        :config-name="configName"
-        :service-name="serviceName"
+        config-name="lngSaleOrderCRUD"
+        service-name="af-gaslink"
+        :enable-multi-select="true"
+        id-key="rr_id"
+        :multi-select-actions="multiSelectActions"
+        @to-detail="toDetail"
+        @multi-select-action="handleMultiSelectAction"
+        @selection-change="handleSelectionChange"
       />
     </template>
   </NormalDataLayout>

package/src/views/component/XFormGroupView/index.vue

@@ -1,78 +1,82 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { showDialog } from 'vant'
-import { ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-// 纯表单
-const configName = ref('form_check_test')
-const serviceName = ref('af-system')
-
-// const configName = ref("计划下发Form")
-// const serviceName = ref("af-linepatrol")
-
-// 表单组
-// const configName = ref('lngChargeAuditMobileFormGroup')
-// const serviceName = ref('af-gaslink')
-
-const formData = ref({})
-const formGroup = ref(null)
-const route = useRoute()
-const isInit = ref(false)
-function submit(_result) {
-  showDialog({ message: '提交成功' }).then(() => {
-    history.back()
-  })
-}
-
-// 表单组——数据
-// function initComponents () {
-//   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
-//     formData.value = {...res}
-//   })
-// }
-
-// 纯表单——数据
-// function initComponents() {
-//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
-// }
-
-// function initComponents() {
-//   runLogic('getlngChargeAuditMobileFormGroupData', { id: route.query?.id, o_id: route.query?.o_id }, 'af-gaslink').then((res) => {
-//     console.log('res------', res)
-//     formData.value = { ...res }
-// formGroup.value.init({
-//   configName: configName.value,
-//   serviceName: serviceName.value,
-//   groupFormData: { ...res },
-//   mode: "新增"
-// })
-//     isInit.value = true
-//   })
-// }
-
-// onBeforeMount(() => {
-//   initComponents()
-// })
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <!--      v-if="isInit" -->
-      <XFormGroup
-        ref="formGroup"
-        :config-name="configName"
-        :service-name="serviceName"
-        :group-form-data="formData"
-        mode="新增"
-        @submit="submit"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showDialog } from 'vant'
+import { ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+// const configName = ref('reviewFormGroup')
+// const serviceName = ref('af-revenue')
+
+// 纯表单
+// const configName = ref('form_check_test')
+// const serviceName = ref('af-system')
+
+// const configName = ref("计划下发Form")
+// const serviceName = ref("af-linepatrol")
+
+// 表单组
+const configName = ref('lngChargeAuditMobileFormGroup')
+const serviceName = ref('af-gaslink')
+
+const formData = ref({})
+const formGroup = ref(null)
+const route = useRoute()
+const isInit = ref(false)
+function submit(_result) {
+  showDialog({ message: '提交成功' }).then(() => {
+    console.log('12121')
+    // history.back()
+  })
+}
+
+// 表单组——数据
+// function initComponents () {
+//   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
+//     formData.value = {...res}
+//   })
+// }
+
+// 纯表单——数据
+// function initComponents() {
+//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
+// }
+
+// function initComponents() {
+//   runLogic('getlngChargeAuditMobileFormGroupData', { id: route.query?.id, o_id: route.query?.o_id }, 'af-gaslink').then((res) => {
+//     console.log('res------', res)
+//     formData.value = { ...res }
+// formGroup.value.init({
+//   configName: configName.value,
+//   serviceName: serviceName.value,
+//   groupFormData: { ...res },
+//   mode: "新增"
+// })
+//     isInit.value = true
+//   })
+// }
+
+// onBeforeMount(() => {
+//   initComponents()
+// })
+</script>
+
+<template>
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <!--      v-if="isInit" -->
+      <XFormGroup
+        ref="formGroup"
+        config-name="ApplyAddContractFormGroup"
+        service-name="af-apply"
+        :group-form-data="formData"
+        mode="新增"
+        @submit="submit"
+      />
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/views/component/XFormView/index.vue

@@ -1,41 +1,42 @@
-<script setup lang="ts">
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { ref } from 'vue'
-
-const configName = ref('ceshiForm')
-const serviceName = ref('af-system')
-
-const formGroupAddConstruction = ref(null)
-const formData = ref({
-  'YYYY': '2025-09-08 16:03:22',
-  'YYYY-MM': '2025-09-08 16:03:22',
-  'YYYY-MM-DD': '2025-09-08 16:03:22',
-  'YYYY-MM-DDHH': '2025-09-08 16:03:22',
-  'YYYY-MM-DDHHMM': '2025-09-08 16:03:22',
-  'YYYY-MM-DDHHMMSS': '2025-09-08 16:03:22',
-})
-
-function onSubmit(data: any) {
-  console.warn('提交表单', data)
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <XForm
-        ref="formGroupAddConstruction"
-        mode="修改"
-        :config-name="configName"
-        :service-name="serviceName"
-        :form-data="formData"
-        @on-submit="onSubmit"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { ref } from 'vue'
+import {
+  Button as VanButton,
+} from 'vant'
+
+const configName = ref('测试Form')
+const serviceName = ref('af-safecheck')
+const formGroupAddConstruction = ref()
+
+// 提交测试
+function onSubmit(form) {
+  console.log('事件触发提交表单----', form)
+}
+async function onAsyncSubmit() {
+  const res = await formGroupAddConstruction.value.asyncSubmit()
+  console.log('异步提交表单----', res)
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <XForm
+        ref="formGroupAddConstruction"
+        mode="新增"
+        :config-name="configName"
+        :show-tab-header="false"
+        service-name="af-safecheck"
+        :is-group-form="true"
+        @on-submit="onSubmit"
+      />
+    </template>
+  </NormalDataLayout>
+  <van-button type="primary" @click="onAsyncSubmit">提交</van-button>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/views/user/my/comm/ModifyPassword.vue

@@ -329,14 +329,18 @@ watch(() => props.visible, (newVal) => {
   .van-field__label {
     color: #333;
     font-weight: 500;
+    display: flex;
+    align-items: center;
   }
 
   .van-field__control {
     color: #333;
+    padding-right: 40px;
   }
 
   .van-field__right-icon {
-    padding: 4px;
+    padding: 8px;
+    min-width: 32px;
   }
 }
 

package/src/views/user/my/index.vue

@@ -3,7 +3,8 @@ import type { PhoneLocationStatus } from '@af-mobile-client-vue3/components/data
 import useSettingStore from '@af-mobile-client-vue3/stores/modules/setting'
 import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
-import { Dialog as vanDialog, Icon as vanIcon } from 'vant'
+import { Dialog as vanDialog, Icon as vanIcon, Sticky as VanSticky,
+} from 'vant'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import ModifyPassword from './comm/ModifyPassword.vue'
@@ -155,16 +156,18 @@ const webMobileConfig = useSettingStore().getSetting()
 <template>
   <main class="my_main">
     <!-- 顶部导航栏 -->
-    <nav class="header_nav">
-      <div class="header_content">
-        <h1 class="main_title">
-          我的
-        </h1>
-        <!--        <div class="setting_section"> -->
-        <!--          <van-icon name="setting-o" class="setting-icon" /> -->
-        <!--        </div> -->
-      </div>
-    </nav>
+    <VanSticky :offset-top="0">
+      <nav class="header_nav">
+        <div class="header_content">
+          <h1 class="main_title">
+            我的
+          </h1>
+          <!--        <div class="setting_section"> -->
+          <!--          <van-icon name="setting-o" class="setting-icon" /> -->
+          <!--        </div> -->
+        </div>
+      </nav>
+    </VanSticky>
 
     <!-- 主要内容区域 -->
     <div class="content">
@@ -276,7 +279,6 @@ const webMobileConfig = useSettingStore().getSetting()
 
 <style scoped lang="less">
 .my_main {
-  min-height: 100vh;
   background-color: #f7f8fa;
 
   // 顶部导航栏