npm - af-mobile-client-vue3 - Versions diffs - 1.1.18 → 1.1.19 - Mend

af-mobile-client-vue3 1.1.18 → 1.1.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/package.json +1 -1
package/src/components/core/ImageUploader/index.vue +163 -163
package/src/components/data/XCellList/index.vue +1 -0
package/src/components/data/XCellListFilter/index.vue +1 -1
package/src/components/data/XFormItem/index.vue +1 -1
package/src/components/data/XOlMap/utils/wgs84ToGcj02.js +154 -154
package/src/components/data/XReportGrid/XReportDemo.vue +33 -33
package/src/components/data/XReportGrid/print.js +184 -184
package/src/views/component/XCellListView/index.vue +9 -4
package/src/views/component/XFormGroupView/index.vue +37 -0
package/src/views/component/XFormView/index.vue +120 -27
package/src/views/component/XOlMapView/XLocationPicker/index.vue +118 -118
package/src/views/component/XReportGridView/index.vue +41 -2
package/src/views/component/test/index.vue +52 -0
package/tsconfig.json +43 -43
package/vite.config.ts +10 -10
package/src/views/component/XFormView/oldindex.vue +0 -133

package/src/components/data/XReportGrid/print.js CHANGED Viewed

@@ -1,184 +1,184 @@
-// print.js
-export function printElement(elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+export function printElement(elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

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

@@ -12,8 +12,8 @@ const router = useRouter()
 const idKey = ref('o_id')
 // 简易crud表单测试
-const configName = ref('crud_oper_log_manage')
-const serviceName = ref('af-system')
+const configName = ref('lngPurchaseOrderMobileCRUD')
+const serviceName = ref('af-gaslink')
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -56,7 +56,12 @@ function toDetail(item) {
     },
   })
 }
+function audit(row) {
+  router.push({
+    name: 'lngPurchaseOrderAuditDetail',
+    params: { id: row.od_id }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
+  })
+}
 // 新增功能
 // function addOption(totalCount) {
 //   router.push({
@@ -95,10 +100,10 @@ function deleteRow(result) {
       <XCellList
         :config-name="configName"
         :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
         :id-key="idKey"
         @to-detail="toDetail"
         @delete-row="deleteRow"
+        @audit="audit"
       />
     </template>
   </NormalDataLayout>

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

@@ -9,6 +9,13 @@ 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()
@@ -18,6 +25,36 @@ function submit(_result) {
     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>

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

@@ -1,40 +1,133 @@
 <script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+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, toRaw } from 'vue'
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
-const formGroup = ref(null)
-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)
+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()
+    })
+  }
 }
-function submit(result) {
-  console.log('>>>> result: ', safeStringify(result))
+// 查询需要修改的数据
+async function getUpdateData() {
+  if (api.value && updateId) {
+    const res = await post(api.value, updateId)
+    updateData.value = res.data[0]
+  }
 }
 </script>
 <template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
+  <NormalDataLayout id="XFormView" title="XForm表单">
     <template #layout_content>
-      <XFormGroup
-        ref="formGroup"
-        :config-name="configName"
-        :service-name="serviceName"
-        mode="新增"
-        @submit="submit"
-      />
+      <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 lang="less">
+<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>