vue2-client 1.9.9 → 1.9.11

package/docs/Logic/345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -16,7 +16,7 @@
   * sql.query(sql别名 string，sql参数 string，页数 int，每页行数 int) 执行已经注册的sql 返回 org.json.JSONArray
   * sql.querySQL(sql名称，sql语句) 执行一个没有注册的sql语句 返回 org.json.JSONArray
   * sql.querySQL(sql名称，sql语句，页数 int，每页行数 int) ) 执行一个没有注册的sql语句 返回 org.json.JSONArray
-  * sql.execSQL(sql名称，sql语句，页数 int，每页行数 int) ) 执行一个增删改sql语句 返回 org.json.JSONArray
+  * sql.execSQL(sql名称，sql语句) 执行一个增删改sql语句 返回 org.json.JSONArray
 - entity 对应 EntityService 类，其中有方法
   * entity.partialSave(实体名称 string,保存参数 org.json.JSONObject) 返回整个实体 JSONObject
   * entity.delete(实体名称 string,id Object)

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -4,10 +4,12 @@
 - 用this.函数函数调用方式调用相应功能。
 
 # 通过this可以调用的函数
+- openDialog(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
 - openDialog(configName, selectedId, mixinData, outEnv)：打开一个对话框：
 * selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
 * mixinData: form表单需要的数据
 * outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
+* getOutEnv 获取获取 outEnv
 ```js
 this.openDialog('xxx', 5, {}, {})
 ```
@@ -17,31 +19,7 @@ this.openDialog('xxx', 5, {}, {})
 - 先给组件起名字，命名规范：main，left，right，top，bottom
 - 用 this.getComponentByName('main') 拿到组件。
 
-# 特殊处理
-- form表单提交数据到列表，而非后台。用 `this.outEnv.data.push(...[])`刷新列表数据。
-
 # x-form-table 可以使用的函数/数据
-- getTableData(): 获取所有数据
-- 获取selectedid getSelectedId()
-- 重新查询 refreshTable()
-```js
-假如组件名称叫 xtable
-// 所有选中的id
-const allid =  this.$refs.xtable.table_selectedRowKeys
-// 所有选中的行 table_selectedRowKeys
-const allrecord =  this.$refs.xtable.table_selectedRows
-
-// xtable 所调用事件
-// 新增修改后调用事件
-afterSubmit( type(新增/修改/擦和讯), id: (所操作的主键id), form: (请求的表单内容))
-// 查询后
-afterQuery( res (查询后数据), querparams (查询参数))
-// 删除后
-afterDelete( res (删除接口返回数据))
-// 操作按钮
-action(record (当前记录), id （当前记录主键）, actionType （操作类型）)
-```
-
 - table_selectedRowKeys 获取选中的id  /不用加 () 这是一个data 中的变量
 - table_selectedRows 获取选中的行  /不用加 () 这是一个data 中的变量
 - getSelectedId 获取获取selectedid

package/package.json

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

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

@@ -71,6 +71,7 @@ export default {
         getSelectedId: () => this.getSelectedId(),
         getSelectedData: () => { return this.selectedId },
         getMixinData: () => { return this.mixinData },
+        getOutEnv: () => { return this.outEnv },
         isInAModal: () => { return true }
       }
     },

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

@@ -134,7 +134,7 @@ export default {
     XAddReport,
     XImportExcel
   },
-  inject: ['getSelectedId', 'getSelectedData', 'getMixinData'],
+  inject: ['getSelectedId', 'getSelectedData', 'getMixinData', 'getOutEnv'],
   data () {
     return {
       // 加载状态
@@ -374,7 +374,8 @@ export default {
           env: this.env,
           form: this.$refs.xForm.form,
           allowedCardMode: res.allowedCardMode,
-          cardModeConfig: res.cardModeConfig
+          cardModeConfig: res.cardModeConfig,
+          summaryUpdate: true
         })
       }
       this.loading = false

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

