vue2-client 1.22.7 → 1.22.9

package/src/base-client/components/common/XFormTable/demo.vue

@@ -2,35 +2,54 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      :queryParamsName="queryParamsName"
+      queryParamsName="scanCodeAndNFCRUD"
       :fixedAddForm="fixedAddForm"
       :externalSelectedRowKeys="selectedKeys"
+      :defaultPageSize="100"
+      :pageSizeArray="['100','200']"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
-      @rowDblClick="rowDblClick"
-      serviceName="af-revenue"
+      @startService="startService"
+      serviceName="af-safecheck"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-      @tableBaseEnter="tableBaseEnter"
-      @addFormSubmit="addFormSubmit"
-    ></x-form-table>
+    >
+    </x-form-table>
+    <a-modal
+      v-model="formModalVisible"
+      title="工单回访"
+      :zIndex="1002"
+      width="50vw"
+      :destroy-on-close="true"
+      @cancel="formModalVisible = false"
+      @ok="ok"
+    >
+      <x-add-native-form
+        ref="xForm"
+      />
+    </a-modal>
+    <button @click="backDealData">提交</button>
   </a-card>
 </template>
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
+import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
+
 export default {
   name: 'Demo',
   components: {
-    XFormTable
+    XFormTable,
+    XAddNativeForm,
   },
-  data() {
+  data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'UserFilesListCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值
@@ -43,41 +62,32 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: []
-      }
+        rows: [],
+      },
+      formModalVisible: false,
     }
   },
