af-mobile-client-vue3 1.6.21 → 1.6.22

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

@@ -1,116 +1,134 @@
 <script setup lang="ts">
-import type { CascadeOption } from '@af-mobile-client-vue3/components/data/XAddressCascadePicker/index.vue'
-import XAddressCascadePicker from '@af-mobile-client-vue3/components/data/XAddressCascadePicker/index.vue'
 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 { showToast } from 'vant'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
-const emit = defineEmits(['deleteRow', 'addressSelected'])
+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 showAddressPicker = ref(false)
-
-const communityOptions = ref<CascadeOption[]>([
-  { id: 'c1', label: '阳光花园阳光花园阳光花园阳光花园阳光花园阳光花园阳光花园', sub_text: '2栋', children: [
-    { id: 'b11', label: '11号楼', status_text: '入户', status_type: '#16a34a', children: [
-      { id: 'u111', label: '11单元', children: [
-        { id: 'u111-h-101', label: '1011室', code: '111222333444555', status_text: '测试', status_type: '#6b7280', is_leaf: true },
-        { id: 'u111-h-102', label: '1021室', code: '111', status_text: '入户', status_type: '#16a34a', is_leaf: true },
-        { id: 'u111-h-103', label: '1031室', code: '111', status_text: '未检', status_type: '#6b7280', is_leaf: true },
-        { id: 'u111-h-104', label: '1041室', code: '111', status_text: '未检', status_type: '#6b7280', is_leaf: true },
-      ] },
-    ] },
-  ] },
-  { id: 'c2', label: '金色家园', sub_text: '1栋' },
-  { id: 'c3', label: '阳光商业广场', sub_text: '4栋' },
-  { id: 'c4', label: '工业园A区', sub_text: '2栋' },
-  { id: 'c5', label: '建材市场', sub_text: '1栋' },
-])
+const configName = ref('lngChargeAuditMobileCRUD')
+const serviceName = ref('af-gaslink')
 
