af-mobile-client-vue3 1.2.56 → 1.2.57

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,157 +1,147 @@
 <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 { defineOptions, onActivated, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
-// 定义事件
-const emit = defineEmits(['deleteRow'])
-const userInfo = useUserStore().getUserInfo()
-// 访问路由
+defineOptions({ name: 'XCellListView' })
+const configName = ref('ApplyMobileProcessCRUD')
+const serviceName = ref('af-apply')
 const router = useRouter()
-// 获取默认值
-const idKey = ref('o_id')
-
-// 简易crud表单测试
-// const configName = ref('orderCarInMobileCRUD')
-// const serviceName = ref('af-gaslink')
-// const configName = ref('lngPriceManageMobileCRUD')
-const configName = ref('测试2')
-const serviceName = ref('af-gaslink')
-// const configName = ref('mobile_liushuiQueryCRUD')
-// const serviceName = ref('af-revenue')
-
-// 资源权限测试
-// const configName = ref('crud_sources_test')
-// const serviceName = ref('af-system')
-
-// 实际业务测试
-// const configName = ref('lngChargeAuditMobileCRUD')
-// const serviceName = ref('af-gaslink')
-
-// 跳转到详情页面
-// function toDetail(item) {
-//   router.push({
-//     name: 'XCellDetailView',
-//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
-//     query: {
-//       operName: item[operNameKey.value],
-//       method:item[methodKey.value],
-//       requestMethod:item[requestMethodKey.value],
-//       operatorType:item[operatorTypeKey.value],
-//       operUrl:item[operUrlKey.value],
-//       operIp:item[operIpKey.value],
-//       costTime:item[costTimeKey.value],
-//       operTime:item[operTimeKey.value],
-//
-//       title: item[titleKey.value],
-//       businessType: item[businessTypeKey.value],
-//       status:item[statusKey.value]
-//     }
-//   })
-// }
-
-// 跳转到表单——以表单组来渲染纯表单
-function toDetail(item) {
-  router.push({
-    name: 'xformgroup222',
-    // query: {
-    //   id: item[idKey.value],
-    // id: item.rr_id,
-    // o_id: item.o_id,
-    // },
-  })
+// 删除功能
+function phone(result) {
+  // todo 调用真机进行通话
 }
-
-// 新增功能
-// function addOption(totalCount) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: totalCount, openid: totalCount },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '新增',
-//     },
-//   })
-// }
-function addOption() {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormGroupView',
-    // params: { id: totalCount.value },
-    // query: {
-    //   configName: configName.value,
-    //   serviceName: serviceName.value,
-    //   mode: '新增',
-    // },
-  })
-  // 如果存在回调函数，调用它并传递true表示已处理
-  // if (typeof callback === 'function') {
-  //   callback(true)
-  // }
+// 跳转流程处理
+function action(row) {
+  router.push({ name: 'XFormGroupView', query: { workflowId: row.ab_f_workflow_id, stepId: row.ws_f_step_id } })
 }
-
-// 修改功能
-function updateRow(result) {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormView',
-    params: { id: 1, openid: 2 },
-    query: {
-      configName: configName.value,
-      serviceName: serviceName.value,
-      mode: '修改',
-    },
-  })
-}
-
-// 删除功能
-function deleteRow(result) {
-  emit('deleteRow', result.o_id)
+// 工作日志
+function worklog(row) {
+  router.push({ name: 'worklog', query: { workflowid: row.ab_f_workflow_id, defname: row.ws_f_name } })
 }
+onMounted(() => {
+  console.log('初始化页面===')
+})
+onActivated(() => {
+  // 每次回到页面都会触发
+  console.log('activated: 每次回到页面都会触发')
+})
 </script>
 
 <template>
-  <NormalDataLayout id="XCellListView" title="工作计划">
-    <template #layout_content>
-      <!--      <XCellList -->
-      <!--        :config-name="configName" -->
-      <!--        :service-name="serviceName" -->
-      <!--        :custom-add="true" -->
-      <!--        :custom-edit="true" -->
-      <!--        :id-key="idKey" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--        @update="updateRow" -->
-      <!--        @add="addOption" -->
-      <!--      /> -->
-
-      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
-
-      <!--      <XCellList -->
-      <!--        config-name="ApplyMobileSuperviseCRUD" -->
-      <!--        service-name="af-apply" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--      /> -->
-
-      <!--      <XCellList -->
-      <!--        service-name="af-revenue" -->
-      <!--        config-name="userfiles_sel_address" -->
-      <!--        @to-detail="toDetail" -->
-      <!--      /> -->
-      <XCellList
-        service-name="af-apply"
-        config-name="ApplyMobileProcessCRUD"
-        :custom-add="true"
-        @to-detail="toDetail"
-        @add="addOption"
-      />
-    </template>
-  </NormalDataLayout>
+  <XCellList
+    :config-name="configName"
+    :service-name="serviceName"
+    @phone="phone"
+    @action="action"
+    @worklog="worklog"
+  />
 </template>
 
 <style scoped lang="less">
+.cell-search-after {
+  padding: 0 12px 12px 12px;
+  background-color: #fff;
+  .van-row:first-child {
+    align-items: center;
+    margin-bottom: 8px;
+    padding: 0 2px;
+    h4 {
+      font-size: 1.08rem;
+      font-weight: 600;
+      margin: 0;
+      color: #222;
+      letter-spacing: 1px;
+    }
+    .stat-date-range {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      font-size: 0.92rem;
+      color: #b0b3b8;
+      font-weight: 400;
+      span {
+        margin-left: 4px;
+        font-size: 0.92rem;
+        color: #b0b3b8;
+      }
+      .van-icon {
+        font-size: 1rem;
+        color: #b0b3b8;
+        margin-right: 2px;
+      }
+    }
+  }
+  .van-row:nth-child(2) {
+    margin-top: 8px;
+    // 统计卡片间距由gutter控制
+    .van-col {
+      // 让卡片宽度自适应
+      .stat-card {
+        width: 100%;
+      }
+    }
+  }
+  .stat-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-radius: 12px;
+    padding: 6px 0 4px 0; // 压缩高度
+    min-height: 44px; // 压缩高度
+    position: relative;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
+    background: #f7f8fa;
+    .stat-num {
+      font-size: 1.08rem; // 缩小字体
+      font-weight: 600;
+      margin-bottom: 2px;
+    }
+    .stat-label {
+      font-size: 0.82rem; // 缩小字体
+      margin-bottom: 2px;
+    }
+    .stat-icon {
+      position: absolute;
+      top: 6px;
+      right: 8px;
+      font-size: 1rem;
+      opacity: 0.4;
+    }
+  }
+  .stat-total {
+    background: #f0f5ff;
+    color: #2f54eb;
+    .stat-num,
+    .stat-label {
+      color: #2f54eb;
+    }
+    .stat-icon {
+      color: #2f54eb;
+    }
+  }
+  .stat-done {
+    background: #e6fffb;
+    color: #13c2c2;
+    .stat-num,
+    .stat-label {
+      color: #13c2c2;
+    }
+    .stat-icon {
+      color: #13c2c2;
+    }
+  }
+  .stat-processing {
+    background: #f9f0ff;
+    color: #b37feb;
+    .stat-num,
+    .stat-label {
+      color: #b37feb;
+    }
+    .stat-icon {
+      color: #b37feb;
+    }
+  }
+}
 </style>

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

