npm - af-mobile-client-vue3 - Versions diffs - 1.1.38 → 1.1.40 - Mend

af-mobile-client-vue3 1.1.38 → 1.1.40

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 (10) hide show

package/package.json +1 -1
package/src/components/data/XCellList/index.vue +3 -7
package/src/components/data/XFormItem/index.vue +0 -1
package/src/components/data/XReportGrid/XReportDemo.vue +33 -33
package/src/components/data/XReportGrid/print.js +184 -184
package/src/utils/queryFormDefaultRangePicker.ts +57 -57
package/src/views/component/XCellListView/index.vue +122 -425
package/src/views/component/XFormGroupView/index.vue +7 -4
package/tsconfig.json +43 -43
package/vite.config.ts +2 -2

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.38",
+  "version": "1.1.40",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

package/src/components/data/XCellList/index.vue CHANGED Viewed

@@ -211,11 +211,8 @@ function initComponent() {
 // 初始化条件参数
 function initConditionParams(formItems, isQuery) {
-  if (!formItems || !Array.isArray(formItems) || formItems.length === 0)
-    return
   const defaultParams = {}
-  let hasDefaults = false
+  let hasDefaults: boolean
   // 从表单配置中获取所有默认值
   formItems.forEach((item) => {
@@ -239,12 +236,11 @@ function initConditionParams(formItems, isQuery) {
         else {
           defaultParams[item.model] = item.queryFormDefault
         }
-        hasDefaults = true
       }
-      hasDefaults = true
     }
-    hasDefaults = true
   })
+  // eslint-disable-next-line prefer-const
+  hasDefaults = true
   // 如果有默认值，则设置到条件参数中并立即执行查询
   queryDefaultParams.value = defaultParams

package/src/components/data/XFormItem/index.vue CHANGED Viewed

@@ -868,7 +868,6 @@ function handleAddressConfirm(location) {
     <VanCalendar
       v-model:show="calendarShow"
       switch-mode="year-month"
-      allow-same-day
       type="range"
       teleport="body"
       :show-confirm="attr.showConfirm"

package/src/components/data/XReportGrid/XReportDemo.vue CHANGED Viewed

@@ -1,33 +1,33 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import XReport from './XReport.vue'
-const mainRef = ref()
-onMounted(() => {
-  // 初始化逻辑
-})
-</script>
-<template>
-  <div id="test">
-    <van-card :bordered="false">
-      <XReport
-        ref="mainRef"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"
-      />
-    </van-card>
-  </div>
-</template>
-<style scoped>
-</style>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import XReport from './XReport.vue'
+const mainRef = ref()
+onMounted(() => {
+  // 初始化逻辑
+})
+</script>
+<template>
+  <div id="test">
+    <van-card :bordered="false">
+      <XReport
+        ref="mainRef"
+        :use-oss-for-img="false"
+        config-name="nurseWorkstationCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"
+      />
+    </van-card>
+  </div>
+</template>
+<style scoped>
+</style>

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/utils/queryFormDefaultRangePicker.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,451 +1,148 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-import { post } from '@af-mobile-client-vue3/services/restTools'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import {
-  showDialog,
-  showNotify,
-  Badge as VanBadge,
-  Dialog as VanDialog,
-  Field as VanField,
-  Icon as VanIcon,
-  Radio as VanRadio,
-  RadioGroup as VanRadioGroup,
-} from 'vant'
-import { defineEmits, onMounted, onUnmounted, reactive, ref } from 'vue'
+import { defineEmits, ref } from 'vue'
+import { useRouter } from 'vue-router'
 // 定义事件
 const emit = defineEmits(['deleteRow'])
-const userState = useUserStore().getLogin()
-let timer: number | null = null
-const configName = ref('ReservationOrderCRUD')
-const serviceName = ref('af-safecheck')
-// 获取组件引用
-const cellListRef = ref()
-const statistics = reactive({
-  awaiting_security: 0,
-  pending: 0,
-})
-// 列表固定查询条件
-const fixQueryForm = { }
-// 处理公告点击
-function handleBadgeClick(opt) {
-  const condition = {}
-  console.log(condition)
-  if (opt === 'backlog') {
-    condition.os_f_accept_status = '待受理'
-    condition.os_f_accept_user_id = null
-  }
-  else {
-    condition.os_f_accept_status = '待安检'
-    condition.os_f_accept_user_id = userState.f.resources.id
-  }
-  console.log(condition)
-  cellListRef.value?.updateConditionAndRefresh(condition)
-}
-// 获取待办数据
-function fetchTodoData() {
-  post(`/af-safecheck/logic/getToDoSafeOrder`, { params: { userid: userState.f.resources.id, f_urban_area: userState.f.resources.orgs } }).then((res) => {
-    console.log('res====', res)
-    if (res && res.length > 0) {
-      statistics.awaiting_security = res[0].awaiting_security || 0
-      statistics.pending = res[0].pending || 0
-    }
+const userInfo = useUserStore().getUserInfo()
+// 访问路由
+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('测试')
+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: 'XFormGroupView',
+    // query: {
+    //   id: item[idKey.value],
+    // id: item.rr_id,
+    // o_id: item.o_id,
+    // },
   })
 }
-onMounted(() => {
-  // 立即执行一次
-  fetchTodoData()
-  getConfig()
-  // 设置定时器，每10秒执行一次
-  timer = window.setInterval(() => {
-    fetchTodoData()
-  }, 10000)
-  window.addEventListener('appstate-change', (e: any) => {
-    if (e.detail.appState === 'afterhidden') {
-      if (timer) {
-        clearInterval(timer)
-        timer = null
-      }
-    }
+// 新增功能
+// function addOption(totalCount) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: totalCount, openid: totalCount },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '新增',
+//     },
+//   })
+// }
+function addOption(callback) {
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: totalCount.value },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '新增',
+    // },
   })
-})
-// 组件销毁时清理定时器
-onUnmounted(() => {
-  if (timer) {
-    clearInterval(timer)
-    timer = null
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
   }
-})
-// 添加新的状态变量
-const showCompleteDialog = ref(false)
-const showInvalidateDialog = ref(false)
-const currentItem = ref(null)
-const completeForm = reactive({
-  result: '',
-  problemDesc: '',
-  remark: '',
-})
-const invalidateForm = reactive({
-  reason: '',
-  remark: '',
-})
-// 安检结果选项
-const inspectionResults = ref([])
-// 作废原因选项
-const invalidateReasons = ref([])
-// 开始安检
-function accept(item) {
-  currentItem.value = item
-  showCompleteDialog.value = true
-}
-// 作废安检
-function showInvalidated(item) {
-  currentItem.value = item
-  showInvalidateDialog.value = true
 }
-// 完成安检
-function completed() {
-  if (!completeForm.result) {
-    showNotify({
-      type: 'warning',
-      message: '请选择安检结果',
-      duration: 2000,
-    })
-    return false
-  }
-  const currentResult = inspectionResults.value.find(item => item.value === completeForm.result)
-  if (currentResult?.showProblemDesc && !completeForm.problemDesc) {
-    showNotify({
-      type: 'warning',
-      message: '请填写问题描述',
-      duration: 2000,
-    })
-    return false
-  }
-  // TODO: 调用后端API保存安检结果
-  post('/af-safecheck/entity/save/t_order_safecheck', {
-    id: currentItem.value.os_id,
-    f_accept_status: '已安检',
-    f_check_result: completeForm.result,
-    f_problem_desc: completeForm.problemDesc || null,
-    f_remark: completeForm.remark || null,
-    version: currentItem.value.os_version,
-  }).then(() => {
-    showNotify({
-      type: 'success',
-      message: '安检完成',
-      duration: 2000,
-    })
-    // 刷新列表
-    cellListRef.value?.updateConditionAndRefresh()
-    fetchTodoData()
-    // 关闭弹窗并重置表单
-    showCompleteDialog.value = false
-    resetCompleteForm()
+// 修改功能
+function updateRow(result, callback) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
   })
-  return true
-}
-// 作废安检
-function invalidated() {
-  if (!invalidateForm.reason) {
-    showNotify({
-      type: 'warning',
-      message: '请选择作废原因',
-      duration: 2000,
-    })
-    return false
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
   }
-  // TODO: 调用后端API保存作废信息
-  post('/af-safecheck/entity/save/t_order_safecheck', {
-    id: currentItem.value.os_id,
-    f_accept_status: '已作废',
-    f_problem_desc: `${invalidateForm.reason}-${invalidateForm.remark}`,
-    version: currentItem.value.os_version,
-  }).then(() => {
-    showNotify({
-      type: 'success',
-      message: '安检已作废',
-      duration: 2000,
-    })
-    // 刷新列表
-    cellListRef.value?.updateConditionAndRefresh()
-    fetchTodoData()
-    // 关闭弹窗并重置表单
-    showInvalidateDialog.value = false
-    resetInvalidateForm()
-  })
-  return true
 }
-function accepted(item) {
-  // TODO: 调用后端API保存作废信息
-  post('/af-safecheck/entity/save/t_order_safecheck', {
-    id: item.os_id,
-    f_accept_status: '待安检',
-    f_accept_user_id: userState.f.resources.id,
-    f_accept_user_name: userState.f.resources.name,
-    version: item.os_version,
-  }).then(() => {
-    showNotify({
-      type: 'success',
-      message: '已成功受理，请及时安检！',
-      duration: 2000,
-    })
-    // 刷新列表
-    cellListRef.value?.updateConditionAndRefresh()
-    fetchTodoData()
-  })
-  return true
-}
-function cancelAccept(item) {
-  // TODO: 调用后端API保存作废信息
-  post('/af-safecheck/entity/save/t_order_safecheck', {
-    id: item.os_id,
-    f_accept_status: '待受理',
-    f_accept_user_id: null,
-    f_accept_user_name: null,
-    version: item.os_version,
-  }).then(() => {
-    showNotify({
-      type: 'success',
-      message: '已成功取消受理！',
-      duration: 2000,
-    })
-    // 刷新列表
-    cellListRef.value?.updateConditionAndRefresh()
-    fetchTodoData()
-  })
-  return true
-}
-function getConfig() {
-  getConfigByName('invalidateReasonsConfig', (result) => {
-    if (result?.value)
-      invalidateReasons.value = result.value
-  }, 'af-safecheck')
-  getConfigByName('inspectionResultsConfig', (result) => {
-    if (result?.value)
-      inspectionResults.value = result.value
-  }, 'af-safecheck')
-}
-// 重置完成安检表单
-function resetCompleteForm() {
-  completeForm.result = ''
-  completeForm.problemDesc = ''
-  completeForm.remark = ''
-}
-// 重置作废安检表单
-function resetInvalidateForm() {
-  invalidateForm.reason = ''
-  invalidateForm.remark = ''
-}
-// 退出登录
-async function exit_login() {
-  showDialog({
-    title: '提示',
-    message: '确定要退出登录吗？',
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    showCancelButton: true,
-  }).then(async () => {
-    await useUserStore().logout()
-  }).catch(() => {
-    // 用户点击取消，不做任何操作
-  })
+// 删除功能
+function deleteRow(result) {
+  emit('deleteRow', result.o_id)
 }
 </script>
 <template>
-  <div class="xlv_t">
-    <XCellList
-      ref="cellListRef"
-      :config-name="configName"
-      :service-name="serviceName"
-      :fix-query-form="fixQueryForm"
-      @accept="accepted"
-      @completed="accept"
-      @invalidated="showInvalidated"
-      @cancel-accept="cancelAccept"
-    >
-      <template #search-left-loginout>
-        <VanBadge @click="exit_login()">
-          <VanIcon name="arrow-left" size="24" />
-        </VanBadge>
-      </template>
-      <template #search-right-bad>
-        <VanBadge :content="statistics.pending" @click="handleBadgeClick('backlog')">
-          <VanIcon name="bullhorn-o" size="24" />
-        </VanBadge>
-      </template>
-      <template #search-right-my>
-        <VanBadge :content="statistics.awaiting_security" @click="handleBadgeClick('my')">
-          <VanIcon name="description-o" size="24" />
-        </VanBadge>
-      </template>
-    </XCellList>
-    <!-- 完成安检弹窗 -->
-    <VanDialog
-      v-model:show="showCompleteDialog"
-      title="完成安检"
-      show-cancel-button
-      :close-on-click-overlay="false"
-      :close-on-popstate="false"
-      :before-close="(action) => action === 'confirm' ? completed() : true"
-      class="inspection-dialog"
-      @cancel="resetCompleteForm"
-    >
-      <div class="dialog-content">
-        <div class="form-item">
-          <div class="form-label">
-            安检结果
-          </div>
-          <VanRadioGroup v-model="completeForm.result" class="radio-group">
-            <VanRadio
-              v-for="item in inspectionResults"
-              :key="item.value"
-              :name="item.value"
-              class="radio-item"
-            >
-              {{ item.label }}
-            </VanRadio>
-          </VanRadioGroup>
-        </div>
-        <div v-if="inspectionResults.find(item => item.value === completeForm.result)?.showProblemDesc" class="form-item">
-          <div class="form-label">
-            问题描述
-          </div>
-          <VanField
-            v-model="completeForm.problemDesc"
-            type="textarea"
-            rows="3"
-            placeholder="请详细描述发现的问题"
-            class="field-item"
-          />
-        </div>
-        <div class="form-item">
-          <div class="form-label">
-            备注信息
-          </div>
-          <VanField
-            v-model="completeForm.remark"
-            type="textarea"
-            rows="3"
-            placeholder="请输入其他备注信息（选填）"
-            class="field-item"
-          />
-        </div>
-      </div>
-    </VanDialog>
-    <!-- 作废安检弹窗 -->
-    <VanDialog
-      v-model:show="showInvalidateDialog"
-      title="作废安检"
-      show-cancel-button
-      :close-on-click-overlay="false"
-      :close-on-popstate="false"
-      :before-close="(action) => action === 'confirm' ? invalidated() : true"
-      class="inspection-dialog"
-      @cancel="resetInvalidateForm"
-    >
-      <div class="dialog-content">
-        <div class="form-item">
-          <div class="form-label">
-            作废原因
-          </div>
-          <VanRadioGroup v-model="invalidateForm.reason" class="radio-group">
-            <VanRadio
-              v-for="item in invalidateReasons"
-              :key="item.value"
-              :name="item.value"
-              class="radio-item"
-            >
-              {{ item.label }}
-            </VanRadio>
-          </VanRadioGroup>
-        </div>
-        <div class="form-item">
-          <div class="form-label">
-            补充说明
-          </div>
-          <VanField
-            v-model="invalidateForm.remark"
-            type="textarea"
-            rows="3"
-            placeholder="请详细说明作废原因（选填）"
-            class="field-item"
-          />
-        </div>
-      </div>
-    </VanDialog>
-  </div>
+  <NormalDataLayout id="XCellListView" title="工作计划">
+    <template #layout_content>
+      <XCellList
+        :config-name="configName"
+        :service-name="serviceName"
+        :id-key="idKey"
+        @to-detail="toDetail"
+        @delete-row="deleteRow"
+        @update="updateRow"
+        @add="addOption"
+      />
+      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
+      <!--      <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" -->
+      <!--      /> -->
+    </template>
+  </NormalDataLayout>
 </template>
 <style scoped lang="less">
-.xlv_t{
-  --van-cell-horizontal-padding: 0;
-  --van-cell-vertical-padding: 0;
-  .dialog-content {
-    padding: 8%;
-    .form-item {
-      margin-bottom: 20px;
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-    .form-label {
-      font-size: 14px;
-      color: #323233;
-      margin-bottom: 12px;
-      font-weight: 500;
-    }
-    .radio-group {
-      display: flex;
-      flex-direction: column;
-      gap: 12px;
-    }
-    .radio-item {
-      font-size: 14px;
-      color: #323233;
-    }
-    .field-item {
-      :deep(.van-field__control) {
-        min-height: 80px;
-        border: 1px solid #ebedf0;
-        border-radius: 4px;
-        padding: 8px 12px;
-        background-color: #f7f8fa;
-      }
-      :deep(.van-field__placeholder) {
-        color: #969799;
-      }
-    }
-  }
-}
 </style>

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

@@ -5,16 +5,19 @@ 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 configName = ref('lngChargeAuditMobileFormGroup')
+const serviceName = ref('af-gaslink')
 const formData = ref({})
 const formGroup = ref(null)

package/tsconfig.json CHANGED Viewed

@@ -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 CHANGED Viewed

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