vue2-client 1.20.35 → 1.20.36

package/.eslintrc.js

@@ -69,12 +69,6 @@ module.exports = {
       env: {
         jest: true
       }
-    },
-    {
-      files: ['src/base-client/components/common/XReportGrid/XReport.vue'],
-      rules: {
-        'vue/no-reserved-keys': 'off'
-      }
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.20.35",
+  "version": "1.20.36",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -2,32 +2,51 @@
   <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"
-      :defaultPageSize="5"
-      serviceName="af-revenue"
+      @startService="startService"
+      serviceName="af-safecheck"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-      @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: 'ceshiCRUD',
@@ -43,26 +62,32 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: []
-      }
+        rows: [],
+      },
+      formModalVisible: false,
     }
   },
-
   methods: {
-    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)
@@ -73,44 +98,61 @@ 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,
+              modifyModelData: { data: { id: 1 } },
+            })
+          })
+      })
+      // 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/index.vue

@@ -92,23 +92,36 @@
                       <div class="photos-header">
                         <div class="photos-title">
                           <a-icon type="picture" style="color: #1890FF;" />
-                          <span>整体安检照片</span>
+                          <span>安检照片</span>
                         </div>
-                        <div class="photos-count" v-if="inspectionData.attachments.photos && inspectionData.attachments.photos.length > 0">
-                          共 {{ inspectionData.attachments.photos.length }} 张
+                        <div class="photos-count" v-if="inspectionData.attachments.filePhotos && inspectionData.attachments.filePhotos.length > 0">
+                          共 {{ totalPhotos }} 张
                         </div>
                       </div>
                       <div class="photos-content">
+                        <div class="subsection-label"><a-icon type="home" />整体安检照片</div>
                         <file-image-group
-                          :file-ids="inspectionData.attachments.photos || []"
+                          :file-ids="inspectionData.attachments.filePhotos || []"
                           :service-name="effectiveServiceName"
-                          :columns="3"
+                          :columns="5"
                           :image-size="60"
                           :gap="10"
                           alt-prefix="整体安检照片"
                           empty-text="暂无整体安检照片"
                         />
                       </div>
+                      <div class="photos-content">
+                        <div class="subsection-label"><a-icon type="file-protect" />通知书照片</div>
+                        <file-image-group
+                          :file-ids="inspectionData.attachments.imagePhotos || []"
+                          :service-name="effectiveServiceName"
+                          :columns="5"
+                          :image-size="60"
+                          :gap="10"
+                          alt-prefix="通知书照片"
+                          empty-text="暂无通知书照片"
+                        />
+                      </div>
                     </div>
                   </div>
                 </a-card>
@@ -220,7 +233,8 @@ export default {
         attachments: {
           signature: null,
           recordings: [],
-          photos: []
+          filePhotos: [],
+          imagePhotos: []
         }
       },
       previewModal: { visible: false, images: [], current: 0 },
@@ -235,6 +249,11 @@ export default {
   },
   computed: {
     ...mapState('account', { currUser: 'user' }),
+    totalPhotos () {
+      const fileLen = this.inspectionData.attachments?.filePhotos?.length || 0;
+      const imageLen = this.inspectionData.attachments?.imagePhotos?.length || 0;
+      return fileLen + imageLen;
+    },
     /** 有效服务名：优先使用 serviceName prop */
     effectiveServiceName () {
       return this.serviceName || ''
@@ -277,7 +296,7 @@ export default {
           deviceList: [],
           checkItems: [],
           hazardList: [],
-          attachments: { signature: null, recordings: [], photos: [] }
+          attachments: { signature: null, recordings: [], filePhotos: [], imagePhotos: [] }
         }
 
         this.showHistoryPanel = !params?.id && !!params?.f_userinfo_id
@@ -481,7 +500,7 @@ export default {
         deviceList: [],
         checkItems: [],
         hazardList: [],
-        attachments: { signature: null, recordings: [], photos: [] }
+        attachments: { signature: null, recordings: [], filePhotos: [], imagePhotos:  [] }
       }
     }
   }
@@ -601,4 +620,5 @@ export default {
   .history-panel { max-height: 200px; }
   .section-grid { grid-template-columns: 1fr; }
 }
+.subsection-label { display: flex; align-items: center; gap: 6px; font-size: 12px; color: #6b7280; font-weight: 500; margin-bottom: 12px; }
 </style>

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

@@ -464,7 +464,7 @@ class InspectionService {
   }
 
   extractAttachments (signatureForm) {
-    const attachments = { signature: {}, recordings: [], photos: [], refusephotos: [] }
+    const attachments = { signature: {}, recordings: [], filePhotos: [], imagePhotos: [], refusephotos: [] }
     if (signatureForm?.signaturePhoto?.[0]?.url) {
       attachments.signature.imageUrl = signatureForm.signaturePhoto[0].url
     }
@@ -479,7 +479,12 @@ class InspectionService {
         .map((r, i) => ({ id: i + 1, name: r.photo_name || `录音 ${i + 1}`, url: r.url || '#' }))
     }
     if (signatureForm?.FilesId) {
-      attachments.photos = signatureForm.FilesId
+      attachments.filePhotos = signatureForm.FilesId
+        .filter(p => p?.url)
+        .map((p, i) => ({ id: i + 1, url: p.url }))
+    }
+    if (signatureForm?.Images) {
+      attachments.imagePhotos = signatureForm.Images
         .filter(p => p?.url)
         .map((p, i) => ({ id: i + 1, url: p.url }))
     }