vue2-client 1.17.13 → 1.17.14

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,47 +1,247 @@
+<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: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '3024'
-    })
+  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' }),
   },
   methods: {
-    /**
-     * 流程详情页成功
-     * @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)
+    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)
     }
   }
 }
 </script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -189,7 +189,8 @@ export default {
     // 获取所有步骤
     getSteps () {
       return postByServiceName(workFlowViewApi.getStepNoteAndHandler, {
-        workflowId: this.workflowId
+        workflowId: this.workflowId,
+        curUserId: String(this.currUser.id)
       })
         .then(res => {
           this.steps = res

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

@@ -401,6 +401,10 @@ export default {
             return step.handler === this.currUser.name
           }
           if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
+            // 首先判断 是否 isCurrently 的值, 如果存在 isCurrently 使用 isCurrently 进行判断
+            if ('isCurrently' in step) {
+              return step.isCurrently
+            }
             // 使用some方法判断当前人员是否满足任一条件
             return step.properties.chargePerson.personList.some(item => {
               if (item.type === 'role') {

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

@@ -17,13 +17,21 @@
                   <a-icon type="user" />
                   <span>操作人: <span class="highlight">{{ log.operator }}</span></span>
                 </div>
-                <div class="log-item" v-if="log.set_handler">
-                  <a-icon type="solution" />
-                  <span>设定下一环节处理者: <span class="highlight">{{ log.set_handler }}</span></span>
+                <div v-if="log.operation !== '转单'">
+                  <div class="log-item" v-if="log.set_handler">
+                    <a-icon type="solution" />
+                    <span>设定下一环节处理者: <span class="highlight">{{ log.set_handler }}</span></span>
+                  </div>
+                  <div class="log-item" v-if="log.set_deadline">
+                    <a-icon type="clock-circle" />
+                    <span>设定下一环节截止时间: <span class="highlight">{{ log.set_deadline }}</span></span>
+                  </div>
                 </div>
-                <div class="log-item" v-if="log.set_deadline">
-                  <a-icon type="clock-circle" />
-                  <span>设定下一环节截止时间: <span class="highlight">{{ log.set_deadline }}</span></span>
+                <div v-else>
+                  <div class="log-item" v-if="log.set_handler">
+                    <a-icon type="solution" />
+                    <span>转单后处理者: <span class="highlight">{{ log.set_handler }}</span></span>
+                  </div>
                 </div>
                 <div class="log-item" v-if="log.notes">
                   <a-icon type="message" />
@@ -70,7 +78,7 @@ export default {
   },
   methods: {
     getDesc (desc) {
-      return desc.replace('&gt;', '>')
+      return desc?.replace('&gt;', '>')
     }
   }
 }

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

@@ -54,8 +54,8 @@ routerResource.example = {
 path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.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'),

package/src/router/guards.js

@@ -167,7 +167,7 @@ const loginGuard = (to, form, next, options) => {
     const login = {
       f: v4LoginData,
       jwt: v4LoginData.id,
-      r: v4LoginData.r
+      r: v4LoginData.r || v4LoginData.permissions
     }
     Vue.$store.commit('account/setLogin', login)
     Vue.$store.commit('account/setPermissions', v4LoginData.r)

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/vue.config.js

@@ -57,11 +57,11 @@ module.exports = {
         target: revenue,
         changeOrigin: true
       },
-      '/api/af-apply': {
-        // pathRewrite: { '^/api/af-apply': '/' },
-        target: revenue,
-        changeOrigin: true
-      },
+      // '/api/af-telephone': {
+      //   pathRewrite: { '^/api/af-telephone': '/' },
+      //   target: 'http://127.0.0.1:9033',
+      //   changeOrigin: true
+      // },
       '/api/af-scada': {
         target: revenue,
         changeOrigin: true