vue2-client 1.17.14 → 1.17.15

package/package.json

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

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,247 +1,47 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="呼叫工单总汇"
-      ref="xFormTable"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      serviceName="af-telephone"
-      @toDeal="toDetail"
-      @updateInfo="updateInfo"
-      @transfer="transfer"
-    >
-    </x-form-table>
-    <WorkflowDetail
-      ref="workFlow"
-      @preClick="preClick"
-      @success="success"
-      @nextClick="nextClick"
-      @x-form-item-emit-func="handleFormItemEvent"
-    >
-    </WorkflowDetail>
-    <a-modal
-      title="转单"
-      :visible="chargeVisible"
-      :confirm-loading="confirmLoading"
-      @ok="chargeVisibleOk"
-      @cancel="() => chargeVisible = false"
-      destroy-on-close
-    >
-      <a-select
-        show-search
-        placeholder="请选择当前环节处理人"
-        v-model="optionsValue"
-        optionFilterProp="children"
-        style="width: 100%"
-      >
-        <a-select-option v-for="item in chargePersonOptions" :key="item.value" :value="item.value">
-          {{ item.label }}
-        </a-select-option>
-      </a-select>
-    </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 { mapState } from 'vuex'
-import { commonApi, postByServiceName } from '@/services/api'
-import { workFlowViewApi } from '@/services/api/workFlow'
-import { runLogic } from '@/services/api/common'
 
 export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    WorkflowDetail,
