npm - vue2-client - Versions diffs - 1.15.28 → 1.15.30 - Mend

vue2-client 1.15.28 → 1.15.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/package.json +1 -1
package/src/base-client/components/common/AmapMarker/index.js +3 -3
package/src/base-client/components/common/XDetailsView/index.js +3 -3
package/src/base-client/components/common/XFormGroupDetails/index.js +3 -3
package/src/base-client/components/common/XTab/XTab.vue +1 -0
package/src/pages/WorkflowDetail/WorkFlowDemo.vue +37 -201
package/src/pages/WorkflowDetail/WorkFlowDemo2.vue +169 -97
package/src/pages/WorkflowDetail/WorkFlowDemo3.vue +203 -203
package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue +24 -0
package/src/router/async/router.map.js +13 -7
package/vue.config.js +4 -3

package/package.json CHANGED Viewed

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

package/src/base-client/components/common/AmapMarker/index.js CHANGED Viewed

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

package/src/base-client/components/common/XDetailsView/index.js CHANGED Viewed

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

package/src/base-client/components/common/XFormGroupDetails/index.js CHANGED Viewed

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

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

@@ -68,6 +68,7 @@ export default {
   },
   mounted () {
     this.activeKey = this.defaultActiveKey
+    this.tabPaneChange('initTabLoading')
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删

package/src/pages/WorkflowDetail/WorkFlowDemo.vue CHANGED Viewed

@@ -1,211 +1,47 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="我的工单"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template slot="button">
-        <a-button @click="addApply">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail
-      ref="workFlow"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-    <!--  协议作废功能  -->
-    <a-modal
-      v-model="formState"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="作废"
-      :destroyOnClose="true"
-      width="55vw">
-      <x-add-native-form
-        ref="xCancelForm"
-        @onSubmit="submit"
-      />
-      <template #footer>
-        <a-button key="back" @click="formState = false">取消</a-button>
-        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
-      </template>
-    </a-modal>
-  </a-card>
-</template>
 <script>
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail,
-    AddressSelect
-  },
-  provide () {
-    return {
-      generalFunction: {
-        setCancel: this.setCancel,
-        updateFormData: this.updateFormData,
-      }
-    }
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ApplyProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      formState: false,
-      submitLoading: false,
-      cancelRecord: {}
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  name: 'WorkFlowDemo',
+  components: { WorkflowDetail },
+  mounted () {
+    this.$refs.workFlow.init({
+      workflowId: '376'
+    })
   },
   methods: {
-    addApply () {
-      console.log('打开了吗')
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.$refs.xFormTable.refreshTable(true)
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
-    },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id,
-      })
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    setForm (record) {
-      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
-    },
-    nextClick ({ form, formStep, workflowId }) {
-      console.log('success', form, formStep, workflowId)
-      const data = {
-        workflowId,
-        form,
-        formStep
-      }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
-        res => {
-          if (res) {
-            // this.$message.success('提交成功！')
-            this.$refs.xFormTable.refreshTable(true)
-          }
-        }
-      )
-    },
-    // 协议作废
-    setCancel (record) {
-      this.cancelRecord = record
-      this.formState = true
-      this.$nextTick(() => {
-        getConfigByName('setCancelForm', 'af-apply', (config) => {
-          if (this.$refs.xCancelForm) {
-            this.$refs.xCancelForm.init({
-              formItems: config.formJson,
-              title: '补充协议作废',
-              businessType: '修改',
-              showSubmitBtn: false,
-              ...config
-            })
-            if (this.$refs.xCancelForm) {
-              console.log(record)
-              // this.$refs.xCancelForm.setForm(recordData)
-            }
-          } else {
-            console.error('xCancelForm组件未加载完成')
-            // 延迟重试
-            setTimeout(() => {
-              this.setCancel(record)
-            }, 100)
-          }
-        })
-      })
-    },
-    async formSubmit () {
-      this.submitLoading = true
-      const formData = await this.$refs.xCancelForm.asyncSubmit()
-      try {
-        await this.submit(formData)
-      } catch (error) {
-        this.$message.error('表单验证失败，请检查填写内容')
-      } finally {
-        this.submitLoading = false
-      }
-    },
-    async submit (formData) {
-      const data = {
-        ...formData,
-      }
-      console.log('==formData', data)
-      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
-        this.$message.success('操作成功')
-        this.formState = false
-      })
-    },
-    updateFormData (workflowId) {
-      runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
-        console.log('>>>> res==', res)
-        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: 1200 })
-      })
-      console.log()
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
+    },
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId 工作流id
+     * @param fromStepId 起ID
+     * @param toStepId 往ID
+     * @param successStepId 完成步骤id
+     * @param successStep 完成步骤名称
+     * @param fromStep 起步骤名称
+     * @param toStep 往步骤名称
+     */
+    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
+      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
     }
   }
 }
 </script>
