vue2-client 1.8.430 → 1.8.432

package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyHandle.vue → WorkFlowHandle.vue}

@@ -1,27 +1,22 @@
 <template>
   <div>
-    <x-add-form
-      :json-data="xAddFormDefine"
-      :modify-model-data="xAddFormData"
-      :visible.sync="xAddFormVisible"
-      @onSubmit="xAddFormSubmit"/>
     <!--   上方流程显示   -->
     <a-card :bordered="false" :loading="loading" title="项目进度">
       <!--  项目进度流程  -->
-      <apply-timeline
+      <work-flow-timeline
         :current-step-id="currentStepId"
         :active-step-id="activeStepId"
-        :apply-id="applyId"
+        :workflow-id="workflowId"
         :steps="stepsForChild"
-        :state="applyState"
+        :state="workflowState"
         change-able
         @activeStep="activeStep"/>
     </a-card>
     <!--  如果不是当前步骤，显示历史记录  -->
     <a-tabs default-active-key="1" @change="note = ''">
-      <a-tab-pane key="1" :tab="!beforeStepActive && !applyState ? '表单' : '进度详情'">
+      <a-tab-pane key="1" :tab="!beforeStepActive && !workflowState ? '表单' : '进度详情'">
         <a-card :bordered="false" :loading="loadingHistory">
-          <div v-if="beforeStepActive || applyState">
+          <div v-if="beforeStepActive || workflowState">
             <!--   当前步骤无记录   -->
             <div v-show="!formCompletedDataPreview" style="text-align: center">
               <h1>该步骤暂无记录</h1>
@@ -57,15 +52,15 @@
             </div>
           </div>
           <!-- 如果是当前步骤，填写表单，控制流程等 -->
-          <div v-if="!beforeStepActive && !applyState">
+          <div v-if="!beforeStepActive && !workflowState">
             <div v-if="canSubmit">
               <!-- 退回提示 -->
               <a-alert v-if="currentStep && currentStep.back" type="info" show-icon style="margin-bottom: 14px">
                 <div slot="message">
                   <span style="color: #000">被退回</span>
                   <span style="margin-left: 14px; font-size: 14px; color: rgba(0, 0, 0, 0.65)">{{
-                      currentStep.back.f_desc
-                    }}</span>
+                    currentStep.back.f_desc
+                  }}</span>
                 </div>
                 <div slot="description">
                   <div>操作人：{{ currentStep.back.f_operator }}</div>
@@ -85,7 +80,6 @@
                 v-if="stepDefine.length > 0"
                 ref="xAddForm"
                 @onSubmit="submitForm">
-                >
               </x-add-native-form>
               <a-form v-if="!lastStep" label-align="left" :label-col="{ span: 3 }" :wrapper-col="{ span: 13 }">
                 <a-form-item v-if="showStepNextBtn" label="操作类型" required>
@@ -175,7 +169,7 @@
         </a-card>
       </a-tab-pane>
       <!-- 退回 -->
-      <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !applyState" key="2" tab="退回">
+      <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !workflowState" key="2" tab="退回">
         <a-form layout="vertical">
           <a-form-item label="退回原因" :wrapper-col="{ span: 10 }" required>
             <a-textarea
@@ -200,23 +194,9 @@
           </a-form-item>
         </a-form>
       </a-tab-pane>
-      <a-tab-pane v-if="currentStepSubTableDefine" key="2" tab="当前步骤子表">
-        <!--   子表内容   -->
-        <a-card :bordered="false">
-          <x-form-table
-            ref="xFormTable"
-            :queryParamsJson="currentStepSubTableDefine"
-            title="业务名称"
-            @removeItem="removeSubTable"
-            @tempTableEdit="editSubTable"
-            @tempTableModify="modifySubTable"
-          >
-          </x-form-table>
-        </a-card>
-      </a-tab-pane>
-      <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !applyState" key="3" tab="工单拆分">
+      <a-tab-pane v-if="canSubmit && !beforeStepActive && showPrevBtn && !workflowState" key="3" tab="工单拆分">
         <!--   分配工单   -->