-
   methods: {
-    tableBaseEnter(...args) {
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
-      console.log('====>', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
-
-      console.log('当前行:', currentIndex, '下一行:', nextIndex)
-      if (!nextIndex) {
-        this.$message.warning('没有下一行')
-        return
-      }
-      // 跳转到下一行的同一列
-      this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
-      setTimeout(() => {
-        this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
-      }, 10)
-    },
-    handleCustomQuery() {
-      this.$refs.xFormTable.queryTable({
-        uf_f_alias: 'XianFeng',
-        uf_f_card_id: '10500030'
+    backDealData () {
+      this.$refs.xFormTable.$refs.xForm.backDealData().then(data => {
+        console.log('backDealData', data)
+        console.log('selected', this.$refs.xFormTable.$refs.xForm?.form)
       })
     },
-    rowDblClick(record) {
-      console.log('rowDblClick', record)
-    },
     // input框 行編輯參數傳遞
-    ceshi(...args) {
+    ceshi (...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
-      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
+        args
+      console.log(
+        'ceshi',
+        attr,
+        value,
+        currentRecord,
+        currentIndex,
+        nextRecord,
+        nextIndex
+      )
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -88,44 +98,115 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test() {
+    test () {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF() {
+    defaultF () {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF() {
+    middleF () {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF() {
+    smallF () {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick(key, value, record) {
+    columnClick (key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
+        props: { selected: arguments[0].his_f_admission_id },
       })
     },
-    action(record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
+    startService (record, id, actionType) {
+      getConfigByNameAsync('测试Form', 'af-safecheck').then(config => {
+        this.formModalVisible = true
+        this.$nextTick(
+          () => {
+            this.formModalVisible = true
+            this.$refs.xForm.init({
+              formItems: config.formJson,
+              title: '工单回访',
+              businessType: '新增',
+              ...config,
+              fixedAddForm: {
+                Images:[
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+                f_image1:[
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+                signs: [
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+              },
+              modifyModelData: {
+                data: {
+                  Images:[
+                    {
+                      'uid': 1850,
+                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                    }
+                  ],
+                  f_image1:[
+                    {
+                      'uid': 1850,
+                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                    }
+                  ],
+                  f_image2: [
+                    {
+                      'uid': 1850,
+                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                    }
+                  ],
+                },
+                signs: [
+                  {
+                    'uid': 1850,
+                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
+                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
+                  }
+                ],
+              },
+            })
+          })
+      })
+      // this.detailVisible = true
+      // console.log('触发了详情操作', record, id, actionType)
+    },
+    async ok () {
+      const res = await this.$refs.xForm.asyncSubmit()
+      await runLogic('ceshwewei', res.realForm)
     },
-    onClose() {
+    onClose () {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow(selectedRowKeys, selectedRows) {
+    selectRow (selectedRowKeys, selectedRows) {
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows
+        rows: selectedRows,
       }
+      console.log('selectedDemo', this.selected)
     },
-    addFormSubmit(params, callback){
-      callback()
-    }
-  }
+  },
+  computed: {},
 }
 </script>
 

package/src/base-client/components/common/XInspectionDetailDrawer/components/InspectionSummary.vue

@@ -51,6 +51,14 @@
           <div class="kv-value">{{ basicInfo.f_address || '——' }}</div>
         </div>
 
+        <div v-if="!safeCheckWebConfig?.safeCheckResult?.hideRealPosition" class="kv-item kv-item-wide">
+          <div class="kv-label">
+            <a-icon type="environment" />
+            实时定位
+          </div>
+          <div class="kv-value">{{ basicInfo?.f_data?.f_real_location || '——' }}</div>
+        </div>
+
         <div class="kv-item">
           <div class="kv-label">
             <a-icon type="clock-circle" />

package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionService.js

@@ -225,6 +225,10 @@ class InspectionService {
     const checkResultJson = apiData.checkResultJson || []
     const signatureForm = apiData.signatureForm || {}
     const historyList = apiData.historyList || []
+    let redundantData = {}
+    if (checkPaper?.f_data && checkPaper?.f_data !== '' && checkPaper.f_data !== null && checkPaper.f_data !== '{}') {
+      redundantData = JSON.parse(checkPaper.f_data) || {}
+    }
     return {
       basicInfo: {
         id: checkPaper.id,
@@ -245,7 +249,8 @@ class InspectionService {
         f_approved: checkPaper.f_approved,
         f_approved_time: checkPaper.f_approved_time,
         f_approved_name: checkPaper.f_approved_name,
-        f_approved_note: checkPaper.f_approved_note
+        f_approved_note: checkPaper.f_approved_note,
+        f_data: redundantData,
       },
       historyList,
       deviceList: await this.extractDeviceList(checkResultJson),

package/src/base-client/components/common/XMarkdownViewer/demo.vue

@@ -1,102 +1,102 @@
-<template>
-  <div style="padding: 16px">
-    <h2>XMarkdownViewer Demo</h2>
-
-    <div style="margin: 12px 0; padding: 12px; background: #f5f5f5; border-radius: 4px">
-      <h4 style="margin: 0 0 8px 0">流式 AI 调用示例</h4>
-      <div style="margin-bottom: 8px">
-        <input
-          v-model="userMessage"
-          type="text"
-          placeholder="输入消息"
-          style="width: 300px; padding: 6px 8px; border: 1px solid #ddd; border-radius: 4px"
-          @keyup.enter="sendMessage"
-        >
-        <button
-          type="button"
-          style="margin-left: 8px; padding: 6px 16px; background: #1890ff; color: #fff; border: none; border-radius: 4px; cursor: pointer"
-          @click="sendMessage"
-        >
-          发送
-        </button>
-        <button
-          v-if="isStreaming"
-          type="button"
-          style="margin-left: 8px; padding: 6px 16px; background: #ff4d4f; color: #fff; border: none; border-radius: 4px; cursor: pointer"
-          @click="stopMessage"
-        >
-          停止
-        </button>
-      </div>
-      <div v-if="isStreaming" style="color: #1890ff; font-size: 12px">AI 正在思考中...</div>
-    </div>
-
-    <div style="margin: 8px 0; color: #666; font-size: 12px">
-      <span v-if="fileName">当前文件：{{ fileName }}（{{ md.length }} 字符）</span>
-      <span v-else-if="md">当前内容：流式响应（{{ md.length }} 字符）</span>
-      <span v-else>请输入消息并点击发送</span>
-    </div>
-
-    <x-markdown-viewer ref="viewer" :markdown="md" />
-  </div>
-</template>
-
-<script>
-import XMarkdownViewer from './XMarkdownViewer.vue'
-
-export default {
-  name: 'XMarkdownViewerDemo',
-  components: {
-    XMarkdownViewer
-  },
-  data () {
-    return {
-      md: '',
-      fileName: '',
-      userMessage: '',
-      isStreaming: false,
-      currentStream: null
-    }
-  },
-  methods: {
-    async sendMessage () {
-      const message = this.userMessage.trim()
-      if (!message) return
-
-      const viewer = this.$refs.viewer
-      if (!viewer || typeof viewer.callAiStream !== 'function') {
-        console.warn('[Demo] viewer 不存在或没有 callAiStream 方法')
-        return
-      }
-
-      // 开始时显示提示
-      viewer.receiveMarkdownString('### 思考中，请稍后...\n')
-      this.isStreaming = true
-
-      // 调用流式接口
-      const stream = viewer.callAiStream(message, {
-        onChunk: (text) => {
-          viewer.receiveMarkdownString('### 思考中，请稍后...\n\n' + viewer.getStreamContent())
-        },
-        onEnd: (fullContent) => {
-          viewer.receiveMarkdownString(fullContent)
-          this.isStreaming = false
-        },
-        onError: (error) => {
-          viewer.receiveMarkdownString('### 抱歉，发生了错误\n\n' + error)
-          this.isStreaming = false
-        }
-      })
-
-      this.currentStream = stream
-    },
-    stopMessage () {
-      if (this.currentStream && typeof this.currentStream.stop === 'function') {
-        this.currentStream.stop()
-        this.isStreaming = false
-      }
-    }
-  }
-}
-</script>
-
+<template>
+  <div style="padding: 16px">
+    <h2>XMarkdownViewer Demo</h2>
+
+    <div style="margin: 12px 0; padding: 12px; background: #f5f5f5; border-radius: 4px">
+      <h4 style="margin: 0 0 8px 0">流式 AI 调用示例</h4>
+      <div style="margin-bottom: 8px">
+        <input
+          v-model="userMessage"
+          type="text"
+          placeholder="输入消息"
+          style="width: 300px; padding: 6px 8px; border: 1px solid #ddd; border-radius: 4px"
+          @keyup.enter="sendMessage"
+        >
+        <button
+          type="button"
+          style="margin-left: 8px; padding: 6px 16px; background: #1890ff; color: #fff; border: none; border-radius: 4px; cursor: pointer"
+          @click="sendMessage"
+        >
+          发送
+        </button>
+        <button
+          v-if="isStreaming"
+          type="button"
+          style="margin-left: 8px; padding: 6px 16px; background: #ff4d4f; color: #fff; border: none; border-radius: 4px; cursor: pointer"
+          @click="stopMessage"
+        >
+          停止
+        </button>
+      </div>
+      <div v-if="isStreaming" style="color: #1890ff; font-size: 12px">AI 正在思考中...</div>
+    </div>
+
+    <div style="margin: 8px 0; color: #666; font-size: 12px">
+      <span v-if="fileName">当前文件：{{ fileName }}（{{ md.length }} 字符）</span>
+      <span v-else-if="md">当前内容：流式响应（{{ md.length }} 字符）</span>
+      <span v-else>请输入消息并点击发送</span>
+    </div>
+
+    <x-markdown-viewer ref="viewer" :markdown="md" />
+  </div>
+</template>
+
+<script>
+import XMarkdownViewer from './XMarkdownViewer.vue'
+
+export default {
+  name: 'XMarkdownViewerDemo',
+  components: {
+    XMarkdownViewer
+  },
+  data () {
+    return {
+      md: '',
+      fileName: '',
+      userMessage: '',
+      isStreaming: false,
+      currentStream: null
+    }
+  },
+  methods: {
+    async sendMessage () {
+      const message = this.userMessage.trim()
+      if (!message) return
+
+      const viewer = this.$refs.viewer
+      if (!viewer || typeof viewer.callAiStream !== 'function') {
+        console.warn('[Demo] viewer 不存在或没有 callAiStream 方法')
+        return
+      }
+
+      // 开始时显示提示
+      viewer.receiveMarkdownString('### 思考中，请稍后...\n')
+      this.isStreaming = true
+
+      // 调用流式接口
+      const stream = viewer.callAiStream(message, {
+        onChunk: (text) => {
+          viewer.receiveMarkdownString('### 思考中，请稍后...\n\n' + viewer.getStreamContent())
+        },
+        onEnd: (fullContent) => {
+          viewer.receiveMarkdownString(fullContent)
+          this.isStreaming = false
+        },
+        onError: (error) => {
+          viewer.receiveMarkdownString('### 抱歉，发生了错误\n\n' + error)
+          this.isStreaming = false
+        }
+      })
+
+      this.currentStream = stream
+    },
+    stopMessage () {
+      if (this.currentStream && typeof this.currentStream.stop === 'function') {
+        this.currentStream.stop()
+        this.isStreaming = false
+      }
+    }
+  }
+}
+</script>
+