+<template>
+  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
+</template>
+<style scoped lang="less">
+</style>

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue CHANGED Viewed

@@ -1,132 +1,204 @@
 <template>
   <a-card :bordered="false">
-    <a-tabs default-active-key="1">
-      <!-- 业务审核 Tab -->
-      <a-tab-pane key="1" tab="业务审核">
-        <x-form-table
-          title="业务审核"
-          :queryParamsName="queryParamsName"
-          :fixedAddForm="fixedAddForm"
-          :fixedQueryForm="fixedQueryForm"
-          @audit="audit"
-          serviceName="af-revenue"
-          ref="xFormTable">
-        </x-form-table>
-        <WorkflowDetail ref="workFlow" @success="confirmAudit" @nextClick="nextClick"></WorkflowDetail>
-      </a-tab-pane>
-      <!-- 我负责的 Tab -->
-      <a-tab-pane key="2" tab="我参与的">
-        <x-form-table
-          title="我参与的业务"
-          :queryParamsName="queryParamsName2"
-          :fixedQueryForm="fixedQueryForm2"
-          @check="check"
-          serviceName="af-revenue"
-          ref="xFormTable">
-        </x-form-table>
-      </a-tab-pane>
-    </a-tabs>
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+    <!--  协议作废功能  -->
+    <a-modal
+      v-model="formState"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="作废"
+      :destroyOnClose="true"
+      width="55vw">
+      <x-add-native-form
+        ref="xCancelForm"
+        @onSubmit="submit"
+      />
+      <template #footer>
+        <a-button key="back" @click="formState = false">取消</a-button>
+        <a-button key="submit" type="primary" :loading="submitLoading" @click="formSubmit">确认</a-button>
+      </template>
+    </a-modal>
   </a-card>
 </template>
 <script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
