af-mobile-client-vue3 1.1.18 → 1.1.19

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/component/XReportGridView/index.vue

@@ -1,5 +1,9 @@
 <script setup lang="ts">
-import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
+import {
+  Button as VanButton,
+  DropdownItem as VanDropdownItem,
+  DropdownMenu as VanDropdownMenu,
+} from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
@@ -7,10 +11,45 @@ const route = useRoute()
 const serverName = ref('af-gaslink')
 // const configName = ref('detailsaddChargesCover')
 const configName = ref(route.query.configName ? route.query.configName : 'ReportGridTest')
+const menuRef = ref(null)
+const itemRef = ref(null)
+const value = ref(0)
+const switch1 = ref(false)
+const switch2 = ref(false)
+const options = [
+  { text: '全部商品', value: 0 },
+  { text: '新款商品', value: 1 },
+  { text: '活动商品', value: 2 },
+]
+function onConfirm() {
+  itemRef.value.toggle()
+  // 或者
+  // menuRef.value.close();
+}
 </script>
 
 <template>
-  <XReport :config-name="configName as string" :server-name="serverName" />
+  <!--  <XReport :config-name="configName as string" :server-name="serverName" /> -->
+  <VanDropdownMenu ref="menuRef" auto-locate>
+    <VanDropdownItem v-model="value" :options="options" />
+    <VanDropdownItem ref="itemRef" title="筛选" teleport="body">
+      <van-cell center title="包邮">
+        <template #right-icon>
+          <van-switch v-model="switch1" />
+        </template>
+      </van-cell>
+      <van-cell center title="团购">
+        <template #right-icon>
+          <van-switch v-model="switch2" />
+        </template>
+      </van-cell>
+      <div style="padding: 5px 16px;">
+        <VanButton type="primary" block round @click="onConfirm">
+          确认
+        </VanButton>
+      </div>
+    </VanDropdownItem>
+  </VanDropdownMenu>
 </template>
 
 <style scoped lang="less">

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

@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import {
+  Tabs as VanTabs,
+  Tab as VanTab,
+  Row as VanRow,
+  Button as VanButton
+} from 'vant'
+import { defineProps, watchEffect, onBeforeMount, ref, onMounted, watch, defineEmits } from 'vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+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 { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { useRoute } from 'vue-router'
+import {getConfigByName, query} from '@af-mobile-client-vue3/services/api/common'
+
+const router = useRoute()
+const formData = ref({})
+function initComponents () {
+  console.log('router.params=', router.params)
+  runLogic('getLngPurchaseOrderAuditGroupData', {id: router.params?.id}).then((res) => {
+    console.log('调用logic完成==',res)
+    formData.value = {...res}
+    console.log('赋值完成===', formData.value)
+  })
+}
+onBeforeMount(()=>{
+  initComponents()
+})
+const submit = (formData) => {
+  console.log('提交表单===', formData)
+  const param = {
+    type: formData.value.auditInfo.f_approval_status === '审核未通过' ? 0 : 1,
+    approval_date:'',
+    approval_remark:formData.value.auditInfo.f_approval_status,
+    approval_operator:useUserStore.getUserInfo?.name,
+    approval_operatorid: useUserStore.getUserInfo?.id,
+    record: {od_id:1}
+  }
+}
+</script>
+
+<template>
+
+  <NormalDataLayout id="XCellListView" title="采购审核">
+    <template #layout_content>
+      <XFormView :config-name="'lngPurchaseOrderFormGroup'" @submit="submit" :group-form-data="formData"/>
+    </template>
+  </NormalDataLayout>
+</template>
+<style scoped lang="less">
+
+</style>

package/tsconfig.json

@@ -1,43 +1,43 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "jsx": "preserve",
-    "lib": ["esnext", "dom", "dom.iterable", "scripthost"],
-    "experimentalDecorators": true,
-    "baseUrl": ".",
-    "module": "esnext",
-    "moduleResolution": "Bundler",
-    "paths": {
-      "@af-mobile-client-vue3/*": ["src/*"]
-    },
-    "types": [
-      "node",
-      "unplugin-vue-router/client",
-      "vite-plugin-vue-layouts/client",
-      "vite-plugin-pwa/client"
-    ],
-    "allowJs": true,
-    "strictNullChecks": false,
-    "noImplicitAny": false,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    "importHelpers": true,
-    "sourceMap": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "src/App.vue",
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "src/**/*.vue",
-    "tests/**/*.ts",
-    "tests/**/*.tsx",
-    "src/components.d.ts",
-    "src/auto-imports.d.ts",
-    "src/typed-router.d.ts",
-    "tests/*.ts"
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "jsx": "preserve",
+    "lib": ["esnext", "dom", "dom.iterable", "scripthost"],
+    "experimentalDecorators": true,
+    "baseUrl": ".",
+    "module": "esnext",
+    "moduleResolution": "Bundler",
+    "paths": {
+      "@af-mobile-client-vue3/*": ["src/*"]
+    },
+    "types": [
+      "node",
+      "unplugin-vue-router/client",
+      "vite-plugin-vue-layouts/client",
+      "vite-plugin-pwa/client"
+    ],
+    "allowJs": true,
+    "strictNullChecks": false,
+    "noImplicitAny": false,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "importHelpers": true,
+    "sourceMap": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "src/App.vue",
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.tsx",
+    "src/components.d.ts",
+    "src/auto-imports.d.ts",
+    "src/typed-router.d.ts",
+    "tests/*.ts"
+  ]
+}