@@ -1,3 +1,3 @@
-import XReport from './XReport'
-
-export default XReport
+import XReport from './XReport'
+
+export default XReport

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -4,7 +4,7 @@
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        config-name="adviceCheckCover"
+        config-name="templateManageView2"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -490,44 +490,50 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv'],
   methods: {
     onComponentMounted (h, cell, cellIndex) {
       if (this.getMixinData && this.getMixinData()) {
         this.mixinData = this.getMixinData()
       }
+      if (cell.slotRef) {
+        this.registerComponent(cell.slotRef, this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0])
+      }
+      // 传递给祖先组件
       console.log(`插槽组件已经初始化 slotType ${cell.slotType}，ref= dynamicComponent_${cell.slotRef || cellIndex} ， serviceName = ${cell.serviceName}`)
       const shouldInit = cell.shouldInit == null ? true : cell.shouldInit
-      if (cell.slotType === 'x-add-native-form' && shouldInit) {
-        // 建议表单需要主动调用初始化方法
-        getConfigByName(cell.slotConfig, cell.serviceName, async (res) => {
-          // 如果配置了 表单初始化logic
-          // 调用 logic 获取参数
-          let param = { ...this.mixinData }
-          let selectedId
-          if (res.paramLogicName) {
-            if (!!this.getSelectedId) {
-              selectedId = this.getSelectedId()
-              if (typeof selectedId !== 'object') {
-                selectedId = { selectedId: selectedId }
+      if (shouldInit) {
+        if (cell.slotType === 'x-add-native-form' && shouldInit) {
+          // 建议表单需要主动调用初始化方法
+          getConfigByName(cell.slotConfig, cell.serviceName, async (res) => {
+            // 如果配置了 表单初始化logic
+            // 调用 logic 获取参数
+            let param = { ...this.mixinData }
+            let selectedId
+            if (res.paramLogicName) {
+              if (!!this.getSelectedId) {
+                selectedId = this.getSelectedId()
+                if (typeof selectedId !== 'object') {
+                  selectedId = { selectedId: selectedId }
+                }
               }
+              param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, cell.serviceName))
             }
-            param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, cell.serviceName))
-          }
-          this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
-            serviceName: cell.serviceName,
-            formItems: res.formJson,
-            showSubmitBtn: !this.isInAModal,
-            businessType: param.businessType || '新增',
-            layout: res.xAddFormLayout,
-            ...res,
-            fixedAddForm: param,
-            modifyModelData: {
-              files: param.files,
-              images: param.images
-            }
-          })
-        }, this.env === 'dev')
+            this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
+              serviceName: cell.serviceName,
+              formItems: res.formJson,
+              showSubmitBtn: !this.isInAModal,
+              businessType: param.businessType || '新增',
+              layout: res.xAddFormLayout,
+              ...res,
+              fixedAddForm: param,
+              modifyModelData: {
+                files: param.files,
+                images: param.images
+              }
+            })
+          }, this.env === 'dev')
+        }
       }
     },
     getEventHandlers (cell) {
@@ -883,15 +889,6 @@ export default {
     }
   },
   mounted () {
-    this.$nextTick(() => {
-      // 使用 setTimeout 延迟访问 $refs
-      this.$nextTick(() => {
-        console.log('组件加载了', this.$refs)
-        console.log('组件加载了1', this.$refs.dynamicComponent_a0)
-        console.log('组件加载了2', Object.entries(this.$refs))
-        this.passComponentNamesToAncestor(this.$refs)
-      })
-    })
   },
 }
 

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

@@ -36,7 +36,7 @@ export default {
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue')
   },