-import { runLogic } from '@vue2-client/services/api/common'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 export default {
-  name: 'UnitManage',
+  name: 'Apply',
   components: {
-    XFormTable, XDescriptions, XAddNativeForm, WorkflowDetail
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect
   },
-  data () {
+  provide () {
     return {
-      // 查询配置名称
-      queryParamsName: 'businessAuditCRUD',
-      queryParamsName2: 'participatedCRUD',
-      // 新增表单固定值
-      fixedAddForm: {},
-      fixedQueryForm: {},
-      fixedQueryForm2: {},
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示详情抽屉
-      detailVisible: false
+      generalFunction: {
+        setCancel: this.setCancel,
+      }
     }
   },
-  created () {
-  },
-  mounted () {
-    this.fixedQueryForm = {
-      ws_f_handler: this.currUser.name
-    }
-    this.fixedQueryForm2 = {
-      a_f_handler: this.currUser.name
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      formState: false,
+      submitLoading: false,
+      cancelRecord: {}
     }
   },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
   methods: {
-    nextClick ({ form, formStep, workflowId }) {
-      console.log('success', form, formStep, workflowId)
-      if (formStep === '管理员审核') {
-        const data = {
-          workflowId,
-          form
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
         }
-        runLogic('auditFinish', { data: data }, 'af-revenue').then(
-          res => {
-            if (res) {
-              this.$message.success('审核完成！！！')
-              this.formModalVisible = false
-              this.$refs.xFormTable.refreshTable(true)
-            }
-          }
-        )
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id,
+        stepId: record.ws_f_step_id
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
       }
     },
-    confirmAudit (param) {
-      runLogic('auditFinish', { data: param }, 'af-revenue').then(
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      const data = {
+        workflowId,
+        form,
+        formStep
+      }
+      runLogic('applySubmitAfter', data, 'af-apply').then(
         res => {
           if (res) {
-            this.$message.success('审核完成！！！')
-            this.formModalVisible = false
+            // this.$message.success('提交成功！')
             this.$refs.xFormTable.refreshTable(true)
           }
         }
       )
     },
-    audit (record, id, type) {
-      console.log(record, id, type)
-      console.log(this.$refs.workFlow)
-      this.detailVisible = true
-      this.$refs.workFlow.init({
-        workflowId: record.w_id
+    // 协议作废
+    setCancel (record) {
+      this.cancelRecord = record
+      this.formState = true
+      this.$nextTick(() => {
+        getConfigByName('setCancelForm', 'af-apply', (config) => {
+          if (this.$refs.xCancelForm) {
+            this.$refs.xCancelForm.init({
+              formItems: config.formJson,
+              title: '补充协议作废',
+              businessType: '修改',
+              showSubmitBtn: false,
+              ...config
+            })
+            if (this.$refs.xCancelForm) {
+              console.log(record)
+              // this.$refs.xCancelForm.setForm(recordData)
+            }
+          } else {
+            console.error('xCancelForm组件未加载完成')
+            // 延迟重试
+            setTimeout(() => {
+              this.setCancel(record)
+            }, 100)
+          }
+        })
       })
     },
-    check (record, id, type) {
-      console.log(record, id, type)
-      console.log(this.$refs.workFlow)
-      this.detailVisible = true
-      this.$refs.workFlow.init({
-        workflowId: record.a_id
-      })
+    async formSubmit () {
+      this.submitLoading = true
+      const formData = await this.$refs.xCancelForm.asyncSubmit()
+      try {
+        await this.submit(formData)
+      } catch (error) {
+        this.$message.error('表单验证失败，请检查填写内容')
+      } finally {
+        this.submitLoading = false
+      }
     },
-    onClose () {
-      this.detailVisible = false
+    async submit (formData) {
+      const data = {
+        ...formData,
+      }
+      console.log('==formData', data)
+      await runLogic('暂时没有实现的logic', data, 'af-apply').then(() => {
+        this.$message.success('操作成功')
+        this.formState = false
+      })
     }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
+  }
 }
 </script>
-<style scoped lang="less">
-:deep(.ant-statistic-content-value) {
-  color: @primary-color;
-}
-</style>

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue CHANGED Viewed

@@ -1,203 +1,203 @@
-<template>
-  <div id="beingProcessed">
-    <x-form-table
-      title="我的工单"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template slot="button">
-        <a-button @click="addApply">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail
-      ref="workFlow"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <!--  地址选择器  -->
-    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
-  </div>
-</template>
-<script>
-import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
-import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
-export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail,
-    AddressSelect,
-    XFormGroup,
-  },
-  // 透传给子组件的方法（目前XFormTable接了）
-  provide () {
-    return {
-      generalFunction: {
-        setCancel: this.setCancel,
-        chargeAdd: this.chargeAdd,
-        addUser: this.addUser,
-        editUser: this.editUser,
-        addContract: this.addContract,
-        addcharge: this.addcharge,
-        updateFormData: this.updateFormData,
-        chargeCancel: this.chargeCancel,
-        chargeBatchRefund: this.chargeBatchRefund,
-      }
-    }
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'ApplyProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      // 提交加载动画
-      confirmLoading: false,
-      refreshFn: null,
-      chargeVisible: false
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-  },
-  methods: {
-    addApply () {
-      console.log('打开了吗')
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.$refs.xFormTable.refreshTable(true)
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
-    },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.ab_f_workflow_id
-      })
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
-    },
-    setForm (record) {
-      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
-    },
-    nextClick ({ form, formStep, workflowId }) {
-      console.log('success', form, formStep, workflowId)
-      const data = {
-        workflowId,
-        form,
-        formStep
-      }
-      runLogic('applySubmitAfter', data, 'af-apply').then(
-        res => {
-          if (res) {
-            // this.$message.success('提交成功！')
-            this.$refs.xFormTable.refreshTable(true)
-          }
-        }
-      )
-    },
-    // 协议作废
-    setCancel (record, refreshFn) {
-      this.$refs.cancelContract.setCancel(record, refreshFn)
-    },
-    // 增值收费新增
-    chargeAdd (refreshFn) {
-      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 协议新增
-    addContract (refreshFn) {
-      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 新增用户
-    addUser (refreshFn) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
-        this.$message.success('只有团购报建流程才可以新增用户信息!')
-        return
-      }
-      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 编辑用户
-    editUser (record, refreshFn) {
-      this.$refs.addUser.editUser(record, refreshFn)
-    },
-    // 新增收费
-    addcharge (refreshFn) {
-      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
-    },
-    // 报装缴费页面初始化
-    updateFormData (workflowId) {
-      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
-        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
-        })
-      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
-        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
-          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
-        })
-      }
-    },
-    // 增值收费单个数据的撤销功能
-    chargeCancel (record, refreshFn) {
-      this.$refs.cancel.chargeCancel(record, refreshFn)
-    },
-    // 批量撤销(退费)
-    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
-      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
-        this.$message.warn('请选择要退费的记录', 5)
-        return
-      }
-      const workflowId = this.$refs.workFlow.workflowId
-      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
-    }
-  }
-}
-</script>
+<template>
+  <div id="beingProcessed">
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <!--  地址选择器  -->
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+  </div>
+</template>
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
+export default {
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect,
+    XFormGroup,
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        chargeAdd: this.chargeAdd,
+        addUser: this.addUser,
+        editUser: this.editUser,
+        addContract: this.addContract,
+        addcharge: this.addcharge,
+        updateFormData: this.updateFormData,
+        chargeCancel: this.chargeCancel,
+        chargeBatchRefund: this.chargeBatchRefund,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      // 提交加载动画
+      confirmLoading: false,
+      refreshFn: null,
+      chargeVisible: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      const data = {
+        workflowId,
+        form,
+        formStep
+      }
+      runLogic('applySubmitAfter', data, 'af-apply').then(
+        res => {
+          if (res) {
+            // this.$message.success('提交成功！')
+            this.$refs.xFormTable.refreshTable(true)
+          }
+        }
+      )
+    },
+    // 协议作废
+    setCancel (record, refreshFn) {
+      this.$refs.cancelContract.setCancel(record, refreshFn)
+    },
+    // 增值收费新增
+    chargeAdd (refreshFn) {
+      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 协议新增
+    addContract (refreshFn) {
+      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 新增用户
+    addUser (refreshFn) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
+        this.$message.success('只有团购报建流程才可以新增用户信息!')
+        return
+      }
+      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 编辑用户
+    editUser (record, refreshFn) {
+      this.$refs.addUser.editUser(record, refreshFn)
+    },
+    // 新增收费
+    addcharge (refreshFn) {
+      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 报装缴费页面初始化
+    updateFormData (workflowId) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
+        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
+        })
+      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
+        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
+        })
+      }
+    },
+    // 增值收费单个数据的撤销功能
+    chargeCancel (record, refreshFn) {
+      this.$refs.cancel.chargeCancel(record, refreshFn)
+    },
+    // 批量撤销(退费)
+    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
+      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
+        this.$message.warn('请选择要退费的记录', 5)
+        return
+      }
+      const workflowId = this.$refs.workFlow.workflowId
+      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
+    }
+  }
+}
+</script>

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

