vue2-client 1.3.12 → 1.3.15

package/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.3.3 - 1.3.12 -2022-09-09 @江超**
+**1.3.15 -2022-09-13 @江超**
+- 功能修改：
+- 修复上传问题
+
+**1.3.14 -2022-09-13 @苗艳强**
+- 修复使用固定查询条件表单清空的问题
+
+**1.3.3 - 1.3.13 -2022-09-09 @江超**
 - 功能修改：
 - 移除非基础业务组件
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.3.12",
+  "version": "1.3.15",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -90,7 +90,7 @@ export default {
       }
       // 初始化文件信息
       const fileInfo = {
-        uid: info.file.uid,
+        uid: info.file.id,
         name: info.file.name,
         status: 'uploading',
         response: '',
@@ -124,9 +124,13 @@ export default {
         // 根据服务端返回的结果判断成功与否，设置文件条目的状态
         if (res.success) {
           fileInfo.status = 'done'
-          fileInfo.response = JSON.parse(res.data)
-          fileInfo.id = JSON.parse(res.data).id
-          fileInfo.url = JSON.parse(res.data).f_downloadpath
+          let dataObj = res.data
+          if (dataObj instanceof String) {
+            dataObj = JSON.parse(dataObj)
+          }
+          fileInfo.response = dataObj
+          fileInfo.id = dataObj.id
+          fileInfo.url = dataObj.f_downloadpath
           this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
           this.$message.success('上传成功！')
         } else {

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

@@ -1,505 +1,505 @@
-<template>
-  <a-skeleton :loading="mainLoading">
-    <template v-if="loaded">
-      <x-add-form
-        :business-title="businessTitle"
-        :business-type="businessType"
-        :fixedAddForm="fixedAddForm"
-        :json-data="formItems"
-        :service-name="serviceName"
-        :loading="loading"
-        :modify-model-data="modifyModelData"
-        :visible.sync="modelVisible"
-        @onSubmit="onAddOrModify"/>
-      <x-form
-        :is-show="isFormShow"
-        :json-data="formItems"
-        :service-name="serviceName"
-        style="margin-bottom: 14px;"
-        @onSubmit="onSubmit">
-        <slot></slot>
-      </x-form>
-      <x-table
-        ref="xTable"
-        :buttonState="buttonState"
-        :fixedQueryForm="fixedQueryForm"
-        :form="form"
-        :json-data="tableColumns"
-        :queryParams="queryParams"
-        :queryParamsName="queryParamsName"
-        :show-pagination="showPagination"
-        @action="action"
-        @loadData="loadData"
-        @selectRow="selectRow"
-        @toggleIsFormShow="toggleIsFormShow">
-        <template slot="expand">
-          <a-space>
-            <a-button v-if="!buttonState || buttonState.add" type="primary" @click="addItem">
-              <a-icon :style="iconStyle" type="plus"/>新增
-            </a-button>
-            <a-button
-              v-if="!buttonState || buttonState.edit"
-              :disabled="!isModify"
-              :loading="editDataLoading"
-              class="btn-success"
-              type="dashed"
-              @click="editItem">
-              <a-icon :style="iconStyle" type="edit"/>修改
-            </a-button>
-            <a-button v-if="!buttonState || buttonState.delete" :disabled="!isDelete" type="danger" @click="deleteItem">
-              <a-icon :style="iconStyle" type="delete"/>删除
-            </a-button>
-            <slot :selectedRowKeys="selectedRowKeys" name="button"></slot>
-          </a-space>
-          <slot name="expand"></slot>
-        </template>
-      </x-table>
-    </template>
-  </a-skeleton>
-</template>
-<script>
-import XForm from '@vue2-client/base-client/components/common/XForm/XForm'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import XTable from '@vue2-client/base-client/components/common/XTable/XTable'
-import { query, commonApi, addOrModify, remove, queryWithResource } from '@vue2-client/services/api/common'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-import { mapState } from 'vuex'
-import { Modal } from 'ant-design-vue'
-import { post } from '@vue2-client/services/api/restTools'
-import { CommonTempTable } from '@vue2-client/services/api/commonTempTable'
-
-export default {
-  name: 'XFormTable',
-  components: {
-    XTable,
-    XForm,
-    XAddForm
-  },
-  data () {
-    return {
-      // Query参数文件内容加载中
-      mainLoading: false,
-      // Query参数文件内容加载完成
-      loaded: false,
-      // 是否展示表单
-      isFormShow: true,
-      // 当使用logic获取到表单表格配置时, 将配置对象直接传入到x-table用于查询
-      queryParams: null,
-      // 服务名称
-      serviceName: 'af-system',
-      // 表格列集合
-      tableColumns: [],
-      // 操作按钮集合
-      buttonState: {},
-      // 表格选择列Key集合
-      selectedRowKeys: [],
-      // 表单项集合
-      formItems: [],
-      // 表单
-      form: {},
-      // 图标样式
-      iconStyle: {
-        position: 'relative',
-        top: '1px'
-      },
-      // 当前业务类型：新增，修改
-      businessType: '',
-      // 是否显示新增/修改模态框
-      modelVisible: false,
-      // 修改业务时查询的单条业务数据
-      modifyModelData: {},
-      // 是否允许修改
-      isModify: false,
-      // 是否允许删除
-      isDelete: false,
-      // 新增，修改业务执行状态
-      loading: false,
-      // 被修改数据加载状态
-      editDataLoading: false,
-      // 是否为临时表
-      isTableTemp: false,
-      // 自定义新增修改接口
-      customAoM: undefined,
-      // 自定义查询接口
-      customQuery: undefined
-    }
-  },
-  computed: {
-    ...mapState('setting', ['isMobile']),
-    businessTitle () {
-      return this.businessType + this.title
-    }
-  },
-  props: {
-    // 业务名称
-    title: {
-      type: String,
-      default: ''
-    },
-    // 查询配置文件名
-    queryParamsName: {
-      type: String,
-      default: null
-    },
-    // 查询配置文件Json，用于查询配置生成器的预览
-    queryParamsJson: {
-      type: Object,
-      default: null
-    },
-    // 业务逻辑名称, 通过logic获取表单表格配置
-    logicName: {
-      type: String,
-      default: null
-    },
-    // 执行logic传递的参数
-    logicParam: {
-      type: Object,
-      default: () => {}
-    },
-    // 固定新增表单
-    fixedAddForm: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    // 固定查询表单
-    fixedQueryForm: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    // 预览模式
-    viewMode: {
-      type: Boolean,
-      default: () => {
-        return false
-      }
-    },
-    // 动态创建子表需要的定义
-    tempTableData: {
-      type: Object,
-      default: null
-    },
-    // 数据只有一页时是否展示分页，true：展示，auto：隐藏
-    showPagination: {
-      type: Boolean,
-      default: true
-    }
-  },
-  watch: {
-    logicParam: {
-      handler () {
-        this.getColumnJsonByLogic()
-      },
-      deep: true
-    },
-    fixedQueryForm: {
-      handler () {
-        this.getColumnsJson()
-      },
-      deep: true
-    },
-    queryParamsJson: {
-      handler () {
-        this.getColumnsJsonBySource()
-      },
-      deep: true
-    }
-  },
-  created () {
-    if (this.queryParamsName) {
-      this.getColumnsJson()
-    } else if (this.queryParamsJson) {
-      this.getColumnsJsonBySource()
-    }
-  },
-  methods: {
-    refreshTable () {
-      this.$refs.xTable.refresh(true)
-    },
-    clearRowKeys () {
-      this.$refs.xTable.clearRowKeys()
-    },
-    setParams (res) {
-      this.tableColumns = res.columnJson
-      this.formItems = res.formJson
-      this.buttonState = res.buttonState
-      this.serviceName = res.serviceName
-      this.customAoM = res.customAoM
-      this.customQuery = res.customQuery
-      this.mainLoading = false
-      this.loaded = true
-    },
-    getColumnsJson () {
-      this.mainLoading = true
-      indexedDB.getByWeb(this.queryParamsName, commonApi.getColumnsJson, { str: this.queryParamsName }, (ret) => {
-        this.setParams(ret)
-      })
-    },
-    getColumnsJsonBySource () {
-      this.mainLoading = true
-      post(commonApi.getColumnsJson, { queryObject: this.queryParamsJson }).then(res => {
-        this.queryParams = res
-        this.setParams(res)
-      })
-    },
-    getColumnJsonByLogic () {
-      this.form = {}
-      this.mainLoading = true
-      indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, commonApi.getColumnsJson, { logic: this.logicName, logicParam: this.logicParam }, (ret) => {
-        this.queryParams = ret
-        this.setParams(ret)
-      })
-    },
-    // 查询表单提交
-    onSubmit (res) {
-      if (res.valid) {
-        // 表单赋值
-        this.form = res.form
-        // commit
-        this.$emit('afterSearchSubmit', res)
-      } else {
-        return false
-      }
-    },
-    // 新增/修改数据表单提交
-    onAddOrModify (res) {
-      if (this.viewMode) {
-        this.$message.info('预览模式禁止新增')
-        return false
-      }
-      // 如果是临时表
-      if (this.isTableTemp) {
-        this.$emit('tempTableModify', res)
-        return
-      }
-      if (res.valid) {
-        this.loading = true
-        const requestParameters = {
-          queryParamsName: this.queryParamsName,
-          form: {}
-        }
-        if (this.businessType === '修改') {
-          const rowKeyValue = this.selectedRowKeys[0]
-          const key = this.tableColumns[0].dataIndex
-          const realKey = key.substring(key.indexOf('_') + 1)
-          requestParameters.form[realKey] = rowKeyValue
-        }
-        for (const key of Object.keys(res.form)) {
-          const realKey = key.substring(key.indexOf('_') + 1)
-          requestParameters.form[realKey] = res.form[key]
-        }
-        if (!this.customAoM || this.customAoM?.length === 0) {
-          this.customAoM = undefined
-        }
-        addOrModify(requestParameters, this.customAoM, this.serviceName).then(res => {
-          this.$message.success(this.businessType + '成功！')
-          this.loading = false
-          this.modelVisible = false
-          this.$refs.xTable.refresh(true)
-          // commit
-          this.$emit('afterSubmit', { type: this.businessType, id: res.id, form: requestParameters.form })
-        }).catch(e => {
-          this.loading = false
-          this.modelVisible = false
-          this.$message.error(this.businessType + '失败！')
-        })
-      } else {
-        return false
-      }
-    },
-    // 刷新加载表格数据
-    loadData (requestParameters, callback) {
-      let result = {}
-      if (this.queryParamsJson) {
-        if (this.queryParamsJson.tableName.startsWith('##')) {
-          this.isTableTemp = true
-          result = this.initTempTable(requestParameters)
-        }
-      }
-      if (!this.isTableTemp) {
-        result = query(requestParameters, undefined, this.serviceName)
-      }
-      this.$emit('afterQuery', result)
-      callback(result)
-    },
-    // 详情按钮事件
-    action (record, id) {
-      this.$emit('action', record, id)
-    },
-    // 新增业务
-    addItem () {
-      this.businessType = '新增'
-      this.modifyModelData = {}
-      this.modelVisible = true
-    },
-    // 修改业务
-    editItem () {
-      this.businessType = '修改'
-      if (!this.viewMode) {
-        const requestParameters = {
-          queryParamsName: this.queryParamsName,
-          conditionParams: {},
-          pageNo: 1,
-          pageSize: 1
-        }
-        requestParameters.conditionParams[this.tableColumns[0].dataIndex] = this.selectedRowKeys[0]
-        requestParameters.f_businessid = this.selectedRowKeys[0]
-        if (this.isTableTemp) {
-          this.$emit('tempTableEdit', requestParameters)
-          return
-        }
-        this.editDataLoading = true
-        if (!this.customQuery || this.customQuery?.length === 0) {
-          this.customQuery = undefined
-        }
-        queryWithResource(requestParameters, this.customQuery, this.serviceName).then(res => {
-          this.modifyModelData = { data: res.data[0], images: res.images, files: res.files }
-          this.modelVisible = true
-          this.editDataLoading = false
-          console.warn(this.modifyModelData)
-        })
-      } else {
-        this.$message.info('预览模式禁止修改')
-      }
-    },
-    // 删除业务
-    deleteItem () {
-      if (this.viewMode) {
-        this.$message.info('预览模式禁止删除')
-        return
-      }
-      Modal.confirm({
-        title: '提示',
-        content: '您本次要删除共' + this.selectedRowKeys.length + '条数据，确定操作吗？',
-        confirmLoading: this.loading,
-        zIndex: 1001,
-        onOk: () => {
-          this.loading = true
-          const requestParameters = {
-            queryParamsName: this.queryParamsName,
-            idList: this.selectedRowKeys
-          }
-          remove(requestParameters, undefined, this.serviceName).then(res => {
-            this.loading = false
-            this.$message.success('删除成功！')
-            this.$refs.xTable.clearRowKeys()
-            this.$refs.xTable.refresh(true)
-            // afterDelete
-            this.$emit('afterDelete', { idList: requestParameters.idList })
-          }).catch(e => {
-            this.loading = false
-            this.$message.error('删除失败！')
-          })
-        },
-        onCancel () {}
-      })
-    },
-    // 查询表单部分显示/隐藏切换
-    toggleIsFormShow () {
-      this.isFormShow = !this.isFormShow
-    },
-    // 控制业务操作按钮组的显示
-    selectRow (rowKeys) {
-      this.selectedRowKeys = rowKeys
-      this.isModify = this.selectedRowKeys.length === 1
-      this.isDelete = this.selectedRowKeys.length > 0
-      this.$emit('selectRow', this.selectedRowKeys)
-    },
-    // 创建临时表sql生成
-    createTempTable (defineJson) {
-      const tableName = defineJson.tableName
-      const define = defineJson.column
-      return post(CommonTempTable.createTempTable, {
-        define: define,
-        tableName: tableName
-      })
-        .then(
-          res => {
-            return res
-          },
-          err => {
-            console.log(err)
-          }
-        )
-    },
-    // 插入临时表数据sql生成
-    insertTempTableData (defineJson) {
-      const tableName = defineJson.tableName
-      const params = {}
-      params.define = defineJson.column
-      params.applyId = defineJson.applyId
-      params.stepName = defineJson.stepName
-      params.tableName = tableName
-      return post(CommonTempTable.insertDataToTempTable, {
-        tempTableData: params
-      })
-        .then(
-          res => {
-            return res
-          }
-        )
-    },
-    // 初始化临时表
-    async initTempTable (json) {
-      await this.createTempTable(this.queryParamsJson)
-      await this.insertTempTableData(this.queryParamsJson)
-      let result = {}
-      await post(CommonTempTable.initApplySubTable, {
-        define: json
-      })
-        .then(
-          res => {
-            console.log('子表临时表已创建')
-            result = res
-          }
-        )
-      return result
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.btn-success {
-  color: #ffffff;
-}
-.btn-success:hover {
-  color: #ffffff !important;
-}
-.btn-success:focus {
-  color: #ffffff !important;
-}
-.btn-success:enabled:hover {
-  background-color: #85CE61 !important;
-  border-color: #85CE61 !important;
-}
-.btn-success:enabled {
-  background-color: #67c23a;
-  border-color: #67c23a;
-}
-.btn-success:disabled {
-  color: rgba(0, 0, 0, 0.25);
-}
-.btn-warn {
-  color: #ffffff;
-}
-.btn-warn:hover {
-  color: #ffffff !important;
-}
-.btn-warn:focus {
-  color: #ffffff !important;
-}
-.btn-warn:enabled:hover {
-  background-color: #ffc833 !important;
-  border-color: #ffc833 !important;
-}
-.btn-warn:enabled {
-  background-color: #ffba00;
-  border-color: #ffba00;
-}
-.btn-warn:disabled {
-  color: rgba(0, 0, 0, 0.25);
-}
-</style>
+<template>
+  <a-skeleton :loading="mainLoading">
+    <template v-if="loaded">
+      <x-add-form
+        :business-title="businessTitle"
+        :business-type="businessType"
+        :fixedAddForm="fixedAddForm"
+        :json-data="formItems"
+        :service-name="serviceName"
+        :loading="loading"
+        :modify-model-data="modifyModelData"
+        :visible.sync="modelVisible"
+        @onSubmit="onAddOrModify"/>
+      <x-form
+        :is-show="isFormShow"
+        :json-data="formItems"
+        :service-name="serviceName"
+        style="margin-bottom: 14px;"
+        @onSubmit="onSubmit">
+        <slot></slot>
+      </x-form>
+      <x-table
+        ref="xTable"
+        :buttonState="buttonState"
+        :fixedQueryForm="fixedQueryForm"
+        :form="form"
+        :json-data="tableColumns"
+        :queryParams="queryParams"
+        :queryParamsName="queryParamsName"
+        :show-pagination="showPagination"
+        @action="action"
+        @loadData="loadData"
+        @selectRow="selectRow"
+        @toggleIsFormShow="toggleIsFormShow">
+        <template slot="expand">
+          <a-space>
+            <a-button v-if="!buttonState || buttonState.add" type="primary" @click="addItem">
+              <a-icon :style="iconStyle" type="plus"/>新增
+            </a-button>
+            <a-button
+              v-if="!buttonState || buttonState.edit"
+              :disabled="!isModify"
+              :loading="editDataLoading"
+              class="btn-success"
+              type="dashed"
+              @click="editItem">
+              <a-icon :style="iconStyle" type="edit"/>修改
+            </a-button>
+            <a-button v-if="!buttonState || buttonState.delete" :disabled="!isDelete" type="danger" @click="deleteItem">
+              <a-icon :style="iconStyle" type="delete"/>删除
+            </a-button>
+            <slot :selectedRowKeys="selectedRowKeys" name="button"></slot>
+          </a-space>
+          <slot name="expand"></slot>
+        </template>
+      </x-table>
+    </template>
+  </a-skeleton>
+</template>
+<script>
+import XForm from '@vue2-client/base-client/components/common/XForm/XForm'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+import XTable from '@vue2-client/base-client/components/common/XTable/XTable'
+import { query, commonApi, addOrModify, remove, queryWithResource } from '@vue2-client/services/api/common'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+import { mapState } from 'vuex'
+import { Modal } from 'ant-design-vue'
+import { post } from '@vue2-client/services/api/restTools'
+import { CommonTempTable } from '@vue2-client/services/api/commonTempTable'
+
+export default {
+  name: 'XFormTable',
+  components: {
+    XTable,
+    XForm,
+    XAddForm
+  },
+  data () {
+    return {
+      // Query参数文件内容加载中
+      mainLoading: false,
+      // Query参数文件内容加载完成
+      loaded: false,
+      // 是否展示表单
+      isFormShow: true,
+      // 当使用logic获取到表单表格配置时, 将配置对象直接传入到x-table用于查询
+      queryParams: null,
+      // 服务名称
+      serviceName: 'af-system',
+      // 表格列集合
+      tableColumns: [],
+      // 操作按钮集合
+      buttonState: {},
+      // 表格选择列Key集合
+      selectedRowKeys: [],
+      // 表单项集合
+      formItems: [],
+      // 表单
+      form: {},
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
+      // 当前业务类型：新增，修改
+      businessType: '',
+      // 是否显示新增/修改模态框
+      modelVisible: false,
+      // 修改业务时查询的单条业务数据
+      modifyModelData: {},
+      // 是否允许修改
+      isModify: false,
+      // 是否允许删除
+      isDelete: false,
+      // 新增，修改业务执行状态
+      loading: false,
+      // 被修改数据加载状态
+      editDataLoading: false,
+      // 是否为临时表
+      isTableTemp: false,
+      // 自定义新增修改接口
+      customAoM: undefined,
+      // 自定义查询接口
+      customQuery: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile']),
+    businessTitle () {
+      return this.businessType + this.title
+    }
+  },
+  props: {
+    // 业务名称
+    title: {
+      type: String,
+      default: ''
+    },
+    // 查询配置文件名
+    queryParamsName: {
+      type: String,
+      default: null
+    },
+    // 查询配置文件Json，用于查询配置生成器的预览
+    queryParamsJson: {
+      type: Object,
+      default: null
+    },
+    // 业务逻辑名称, 通过logic获取表单表格配置
+    logicName: {
+      type: String,
+      default: null
+    },
+    // 执行logic传递的参数
+    logicParam: {
+      type: Object,
+      default: () => {}
+    },
+    // 固定新增表单
+    fixedAddForm: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    // 固定查询表单
+    fixedQueryForm: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    // 预览模式
+    viewMode: {
+      type: Boolean,
+      default: () => {
+        return false
+      }
+    },
+    // 动态创建子表需要的定义
+    tempTableData: {
+      type: Object,
+      default: null
+    },
+    // 数据只有一页时是否展示分页，true：展示，auto：隐藏
+    showPagination: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    logicParam: {
+      handler () {
+        this.getColumnJsonByLogic()
+      },
+      deep: true
+    },
+    fixedQueryForm: {
+      handler () {
+        this.form = {}
+      },
+      deep: true
+    },
+    queryParamsJson: {
+      handler () {
+        this.getColumnsJsonBySource()
+      },
+      deep: true
+    }
+  },
+  created () {
+    if (this.queryParamsName) {
+      this.getColumnsJson()
+    } else if (this.queryParamsJson) {
+      this.getColumnsJsonBySource()
+    }
+  },
+  methods: {
+    refreshTable () {
+      this.$refs.xTable.refresh(true)
+    },
+    clearRowKeys () {
+      this.$refs.xTable.clearRowKeys()
+    },
+    setParams (res) {
+      this.tableColumns = res.columnJson
+      this.formItems = res.formJson
+      this.buttonState = res.buttonState
+      this.serviceName = res.serviceName
+      this.customAoM = res.customAoM
+      this.customQuery = res.customQuery
+      this.mainLoading = false
+      this.loaded = true
+    },
+    getColumnsJson () {
+      this.mainLoading = true
+      indexedDB.getByWeb(this.queryParamsName, commonApi.getColumnsJson, { str: this.queryParamsName }, (ret) => {
+        this.setParams(ret)
+      })
+    },
+    getColumnsJsonBySource () {
+      this.mainLoading = true
+      post(commonApi.getColumnsJson, { queryObject: this.queryParamsJson }).then(res => {
+        this.queryParams = res
+        this.setParams(res)
+      })
+    },
+    getColumnJsonByLogic () {
+      this.form = {}
+      this.mainLoading = true
+      indexedDB.getByWeb(`${this.logicName}_${JSON.stringify(this.logicParam)}`, commonApi.getColumnsJson, { logic: this.logicName, logicParam: this.logicParam }, (ret) => {
+        this.queryParams = ret
+        this.setParams(ret)
+      })
+    },
+    // 查询表单提交
+    onSubmit (res) {
+      if (res.valid) {
+        // 表单赋值
+        this.form = res.form
+        // commit
+        this.$emit('afterSearchSubmit', res)
+      } else {
+        return false
+      }
+    },
+    // 新增/修改数据表单提交
+    onAddOrModify (res) {
+      if (this.viewMode) {
+        this.$message.info('预览模式禁止新增')
+        return false
+      }
+      // 如果是临时表
+      if (this.isTableTemp) {
+        this.$emit('tempTableModify', res)
+        return
+      }
+      if (res.valid) {
+        this.loading = true
+        const requestParameters = {
+          queryParamsName: this.queryParamsName,
+          form: {}
+        }
+        if (this.businessType === '修改') {
+          const rowKeyValue = this.selectedRowKeys[0]
+          const key = this.tableColumns[0].dataIndex
+          const realKey = key.substring(key.indexOf('_') + 1)
+          requestParameters.form[realKey] = rowKeyValue
+        }
+        for (const key of Object.keys(res.form)) {
+          const realKey = key.substring(key.indexOf('_') + 1)
+          requestParameters.form[realKey] = res.form[key]
+        }
+        if (!this.customAoM || this.customAoM?.length === 0) {
+          this.customAoM = undefined
+        }
+        addOrModify(requestParameters, this.customAoM, this.serviceName).then(res => {
+          this.$message.success(this.businessType + '成功！')
+          this.loading = false
+          this.modelVisible = false
+          this.$refs.xTable.refresh(true)
+          // commit
+          this.$emit('afterSubmit', { type: this.businessType, id: res.id, form: requestParameters.form })
+        }).catch(e => {
+          this.loading = false
+          this.modelVisible = false
+          this.$message.error(this.businessType + '失败！')
+        })
+      } else {
+        return false
+      }
+    },
+    // 刷新加载表格数据
+    loadData (requestParameters, callback) {
+      let result = {}
+      if (this.queryParamsJson) {
+        if (this.queryParamsJson.tableName.startsWith('##')) {
+          this.isTableTemp = true
+          result = this.initTempTable(requestParameters)
+        }
+      }
+      if (!this.isTableTemp) {
+        result = query(requestParameters, undefined, this.serviceName)
+      }
+      this.$emit('afterQuery', result)
+      callback(result)
+    },
+    // 详情按钮事件
+    action (record, id) {
+      this.$emit('action', record, id)
+    },
+    // 新增业务
+    addItem () {
+      this.businessType = '新增'
+      this.modifyModelData = {}
+      this.modelVisible = true
+    },
+    // 修改业务
+    editItem () {
+      this.businessType = '修改'
+      if (!this.viewMode) {
+        const requestParameters = {
+          queryParamsName: this.queryParamsName,
+          conditionParams: {},
+          pageNo: 1,
+          pageSize: 1
+        }
+        requestParameters.conditionParams[this.tableColumns[0].dataIndex] = this.selectedRowKeys[0]
+        requestParameters.f_businessid = this.selectedRowKeys[0]
+        if (this.isTableTemp) {
+          this.$emit('tempTableEdit', requestParameters)
+          return
+        }
+        this.editDataLoading = true
+        if (!this.customQuery || this.customQuery?.length === 0) {
+          this.customQuery = undefined
+        }
+        queryWithResource(requestParameters, this.customQuery, this.serviceName).then(res => {
+          this.modifyModelData = { data: res.data[0], images: res.images, files: res.files }
+          this.modelVisible = true
+          this.editDataLoading = false
+          console.warn(this.modifyModelData)
+        })
+      } else {
+        this.$message.info('预览模式禁止修改')
+      }
+    },
+    // 删除业务
+    deleteItem () {
+      if (this.viewMode) {
+        this.$message.info('预览模式禁止删除')
+        return
+      }
+      Modal.confirm({
+        title: '提示',
+        content: '您本次要删除共' + this.selectedRowKeys.length + '条数据，确定操作吗？',
+        confirmLoading: this.loading,
+        zIndex: 1001,
+        onOk: () => {
+          this.loading = true
+          const requestParameters = {
+            queryParamsName: this.queryParamsName,
+            idList: this.selectedRowKeys
+          }
+          remove(requestParameters, undefined, this.serviceName).then(res => {
+            this.loading = false
+            this.$message.success('删除成功！')
+            this.$refs.xTable.clearRowKeys()
+            this.$refs.xTable.refresh(true)
+            // afterDelete
+            this.$emit('afterDelete', { idList: requestParameters.idList })
+          }).catch(e => {
+            this.loading = false
+            this.$message.error('删除失败！')
+          })
+        },
+        onCancel () {}
+      })
+    },
+    // 查询表单部分显示/隐藏切换
+    toggleIsFormShow () {
+      this.isFormShow = !this.isFormShow
+    },
+    // 控制业务操作按钮组的显示
+    selectRow (rowKeys) {
+      this.selectedRowKeys = rowKeys
+      this.isModify = this.selectedRowKeys.length === 1
+      this.isDelete = this.selectedRowKeys.length > 0
+      this.$emit('selectRow', this.selectedRowKeys)
+    },
+    // 创建临时表sql生成
+    createTempTable (defineJson) {
+      const tableName = defineJson.tableName
+      const define = defineJson.column
+      return post(CommonTempTable.createTempTable, {
+        define: define,
+        tableName: tableName
+      })
+        .then(
+          res => {
+            return res
+          },
+          err => {
+            console.log(err)
+          }
+        )
+    },
+    // 插入临时表数据sql生成
+    insertTempTableData (defineJson) {
+      const tableName = defineJson.tableName
+      const params = {}
+      params.define = defineJson.column
+      params.applyId = defineJson.applyId
+      params.stepName = defineJson.stepName
+      params.tableName = tableName
+      return post(CommonTempTable.insertDataToTempTable, {
+        tempTableData: params
+      })
+        .then(
+          res => {
+            return res
+          }
+        )
+    },
+    // 初始化临时表
+    async initTempTable (json) {
+      await this.createTempTable(this.queryParamsJson)
+      await this.insertTempTableData(this.queryParamsJson)
+      let result = {}
+      await post(CommonTempTable.initApplySubTable, {
+        define: json
+      })
+        .then(
+          res => {
+            console.log('子表临时表已创建')
+            result = res
+          }
+        )
+      return result
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.btn-success {
+  color: #ffffff;
+}
+.btn-success:hover {
+  color: #ffffff !important;
+}
+.btn-success:focus {
+  color: #ffffff !important;
+}
+.btn-success:enabled:hover {
+  background-color: #85CE61 !important;
+  border-color: #85CE61 !important;
+}
+.btn-success:enabled {
+  background-color: #67c23a;
+  border-color: #67c23a;
+}
+.btn-success:disabled {
+  color: rgba(0, 0, 0, 0.25);
+}
+.btn-warn {
+  color: #ffffff;
+}
+.btn-warn:hover {
+  color: #ffffff !important;
+}
+.btn-warn:focus {
+  color: #ffffff !important;
+}
+.btn-warn:enabled:hover {
+  background-color: #ffc833 !important;
+  border-color: #ffc833 !important;
+}
+.btn-warn:enabled {
+  background-color: #ffba00;
+  border-color: #ffba00;
+}
+.btn-warn:disabled {
+  color: rgba(0, 0, 0, 0.25);
+}
+</style>

package/src/layouts/header/InstitutionDetail.vue

@@ -81,7 +81,7 @@ export default {
         return
       }
       const otherFiles = []
-      post('/api/af-system/getInstitutionDetail', {
+      post('/api/af-system/logic/getInstitutionDetail', {
         id: this.institutionId
       }).then(res => {
         res.files.forEach(item => {
@@ -116,7 +116,7 @@ export default {
       a.click()
     },
     confirm_institution () {
-      post('/api/af-system/affirmInstitution', {
+      post('/api/af-system/logic/affirmInstitution', {
         data: {
           tobe: [
             {