-const buildingMap: Record<string, CascadeOption[]> = {
-  c1: [{ id: 'b11', label: '1号楼' }, { id: 'b12', label: '2号楼' }],
-  c2: [{ id: 'b21', label: '1号楼' }],
-  c3: [{ id: 'b31', label: 'A栋' }, { id: 'b32', label: 'B栋' }],
-  c4: [{ id: 'b41', label: '1号楼' }, { id: 'b42', label: '2号楼' }, { id: 'b43', label: '3号楼' }],
-  c5: [{ id: 'b51', label: '1号楼' }],
-}
+// 资源权限测试
+// 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 buildHouseLeafList(unitId: string): CascadeOption[] {
-  return Array.from({ length: 8 }).map((_, index) => {
-    const roomNo = 101 + index
-    return {
-      id: `${unitId}-h-${roomNo}`,
-      label: String(roomNo),
-      is_leaf: true,
-      code: `U${String(index + 1).padStart(3, '0')}`,
-      status_text: index % 2 === 0 ? '入户' : '未检',
-      status_type: index % 2 === 0 ? '#16a34a' : '#6b7280',
-    }
+// 跳转到表单——以表单组来渲染纯表单
+function toDetail(item) {
+  const query = {
+    checkId: null,
+    safeCheckType: '年度普查',
+    bonusData: JSON.stringify({
+      inspectionType: {},
+    }),
+    userType: '民用',
+    userinfoid: '96451',
+    newDate: new Date().getTime(),
+    isDraft: 'false', // 是否存在临时数据
+    draftType: '计划安检',
+  }
+  router.push({
+    name: 'SecurityCertificate',
+    query,
   })
+  // router.push({
+  //   name: 'XFormView',
+  //   query: {
+  //     id: item[idKey.value],
+  //     // id: item.rr_id,
+  //     // o_id: item.o_id,
+  //   },
+  // })
 }
 
-const unitWithFloorAndHouseMap: Record<string, CascadeOption[]> = {
-  b11: [
-    { id: 'u111', label: '1单元', children: buildHouseLeafList('u111') },
-    { id: 'u112', label: '2单元', children: buildHouseLeafList('u112') },
-  ],
-  b12: [
-    { id: 'u121', label: '1单元', children: buildHouseLeafList('u121') },
-  ],
-  b21: [
-    { id: 'u211', label: '1单元', children: buildHouseLeafList('u211') },
-  ],
-  b31: [
-    { id: 'u311', label: '1单元', children: buildHouseLeafList('u311') },
-    { id: 'u312', label: '2单元', children: buildHouseLeafList('u312') },
-  ],
-  b32: [
-    { id: 'u321', label: '1单元', children: buildHouseLeafList('u321') },
-  ],
-  b41: [
-    { id: 'u411', label: '1单元', children: buildHouseLeafList('u411') },
-  ],
-  b42: [
-    { id: 'u421', label: '1单元', children: buildHouseLeafList('u421') },
-    { id: 'u422', label: '2单元', children: buildHouseLeafList('u422') },
-  ],
-  b43: [
-    { id: 'u431', label: '1单元', children: buildHouseLeafList('u431') },
-  ],
-  b51: [
-    { id: 'u511', label: '1单元', children: buildHouseLeafList('u511') },
-  ],
-}
+// 新增功能
+// function addOption(totalCount) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: totalCount, openid: totalCount },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '新增',
+//     },
+//   })
+// }
 
-async function loadAddressChildren(node: CascadeOption, _path: CascadeOption[], levelIndex: number): Promise<CascadeOption[]> {
-  if (levelIndex === 0) {
-    return buildingMap[String(node.id)] || []
-  }
+// 修改功能
+// function updateRow(result) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: result.o_id, openid: result.o_id },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '修改',
+//     },
+//   })
+// }
 
-  if (levelIndex === 1) {
-    return unitWithFloorAndHouseMap[String(node.id)] || []
-  }
+// 删除功能
+function deleteRow(result) {
+  emit('deleteRow', result.o_id)
+}
 
-  return []
+// 多选操作处理
+function handleMultiSelectAction(action: string, selectedItems: any[], selectedItemsArray: any[]) {
+  console.log('多选操作:', action, selectedItems, selectedItemsArray)
 }
 
-function selectAddress() {
-  showAddressPicker.value = true
+// 选择变化处理
+function handleSelectionChange(selectedItems: any[]) {
+  console.log('选择变化，当前选中:', selectedItems.length, '个项目')
+  // 可以在这里更新UI状态，比如显示选中数量等
 }
 
-function handleAddressConfirm(payload: { leaf: CascadeOption, path: CascadeOption[] }) {
-  console.log('>>>> payload: ', JSON.stringify(payload))
-  const pathLabel = payload.path.map(item => item.label).join(' / ')
-  showToast(`已选择：${pathLabel}`)
+// 数据加载完成后处理 @after-load
+function afterLoad(result) {
+  console.log('afterLoad:', result)
+}
+function emitFunc(func, data) {
+  console.log('emitFunc:', func, data)
 }
 </script>
 
@@ -118,18 +136,16 @@ function handleAddressConfirm(payload: { leaf: CascadeOption, path: CascadeOptio
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
       <XCellList
-        :config-name="configName"
-        :service-name="serviceName"
-        @select-address="selectAddress"
-      />
-      <XAddressCascadePicker
-        v-model="showAddressPicker"
-        title="地址选择"
-        :root-options="communityOptions"
-        :load-children="loadAddressChildren"
-        :expanded-level-indexes="[2]"
-        :preserve-last-state-on-confirm="true"
-        @confirm="handleAddressConfirm"
+        config-name="scanCodeAndNFCRUD"
+        service-name="af-safecheck"
+        :enable-multi-select="true"
+        id-key="t_id"
+        :is-limit-query="true"
+        :multi-select-actions="multiSelectActions"
+        @to-detail="toDetail"
+        @multi-select-action="handleMultiSelectAction"
+        @selection-change="handleSelectionChange"
+        @x-form-item-emit-func="emitFunc"
       />
     </template>
   </NormalDataLayout>

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

@@ -5,22 +5,60 @@ 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_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<any>(null)
+const formGroup = ref(null)
 const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
-    formGroup.value?.closeLoading?.()
-    history.back()
-  }).catch(() => {
-    formGroup.value?.closeLoading?.()
+    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>
@@ -29,10 +67,9 @@ function submit(_result) {
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
-        :config-name="configName"
-        :service-name="serviceName"
+        config-name="ApplyAddContractFormGroup"
+        service-name="af-apply"
         :group-form-data="formData"
-        :enable-submit-loading="true"
         mode="新增"
         @submit="submit"
       />

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

@@ -1,36 +1,25 @@
 <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 router from '@af-mobile-client-vue3/router'
 import { ref } from 'vue'
+import {
+  Button as VanButton,
+} from 'vant'
 
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
-
-const formGroupAddConstruction = ref<any>(null)
-function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
-// 地图预览相关
-const previewMapRef = ref(null)
+const configName = ref('测试Form')
+const serviceName = ref('af-safecheck')
+const formGroupAddConstruction = ref()
 
-async function onSubmit(data: any) {
-  try {
-    console.warn('提交表单', data)
-    await sleep(1000) // 暂停10秒
-    router.back()
-  }
-  finally {
-    formGroupAddConstruction.value?.closeLoading?.()
-  }
+// 提交测试
+function onSubmit(form) {
+  console.log('事件触发提交表单----', form)
 }
-function onAddressChange(data: any) {
-  console.warn('表单新增数据变化', data)
+async function onAsyncSubmit() {
+  const res = await formGroupAddConstruction.value.asyncSubmit()
+  console.log('异步提交表单----', res)
 }
-
-function onRegionChange(data: any) {
-  console.warn('表单新增数据变化', data)
+function emitFunc(func, data) {
+  console.log('emitFunc:', func, data)
 }
 </script>
 
@@ -39,16 +28,17 @@ function onRegionChange(data: any) {
     <template #layout_content>
       <XForm
         ref="formGroupAddConstruction"
-        mode="新增"
+        mode="修改"
         :config-name="configName"
-        :service-name="serviceName"
-        :enable-submit-loading="true"
-        @address-change="onAddressChange"
-        @region-change="onRegionChange"
+        :show-tab-header="false"
+        service-name="af-safecheck"
+        :is-group-form="true"
         @on-submit="onSubmit"
+        @x-form-item-emit-func="emitFunc"
       />
     </template>
   </NormalDataLayout>
+  <van-button type="primary" @click="onAsyncSubmit">提交1</van-button>
 </template>
 
 <style scoped lang="less">