vue2-client 1.20.40 → 1.20.42

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.20.41 -2026-04-10 @唐增辉**
+- 增加从系统参数管理获取数据
+- 扩展页面pageSize控制
+
 **1.19.0 -2026-01-05 @江超**
 - 移除对旧字典的支持（暂时保留方法）
 

package/package.json

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

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -1360,6 +1360,11 @@ export default {
           }
         } else if (this.attr.keyName.indexOf('async ') !== -1 || this.attr.keyName.indexOf('function ') !== -1) {
           this.updateOptions()
+        } else if (this.attr.keyName.indexOf('systemParam@') !== -1 && this.attr.keyName.length >= 12 && this.attr.keyName.substring(0, 12) === 'systemParam@') {
+          const configName = this.attr.keyName.substring(12)
+          if (configName && configName !== 'undefined' && this.currUser.appdata && this.currUser.appdata.params) {
+            this.getDataCallback(this.currUser.appdata.params[configName])
+          }
         } else {
           let configName
           if (this.attr.keyName.indexOf('config@') !== -1) {

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

@@ -59,7 +59,7 @@
             :extraHeight="extraHeight"
             :serviceName="serviceName"
             :defaultPageSize="defaultPageSize"
-            :pageSizeArray="pageSizeArray"
+            :pageSizeArray="currentPageSizeArray || pageSizeArray"
             :pageMaxSize="realQueryConfig.queryPagesSize"
             :externalSelectedRowKeys="externalSelectedRowKeys"
             :customPagination="customPagination"
@@ -133,7 +133,7 @@
               :extraHeight="extraHeight"
               :serviceName="serviceName"
               :defaultPageSize="defaultPageSize"
-              :pageSizeArray="pageSizeArray"
+              :pageSizeArray="currentPageSizeArray || pageSizeArray"
               :pageMaxSize="realQueryConfig.queryPagesSize"
               :externalSelectedRowKeys="externalSelectedRowKeys"
               :customPagination="customPagination"
@@ -330,7 +330,8 @@ export default {
       // Modal 弹框显示状态
       tableModalVisible: false,
       // 弹框模式下表单查询中的加载状态
-      formQueryLoading: false
+      formQueryLoading: false,
+      currentPageSizeArray: null
     }
   },
   computed: {
@@ -717,7 +718,19 @@ export default {
       this.realQueryConfig = res
       // 读取表格展示模式配置
       this.tableShowMode = res.tableShowMode || 'default'
-
+      if (this.realQueryConfig.expandPageSize) {
+        const baseArray = this.pageSizeArray.slice()
+        const extraSizes = ['100', '500', '1000']
+        extraSizes.forEach(size => {
+          if (!baseArray.includes(size)) {
+            baseArray.push(size)
+          }
+        })
+        baseArray.sort((a,b) => Number(a) - Number(b))
+        this.currentPageSizeArray = baseArray
+      } else {
+        this.currentPageSizeArray = null
+      }
       // 弹框模式下，xTable 可能还未渲染，需要特殊处理
       const hasRequiredRefs =
         this.tableShowMode === 'popup'
@@ -963,14 +976,23 @@ export default {
         })
       })
     },
+    async crudEditBefore(modifyModelData) {
+      return await new Promise((resolve) => {
+        this.$emit('crudEditBefore', modifyModelData, resolve)
+      })
+    },
     /**
      * 修改按钮事件
      * @param modifyModelData 修改表单数据
      */
-    edit (modifyModelData) {
+    async edit(modifyModelData) {
       if (this.customEdit) {
         this.$emit('edit')
       } else {
+        if (this.$listeners.crudEditBefore) {
+          const res = await this.crudEditBefore(modifyModelData)
+          if (res === false) return
+        }
         const res = this.realQueryConfig
         const localEditMode = !this.localEditMode ? res.localEditMode : this.localEditMode
         this.$refs.xAddForm.init({

package/src/base-client/components/common/XReport/print.js

@@ -1,186 +1,186 @@
-// 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;
-            padding: 15px;
-            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;
-            padding: 15px;
-            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;
+            padding: 15px;
+            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;
+            padding: 15px;
+            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/components/STable/index.js

@@ -177,6 +177,14 @@ export default {
         }
       },
       immediate: true
+    },
+    pageSizeArray: {
+      handler(val) {
+        if (val && val.length) {
+          this.pageSizeOptions = [...val]
+        }
+      },
+      immediate: true
     }
   },
   created () {

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,102 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="呼叫工单总汇"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      serviceName="af-telephone"
+      @toDeal="toDetail"
+      @updateInfo="updateInfo"
+    >
+    </x-form-table>
+    <WorkflowDetail
+      ref="workFlow"
+      @preClick="preClick"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <DealOrUpdate @refresh="refresh" ref="dealOrUpdate"/>
+  </a-card>
+</template>
+
 <script>
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import DealOrUpdate from '@/pages/telephone/workFlow/dealOrUpdate.vue'
+// import { getConfigByName, runLogic } from 'vue2-client/src/services/api/common'
+import { mapState } from 'vuex'
 
 export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: 6255
-    })
+  name: 'Apply',
+  components: {
+    XFormTable,
+    WorkflowDetail,
+    DealOrUpdate
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {}
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'teleProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      // 提交加载动画
+      confirmLoading: false,
+      refreshFn: null,
+      chargeVisible: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
+    success () {
+      console.log('完工')
+    },
+    toDetail (record) {
+      // 修改第一步的工单
+      if (record.ws_f_step_id === 1) {
+        console.log('进入工单详情')
+        this.$refs.dealOrUpdate.dealOrUpdate(record, '处理工单')
+      } else {
+        // 进入工单详情
+        this.$refs.workFlow.init({
+          workflowId: record.wo_f_workflow_id,
+          stepId: record.ws_f_step_id
+        })
+      }
     },
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId 工作流id
-     * @param fromStepId 起ID
-     * @param toStepId 往ID
-     * @param successStepId 完成步骤id
-     * @param successStep 完成步骤名称
-     * @param fromStep 起步骤名称
-     * @param toStep 往步骤名称
-     */
-    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
-      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    updateInfo (record) {
+      this.$refs.dealOrUpdate.dealOrUpdate(record, '修改信息')
+    },
+    // 退回的事件处理
+    preClick (data) {
+      console.log('退回事件处理', data)
+      if (data.toStepId === 1) {
+        this.$refs.workFlow.onClose()
+        this.$refs.xFormTable.refreshTable(true)
+      }
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    refresh () {
+      this.$refs.xFormTable.refreshTable(true)
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>