-        <workflow-list-resolution :apply-project-id="applyId" :details="details"></workflow-list-resolution>
+        <workflow-list-resolution :workflow-project-id="workflowId" :details="details"></workflow-list-resolution>
       </a-tab-pane>
     </a-tabs>
     <!-- 文件预览 -->
@@ -230,23 +210,24 @@
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
+import { post, postByServiceName } from '@vue2-client/services/api/restTools'
+import { workFlowViewApi } from '@/services/api/workFlow'
 import { formatDate } from '@vue2-client/utils/util'
-// import { commonApi } from 'vue2-client/src/services/api/common'
+// import { commonApi } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 import moment from 'moment'
 import FilePreview from '@vue2-client/components/FilePreview'
-import ApplyTimeline from './ApplyTimeline'
-import { FileItem, ImageItem } from 'vue2-client/src/components/FileImageItem'
+import WorkFlowTimeline from './WorkFlowTimeline.vue'
+import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
 import WorkflowListResolution from './WorkflowListResolution'
+import { commonApi } from '@/services/api'
 
 export default {
   name: 'ApplyHandle',
   components: {
     WorkflowListResolution,
     XAddNativeForm,
-    ApplyTimeline,
+    WorkFlowTimeline,
     XFormTable,
     XAddForm,
     FilePreview,
@@ -256,9 +237,6 @@ export default {
   computed: {
     ...mapState('account', { currUser: 'user' }),
     canSubmit () {
-      if (isDevelopment) {
-        return true
-      }
       const step = this.stepsForChild[this.currentStepId - 1]
       if (step && step.handler) {
         return step.handler.includes(this.currUser.name)
@@ -268,8 +246,6 @@ export default {
   },
   data () {
     return {
-      // 子表查询配置
-      queryParamsJson: {},
       // 显示供用户填写的当前步骤表单
       showForm: false,
       // 当前步骤表单标题
@@ -330,18 +306,7 @@ export default {
       stepsExtraInfo: [],
       // 控制基础信息页流程展示加载
       loading: true,
-      // 当前步骤子表定义
-      currentStepSubTableDefine: null,
       createQueryVisible: false,
-      // 子表定义
-      subTableDefine: {},
-      subTableName: '',
-      xAddFormVisible: false,
-      xAddFormData: {},
-      xAddFormDefine: [],
-      subTableData: {},
-      // 修改子表数据，对应的id
-      editSubTableId: undefined,
       // 激活的步骤名
       activeStepName: '',
       stepsParse: undefined,
@@ -355,8 +320,6 @@ export default {
       deadlineHelp: '',
       // 当前任务是否延期
       taskIsOverdue: moment().isAfter(this.completeTime, 'day'),
-      // 人员信息
-      empTree: [],
       // 预览图片弹框
       previewFileVisible: false,
       filePath: '',
@@ -369,16 +332,9 @@ export default {
   async mounted () {
     this.init()
     this.checkDeadline()
-    post(applyDetailViewApi.getEmpTree, {}).then(res => {
-      this.empTree = res
-    })
-    console.log('formCompletedData', this.formCompletedData)
-    console.log('stepDefine', this.stepDefine)
-    console.log(this.workflowId)
-    console.log(this.applyId)
   },
   props: {
-    applyId: {
+    workflowId: {
       type: String,
       required: true
     },
@@ -390,14 +346,10 @@ export default {
       type: Array,
       required: true
     },
-    applyState: {
+    workflowState: {
       type: [Boolean, Number],
       required: true
     },
-    workflowId: {
-      type: Number,
-      required: true
-    },
     completeTime: {
       type: String,
       required: true
@@ -416,12 +368,6 @@ export default {
       this.getCurrentStep()
     },
     onClose () {
-      if (this.subTableName.length > 0) {
-        post(applyDetailViewApi.deleteApplySubTempTable, { tableName: this.subTableName })
-          .then(res => {
-            console.log('临时表已手动删除')
-          })
-      }
       this.activeStepId = this.currentStepId
       this.checkedChargePerson = undefined
       this.loadingHistory = true
@@ -431,177 +377,15 @@ export default {
       this.preBtnText = []
       this.stepNextBtnText = []
       this.stepsExtraInfo = []
-      this.editSubTableId = undefined
-      this.currentStepSubTableDefine = null
       this.loading = true
       this.showNextBtn = false
       this.showStepNextBtn = false
       this.showPrevBtn = false
       this.stepDone = false
-      this.subTableName = ''
       this.formCompletedData = {}
       this.formCompletedDataPreview = null
       this.operationType = 'submit'
     },
-    // 子表增加回调
-    modifySubTable (res) {
-      if (!res.valid) {
-        return
-      }
-      const currentStepName = this.getStepNameByStepId(this.currentStepId)
-      const applyId = this.applyId
-      const form = res.form
-      const formData = []
-      for (const key in form) {
-        const arr = key.split('_')
-        let newKey = ''
-        for (let i = 1; i < arr.length; i++) {
-          newKey += arr[i]
-          if (i !== arr.length - 1) {
-            newKey += '_'
-          }
-        }
-        form[newKey] = form[key]
-        delete form[key]
-        const item = {}
-        item.label = newKey
-        item.value = form[newKey]
-        formData.push(item)
-      }
-      post(applyDetailViewApi.applySubTableInsert, {
-        stepName: currentStepName,
-        applyId: applyId,
-        information: formData
-      })
-        .then(
-          res => {
-            this.$message.success('添加成功！')
-            this.$refs.xFormTable.modelVisible = false
-            this.$refs.xFormTable.$refs.xTable.refresh(true)
-          }
-        )
-    },
-    // 删除子表数据
-    removeSubTable (list) {
-      const tempTableData = {}
-      tempTableData.applyId = this.applyId
-      tempTableData.stepName = this.activeStepName
-      post(applyDetailViewApi.getApplySubTableData, {
-        tempTableData: tempTableData
-      })
-        .then(
-          res => {
-            const data = res
-            const targetIds = []
-            for (const key in data) {
-              const item = JSON.parse(data[key].itemsjson)
-              if (item[0].label === 'id') {
-                for (let i = 0; i < list.length; i++) {
-                  if (list[i] === item[0].value) {
-                    targetIds.push(data[key].id)
-                  }
-                }
-              }
-            }
-            post(applyDetailViewApi.deleteSubTableData, {
-              ids: targetIds
-            })
-              .then(
-                res => {
-                  this.$message.success('删除成功！')
-                  this.$refs.xFormTable.$refs.xTable.refresh(true)
-                }
-              )
-          }
-        )
-    },
-    getSubTableDefineLocal (stepName) {
-      for (const step of this.stepsDefine) {
-        if (stepName === step.name) {
-          return step.properties.subTableDefine
-        }
-      }
-    },
-    // 已完成信息动态规定宽度
-    getFinishedInfoWidth (value) {
-      if (value.length > 20) {
-        return 3
-      } else if (value.length > 6) {
-        return 2
-      } else {
-        return 1
-      }
-    },
-    // 子表修改
-    editSubTable (params) {
-      const subTableDefine = this.getSubTableDefineLocal(this.currentStep.state).column
-      for (let i = 0; i < subTableDefine.length; i++) {
-        subTableDefine[i].name = subTableDefine[i].title
-        delete subTableDefine[i].title
-        subTableDefine[i].isOnlyAddOrEdit = true
-        subTableDefine[i].model = subTableDefine[i].key.split('.')[1]
-        delete subTableDefine[i].key
-        subTableDefine[i].addOrEdit = 'all'
-        subTableDefine[i].type = 'input'
-      }
-      this.xAddFormDefine = subTableDefine
-      // 将修改的数据回显至XAddForm
-      const tempTableData = {}
-      tempTableData.applyId = this.applyId
-      tempTableData.stepName = this.activeStepName
-      post(applyDetailViewApi.getApplySubTableData, {
-        tempTableData: tempTableData
-      })
-        .then(
-          res => {
-            const subTableData = res
-            const condition = params.conditionParams
-            const targetKey = Object.keys(condition)[0].split('_')[1]
-            const targeValue = Object.values(condition)[0]
-            const editData = {}
-            for (const key in subTableData) {
-              const item = JSON.parse(subTableData[key].itemsjson)
-              const editId = subTableData[key].id
-              for (let i = 0; i < item.length; i++) {
-                if (item[i].label === targetKey && item[i].value === targeValue) {
-                  this.editSubTableId = editId
-                  for (let j = 0; j < item.length; j++) {
-                    editData[item[j].label] = item[j].value
-                  }
-                }
-              }
-            }
-            this.xAddFormData = editData
-            this.xAddFormVisible = true
-          }
-        )
-    },
-    // 修改模态框，提交
-    xAddFormSubmit (source) {
-      if (source.valid) {
-        const form = source.form
-        const formatForm = []
-        const keys = Object.keys(form)
-        const values = Object.values(form)
-        for (let i = 0; i < keys.length; i++) {
-          const temp = {}
-          temp.label = keys[i]
-          temp.value = values[i]
-          formatForm.push(temp)
-        }
-        return post(applyDetailViewApi.updateSubTableData, {
-          id: this.editSubTableId,
-          form: formatForm
-        })
-          .then(
-            res => {
-              this.xAddFormVisible = false
-              this.$message.success('数据已成功修改')
-              this.$refs.xFormTable.$refs.xTable.refresh(true)
-            }
-          )
-      }
-    },
     // 获取单个步骤的定义
     getSingleStepDefine (name) {
       for (const step of this.stepsDefine) {
@@ -616,8 +400,8 @@ export default {
     },
     // 获取当前步骤
     getCurrentStep () {
-      return post(applyDetailViewApi.getApplyCurrentSubState, {
-        applyId: this.applyId
+      return postByServiceName(workFlowViewApi.getWorkFlowCurrentSubState, {
+        workflowId: this.workflowId
       })
         .then(res => {
           res.state = this.stepsForChild[res.id - 1].name
@@ -638,8 +422,8 @@ export default {
       if (!this.formValid) {
         console.log('nothing')
       } else {
-        return post(applyDetailViewApi.afterApplyFinalStepSubmit, {
-          applyId: this.applyId
+        return postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
+          workflowId: this.workflowId
         })
           .then(
             res => {
@@ -652,9 +436,8 @@ export default {
               this.$emit('refresh')
               this.$emit('success')
             },
-            err => {
+            () => {
               this.$message.error('提交失败！')
-              console.log(err)
             }
           )
       }
@@ -679,11 +462,7 @@ export default {
       if (!this.formValid) {
         console.log('nothing')
       } else {
-        await post(applyDetailViewApi.updateApplyStepData, extraData)
-        return post(applyDetailViewApi.updateApplySubState, {
-          stepId: this.nextBtnTo,
-          applyId: this.applyId
-        })
+        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -691,42 +470,13 @@ export default {
                 setDeadline: this.deadline,
                 notes: this.note.trim()
               }
-              console.log('备注')
-              console.log(this.note.trim())
-              console.log(this.nextBtnTo)
               this.saveWorkflowLog('提交', this.generateStepChangeText(this.currentStepId, this.nextBtnTo), extra)
               this.$message.success('提交成功')
-              // 微信推送
-              /* post(applyDetailViewApi.saveWatchData, {
-                first: this.taskName,
-                workflowId: this.workflowId,
-                f_entry_name: this.details.f_entry_name,
-                f_workflow_define_name: this.details.f_workflow_define_name,
-                f_sub_state: this.details.f_sub_state,
-                f_complete_time: this.details.f_complete_time,
-                currUser: this.currUser.name,
-                taskName: this.taskName,
-                keyword1: this.workflowId + '(' + this.details.f_entry_name + ')',
-                keyword2: this.details.f_workflow_define_name + '-' + this.details.f_sub_state,
-                keyword3: '截至时间:' + this.details.f_complete_time + ',请尽快处理。',
-                keyword4: this.currUser.name + '推送,' + this.taskName,
-                remark: this.note.trim(),
-                name: this.checkedChargePerson.split('_')[0],
-                operator: this.currUser.name
-              }).then(res => {
-                this.information = res
-                if (this.information.code === 200) {
-                  this.$message.success(this.information.msg)
-                } else {
-                  this.$message.info(this.information.msg)
-                }
-              }) */
               this.loading = true
               this.loadingHistory = true
               this.$emit('refresh')
               this.onClose()
               this.init()
-              console.log('提交人' + this.checkedChargePerson)
             },
             err => {
               this.$message.error('提交失败！')
@@ -741,13 +491,12 @@ export default {
         this.$message.error('退回请在备注中填写理由')
         return
       }
-      return post(applyDetailViewApi.updateApplySubState, {
+      return postByServiceName(workFlowViewApi.updateWorkFlowState, {
         stepId: this.preBtnTo,
-        applyId: this.applyId
+        workflowId: this.workflowId
       })
         .then(
           res => {
-            // this.sendBackPush()
             this.saveWorkflowLog('退回', this.generateStepChangeText(this.currentStepId, this.preBtnTo), { notes })
             this.$message.success('退回成功')
             this.loading = true
@@ -762,36 +511,6 @@ export default {
           }
         )
     },
-    // 退回推送
-    sendBackPush () {
-      const dataPush = this.stepsForChild
-      let backName = null
-      let backNameId = null
-      this.currentDirections.forEach(res => {
-        if (res.type === 'back') {
-          backNameId = (parseInt(res.to) - 1)
-        }
-      })
-      backName = dataPush[backNameId].handler
-      // 微信推送
-      post(applyDetailViewApi.saveWatchData, {
-        first: '工单退回',
-        keyword1: this.applyId + '(' + this.details.f_entry_name + ')',
-        keyword2: this.details.f_workflow_define_name + '-' + this.details.f_sub_state,
-        keyword3: '',
-        keyword4: this.currUser.name + '工单退回给' + backName,
-        remark: this.note.trim(),
-        name: backName,
-        operator: this.currUser.name
-      }).then(res => {
-        this.information = res
-        if (this.information.code === 200) {
-          this.$message.success(this.information.msg)
-        } else {
-          this.$message.info(this.information.msg)
-        }
-      })
-    },
     async stepNextClick () {
       const extraData = this.getApplyStepExtraData(this.stepNextBtnTo)
       if (!extraData) {
@@ -801,11 +520,7 @@ export default {
       if (!this.formValid) {
         console.log('nothing')
       } else {
-        await post(applyDetailViewApi.updateApplyStepData, extraData)
-        return post(applyDetailViewApi.updateApplySubState, {
-          stepId: this.stepNextBtnTo,
-          applyId: this.applyId
-        })
+        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -831,14 +546,11 @@ export default {
     // 获取当前步骤节点，连通的节点
     getDirection () {
       // 获取流程定义
-      return post(applyDetailViewApi.getApplyWorkflowDefine, {
-        id: this.applyId
+      return postByServiceName(workFlowViewApi.getWorkFlowDefine, {
+        id: this.workflowId
       })
         .then(res => {
-          console.log('res====', res)
-          console.log('res====', res.value.steps)
           res = JSON.parse(res.value)
-          console.log('res.steps====', res.steps)
           this.directions = []
           this.stepsDefine = res.steps
           this.resolveDirections()
@@ -854,15 +566,15 @@ export default {
           this.currentStepId = this.stepsDefine[i].id
         }
       }
-      this.getSubTableDefine(this.currentStepId)
       let hasBack = false
-      console.log('this.currentStepId====', this.currentStepId)
-      this.currentDirections = this.stepsDefine[this.currentStepId - 1].properties.actions.filter((item) => {
-        if (item.type === 'back') {
-          hasBack = true
-        }
-        return true
-      })
+      if (this.stepsDefine[this.currentStepId - 1]?.properties?.actions) {
+        this.currentDirections = this.stepsDefine[this.currentStepId - 1].properties.actions.filter((item) => {
+          if (item.type === 'back') {
+            hasBack = true
+          }
+          return true
+        })
+      }
       // 默认可退回到上一步
       if (!hasBack && this.currentStepId !== 1) {
         this.currentDirections.push({ head: this.currentStepId, tail: this.currentStepId - 1, type: 'back' })
@@ -884,8 +596,8 @@ export default {
       this.formValid = true
       const formData = obj.realForm
       const time = this.format(new Date(), 'yyyy-MM-dd hh:mm:ss')
-      return post(applyDetailViewApi.saveApplyStepFormData, {
-        applyId: this.applyId,
+      return postByServiceName(workFlowViewApi.saveWorkFlowStepFormData, {
+        workflowId: this.workflowId,
         stepId: this.currentStepId,
         form: formData,
         data: time,
@@ -907,9 +619,7 @@ export default {
     },
     // 打开填写表单，获取当前步骤定义内容，生成表单
     openForm () {
-      // window.setTimeout(() => {
       this.stepDefine = this.stepsDefine[this.currentStep.id - 1].properties.form.formJson
-      console.log('this.stepDefine', this.stepDefine)
       this.showForm = true
       this.$nextTick(() => {
         this.$refs.xAddForm.init({
@@ -918,36 +628,6 @@ export default {
           showSubmitBtn: false
         })
       })
-      console.log('this===', this)
-      // }, 1)
-      // this.stepDefine = this.stepsDefine[this.currentStep.id - 1].properties.form.formJson
-      // this.showForm = true
-      // console.log('this.stepDefine', this.stepDefine)
-      // console.log('this', this)
-      // this.$nextTick(() => {
-      //   console.log('$nextTick==this', this)
-      //   console.log('$nextTick==this', this.$refs)
-      //   console.log('$nextTick==this', this.$refs.xAddForm)
-      //   this.$refs.xAddForm.init({
-      //     businessType: '修改',
-      //     formItems: this.stepDefine,
-      //     showSubmitBtn: false
-      //   })
-      // })
-    },
-    // 获取子表定义
-    getSubTableDefine (stepId) {
-      const stepName = this.getStepNameByStepId(stepId)
-      const define = this.getSubTableDefineLocal(stepName)
-      if (define !== undefined) {
-        if (define.tableName !== undefined) {
-          this.subTableName = define.tableName.split(' ')[0]
-          this.currentStepSubTableDefine = define
-          // 为配置参数添加当前报建ID和步骤名称
-          this.currentStepSubTableDefine.applyId = this.applyId
-          this.currentStepSubTableDefine.stepName = this.activeStepName
-        }
-      }
     },
     // 根据当前节点，判断之后流程，以及按钮的显示
     workflowControl () {
@@ -993,14 +673,10 @@ export default {
       this.activeStepName = this.getStepNameByStepId(stepId)
       // 清空回显数据
       this.formCompletedData = {}
-      console.log('this==========', this)
       let formCompletedDataPreview = null
       this.getStepDefine(stepId)
-      // 获取当前激活节点子表
-      this.currentStepSubTableDefine = undefined
-      await this.getSubTableDefine(stepId)
       // 判断激活的节点，是不是待完成节点
-      if (this.activeStepName !== this.currentStep.state || this.applyState) {
+      if (this.activeStepName !== this.currentStep.state || this.workflowState) {
         // 获取激活节点历史数据，和字段定义
         await this.getCompletedFormData(stepId)
         // 将回显数据拷贝，避免引用传递
@@ -1051,8 +727,8 @@ export default {
     },
     // 获取已经完成步骤的数据
     getCompletedFormData (stepId) {
-      return post(applyDetailViewApi.getApplyCompletedStepData, {
-        applyId: this.applyId,
+      return postByServiceName(workFlowViewApi.getWorkFlowCompletedStepData, {
+        workflowId: this.workflowId,
         stepId: stepId
       })
         .then(
@@ -1080,7 +756,7 @@ export default {
         return false
       }
       return {
-        applyId: this.applyId,
+        workflowId: this.workflowId,
         stepId,
         name: this.getStepNameByStepId(stepId),
         handler: stepHandler,
@@ -1101,8 +777,8 @@ export default {
     },
     // 保存工作流日志
     saveWorkflowLog (operation, desc, extra) {
-      post(applyDetailViewApi.saveApplyWorkflowLog, {
-        applyId: this.applyId,
+      postByServiceName(workFlowViewApi.saveWorkFlowLog, {
+        workflowId: this.workflowId,
         operation,
         desc,
         operator: this.currUser.name,
@@ -1154,44 +830,22 @@ export default {
       }
     },
     // 从指定步骤设置负责人下拉选择框
-    setChargePersonOptions (stepId) {
-      const defineProperties = this.stepsDefine[stepId - 1].properties
-      const chargeDepartment = defineProperties.chargeDepartment
+    async setChargePersonOptions (stepId) {
       this.checkedChargePerson = undefined
-      const chargePersonOptions = []
-      // 将部门转为对应人员
-      if (chargeDepartment && chargeDepartment.length) {
-        chargeDepartment.forEach(department => {
-          for (const tree of this.empTree) {
-            if (tree.title === department) {
-              chargePersonOptions.push(...tree.children)
-            }
-          }
-        })
-      }
-      // 添加人员
-      const chargePerson = defineProperties.inCharge
-      if (chargePerson && chargePerson.length) {
-        const keyOptions = chargePersonOptions.map(person => person.key)
-        chargePerson.forEach(person => {
-          if (person.includes('_')) {
-            const name = person.split('_')[0]
-            // 人员去重
-            if (!keyOptions.includes(person)) {
-              chargePersonOptions.push({ label: name, key: person })
-            }
-          }
+      const defineProperties = this.stepsDefine[stepId - 1].properties
+      const chargePerson = defineProperties.chargePerson
+      let chargePersonOptions = []
+      // 获取所有用户信息
+      const allUser = await post(commonApi.getAllUserOptionList, {})
+      if (chargePerson.role) {
+        // 根据角色获取人员
+        chargePersonOptions = allUser.filter(item => item.rolestr && item.rolestr.includes(chargePerson.role)).map(item => {
+          return { label: item.label, value: item.label }
         })
-      }
-      if (!chargePersonOptions.length) {
-        // 所有人员
-        this.empTree.forEach(department => {
-          if (department.children) {
-            const children = department.children.map(person => {
-              return { label: person.title, key: person.key }
-            })
-            chargePersonOptions.push(...children)
-          }
+      } else if (chargePerson.department) {
+        // 根据部门获取人员
+        chargePersonOptions = allUser.filter(item => item.depname === chargePerson.department).map(item => {
+          return { label: item.label, value: item.label }
         })
       }
       this.chargePersonOptions = chargePersonOptions
@@ -1201,16 +855,8 @@ export default {
       }
     }
   },
-  watch: {
-    visible (newVal) {
-      if (newVal) {
-        this.init()
-      }
-    }
-  }
+  watch: {}
 }
-// 是否开发环境
-const isDevelopment = process.env.NODE_ENV === 'development'
 </script>
 <style lang="less" scoped>
 .line {