vue2-client 1.9.45 → 1.9.48

package/package.json

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

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

@@ -76,25 +76,57 @@
           />
         </a-card>
       </a-row>
+      <a-row :gutter="16" v-for="(item, key) in childTableData" :key="'childTableRow' + key">
+        <a-card :title="item.name" :bordered="false" size="small">
+          <x-form-table
+            :key="'childTable_' + item.model"
+            :title="item.name"
+            :queryParamsName="item.childTableConfigName"
+            :localEditMode="true"
+            :fixed-query-form="childTableFixedQueryForm(item)"
+            :service-name="serviceName"
+            :ref="'childXFormTable_' + item.model">
+          </x-form-table>
+        </a-card>
+      </a-row>
       <a-row type="flex" justify="end">
         <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
       </a-row>
     </a-form-model>
+    <a-modal
+      v-model="listSelectData.show"
+      :closable="false"
+      :centered="true"
+      :destroyOnClose="true"
+      @ok="listSelectHandle"
+      width="75vw"
+      okText="确认"
+    >
+      <x-form-table
+        title="请选择一条数据"
+        :queryParamsName="listSelectData.configName"
+        :listSelectMode="true"
+        :service-name="serviceName"
+        ref="listSelectTable">
+      </x-form-table>
+    </a-modal>
   </div>
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { formatDate } from '@vue2-client/utils/util'
+import { formatDate, setDataByRealKey } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
 import { addOrModify, getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import { checkIdNumber, REG_EMAIL, REG_LANDLINE, REG_PHONE } from '@vue2-client/utils/reg'
 import moment from 'moment/moment'
 import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
+import util from '@/utils/util'
 
 export default {
   name: 'XAddNativeForm',
   components: {
-    XFormItem
+    XFormItem,
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
   },
   props: {},
   data () {
@@ -130,8 +162,6 @@ export default {
       rules: {},
       // 调用logic获取数据源的追加参数
       getDataParams: {},
-      // 是否处理表单key
-      isKeyHandle: true,
       // 动态简易表单集合
       simpleFormJsonData: {},
       // 待修改的数据集
@@ -139,7 +169,13 @@ export default {
       // 当前环境
       env: 'prod',
       // 表单模式 horizontal | vertical | inline
-      layout: 'horizontal'
+      layout: 'horizontal',
+      // 列表选择框数据暂存
+      listSelectData: {
+        show: false,
+        configName: '',
+        dataChangeFunc: ''
+      }
     }
   },
   computed: {
@@ -167,6 +203,12 @@ export default {
         }
       )
     },
+    // 过滤出用于子表数据新增/修改场景的表单项
+    childTableData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'childTable'
+      })
+    },
     // 过滤出用于静默新增场景的表单项
     silenceAddJsonData: function () {
       return this.formItems.filter(function (item) {
@@ -203,7 +245,7 @@ export default {
     init (params) {
       const {
         configName, configContent, formItems, formJson, viewMode, isHandleFormKey = true,
-        showSubmitBtn = true, serviceName, isKeyHandle = true,
+        showSubmitBtn = true, serviceName,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
         simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal'
       } = params
@@ -226,9 +268,8 @@ export default {
       this.getDataParams = getDataParams
       this.simpleFormJsonData = simpleFormJsonData
       this.env = env
-      this.isKeyHandle = isKeyHandle
       // 如果 fixedAddForm 有 selected_id 值，并且设置了处理表单key值，则多给 selected_id 加前缀 避免处理错误
-      if (fixedAddForm.selected_id && this.isKeyHandle) {
+      if (fixedAddForm.selected_id && this.isHandleFormKey) {
         fixedAddForm._selected_id = fixedAddForm.selected_id
         delete fixedAddForm.selected_id
       }
@@ -553,16 +594,29 @@ export default {
     async onSubmit () {
       const valid = await this.validateForm()
       if (!valid) return false
+      if (this.viewMode) {
+        this.$message.info('预览模式禁止新增和修改')
+        return false
+      }
       this.loading = true
       const requestForm = this.prepareForm()
       await this.appendSilenceAddFields(requestForm)
-
       const realForm = this.handleFormKeys(requestForm)
-      if (this.viewMode) {
-        this.$message.info('预览模式禁止新增和修改')
-        return false
+      // 增加子表数据
+      if (this.childTableData.length > 0) {
+        for (const item of this.childTableData) {
+          const childModel = item.model
+          const childData = this.$refs['childXFormTable_' + item.model][0].getTableData()
+          for (let i = 0; i < childData.length; i++) {
+            childData[i] = this.handleFormKeys(childData[i])
+            // 外键不需要带表别名，所以此处放到表单处理后赋值
+            if (realForm.id) {
+              childData[i][item.childTableForeignKeyName] = realForm.id
+            }
+          }
+          realForm[childModel] = childData
+        }
       }
-
       if (this.$listeners.onSubmit) {
         // 交由父级处理
         this.$emit('onSubmit', {
@@ -610,6 +664,15 @@ export default {
       })
     },
 
+    childTableFixedQueryForm (item) {
+      if (this.modifyModelData?.primaryKeyData) {
+        const fixedForm = {}
+        fixedForm[item.childTableForeignKeyName] = Object.values(this.modifyModelData.primaryKeyData)[0]
+        return fixedForm
+      }
+      return null
+    },
+
     prepareForm () {
       const form = { ...this.form }
       for (const key of Object.keys(form)) {
@@ -667,7 +730,7 @@ export default {
           }
           realForm[extraFormKey][realKey] = value
         } else {
-          const realKey = this.isKeyHandle ? this.getRealKey(key) : key
+          const realKey = this.isHandleFormKey ? this.getRealKey(key) : key
           // 如果发生重名，不覆盖，把key的别名带上
           if (realForm[realKey]) {
             realForm[key] = value
@@ -722,7 +785,7 @@ export default {
       }
       // 对动态简易表单项特殊处理
       for (const key in modifyModelData.data) {
-        const realKey = this.isKeyHandle ? this.getRealKey(key) : key
+        const realKey = this.isHandleFormKey ? this.getRealKey(key) : key
         if (this.simpleFormJsonData[realKey]) {
           const extraForm = JSON.parse(modifyModelData.data[key])
           for (const key in extraForm) {
@@ -766,10 +829,37 @@ export default {
         }
       }
     },
+    async listSelectHandle () {
+      if (this.$refs?.listSelectTable?.table_selectedRows?.length) {
+        // 如果配置了自定义函数
+        if (this.listSelectData.dataChangeFunc) {
+          await executeStrFunction(this.listSelectData.dataChangeFunc, [this.form, this.setForm, {
+            ...this.attr,
+            selectRows: this.$refs.listSelectTable.table_selectedRows
+          }, util, this.mode, runLogic, getConfigByNameAsync])
+        } else {
+          if (this.$refs?.listSelectTable?.table_selectedRows?.length !== 1) {
+            this.$message.warning('请选择一条数据')
+            return
+          }
+          setDataByRealKey(this.form, this.$refs.listSelectTable.table_selectedRows[0])
+        }
+        this.listSelectData.show = false
+      } else {
+        this.$message.warning('请选择一条数据')
+      }
+    },
     setForm (obj) {
       this.form = Object.assign(this.form, obj)
     },
     emitFunc (func, data) {
+      // 打开列表选择框逻辑
+      if (func === 'openSelectCRUDFrom') {
+        this.listSelectData.show = true
+        this.listSelectData.configName = data.keyName.split('@')[data.keyName.split('@').length - 1]
+        this.listSelectData.dataChangeFunc = data.dataChangeFunc
+        return
+      }
       if (data?.model) {
         this.$emit(func, data, this.form[data.model])
       } else {

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

@@ -6,7 +6,8 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    getConfigByNameAsync('outpatientfeesForm', 'af-his').then(res => {
+    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
+      console.log('===res', res)
       this.$refs.xAddFrom.init(res)
     })
   },

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

@@ -487,6 +487,28 @@
       ref="xTreeSelect">
     </x-tree-select>
   </x-form-col>
+  <!-- 列表选择框 -->
+  <x-form-col
+    v-else-if="attr.type === 'listSelect' && show"
+    :flex="attr.flex">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="showLabel?attr.name:undefined"
+      :labelCol="layout === 'inline' && attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
+      :wrapperCol="layout === 'inline'&& attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
+      :style="layout === 'inline'&& attr.occupyCol && attr.occupyCol > 1? {width:`calc(100% - ${attr.occupyCol * 1.533}rem)`}:{}"
+      :prop="attr.prop ? attr.prop : attr.model">
+      <!--  如果配置了后置按钮插槽    -->
+      <a-input
+        v-model="form[attr.model]"
+        @click="emitFunc('openSelectCRUDFrom',attr)"
+        :whitespace="true"
+        :read-only="true"
+        style="width:100%"
+        :placeholder="attr.placeholder ? attr.placeholder : '请选择'+attr.name.replace(/\s*/g, '')"
+        :ref="`${attr.model}listSelect`"/>
+    </a-form-model-item>
+  </x-form-col>
   <!-- 评分框 -->
   <x-form-col
     v-else-if="attr.type === 'rate' && show"

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

@@ -1,40 +1,40 @@
-<script>
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XFormGroup },
-  created () {
-    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
-      this.$refs.xFormGroupDemo.init({
-        ...res,
-        serviceName: 'af-revenue',
-        showLeftTab: true,
-      })
-    })
-  },
-  methods: {
-    submitForm () {
-      this.$refs.xFormGroupDemo.onSubmit().then(res => {
-        console.log('所有表单的结果', res)
-      })
-    }
-  }
-}
-</script>
-
-<template>
-  <a-modal
-    :visible="true"
-    :bodyStyle="{height:'70vh'}"
-    title="测试表单组"
-    @ok="submitForm"
-    width="85vw">
-    <x-form-group ref="xFormGroupDemo"></x-form-group>
-  </a-modal>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XFormGroup },
+  created () {
+    getConfigByNameAsync('addUserGeneralInfoFrom', 'af-revenue').then(res => {
+      this.$refs.xFormGroupDemo.init({
+        ...res,
+        serviceName: 'af-revenue',
+        showLeftTab: true,
+      })
+    })
+  },
+  methods: {
+    submitForm () {
+      this.$refs.xFormGroupDemo.onSubmit().then(res => {
+        console.log('所有表单的结果', res)
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal
+    :visible="true"
+    :bodyStyle="{height:'70vh'}"
+    title="测试表单组"
+    @ok="submitForm"
+    width="85vw">
+    <x-form-group ref="xFormGroupDemo"></x-form-group>
+  </a-modal>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -229,6 +229,13 @@ export default {
         return false
       }
     },
+    // 是否作为选择列表
+    listSelectMode: {
+      type: Boolean,
+      default: () => {
+        return false
+      }
+    },
     // 环境
     env: {
       type: String,
@@ -384,6 +391,7 @@ export default {
             title: this.title,
             viewMode: this.viewMode,
             localEditMode: this.localEditMode,
+            listSelectMode: this.listSelectMode,
             tableSummaryMap: res.tableSummaryMap,
             serviceName: this.serviceName,
             env: this.env,

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

@@ -4,7 +4,6 @@
       title="示例表单查询"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      :localEditMode="true"
       service-name="af-system"
       @action="action"
       @columnClick="columnClick"

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/XTable/XTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-show="tableColumns.length > 0">
-    <a-row :gutter="48">
-      <a-col>
+    <a-row :gutter="48" v-show="shouOperaBtn || showRightTools">
+      <a-col v-show="shouOperaBtn">
         <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
           <a-space>
             <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -304,8 +304,12 @@ export default {
       localEditMode: false,
       // 本地编辑模式所用数据源
       localEditModeDataSource: [],
+      // 本地编辑模式数据源是否已由外部加载
+      isLocalDataSourceLoadedExternally: false,
       // 是否展示右侧工具栏
       showRightTools: true,
+      // 是否展示左边按钮栏
+      shouOperaBtn: true,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         // 取到表格携带的表单参数
@@ -563,6 +567,7 @@ export default {
         customTableSummaryArray = [],
         viewMode,
         localEditMode,
+        listSelectMode,
         formItems,
         env = 'prod',
         createdQuery = true,
@@ -609,10 +614,16 @@ export default {
       this.primaryKey = primaryKey
       this.buttonState = buttonState
       if (this.localEditMode) {
+        this.localEditModeDataSource = []
+        this.isLocalDataSourceLoadedExternally = false
         this.buttonState.import = false
         this.buttonState.export = false
         this.showRightTools = false
       }
+      if (listSelectMode) {
+        this.showRightTools = false
+        this.shouOperaBtn = false
+      }
       this.buttonPermissions = buttonPermissions
       this.editButtonStateData = editButtonStateData
       this.title = title
@@ -670,6 +681,19 @@ export default {
     async loadTableData (requestParameters) {
       let result
       if (this.localEditMode) {
+        if (!this.isLocalDataSourceLoadedExternally && requestParameters?.conditionParams && Object.keys(requestParameters?.conditionParams).length > 0) {
+          const result = await query(Object.assign(requestParameters, { userId: this.currUser?.id }),
+            this.serviceName, this.env === 'dev')
+          if (result.data) {
+            let no = 0
+            this.localEditModeDataSource = result.data.map(item => {
+              item['序号'] = no
+              no++
+              return item
+            })
+          }
+          this.isLocalDataSourceLoadedExternally = true
+        }
         result = new Promise((resolve) => {
           resolve({
             data: this.localEditModeDataSource

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,51 +1,50 @@
-<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 () {
+      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/NewDynamicStatistics/FavoriteList.vue

@@ -30,7 +30,6 @@ export default {
   },
   methods: {
     loadData () {
-      console.warn(123)
       indexedDB.getAll((data) => {
         const realData = data.filter(item => item.data && item.data.uuid)
           .map(item => item.data)

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

@@ -83,9 +83,9 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),

package/src/router/guards.js

@@ -169,7 +169,6 @@ const loginGuard = (to, from, next, options) => {
       r: v4LoginData.r
     }
     Vue.$store.commit('account/setLogin', login)
-    console.log('Vue.$store.state?.setting?.menuData', JSON.stringify(Vue.$store.state?.setting?.menuData))
     if (!Vue.$store.state?.setting?.menuData || Vue.$store.state?.setting?.menuData?.length === 0) {
       loadRoutes(funcToRouter(v4LoginData.functions))
     }

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/services/api/workFlow.js

@@ -1,63 +1,63 @@
-// 工单专用api
-const workFlowViewApi = {
-  // 查询：获取工作流基本数据
-  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
-  // 保存工作流流程定义
-  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
-  // 获取工作流流程定义
-  getWorkFlowDefine: '/logic/getWorkFlowDefine',
-  // 获取工作流当前步骤
-  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
-  // 保存用户每一步输入的表单内容
-  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
-  // 获取已经完成步骤的用户填写数据
-  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
-  // 改变工作流进度
-  updateWorkFlowState: '/logic/updateWorkFlowState',
-  // 完工确认后更改工作流状态
-  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
-  // 获取步骤留言和表单填写人姓名
-  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
-  // 更新步骤信息
-  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
-  // 保存工作流日志
-  saveWorkFlowLog: '/logic/saveWorkFlowLog',
-  // 获取工作流日志
-  getWorkFlowLog: '/logic/getWorkFlowLog',
-  // 获取员工任务详情信息
-  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
-  // 根据条件查询任务
-  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
-  // 根据流程名称获取所有步骤名称
-  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
-  // 获取工作流任务留言
-  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
-  // 更新任务完成时间
-  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
-  // 获取任务完成时间更改记录
-  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
-  // 修改工单
-  updateWorkFlow: '/logic/updateWorkFlow',
-  // 获取工作流流程图设计
-  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
-  // 简单添加字典项
-  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
-  // 删除工作流项目
-  deleteWorkFlow: '/logic/deleteWorkFlow',
-  // 获取流程分类数据
-  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
-  // 创建任务
-  createWorkflowTask: '/logic/createWorkflowTask',
-  // 获取部门选择框数据
-  getDepartmentList: '/logic/getDepartmentList',
-  // 获取人员任务汇总数据
-  getEmployeeSummary: '/logic/getEmployeeSummary',
-  // 获取逾期任务排行榜
-  getOverdueRanking: '/logic/getOverdueRanking',
-  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
-  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
-  // 表单提交到下一步
-  submitToNextStep: '/logic/submitToNextStep'
-}
-
-export { workFlowViewApi }
+// 工单专用api
+const workFlowViewApi = {
+  // 查询：获取工作流基本数据
+  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
+  // 保存工作流流程定义
+  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
+  // 获取工作流流程定义
+  getWorkFlowDefine: '/logic/getWorkFlowDefine',
+  // 获取工作流当前步骤
+  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
+  // 保存用户每一步输入的表单内容
+  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
+  // 获取已经完成步骤的用户填写数据
+  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
+  // 改变工作流进度
+  updateWorkFlowState: '/logic/updateWorkFlowState',
+  // 完工确认后更改工作流状态
+  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
+  // 获取步骤留言和表单填写人姓名
+  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
+  // 更新步骤信息
+  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
+  // 保存工作流日志
+  saveWorkFlowLog: '/logic/saveWorkFlowLog',
+  // 获取工作流日志
+  getWorkFlowLog: '/logic/getWorkFlowLog',
+  // 获取员工任务详情信息
+  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
+  // 根据条件查询任务
+  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
+  // 根据流程名称获取所有步骤名称
+  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
+  // 获取工作流任务留言
+  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
+  // 更新任务完成时间
+  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
+  // 获取任务完成时间更改记录
+  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
+  // 修改工单
+  updateWorkFlow: '/logic/updateWorkFlow',
+  // 获取工作流流程图设计
+  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
+  // 简单添加字典项
+  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
+  // 删除工作流项目
+  deleteWorkFlow: '/logic/deleteWorkFlow',
+  // 获取流程分类数据
+  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
+  // 创建任务
+  createWorkflowTask: '/logic/createWorkflowTask',
+  // 获取部门选择框数据
+  getDepartmentList: '/logic/getDepartmentList',
+  // 获取人员任务汇总数据
+  getEmployeeSummary: '/logic/getEmployeeSummary',
+  // 获取逾期任务排行榜
+  getOverdueRanking: '/logic/getOverdueRanking',
+  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
+  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
+  // 表单提交到下一步
+  submitToNextStep: '/logic/submitToNextStep'
+}
+
+export { workFlowViewApi }

package/src/utils/formatter.js

@@ -1,3 +1,5 @@
+const util = require('@vue2-client/utils/util')
+
 /**
  * 把对象按照 js配置文件的格式进行格式化
  * @param obj 格式化的对象
@@ -66,15 +68,7 @@ function formatConfig (obj, dep) {
 }
 
 function getRealKeyData (data) {
-  const obj = {}
-  Object.keys(data).forEach(k => {
-    if (k.indexOf('_') >= 0) {
-      obj[k.substring(k.indexOf('_') + 1)] = data[k]
-    } else {
-      obj[k] = data[k]
-    }
-  })
-  return obj
+  return util.getRealKeyData(data)
 }
 
 module.exports = { formatConfig, getRealKeyData }

package/src/utils/request.js

@@ -91,7 +91,7 @@ export function setSystemVersion (value) {
  * 获取系统版本
  */
 export function getSystemVersion () {
-  return Cookie.get(SYSTEM_VERSION)
+  return Cookie.get(SYSTEM_VERSION) || 'V4'
 }
 
 /**

package/src/utils/util.js

@@ -278,4 +278,33 @@ export function compareRows (beforeRow, afterRow) {
   return changeItem
 }
 
+export function getRealKeyData (data) {
+  return Object.keys(data).reduce((obj, key) => {
+    const realKey = key.includes('_') ? key.split('_').pop() : key
+    obj[realKey] = data[key] // 赋值
+    return obj
+  }, {})
+}
+
+export function setDataByRealKey (form, data) {
+  // 创建一个映射 realKey -> formKey
+  const realFormMap = {}
+
+  // 遍历 form，建立真实键名和 form 键的映射
+  Object.keys(form).forEach(key => {
+    const realKey = key.includes('_') ? key.split('_').pop() : key // 获取真实键名
+    realFormMap[realKey] = key // 存储映射关系
+  })
+
+  // 遍历 data，更新 form 中的值
+  Object.keys(data).forEach(key => {
+    const realKey = key.includes('_') ? key.split('_').pop() : key // 获取真实键名
+    if (realFormMap[realKey]) {
+      form[realFormMap[realKey]] = data[key] // 根据映射关系赋值
+    }
+  })
+
+  return form
+}
+
 const _toString = Object.prototype.toString

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

@@ -15,6 +15,7 @@ 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://aote-office.8866.org:31567'
 const revenue = 'http://aote-office.8866.org:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
@@ -65,12 +66,14 @@ module.exports = {
       '/api': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        // pathRewrite: { '^/api/': '/' },
         target: revenue,
         changeOrigin: true
       },
       '/devApi': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        pathRewrite: { '^/api/': '/' },
         target: revenue,
         changeOrigin: true
       },