@@ -1059,6 +1059,10 @@ export default {
           const stepDefine = this.targetStepDefine[i]
           const key = this.getRealKey(stepDefine.model, isKeyHandle)
           if (Object.prototype.hasOwnProperty.call(dataObj, key)) {
+            // 历史表单内容根据流程中配置的表单项顺序进行渲染，需要兼容表单项展示函数
+            if (stepDefine.showFormItemFunc && !(await this.showFormItemFunc(stepDefine.showFormItemFunc, dataObj))) {
+              continue
+            }
             let value = dataObj[key]
             // 字典值处理
             if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
@@ -1361,6 +1365,26 @@ export default {
         this.$message.error('执行操作失败')
       }
     },
+    // 表单项展示函数--用来渲染历史节点数据时和填写表单显示内容同步
+    async showFormItemFunc (func, form) {
+      try {
+        if (func) {
+          // 一般展示项函数中不应该存在setForm函数 先屏蔽this.setForm和this.attr的传递还有在this上下文指向不同可能存在异常 流程表单的展示项函数尽量功能单一。有异常默认进行展示(先兼容到这后续有问题进行调整)
+          const obj = executeStrFunctionByContext(this, func, [form, null, null, util, '新增/修改'])
+          // 判断是 bool 还是  obj  兼容
+          if (typeof obj === 'boolean') {
+            return obj
+          } else if (obj && typeof obj === 'object') {
+            // obj 是一个对象，并且不是数组
+            return obj?.show
+          }
+        } else {
+          return true
+        }
+      } catch (e) {
+        return true
+      }
+    },
     // 检查按钮是否显示
     checkButtonVisible (button) {
       try {

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

@@ -50,9 +50,13 @@ routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStati
 // 数据检索(新)
 routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
 // 示例页面
-routerResource.businessAudit = {
-  path: 'businessAudit',
+routerResource.example = {
+path: 'example',
   name: '示例主页面',
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo3.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
@@ -63,9 +67,10 @@ routerResource.businessAudit = {
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonexampleDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
@@ -94,7 +99,8 @@ const routerMap = {
   root: {
     path: '/',
     name: '首页',
-    redirect: homePage,
+    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
+    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
     component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
   },
   exp403: {
@@ -108,7 +114,7 @@ const routerMap = {
     name: 'exp404',
     path: '404',
     component: () =>
-      import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2')
+      import('@vue2-client/pages/exception/404')
   },
   exp500: {
     name: 'exp500',

package/vue.config.js CHANGED Viewed

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 // v4 产品演示
-const v3Server = 'http://218.93.226.210: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://218.93.226.210:31467'
+const OSSServerDev = 'http://192.168.50.67:30351'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://218.93.226.210: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 铜川
@@ -53,6 +53,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-apply': {
+        // pathRewrite: { '^/api/af-apply': '/' },
         target: revenue,
         changeOrigin: true
       },