package/vite.config.ts

@@ -13,7 +13,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
 
   const appProxys = {}
 
-  const v4Server = 'http://aote-office.8866.org:31567'
+  const v4Server = 'http://aote-office.8866.org:31577'
   const v3Server = 'http://aote-office.8866.org:31567'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://39.104.49.8:30372'
@@ -95,15 +95,15 @@ export default ({ mode }: ConfigEnv): UserConfig => {
       postcss: {
         plugins: [
           // 自动获取浏览器的流行度和能够支持的属性，并为 CSS 规则添加前缀
-          autoprefixer(),
-          viewport({
-            appSelector: '#system-app',
-            viewportWidth: 375,
-            maxDisplayWidth: 800,
-            appContainingBlock: 'auto',
-            necessarySelectorWhenAuto: '.app-wrapper',
-            rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
-          }),
+          // autoprefixer(),
+          // viewport({
+          //   appSelector: '#system-app',
+          //   viewportWidth: 375,
+          //   maxDisplayWidth: 800,
+          //   appContainingBlock: 'auto',
+          //   necessarySelectorWhenAuto: '.app-wrapper',
+          //   rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
+          // }),
         ],
       },
     },

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

@@ -1,133 +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 { post } from '@af-mobile-client-vue3/services/restTools'
-import {
-  showDialog,
-  NavBar as VanNavBar,
-  Space as VanSpace,
-} from 'vant'
-import { defineEmits, getCurrentInstance, onBeforeMount, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const emit = defineEmits(['onSumbit'])
-const xForm = ref(null)
-const id = ref(-1)
-const openid = ref('')
-const instance = getCurrentInstance()
-const xFormInit = ref(false)
-const route = useRoute()
-const configName = route.query.configName as string
-const serviceName = route.query.serviceName as string
-const mode = route.query.mode as string
-const updateData = ref({})
-const title = ref('')
-const groupFormItems = ref({})
-const api = ref('/af-system/logic/commonQuery')
-const updateId = {
-  queryParamsName: 'crud_oper_log_manage',
-  pageNo: 1,
-  pageSize: 20,
-  conditionParams: { o_id: route.params.id as string },
-}
-const loadUpdate = ref(false)
-// const serviceName = ref('af-revenue')
-const _currentEvaluate = {
-  id: null,
-  f_business_name: '',
-  f_evaluate_state: '',
-}
-
-// 组件挂载前获取数据
-onBeforeMount(async () => {
-  if (instance) {
-    id.value = route.params.id as unknown as number
-    openid.value = route.params.openid as string
-    formInit()
-  }
-})
-
-// 组件初始化前的判断
-async function formInit() {
-  getConfigByName(configName, (result) => {
-    groupFormItems.value = result
-    title.value = result.title
-    if (mode === '修改')
-      getUpdateData()
-    xFormInit.value = true
-  }, serviceName)
-}
-
-// 获取配置信息
-function queryData() {
-
-}
-
-// 提交操作
-function onSubmit(params) {
-  // const data = {
-  //   id: currentEvaluate.id,
-  //   f_json: params,
-  //   f_evaluate_date: formatDate(new Date()),
-  //   f_evaluate_state: '已评价',
-  //   f_evaluate_type: '用户评价',
-  //   f_evaluate_userid: openid.value,
-  // }
-  // openApiLogic(data, 'saveEvaluate', formServiveName).then((_res: any) => {
-  //     showDialog({ message: '评价成功了' }).then(() => {history.back()})
-  // }).catch(() => {
-  //   showDialog({ message: '评价失败了' })
-  // })
-  if (params) {
-    emit('onSumbit', params)
-    showDialog({ message: '评价成功了' }).then(() => {
-      history.back()
-    })
-  }
-  else {
-    showDialog({ message: '评价失败了' }).then(() => {
-      history.back()
-    })
-  }
-}
-
-// 查询需要修改的数据
-async function getUpdateData() {
-  if (api.value && updateId) {
-    const res = await post(api.value, updateId)
-    updateData.value = res.data[0]
-  }
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XFormView" title="XForm表单">
-    <template #layout_content>
-      <VanSpace direction="vertical" fill>
-        <VanNavBar :title="title ? mode.concat(title) : null" />
-        <XForm
-          v-if="xFormInit"
-          ref="xForm"
-          :group-form-items="JSON.parse(JSON.stringify(groupFormItems))"
-          :service-name="serviceName"
-          :form-data="updateData"
-          :mode="mode"
-          style="margin-bottom: 14px;"
-          @on-submit="onSubmit"
-        />
-      </VanSpace>
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped>
-.van-doc-demo-block__title {
-  margin: 0;
-  padding: 32px 16px 16px;
-  color: black;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 16px;
-}
-</style>