-  },
-  // 透传给子组件的方法（目前XFormTable接了）
-  provide () {
-    return {
-      generalFunction: {}
-    }
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'teleProcessCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false,
-      // 提交加载动画
-      confirmLoading: false,
-      refreshFn: null,
-      chargeVisible: false,
-      // 环节人员信息
-      chargePerson: {},
-      chargePersonOptions: [],
-      optionsValue: '',
-      record: {},
-      define: {},
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  name: 'WorkFlowDemo',
+  components: { WorkflowDetail },
+  mounted () {
+    this.$refs.workFlow.init({
+      workflowId: '3024'
+    })
   },
   methods: {
-    success () {
-      console.log('完工')
-    },
-    toDetail (record) {
-      // 修改第一步的工单
-      if (record.ws_f_step_id === 1 && record.w_f_state === 0) {
-        console.log('进入工单详情')
-        if (record.w_f_workflow_define_name === '报修单处理流程') {
-          this.$refs.dealOrUpdate.dealOrUpdate(record, '处理工单')
-        } else if (record.w_f_workflow_define_name === '投诉单处理流程') {
-          this.$refs.dealComplaint.dealComplaintOrder(record)
-        } else if (record.w_f_workflow_define_name === '咨询单处理流程') {
-          this.$refs.dealConsultation.dealConsultationOrder(record)
-        } else {
-          this.$message.warn('未知流程类型')
-        }
-      } else {
-        // 进入流程详情
-        this.$refs.workFlow.init({
-          workflowId: record.wo_f_workflow_id,
-          stepId: record.ws_f_step_id
-        })
-      }
-    },
-    updateInfo (record) {
-      this.$refs.dealOrUpdate.dealOrUpdate(record, '修改信息')
-    },
-    async transfer (record, id) {
-      this.record = record
-      console.log('>>>> 转单: ', JSON.stringify(record), JSON.stringify(id))
-      // 1. 获取当前环节的配置
-      // const thisNodeId = await postByServiceName(workFlowViewApi.getWorkFlowCurrentSubState, {
-      //   workflowId: record.wo_f_workflow_id
-      // })
-      const workFlowDefine = await postByServiceName(workFlowViewApi.getStepNoteAndHandler, {
-        workflowId: record.wo_f_workflow_id
-      })
-      console.log('>>>> workFlowDefine: ', JSON.stringify(workFlowDefine))
-      const define = workFlowDefine.find(item => item.id === this.record.ws_f_step_id)
-      this.define = define
-      if (!define?.properties?.chargePerson) {
-        this.$message.warn('流程配置错误')
-        return []
-      }
-      console.log('>>>> define: ', JSON.stringify(define))
-      // 2. 根据 needSelectPerson 判断是否需要选择人员
-      this.optionsValue = ''
-      this.chargePersonOptions = []
-      if (define?.properties?.chargePerson.needSelectPerson) {
-        // 默认是当初处理人
-        this.chargePersonOptions = await this.getChangePerson(this.record.ws_f_step_id, define)
-        const option = this.chargePersonOptions.find(item => item.label === define.handler)
-        console.log('>>>> option: ', option)
-        this.optionsValue = option?.value || ''
-        console.log('>>>> chargePersonOptions: ', JSON.stringify(this.chargePersonOptions))
-      } else {
-        // 全部部门
-        this.chargePersonOptions = await runLogic('getDepartmentByOrgId', {}, 'af-telephone')
-      }
-      this.chargeVisible = true
-    },
-    async getChangePerson (nodeId, define) {
-      const chargePerson = define.properties.chargePerson
-      this.chargePerson = this.normalizeChargePersonFormat(chargePerson)
-
-      if (!chargePerson.needSelectPerson || !chargePerson.personList) return []
-
-      // 获取所有用户信息
-      const allUser = await postByServiceName(commonApi.getAllUserOptionList, {})
-
-      // 根据配置筛选用户
-      const options = this.filterUsersByPersonConfig(chargePerson.personList, allUser)
-
-      // 去重处理
-      return Array.from(new Map(options.map(item => [item.value, item])).values())
-    },
-    // 标准化人员配置格式（兼容旧格式）
-    normalizeChargePersonFormat (chargePerson) {
-      if (chargePerson.role || chargePerson.department) {
-        chargePerson.needSelectPerson = true
-        chargePerson.personList = [{
-          type: chargePerson.role ? 'role' : 'department',
-          name: chargePerson.role || chargePerson.department
-        }]
-      }
-      return chargePerson
-    },
-
-    // 根据人员配置筛选用户
-    filterUsersByPersonConfig (personList, allUsers) {
-      return personList.reduce((acc, personItem) => {
-        let filteredUsers = []
-
-        if (personItem.type === 'role') {
-          filteredUsers = allUsers.filter(user =>
-            user.rolestr && user.rolestr.split(',').includes(personItem.name)
-          ).map(user => ({
-            label: user.label,
-            value: user.value
-          }))
-        } else if (personItem.type === 'department') {
-          filteredUsers = allUsers.filter(user =>
-            user.depname === personItem.name
-          ).map(user => ({
-            label: user.label,
-            value: user.value
-          }))
-        }
-
-        return [...acc, ...filteredUsers]
-      }, [])
-    },
-    // 提交转单
-    chargeVisibleOk () {
-      console.log('>>>> 转单成功: ', this.optionsValue)
-      const handler = this.chargePersonOptions.find(item => item.value === this.optionsValue)?.label
-      if (this.define.handler === handler) {
-        this.$message.warn('请勿选择当前处理人')
-        return
-      }
-      const param = {
-        workflowId: this.record.wo_f_workflow_id, // t_workflow -id
-        stepRecordId: this.record.ws_id, // 步骤id (t_workflow_step -id)
-        handler: handler, // 人员名称 或者 部门名称
-        handlerId: this.optionsValue, // 人员id 或者 部门id
-        ...this.define.properties.chargePerson,
-        f_operator: this.currUser.name,
-        oldHandler: this.define.handler,
-      }
-      this.confirmLoading = true
-      runLogic('transfer', param, 'af-telephone').then(res => {
-        this.$message.success('转单成功')
-        this.chargeVisible = false
-        this.$refs.xFormTable.refresh(false)
-      }).finally(() => {
-        this.confirmLoading = false
-      })
-    },
-    // 退回的事件处理
-    preClick (data) {
-      console.log('退回事件处理', data)
-      if (data.toStepId === 1) {
-        this.$refs.workFlow.onClose()
-        this.$refs.xFormTable.refreshTable(true)
-      }
-    },
-    handleFormItemEvent (func, data, value) {
-      console.log('打印一下：', func, data, value)
-    },
-    nextClick ({ form, formStep, workflowId }) {
-      console.log('success', form, formStep, workflowId)
-      this.$refs.xFormTable.refreshTable(true)
-    },
-    refresh () {
-      this.$refs.xFormTable.refreshTable(true)
+    /**
+     * 流程详情页成功
+     * @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>