af-mobile-client-vue3 1.2.55 → 1.2.57

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

@@ -1,42 +1,105 @@
 <script setup lang="ts">
+// 组件顶部功能说明：本组件为表单视图，支持通过 setRef 注册自身到父组件
 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 { post } from '@af-mobile-client-vue3/services/restTools'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import dayjs from 'dayjs/esm/index'
+import { showFailToast, showToast } from 'vant'
+import {computed, defineExpose, defineProps, onMounted, onUnmounted, ref} from 'vue'
+import { useRoute } from 'vue-router'
 
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
+const props = withDefaults(defineProps<{
+  setRef?: (refValue: any) => void
+  removeRef?: (refValue: any) => void
+  formGroupName?: string
+}>(), {
+  setRef: () => {},
+  removeRef: () => {},
+  formGroupName: '',
+})
+const configName = ref('mobile_OtherChargeCancelForm')
+const serviceName = ref('af-apply')
+const route = useRoute()
+const userInfo = useUserStore().getUserInfo()
+const workflowId = computed(() => route.query.workflowid)
+const formData = ref({
+  f_cancel_reason: '1111',
+})
 
-const formGroupAddConstruction = ref(null)
-function emitFunc(func, data) {
-  console.log('>>>> func: ', func)
-  console.log('>>>> data: ', data)
-  if (func === 'selectAddress') {
-    const add = 'ccss'
-    // 设置单个字段
-    formGroupAddConstruction.value?.setForm({ address: '你的字符串' })
+const xFormRef = ref()
+const aaa = ref({})
+function submit(res: any) {
+  if (Number(res.charge_money) > Number(res.surplus_money)) {
+    showFailToast('收费金额不能大于未结金额！！')
+    return
   }
+  const saveData = {
+    f_payment_type: res.payment_type,
+    f_charge_money: res.charge_money,
+    f_amount_words: res.amount_words,
+    f_payment_method: res.payment_method,
+    f_actual_date: res.actual_date,
+    f_charge_status: '有效',
+    f_workflow_id: workflowId.value,
+    f_charge_collectors: userInfo.f_operator,
+    f_charge_collectors_id: userInfo.f_operatorid,
+    f_charge_date: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    f_filialeid: userInfo.f_orgid,
+    f_filiale: userInfo.f_orgname,
+  }
+  post('api/af-apply/entity/save/t_charge_record', saveData).then((_res) => {
+    showToast('提交成功！')
+    history.back()
+  })
+}
+function init() {
+  // runLogic('getApplyBusinessrecode', { f_workflow_id: 854 }, 'af-apply').then((res) => {
+  //   // formData.value = res
+  //   console.log('res==', res)
+  // }).catch((err) => {
+  //
+  // })
+  setTimeout(() => {
+    Object.assign(formData.value, { f_cancel_reason: '2222222' })
+  }, 5000)
+}
+function validate() {
+  // 调用 XForm 的 validate 方法
+  return xFormRef.value?.validate?.() ?? Promise.resolve()
 }
-function submit(data) {
-  console.log('>>>> data: ', JSON.stringify(data))
+function getFormData() {
+  console.log('自定义表单=====', xFormRef.value.getFormData())
+  // 获取 XForm 的表单数据
+  return xFormRef.value?.getFormData?.() ?? {}
 }
+onMounted(() => {
+  init()
+})
+const exposeObj = { validate, getFormData, init, formGroupName: props.formGroupName }
+defineExpose(exposeObj)
+onMounted(() => {
+  props.setRef && props.setRef(exposeObj)
+})
+onUnmounted(() => {
+  props.removeRef && props.removeRef(exposeObj)
+})
+// watch(() => props.formData, (newVal) => {
+//   console.log('变更了===', newVal)
+//   if (newVal) {
+//     Object.assign(form, newVal)
+//   }
+// })
 </script>
 
-<!-- workflowId -->
 <template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <XForm
-        ref="formGroupAddConstruction"
-        mode="新增"
-        :config-name="configName"
-        :service-name="serviceName"
-        :param-logic-name-param="{ aa: 123 }"
-        :form-data="{ f_project_name: 333 }"
-        @x-form-item-emit-func="emitFunc"
-        @on-submit="submit"
-      />
-    </template>
-  </NormalDataLayout>
+  <XForm
+    ref="xFormRef"
+    mode="新增"
+    :config-name="configName"
+    :service-name="serviceName"
+    :form-data="formData"
+    @on-submit="submit"
+  />
 </template>
 
 <style scoped lang="less">

package/src/views/component/XOlMapView/XLocationPicker/index.vue

@@ -1,118 +1,118 @@
-<script setup lang="ts">
-import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
-import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { showNotify } from 'vant'
-import { ref } from 'vue'
-
-const selectedLocation = ref<LocationResult>()
-
-// 处理位置选择
-function handleLocationConfirm(location: LocationResult) {
-  // console.log('选择的位置:', location)
-  // selectedLocation.value = location
-  showNotify({ type: 'success', message: '位置已选择' })
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
-    <template #layout_content>
-      <div class="location-picker-demo">
-        <!-- 页面标题 -->
-        <div class="page-header">
-          <div class="title">
-            位置选择
-          </div>
-        </div>
-
-        <!-- 选择结果展示 -->
-        <div v-if="selectedLocation" class="location-result">
-          <div class="label">
-            已选位置:
-          </div>
-          <div class="value">
-            {{ selectedLocation.address }}
-          </div>
-          <div class="coordinates">
-            经度: {{ selectedLocation.longitude.toFixed(6) }},
-            纬度: {{ selectedLocation.latitude.toFixed(6) }}
-          </div>
-        </div>
-
-        <!-- 地图组件 -->
-        <div class="map-container">
-          <LocationPicker
-            v-model="selectedLocation"
-            :default-center="[108.948024, 34.263161]"
-            :default-zoom="12"
-            @confirm="handleLocationConfirm"
-          />
-        </div>
-      </div>
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-.location-picker-demo {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background-color: #f7f8fa;
-}
-
-.page-header {
-  height: 44px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: white;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-  position: relative;
-  z-index: 1;
-
-  .title {
-    font-size: 16px;
-    color: #333;
-    font-weight: 500;
-  }
-}
-
-.location-result {
-  background: white;
-  padding: 12px 16px;
-  margin: 10px;
-  border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-
-  .label {
-    font-size: 14px;
-    color: #666;
-    margin-bottom: 4px;
-  }
-
-  .value {
-    font-size: 16px;
-    color: #333;
-    margin-bottom: 8px;
-    word-break: break-all;
-  }
-
-  .coordinates {
-    font-size: 12px;
-    color: #999;
-  }
-}
-
-.map-container {
-  flex: 1;
-  position: relative;
-  margin: 0 10px 10px 10px;
-  border-radius: 8px;
-  overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-</style>
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  // console.log('选择的位置:', location)
+  // selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>

package/src/views/user/login/LoginForm.vue

@@ -5,13 +5,14 @@ import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
 import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
 import { funcToRouter, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
+import { secureStorageBatchWrite, secureStorageRead } from '@af-mobile-client-vue3/utils/secureStorage'
 import { isWechat } from '@af-mobile-client-vue3/utils/wechatUtil'
 import {
   closeToast,
   showDialog,
   showFailToast,
+  showLoadingToast,
   Switch,
   Button as VanButton,
   Col as VanCol,
@@ -102,6 +103,8 @@ function handleSubmit() {
     .then(async () => {
       try {
         loading.value = true
+        showLoadingToast('登录中...')
+        console.warn(setting)
         const data: any = await userState.Login({
           username: formData.username,
           password: formData.password,
@@ -158,6 +161,19 @@ function closeWindows() {
 }
 
 async function afterGeneral(result) {
+  // 排序 functions 及其嵌套的 children
+  if (result.functions && Array.isArray(result.functions)) {
+    // 对顶层菜单进行排序
+    result.functions.sort((a, b) => (a.position || 0) - (b.position || 0))
+
+    // 对每个菜单的子项进行排序
+    for (const item of result.functions) {
+      if (item.children && Array.isArray(item.children)) {
+        item.children.sort((a, b) => (a.position || 0) - (b.position || 0))
+      }
+    }
+  }
+
   const user: any = {
     ...result,
     username: result.ename,
@@ -172,8 +188,25 @@ async function afterGeneral(result) {
   userState.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
   // 加载路由
   loadRoutes(funcToRouter(user.functions))
+
+  // 存储登录数据到本地缓存
+  secureStorageBatchWrite([
+    {
+      key: 'loginData',
+      value: {
+        username: formData.username,
+        password: formData.password,
+        rememberMe: rememberMe.value,
+      },
+    },
+    {
+      key: 'userData',
+      value: result,
+    },
+  ])
+
   // 每次重新登录时，清除indexedDB缓存
-  indexedDB.clear()
+  // indexedDB.clear()
 }
 async function wxLoginFun() {
   await localStorage.setItem('wechatLoginPending', 'true')
@@ -221,6 +254,23 @@ onMounted(() => {
     localStorage.removeItem('wechatLoginPending')
     wxLoginFunContinue(code, state)
   }
+  try {
+    // 手机登录获取本地缓存的登录数据
+    secureStorageRead('loginData', (result: any) => {
+      if (result.status === 'success') {
+        const res = JSON.parse(result.data.value)
+        if (res.rememberMe) {
+          formData.username = res.username
+          formData.password = res.password
+          rememberMe.value = res.rememberMe
+        }
+      }
+    })
+  }
+  catch (e) {
+    console.debug('读取本地缓存失败', e)
+    // 未拿到跳过
+  }
 })
 </script>
 

package/vite.config.ts

@@ -11,8 +11,8 @@ export default ({ mode }: ConfigEnv): UserConfig => {
 
   const appProxys = {}
 
-  const v4Server = 'http://aote-office.8866.org:31567'
-  const v3Server = 'http://aote-office.8866.org:31567'
+  const v4Server = 'http://192.168.50.67:31577'
+  const v3Server = 'https://wkf.qhgas.com'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://39.104.49.8:30372'
   // const OSSServerProd = 'http://192.168.50.67:31351'

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

@@ -1,70 +0,0 @@
-<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 { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-import { onBeforeMount, ref, toRaw } from 'vue'
-
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
-const formGroup = ref(null)
-const formConfig = ref(null)
-const submitSimple = ref(null)
-const isLoading = ref(true)
-
-function safeStringify(obj) {
-  const seen = new WeakSet()
-  return JSON.stringify(toRaw(obj), (key, val) => {
-    if (typeof val === 'object' && val !== null) {
-      if (seen.has(val))
-        return
-      seen.add(val)
-    }
-    return val
-  }, 2)
-}
-
-function submit(result) {
-  console.log('>>>> result: ', safeStringify(result))
-}
-
-function loadConfig() {
-  return new Promise((resolve) => {
-    getConfigByName(configName.value, (result) => {
-      submitSimple.value = result.showSubmitBtn
-      formConfig.value = result
-      resolve(result)
-    }, serviceName.value)
-  })
-}
-
-onBeforeMount(async () => {
-  try {
-    await loadConfig()
-  }
-  finally {
-    isLoading.value = false
-  }
-})
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <van-loading v-if="isLoading" />
-      <XForm
-        v-else
-        ref="formGroup"
-        mode="查询"
-        :service-name="serviceName"
-        :group-form-items="formConfig"
-        :form-data="{}"
-        :form-name="formConfig?.groupName || '11111'"
-        :submit-button="submitSimple"
-        @on-submit="submit"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-</style>