vue2-client 1.8.430 → 1.8.432

package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyHandleReso.vue → WorkFlowHandleReso.vue}

@@ -8,20 +8,20 @@
     <!--   上方流程显示   -->
     <a-card :bordered="false" :loading="loading" title="项目进度">
       <!--  项目进度流程  -->
-      <apply-timeline
+      <workflow-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,7 +57,7 @@
             </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">
@@ -171,7 +171,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
@@ -203,16 +203,13 @@
             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>
     <!-- 文件预览 -->
@@ -226,14 +223,14 @@
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/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 { 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 { FileItem, ImageItem } from 'vue2-client/src/components/FileImageItem'
+import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
 import WorkflowListResolution from './WorkflowListResolution'
 
 export default {
@@ -363,14 +360,9 @@ export default {
   async mounted () {
     this.init()
     this.checkDeadline()
-    post(applyDetailViewApi.getEmpTree, {}).then(res => {
-      this.empTree = res
-    })
-    console.log(this.workflowId)
-    console.log(this.applyId)
   },
   props: {
-    applyId: {
+    workflowId: {
       type: String,
       required: true
     },
@@ -382,14 +374,10 @@ export default {
       type: Array,
       required: true
     },
-    applyState: {
+    workflowState: {
       type: [Boolean, Number],
       required: true
     },
-    workflowId: {
-      type: Number,
-      required: true
-    },
     completeTime: {
       type: String,
       required: true
@@ -408,12 +396,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
@@ -435,139 +417,6 @@ export default {
       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) {
@@ -581,17 +430,6 @@ export default {
           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)
-            }
-          )
       }
     },
     // 获取单个步骤的定义
@@ -608,8 +446,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
@@ -628,8 +466,8 @@ export default {
     async lastStepNextClick () {
       await this.$refs.xAddForm.onSubmit()
       if (this.formValid) {
-        return post(applyDetailViewApi.afterApplyFinalStepSubmit, {
-          applyId: this.applyId
+        return postByServiceName(workFlowViewApi.afterWorkFlowFinalStepSubmit, {
+          workflowId: this.workflowId
         })
           .then(
             res => {
@@ -666,11 +504,7 @@ export default {
       })
       await this.$refs.xAddForm.onSubmit()
       if (this.formValid) {
-        await post(applyDetailViewApi.updateApplyStepData, extraData)
-        return post(applyDetailViewApi.updateApplySubState, {
-          stepId: this.nextBtnTo,
-          applyId: this.applyId
-        })
+        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -683,31 +517,6 @@ export default {
               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')
@@ -728,9 +537,9 @@ export default {
         this.$message.error('退回请在备注中填写理由')
         return
       }
-      return post(applyDetailViewApi.updateApplySubState, {
+      return postByServiceName(workFlowViewApi.updateApplySubState, {
         stepId: this.preBtnTo,
-        applyId: this.applyId
+        workflowId: this.workflowId
       })
         .then(
           res => {
@@ -761,9 +570,9 @@ export default {
       })
       backName = dataPush[backNameId].handler
       // 微信推送
-      post(applyDetailViewApi.saveWatchData, {
+      postByServiceName(workFlowViewApi.saveWatchData, {
         first: '工单退回',
-        keyword1: this.applyId + '(' + this.details.f_entry_name + ')',
+        keyword1: this.workflowId + '(' + this.details.f_entry_name + ')',
         keyword2: this.details.f_workflow_define_name + '-' + this.details.f_sub_state,
         keyword3: '',
         keyword4: this.currUser.name + '工单退回给' + backName,
@@ -786,11 +595,7 @@ export default {
       }
       await this.$refs.xAddForm.onSubmit()
       if (this.formValid) {
-        await post(applyDetailViewApi.updateApplyStepData, extraData)
-        return post(applyDetailViewApi.updateApplySubState, {
-          stepId: this.stepNextBtnTo,
-          applyId: this.applyId
-        })
+        return postByServiceName(workFlowViewApi.submitToNextStep, extraData)
           .then(
             res => {
               const extra = {
@@ -816,8 +621,8 @@ export default {
     // 获取当前步骤节点，连通的节点
     getDirection () {
       // 获取流程定义
-      return post(applyDetailViewApi.getApplyWorkflowDefine, {
-        id: this.applyId
+      return postByServiceName(workFlowViewApi.getApplyWorkflowDefine, {
+        id: this.workflowId
       })
         .then(res => {
           console.log('res====', res)
@@ -870,8 +675,8 @@ export default {
         this.formValid = true
         const formData = obj.form
         const time = this.format(new Date(), 'yyyy-MM-dd hh:mm:ss')
-        return post(applyDetailViewApi.saveApplyStepFormData, {
-          applyId: this.applyId,
+        return postByServiceName(workFlowViewApi.saveApplyStepFormData, {
+          workflowId: this.workflowId,
           stepId: this.currentStepId,
           form: formData,
           data: time,
@@ -895,7 +700,7 @@ export default {
     // 打开填写表单，获取当前步骤定义内容，生成表单
     openForm () {
       const define = this.getSingleStepDefine(this.currentStep.state)
-      return post(commonApi.getColumnsJson, { queryObject: define }).then(res => {
+      return postByServiceName(commonApi.getColumnsJson, { queryObject: define }).then(res => {
         this.stepDefine = res.formJson
         this.showForm = true
       })
@@ -912,7 +717,7 @@ export default {
           this.subTableName = define.tableName.split(' ')[0]
           this.currentStepSubTableDefine = define
           // 为配置参数添加当前报建ID和步骤名称
-          this.currentStepSubTableDefine.applyId = this.applyId
+          this.currentStepSubTableDefine.workflowId = this.workflowId
           this.currentStepSubTableDefine.stepName = this.activeStepName
         }
       }
@@ -970,7 +775,7 @@ export default {
       // 将回显数据拷贝，避免引用传递
       let formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
       // 判断激活的节点，是不是待完成节点
-      if (this.activeStepName !== this.currentStep.state || this.applyState) {
+      if (this.activeStepName !== this.currentStep.state || this.workflowState) {
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         const formData = formCompletedDataPreview.data
         for (const key in formData) {
@@ -1016,8 +821,8 @@ export default {
     },
     // 获取已经完成步骤的数据
     getCompletedFormData (stepId) {
-      return post(applyDetailViewApi.getApplyCompletedStepData, {
-        applyId: this.applyId,
+      return postByServiceName(workFlowViewApi.getApplyCompletedStepData, {
+        workflowId: this.workflowId,
         stepId: stepId
       })
         .then(
@@ -1046,7 +851,7 @@ export default {
         return false
       }
       return {
-        applyId: this.applyId,
+        workflowId: this.workflowId,
         stepId,
         name: this.getStepNameByStepId(stepId),
         handler: stepHandler,
@@ -1067,8 +872,8 @@ export default {
     },
     // 保存工作流日志
     saveWorkflowLog (operation, desc, extra) {
-      post(applyDetailViewApi.saveApplyWorkflowLog, {
-        applyId: this.applyId,
+      postByServiceName(workFlowViewApi.saveApplyWorkflowLog, {
+        workflowId: this.workflowId,
         operation,
         desc,
         operator: this.currUser.name,

package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyTimeline.vue → WorkFlowTimeline.vue}

@@ -43,9 +43,9 @@ import TrimTextTail from './TrimTextTail'
 
 export default {
   components: { TrimTextTail },
-  name: 'ApplyTimeline',
+  name: 'WorkFlowTimeline',
   props: {
-    applyId: {
+    workflowId: {
       type: String,
       required: true
     },

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

@@ -2,86 +2,56 @@
   <!-- 抽屉 -->
   <div>
     <!-- 基础信息 -->
-    <apply-base-information-details
+    <workflow-base-information-details
       v-if="details"
       ref="baseInformation"
-      :apply-id="applyId"
+      :workflow-id="workflowId"
       :details="details"
       :visible="visible"
     />
     <div :style="{ height: screenHeight * 0.9 + 'px' }">
       <a-card style="margin-top: 20px">
         <a-tabs :activeKey="activeKey" @change="changeTab">
-          <!-- 暂时不需要 -->
-          <!--   第一个标签页，显示基本信息和流程图   -->
-          <!-- <a-tab-pane key="1" tab="基础信息">
-            <div v-if="activeKey === '1'">
-              <apply-statistics :loading="!(details.f_sub_state && steps)" :chart-data="chartData"/>
-              <apply-process-view
-                :loading="!(details.f_sub_state && steps)"
-              >
-                <apply-timeline
-                  :apply-id="applyId"
-                  :steps="steps"
-                  :current-step-id="details.f_step_id"
-                  :state="details.f_state === 1"/>
-              </apply-process-view>
-            </div>
-          </a-tab-pane> -->
-          <!--   第二个标签页，显示流程信息，根据当前节点显示历史记录、填写表单、控制流程按钮   -->
           <a-tab-pane key="2" tab="查看 / 编辑进度">
-            <apply-handle
+            <workflow-handle
               v-if="
-                activeKey === '2' &&
+                activeKey === '1' &&
                   details.f_state !== undefined &&
                   steps !== undefined
               "
-              ref="applyHandle"
-              :apply-id="applyId"
-              :workflow-id="details.f_workflow_define_id"
-              :applyState="details.f_state === 1"
+              ref="workflowHandle"
+              :workflow-id="workflowId"
+              :workflowState="details.f_state === 1"
               :complete-time="details.f_complete_time"
               :stepsForChild="steps"
-              :visible="visible"
               :taskName="details.f_task_name"
               :details="details"
               @refresh="stepChanged"
             />
           </a-tab-pane>
-          <a-tab-pane key="3" tab="任务流转记录">
-            <apply-workflow-log v-if="activeKey === '3'" :apply-id="applyId" />
+          <a-tab-pane key="2" tab="任务流转记录">
+            <workflow-log v-if="activeKey === '2'" :workflow-id="workflowId"/>
           </a-tab-pane>
-          <a-tab-pane key="4">
+          <a-tab-pane key="3">
             <span slot="tab">
               <span>任务留言</span>
-              <a-badge :count="messageList.length" :offset="[4, -4]" :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
+              <a-badge
+                :count="messageList.length"
+                :offset="[4, -4]"
+                :number-style="{ backgroundColor: '#b2b2b2' }"></a-badge>
             </span>
             <a-row>
               <a-col :span="14">
-                <leave-message :projectName="details.f_task_name" :data="messageList" :loading="messageLoading" :submit-message="submitMessage" @refresh="getMessage" />
+                <leave-message
+                  :projectName="details.f_task_name"
+                  :data="messageList"
+                  :loading="messageLoading"
+                  :submit-message="submitMessage"
+                  @refresh="getMessage"
+                  :workflow-id="workflowId"/>
               </a-col>
             </a-row>
           </a-tab-pane>
-          <!--   第三个标签页，显示用户表   -->
-          <!-- <a-tab-pane key="3" tab="用户">
-            <x-form-table
-              v-if="fixedAddForm && activeKey === '3'"
-              ref="xFormTableOne"
-              :fixed-add-form="fixedAddForm"
-              :fixed-query-form="fixedQueryForm"
-              queryParamsName="applyCustomerQueryParams"
-            />
-          </a-tab-pane> -->
-          <!--   第四个标签页，显示表具表   -->
-          <!-- <a-tab-pane key="4" tab="表具">
-            <x-form-table
-              v-if="fixedAddForm && activeKey === '4'"
-              ref="xFormTableTwo"
-              :fixed-add-form="fixedAddForm"
-              :fixed-query-form="fixedQueryForm"
-              queryParamsName="applyMetersQueryParams"
-            />
-          </a-tab-pane> -->
         </a-tabs>
       </a-card>
     </div>
@@ -90,22 +60,25 @@
 
 <script>
 import { mapState } from 'vuex'
-import applyBaseInformationDetails from './ApplyBaseInformationDetails'
-import applyHandle from './ApplyHandle'
+import workflowBaseInformationDetails from './WorkFlowBaseInformationDetails.vue'
+import workflowHandle from './WorkFlowHandle.vue'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
-import ApplyWorkflowLog from './ApplyWorkflowLog'
+import { postByServiceName } from '@vue2-client/services/api/restTools'
+import { workFlowViewApi } from '@/services/api/workFlow'
+import ApplyWorkflowLog from './WorkflowLog.vue'
+import WorkflowLog from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkflowLog.vue'
+import LeaveMessage from '@/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue'
 // import LeaveMessage from '@/components/LeaveMessage'
 
 export default {
   name: 'WorkOrderParentDetails',
   components: {
-    applyBaseInformationDetails,
-    applyHandle,
+    LeaveMessage,
+    WorkflowLog,
+    workflowBaseInformationDetails,
+    workflowHandle,
     XFormTable,
     ApplyWorkflowLog
-    // LeaveMessage
   },
   data () {
     return {
@@ -139,7 +112,7 @@ export default {
     ...mapState('setting', ['isMobile'])
   },
   props: {
-    applyId: {
+    workflowId: {
       type: String,
       required: true
     },
@@ -155,8 +128,8 @@ export default {
     },
     // 获取所有步骤
     getSteps () {
-      return post(applyDetailViewApi.getStepNoteAndHandler, {
-        applyId: this.applyId
+      return postByServiceName(workFlowViewApi.getStepNoteAndHandler, {
+        workflowId: this.workflowId
       })
         .then(res => {
           this.steps = res
@@ -168,8 +141,8 @@ export default {
     // 获取基础信息
     getBaseInfo () {
       this.loading = true
-      return post(applyDetailViewApi.getApplyBasicInfo, {
-        applyId: this.applyId
+      return postByServiceName(workFlowViewApi.getApplyBasicInfo, {
+        workflowId: this.workflowId
       })
         .then(res => {
           res.f_sub_state = this.steps[res.f_step_id - 1].name
@@ -187,8 +160,8 @@ export default {
       this.getMessage()
       await this.getSteps()
       await this.getBaseInfo()
-      this.fixedQueryForm.a_f_apply_id = this.applyId
-      this.fixedAddForm.a_f_apply_id = this.applyId
+      this.fixedQueryForm.a_f_workflow_id = this.workflowId
+      this.fixedAddForm.a_f_workflow_id = this.workflowId
       if (this.$refs.xFormTableOne !== undefined) {
         this.$refs.xFormTableOne.$refs.xTable.refresh(true)
       }
@@ -205,8 +178,8 @@ export default {
       console.log('数据', this.details)
       console.log('流程', this.steps)
       this.messageLoading = true
-      post(applyDetailViewApi.getApplyLeaveMessage, {
-        applyId: this.applyId
+      postByServiceName(workFlowViewApi.getApplyLeaveMessage, {
+        workflowId: this.workflowId
       }).then(res => {
         this.messageList = res
         this.messageLoading = false
@@ -214,8 +187,8 @@ export default {
     },
     // 提交留言
     submitMessage (data) {
-      data.f_apply_id = this.applyId
-      return post('/api/af-apply/entity/t_apply_leave_message', data)
+      data.f_workflow_id = this.workflowId
+      return postByServiceName('/entity/t_workflow_leave_message', data)
     }
   },
   watch: {