-  inject: ['isInAModal', 'getSelectedId', 'getSelectedData'],
+  inject: ['isInAModal', 'getSelectedId', 'getSelectedData', 'getOutEnv'],
   data () {
     return {
       activeKey: 0,

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

@@ -213,6 +213,7 @@
       :closable="false"
       :visible="summaryDrawerVisible"
       :z-index="2000"
+      width="25%"
       :after-visible-change="afterVisibleChange"
       @close="onClose"
     >
@@ -224,7 +225,15 @@
             :title="f.title + '：'"
             :value="f.value"
             :precision="2"
-            style="margin-right: 50px"/>
+            style="margin-right: 50px">
+            <template #prefix>
+              <a-spin :spinning="f.loading">
+              </a-spin>
+            </template>
+            <template #suffix>
+              <a-icon v-show="!f.loading" :type="f.success !== false ? 'check-circle' : 'close-circle'" :style="{color: f.success !== false ? 'green' : 'red'}"/>
+            </template>
+          </a-statistic>
         </div>
       </template>
     </a-drawer>
@@ -255,7 +264,9 @@ import {
   querySummary,
   queryWithResource,
   remove,
-  asyncRunTask, editRowSave
+  asyncRunTask,
+  editRowSave,
+  runLogic
 } from '@vue2-client/services/api/common'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
 import { Modal } from 'ant-design-vue'
@@ -356,6 +367,8 @@ export default {
       buttonPermissions: [],
       // 是否展示汇总
       showSummary: false,
+      // 自定义汇总
+      showCustomSummary: false,
       summaryData: [],
       // 图标样式
       iconStyle: {
@@ -370,6 +383,7 @@ export default {
       summaryDrawerVisible: false,
       // 汇总更新标志
       summaryUpdate: false,
+      customSummaryArray: [],
       formItems: [],
       // 是否为编辑模式
       isEditMode: false,
@@ -535,15 +549,42 @@ export default {
         form,
         serviceName,
         tableSummaryMap = {},
+        customTableSummaryArray = [
+        ],
         viewMode,
         formItems,
         env = 'prod',
         createdQuery = true,
         primaryKey,
         allowedCardMode = false,
-        cardModeConfig
+        cardModeConfig,
+        summaryUpdate
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
+      if (this.showSummary) {
+        Object.keys(tableSummaryMap).forEach(item => {
+          this.summaryData.push({
+            key: item,
+            title: tableSummaryMap[item],
+            value: ' ',
+            loading: true,
+            success: false
+          })
+        })
+      }
+      if (customTableSummaryArray.length > 0) {
+        customTableSummaryArray.forEach(item => {
+          this.summaryData.push({
+            key: item.key,
+            title: item.title,
+            value: ' ',
+            loading: true,
+            success: false
+          })
+        })
+        this.showCustomSummary = true
+        this.customSummaryArray = customTableSummaryArray
+      }
       this.queryParams = queryParams
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
       if (this.tableColumns.length === 0) {
@@ -562,6 +603,7 @@ export default {
       this.rowKey = this.getPrimaryKeyName()
       this.allowedCardMode = allowedCardMode
       this.cardModeConfig = cardModeConfig
+      this.summaryUpdate = summaryUpdate
       let totalWidth = 0
       for (let i = 0; i < this.tableColumns.length; i++) {
         const item = this.tableColumns[i]
@@ -979,11 +1021,49 @@ export default {
     },
     async retrieveSummaryData () {
       if (this.requestParameters.querySummary) {
-        this.summaryData = await querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+        querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev').then(res => {
+          if (res.length > 0) {
+            this.summaryData.forEach(item => {
+              res.forEach(summary => {
+                if (item.title === summary.title) {
+                  item.value = summary.value
+                  item.success = true
+                  item.loading = false
+                }
+              })
+            })
+          }
+        })
+      }
+      if (this.showCustomSummary) {
+        this.customSummaryArray.forEach(item => {
+          runLogic(item.source, Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev').then((res) => {
+            this.summaryData.forEach(summary => {
+              if (item.key === summary.key) {
+                summary.value = res.value
+                summary.success = true
+                summary.loading = false
+              }
+            })
+          }).catch(e => {
+            this.summaryData.forEach(summary => {
+              if (item.key === summary.key) {
+                summary.value = 0
+                summary.success = false
+                summary.loading = false
+              }
+            })
+          })
+        })
       }
     },
     showDrawer () {
       if (this.summaryUpdate) {
+        this.summaryData.forEach(item => {
+          item.loading = true
+          item.success = false
+          item.value = ' '
+        })
         this.summaryDrawerVisible = true
       } else {
         this.$message.warning('请查询后再来查看')

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -1,92 +1,196 @@
 <template>
   <div>
-    <div class="editor-tools">
-      <a-space>
-        <a-radio-group default-value="form" button-style="solid" @change="changeMode" :loading="isModeSettingLoading">
-          <a-radio-button value="form">
-            预览
-          </a-radio-button>
-          <a-radio-button value="design">
-            设计
-          </a-radio-button>
-        </a-radio-group>
-        <template v-if="this.objectOfAttrs.mode === 'design'">
-          <a-button type="primary" @click="save">
-            保存
-          </a-button>
-        </template>
-      </a-space>
+    <div v-show="ready">
+      <a-row class="editor-action-container" type="flex" justify="space-between">
+        <a-col class="editor-tools">
+          <a-radio-group
+            v-show="showModeChoose"
+            button-style="solid"
+            @change="changeMode"
+            v-model="modeType">
+            <a-radio-button v-for="item of modeList" :key="item.value" :value="item.value">
+              {{ item.label }}
+            </a-radio-button>
+          </a-radio-group>
+        </a-col>
+        <a-col class="editor-action">
+          <a-space>
+            <template v-if="this.modeType !== 'readonly'">
+              <a-button type="primary" @click="save">
+                保存
+              </a-button>
+            </template>
+            <a-button type="primary" @click="print">
+              打印
+            </a-button>
+            <a-button @click="refresh">
+              刷新
+            </a-button>
+          </a-space>
+          <a-dropdown>
+            <a-menu slot="overlay" @click="handleExportMenuClick">
+              <a-menu-item key="exportPdf">导出为Pdf</a-menu-item>
+              <a-menu-item key="exportWord">导出为Word</a-menu-item>
+              <a-menu-item key="exportHtmlWithStyle">导出为Html</a-menu-item>
+            </a-menu>
+            <a-button style="margin-left: 8px"> 导出 <a-icon type="down" /> </a-button>
+          </a-dropdown>
+        </a-col>
+      </a-row>
+      <a-divider/>
+      <a-spin tip="加载中，马上好" :spinning="loading">
+        <iframe
+          id="x-editor"
+          src="/his/editor/editor.html"
+          v-bind="objectOfAttrs"
+          @load="onload"
+          style="height: calc(-200px - 3rem + 100vh);">
+        </iframe>
+      </a-spin>
+    </div>
+    <div v-show="!ready">
+      <a-empty description="请选择文书" />
     </div>
-    <a-spin tip="加载中，马上好" :spinning="!isLoaded">
-      <iframe
-        id="x-editor"
-        src="/his/editor/editor.html"
-        v-bind="objectOfAttrs"
-        @load="onload"
-        style="height: calc(-200px - 3rem + 100vh);">
-      </iframe>
-    </a-spin>
   </div>
 </template>
 
 <script>
 
+import { runLogic } from '@vue2-client/services/api/common'
+
 export default {
   name: 'XHisEditor',
   data () {
     return {
-      isLoaded: false,
-      isModeSettingLoading: false,
+      ready: false,
+      loading: false,
       objectOfAttrs: {
         width: '100%',
         height: '650vh',
-        frameborder: 0,
-        mode: 'form'
+        frameborder: 0
       },
+      // 数据模式
+      modeType: 'readonly',
+      // 是否显示模式切换功能
+      showModeChoose: true,
+      // 数据模式列表
+      modeList: [
+        {
+          label: '预览',
+          value: 'readonly'
+        },
+        {
+          label: '设计',
+          value: 'design'
+        }
+      ],
+      // 编辑器实例
       editorRef: null,
-      // 文件路径
-      fileUrl: undefined
+      // 文档资源ID
+      resId: undefined,
+      // 文档链接
+      fileUrl: undefined,
+      // 文档绑定数据
+      bindObject: undefined,
+      // 数据模式 template:模板编辑；data:数据编辑
+      dataMode: undefined,
+      // 保存数据调用的Logic名称
+      saveDataLogicName: undefined,
+      // 服务名
+      serviceName: undefined
     }
   },
   methods: {
+    // 初始化文档
+    onload: function (e) {
+      this.editorRef = e.target.contentWindow.editor
+    },
+    // 初始化组件
     init (params) {
       const {
-        fileUrl
+        fileUrl,
+        resId,
+        bindObject,
+        saveDataLogicName,
+        serviceName,
+        showModeChoose = true,
+        modeType = 'readonly'
       } = params
-      this.fileUrl = fileUrl
-      // test
-      this.fileUrl = '/his/editor/mock/bind_data.html'
+      this.resId = resId
+      if (bindObject) {
+        this.dataMode = 'data'
+        this.bindObject = bindObject
+      } else {
+        this.dataMode = 'template'
+      }
+      this.saveDataLogicName = saveDataLogicName
+      this.serviceName = serviceName
+      this.showModeChoose = showModeChoose
+      this.modeType = modeType
+      this.ready = true
+      this.loadFile(fileUrl)
     },
-    // 初始化文档
-    onload: function (e) {
-      this.editorRef = e.target.contentWindow.editor
-      // 编辑器加载完成后，需要默认文档操作的情况
-      setTimeout(() => {
-        this.editorRef.loadUrl(this.fileUrl).then(() => {
-          this.editorRef.setBindObject('周杰伦', 'name')
-          this.isModeSettingLoading = false
-          this.isLoaded = true
-        })
-      }, 0)
+    // 加载文档
+    loadFile (fileUrl) {
+      this.loading = true
+      this.editorRef.loadUrl(fileUrl).then(() => {
+        if (this.bindObject) {
+          this.editorRef.setBindObject(this.bindObject)
+        }
+        this.changeMode()
+        this.fileUrl = fileUrl
+        this.loading = false
+      })
     },
+    // 修改模式
     changeMode (e) {
-      this.objectOfAttrs.mode = e.target.value
-      this.isModeSettingLoading = true
-      this.isLoaded = false
-      this.refreshFrame()
-    },
-    refreshFrame () {
-      const iframe = document.getElementById('x-editor')
-      iframe.contentWindow.location.reload()
+      this.editorRef.execCommand(this.modeType)
     },
+    // 保存文档
     save () {
-      // TODO 保存
+      // 验证必须输入项
+      if (this.editorRef.validate()) {
+        // 获取HTML文档和结构化数据(JSON)
+        const data = {
+          doc: this.editorRef.getHtml(),
+          dataObject: this.editorRef.getBindObject(),
+          dataMode: this.dataMode,
+          resId: this.resId
+        }
+        // 保存HTML文档和结构化数据到后端服务
+        runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
+          this.loadFile(res.url)
+          this.$message.success('保存成功')
+        })
+      } else {
+        this.$message.error('请检查未填写的项目')
+      }
+    },
+    // 打印文档
+    print () {
+      this.editorRef.execCommand('print')
+    },
+    // 关闭编辑器
+    close () {
+      this.ready = false
+    },
+    // 刷新文档
+    refresh () {
+      this.loadFile(this.fileUrl)
+    },
+    // 导出下拉菜单
+    handleExportMenuClick (e) {
+      const key = e.key
+      this.editorRef.execCommand(key)
     }
   }
 }
 </script>
 <style scoped lang="less">
-.editor-tools {
+.editor-action-container {
   height: 40px;
 }
+:deep(.ant-divider-horizontal) {
+  margin: 4px 0;
+}
 </style>

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,51 +1,51 @@
-<template>
-  <div>
-    <a-list v-show="!loading" size="small" :data-source="data">
-      <a-list-item slot="renderItem" slot-scope="item">
-        <div>
-          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
-          <p>{{ item.date }}</p>
-        </div>
-        <a class="delete_item">
-          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
-        </a>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'FavoriteList',
-  data () {
-    return {
-      data: [],
-      loading: false
-    }
-  },
-  mounted () {
-    this.loadData()
-  },
-  methods: {
-    loadData () {
-      console.warn(123)
-      indexedDB.getAll((data) => {
-        const realData = data.filter(item => item.data && item.data.uuid)
-          .map(item => item.data)
-        this.data = realData
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.delete_item {
-  margin-left: 8px;
-  color: #333;
-}
-p {
-  margin: 0
-}
-</style>
+<template>
+  <div>
+    <a-list v-show="!loading" size="small" :data-source="data">
+      <a-list-item slot="renderItem" slot-scope="item">
+        <div>
+          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
+          <p>{{ item.date }}</p>
+        </div>
+        <a class="delete_item">
+          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
+        </a>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'FavoriteList',
+  data () {
+    return {
+      data: [],
+      loading: false
+    }
+  },
+  mounted () {
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      console.warn(123)
+      indexedDB.getAll((data) => {
+        const realData = data.filter(item => item.data && item.data.uuid)
+          .map(item => item.data)
+        this.data = realData
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.delete_item {
+  margin-left: 8px;
+  color: #333;
+}
+p {
+  margin: 0
+}
+</style>

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -8,12 +8,23 @@ export default {
     this.$refs.workFlow.init({
       workflowId: '9'
     })
+  },
+  methods: {
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
+    }
   }
 }
 </script>
 
 <template>
-  <WorkflowDetail ref="workFlow"></WorkflowDetail>
+  <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
 </template>
 
 <style scoped lang="less">

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -39,12 +39,15 @@
               />
             </a-tab-pane>
             <a-tab-pane key="2" tab="任务流转记录">
-              <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId" />
+              <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId"/>
             </a-tab-pane>
             <a-tab-pane key="4">
               <span slot="tab">
                 <span>任务留言</span>
-                <a-badge :count="messageList.length" :offset="[4, -4]" :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
+                <a-badge
+                  :count="messageList.length"
+                  :offset="[4, -4]"
+                  :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
               </span>
               <a-row>
                 <a-col :span="14">
@@ -117,8 +120,7 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['isMobile'])
   },
-  props: {
-  },
+  props: {},
   mounted () {
     // this.init()
   },
@@ -188,8 +190,9 @@ export default {
       this.activeKey = id
     },
     // 提交完成后事件
-    success () {
-      this.$emit('success')
+    success (res) {
+      this.visible = false
+      this.$emit('success', res)
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -418,29 +418,23 @@ export default {
     },
     // 完工按钮
     async lastStepNextClick () {
-      await this.$refs.xAddForm.onSubmit()
-      if (!this.formValid) {
-        console.log('nothing')
-      } else {
-        return postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
+      this.$refs.xAddForm.asyncSubmit().then((res) => {
+        this.submitForm(res)
+        postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
           workflowId: this.workflowId
-        })
-          .then(
-            res => {
-              this.saveWorkflowLog('确认完工', '最后一步: ' + this.getStepNameByStepId(this.currentStepId), { notes: this.note.trim() })
-              this.$message.success('已完工！')
-              this.loading = true
-              this.loadingHistory = true
-              this.onClose()
-              this.init()
-              this.$emit('refresh')
-              this.$emit('success')
-            },
-            () => {
-              this.$message.error('提交失败！')
-            }
-          )
-      }
+        }).then(_res => {
+            this.saveWorkflowLog('确认完工', '最后一步: ' + this.getStepNameByStepId(this.currentStepId), { notes: this.note.trim() })
+            this.$message.success('已完工！')
+            this.loading = true
+            this.loadingHistory = true
+            this.onClose()
+            this.$emit('success', { note: this.note.trim(), form: res.realForm, workflowId: this.workflowId })
+          },
+          () => {
+            this.$message.error('提交失败！')
+          }
+        )
+      })
     },
     // 三个按钮点击后逻辑
     async nextClick () {
@@ -458,11 +452,9 @@ export default {
           }
         })
       })
-      await this.$refs.xAddForm.onSubmit()
-      if (!this.formValid) {
-        console.log('nothing')
-      } else {
-        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
+      this.$refs.xAddForm.asyncSubmit().then(res => {
+        this.submitForm(res)
+        postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -483,7 +475,7 @@ export default {
               console.log(err)
             }
           )
-      }
+      })
     },
     async preClick () {
       const notes = this.note.trim()
@@ -516,11 +508,9 @@ export default {
       if (!extraData) {
         return
       }
-      await this.$refs.xAddForm.onSubmit()
-      if (!this.formValid) {
-        console.log('nothing')
-      } else {
-        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
+      this.$refs.xAddForm.asyncSubmit().then(res => {
+        this.submitForm(res)
+        postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -541,7 +531,7 @@ export default {
               console.log(err)
             }
           )
-      }
+      })
     },
     // 获取当前步骤节点，连通的节点
     getDirection () {

package/src/router/async/router.map.js

@@ -83,8 +83,8 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}

package/vue.config.js

@@ -11,11 +11,11 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://192.168.11.160:31467/'
+const v3Server = 'http://aote-office.8866.org:31567'
 const gateway = 'http://192.168.50.67:31467'
 const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-const revenue = 'http://192.168.11.160:31467/'
+const revenue = 'http://aote-office.8866.org:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川