@@ -1,35 +1,36 @@
 <script setup lang="ts">
 import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+import XFormView from '@af-mobile-client-vue3/views/component/XFormView/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('appapplyuserinfoFormGroup')
+const serviceName = ref('af-apply')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
 
 // 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-const serviceName = ref('af-gaslink')
+// 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()
-  })
+  showDialog({ message: '提交成功' })
+  history.back()
+}
+const myXForm = ref([])
+function setRef(value: any) {
+  console.log('myXForm', myXForm)
+  formGroup.value.setRef(myXForm.value)
+  console.log(formGroup)
 }
-
 // 表单组——数据
 // function initComponents () {
 //   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
@@ -67,12 +68,16 @@ function submit(_result) {
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
-        config-name="ceshi11111FormGroup"
-        service-name="af-apply"
+        :config-name="configName"
+        :service-name="serviceName"
         :group-form-data="formData"
         mode="新增"
         @submit="submit"
-      />
+      >
+<!--        <template #device="{ setRef, removeRef, item, formData }">
+          <XFormView :setRef="setRef" :formGroupName="'myXForm'"/>
+        </template>-->
+      </XFormGroup>
     </template>
   </NormalDataLayout>
 </template>

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

@@ -1,25 +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('addappapplychargeForm')
+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)
+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 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>
 
 <template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <XForm
-        ref="formGroupAddConstruction"
-        mode="新增"
-        :config-name="configName"
-        :service-name="serviceName"
-      />
-    </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/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>