vue2-client 1.8.430 → 1.8.432

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -2,7 +2,7 @@
   <!-- 抽屉 -->
   <a-drawer
     :visible="visible"
-    :width="isMobile ? screenWidth : screenWidth * 0.95"
+    width="85vw"
     :placement="direction"
     title="流程详情"
     @close="onClose"
@@ -10,44 +10,26 @@
   >
     <div>
       <!-- 基础信息 -->
-      <apply-base-information
+      <workflow-base-information
         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
+            <a-tab-pane key="1" tab="查看 / 编辑进度">
+              <WorkFlowHandle
                 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"
@@ -56,8 +38,8 @@
                 @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">
               <span slot="tab">
@@ -67,35 +49,14 @@
               <a-row>
                 <a-col :span="14">
                   <leave-message
+                    :workflowId="this.workflowId"
                     :projectName="details.f_task_name"
                     :data="messageList"
                     :loading="messageLoading"
-                    :submit-message="submitMessage"
-                    @refresh="getMessage"
                     @success="success"/>
                 </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>
@@ -105,21 +66,21 @@
 
 <script>
 import { mapState } from 'vuex'
-import applyBaseInformation from './WorkflowPageDetail/ApplyBaseInformation'
-import applyHandle from './WorkflowPageDetail/ApplyHandle'
+import workflowBaseInformation from './WorkflowPageDetail/WorkFlowBaseInformation.vue'
+import WorkFlowHandle from './WorkflowPageDetail/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 './WorkflowPageDetail/ApplyWorkflowLog'
+import { postByServiceName } from '@/services/api/restTools'
+import { workFlowViewApi } from '@/services/api/workFlow'
+import WorkflowLog from './WorkflowPageDetail/WorkflowLog.vue'
 import LeaveMessage from './WorkflowPageDetail/LeaveMessage'
 
 export default {
   name: 'WorkflowDetail',
   components: {
-    applyBaseInformation,
-    applyHandle,
+    workflowBaseInformation,
+    WorkFlowHandle,
     XFormTable,
-    ApplyWorkflowLog,
+    WorkflowLog,
     LeaveMessage
   },
   data () {
@@ -129,7 +90,7 @@ export default {
       // 页面高度
       screenHeight: document.documentElement.clientHeight,
       // 控制当前标签页
-      activeKey: '2',
+      activeKey: '1',
       // 保存流程和留言信息
       steps: undefined,
       // 基础信息
@@ -147,6 +108,9 @@ export default {
       // 留言数据
       messageList: [],
       messageLoading: true,
+      workflowId: '',
+      direction: '',
+      visible: false
     }
   },
   computed: {
@@ -154,47 +118,33 @@ export default {
     ...mapState('setting', ['isMobile'])
   },
   props: {
-    applyId: {
-      type: String,
-      required: true
-    },
-    direction: {
-      type: String,
-      required: false,
-      default: ''
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   methods: {
     // 内部组件更新了当前步骤后的回调
     stepChanged () {
       this.loading = true
-      this.init()
+      this.reload()
     },
     // 获取所有步骤
     getSteps () {
-      return post(applyDetailViewApi.getStepNoteAndHandler, {
-        applyId: this.applyId
+      return postByServiceName(workFlowViewApi.getStepNoteAndHandler, {
+        workflowId: this.workflowId
       })
         .then(res => {
           this.steps = res
-          console.log('所有步骤', this.steps)
         }, err => {
           console.log(err)
         })
     },
     // 关闭抽屉的回调
     onClose () {
-      if (this.$refs.applyHandle !== undefined) {
-        this.$refs.applyHandle.onClose()
+      if (this.$refs.workflowHandle !== undefined) {
+        this.$refs.workflowHandle.onClose()
       }
-      this.$emit('update:visible', false)
+      this.visible = false
       this.activeKey = '2'
       this.allStepDown = false
       this.details = {}
@@ -206,8 +156,8 @@ export default {
     // 获取基础信息
     getBaseInfo () {
       this.loading = true
-      return post(applyDetailViewApi.getApplyBasicInfo, {
-        applyId: this.applyId
+      return postByServiceName(workFlowViewApi.getWorkFlowBasicInfo, {
+        workflowId: this.workflowId
       })
         .then(res => {
           res.f_sub_state = this.steps[res.f_step_id - 1].name
@@ -220,53 +170,28 @@ export default {
           console.log(err)
         })
     },
-    // 初始化两张固定表
-    async init () {
-      this.getMessage()
+    async reload () {
       await this.getSteps()
       await this.getBaseInfo()
-      this.fixedQueryForm.a_f_apply_id = this.applyId
-      this.fixedAddForm.a_f_apply_id = this.applyId
-      if (this.$refs.xFormTableOne !== undefined) {
-        this.$refs.xFormTableOne.$refs.xTable.refresh(true)
-      }
-      if (this.$refs.xFormTableTwo !== undefined) {
-        this.$refs.xFormTableTwo.$refs.xTable.refresh(true)
-      }
+      this.fixedQueryForm.a_f_workflow_id = this.workflowId
+      this.fixedAddForm.a_f_workflow_id = this.workflowId
+    },
+    // 初始化两张固定表
+    async init ({ workflowId, direction, visible = true }) {
+      this.workflowId = workflowId
+      this.direction = direction
+      this.visible = visible
+      await this.reload()
     },
     // 切换标签页
     changeTab (id) {
       this.activeKey = id
     },
-    // 获取留言
-    getMessage () {
-      console.log('数据', this.details)
-      console.log('流程', this.steps)
-      this.messageLoading = true
-      post(applyDetailViewApi.getApplyLeaveMessage, {
-        applyId: this.applyId
-      }).then(res => {
-        this.messageList = res
-        this.messageLoading = false
-      })
-    },
-    // 提交留言
-    submitMessage (data) {
-      data.f_apply_id = this.applyId
-      return post('/api/af-apply/entity/save/t_apply_leave_message', data)
-    },
     // 提交完成后事件
     success () {
       this.$emit('success')
     }
-  },
-  watch: {
-    visible (newVal) {
-      if (newVal) {
-        this.init()
-      }
-    },
-  },
+  }
 }
 </script>
 

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

@@ -1,5 +1,5 @@
 <template>
-  <a-spin size="large" :spinning="loading">
+  <a-spin size="large" :spinning="messageLoading">
     <a-comment>
       <a-avatar slot="avatar" size="large" style="background:#6877ee">{{ user.name.substr(0, 1) }}</a-avatar>
       <div slot="content">
@@ -7,27 +7,13 @@
         <a-space>
           <a-button type="primary" :loading="submitting" :disabled="messageText.trim() === ''" @click="onSubmit">提交
           </a-button>
-          <!--          <a-button
-                      type="primary"
-                      :loading="submittingWeChat"
-                      :disabled="messageText.trim() === ''"
-                      @click="onWeChatSubmit">提交并微信推送
-                    </a-button>
-                    <a-select
-                      v-model="checkedChargePerson"
-                      placeholder="请选择或搜索"
-                      :options="chargePersonOptions"
-                      :disabled="messageText.trim() === ''"
-                      show-search
-                      style="width: 195px"
-                    />-->
         </a-space>
       </div>
     </a-comment>
-    <a-empty v-if="!data.length"/>
+    <a-empty v-if="!messageList.length"/>
     <div class="comment">
       <a-comment
-        v-for="message in data"
+        v-for="message in messageList"
         :key="message.id"
         :author="message.f_created_by"
         :content="message.f_content"
@@ -46,32 +32,24 @@
 <script>
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
-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'
 
 export default {
   name: 'LeaveMessage',
   props: {
-    data: {
-      type: Array,
-      required: true
-    },
-    loading: {
-      type: Boolean,
-      required: false
-    },
-    submitMessage: {
-      type: Function,
+    projectName: {
+      type: String,
       required: true
     },
-    projectName: {
+    workflowId: {
       type: String,
       required: true
     },
   },
   data () {
     return {
+      messageList: [],
       submitting: false,
       submittingPerson: false,
       submittingWeChat: false,
@@ -83,29 +61,11 @@ export default {
       // 人员信息
       empTree: [],
       messageText: '',
-      information: []
+      information: [],
+      messageLoading: false
     }
   },
-  mounted () {
-    post(applyDetailViewApi.getEmpTree, {}).then(res => {
-      this.empTree = res
-      this.empTree.forEach(department => {
-        if (department.children) {
-          const children = department.children.map(parson => {
-            return { label: parson.title.split('_')[0], key: parson.key.split('_')[0] }
-          })
-          this.chargePersonOptions.push(...children)
-        }
-      })
-      // eslint-disable-next-line array-callback-return
-      const index = this.chargePersonOptions.findIndex(item => {
-        if (item.label === this.user.name) {
-          return true
-        }
-      })
-      this.chargePersonOptions.splice(index, 1)
-    })
-  },
+  mounted () {},
   computed: {
     ...mapState('account', ['user'])
   },
@@ -113,57 +73,6 @@ export default {
     format (date) {
       return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
     },
-    onWeChatSubmit () {
-      if (this.checkedChargePerson === undefined || this.checkedChargePerson === null) {
-        this.$message.error('请选择推送人')
-        return
-      }
-      this.submitting = true
-      post(applyDetailViewApi.saveWatchData, {
-          first: '留言推送',
-          keyword1: this.projectName,
-          keyword2: this.messageText,
-          keyword3: '',
-          keyword4: '',
-          remark: '',
-          name: this.checkedChargePerson,
-          operator: this.user.name
-        }
-      ).then(res => {
-        this.information = res
-        if (this.information.code === 200) {
-          this.submitMessage({
-            f_created_by: this.user.name,
-            f_content: this.messageText.trim()
-          }).then(() => {
-            this.submitting = false
-            this.$message.success('留言成功并且推送成功')
-            this.messageText = ''
-            this.$emit('refresh')
-          }).catch(() => {
-            this.submitting = false
-            this.$message.error('推送并且留言失败，请重试')
-          })
-        } else {
-          this.$message.error(this.information.msg)
-        }
-      })
-      // this.submitMessage({
-      //   f_created_by: this.user.name,
-      //   f_content: this.messageText.trim()
-      // }).then(() => {
-      //   this.submitting = false
-      //   this.$message.success('留言成功')
-      //   this.messageText = ''
-      //   this.$emit('refresh')
-      // }).catch(() => {
-      //   this.submitting = false
-      //   this.$message.error('留言失败，请重试')
-      // })
-    },
-    openPersonnel () {
-      this.summaryVisible = true
-    },
     onSubmit () {
       this.submitting = true
       this.submitMessage({
@@ -178,7 +87,22 @@ export default {
         this.submitting = false
         this.$message.error('留言失败，请重试')
       })
-    }
+    },
+    // 获取留言
+    getMessage () {
+      this.messageLoading = true
+      postByServiceName(workFlowViewApi.getWorkFlowLeaveMessage, {
+        workflowId: this.workflowId
+      }).then(res => {
+        this.messageList = res
+        this.messageLoading = false
+      })
+    },
+    // 提交留言
+    submitMessage (data) {
+      data.f_workflow_id = this.workflowId
+      return postByServiceName('/entity/save/t_workflow_leave_message', data)
+    },
   }
 }
 </script>

package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyBaseInformation.vue → WorkFlowBaseInformation.vue}

@@ -24,7 +24,7 @@
       <div class="info-tag" style="background: #34d6af">
         <div><a-icon type="carry-out" theme="filled" style="font-size: 16px" /></div>
         <div class="content">
-          <div class="title">{{ format(details.f_apply_date, 'yyyy-MM-dd') }}</div>
+          <div class="title">{{ format(details.f_workflow_date, 'yyyy-MM-dd') }}</div>
           <div class="sub-text">创建日期</div>
         </div>
       </div>
@@ -93,10 +93,10 @@
         </div>
       </div>
       <!--  第五个  -->
-      <div v-show="details.f_apply_parentid" @click="ordRecord" class="info-tag" style="background: #31c565">
+      <div v-show="details.f_workflow_parentid" @click="ordRecord" class="info-tag" style="background: #31c565">
         <div><a-icon type="profile" theme="filled" style="font-size: 16px" /></div>
         <div class="content">
-          <div class="title">{{ details.f_apply_parentid }}</div>
+          <div class="title">{{ details.f_workflow_parentid }}</div>
           <div class="sub-text">父级工单编号</div>
         </div>
       </div>
@@ -107,7 +107,7 @@
     </a-modal>
     <!-- 父级工单 -->
     <a-modal v-model="masterWorkOrderVisible" title="主工单" :footer="null" :z-index="1001" :width="1500">
-      <work-order-parent-details :apply-id="details.f_apply_parentid"></work-order-parent-details>
+      <work-order-parent-details :workflow-id="details.f_workflow_parentid"></work-order-parent-details>
     </a-modal>
   </div>
 </template>
@@ -115,9 +115,9 @@
 <script>
 import { mapState } from 'vuex'
 import { formatDate } from '@vue2-client/utils/util'
-import { post } from '@vue2-client/services/api/restTools'
+import { postByServiceName } from '@vue2-client/services/api/restTools'
 import moment from 'moment'
-import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
+import { workFlowViewApi } from '@/services/api/workFlow'
 import WorkOrderParentDetails from './WorkOrderParentDetails'
 
 export default {
@@ -156,7 +156,7 @@ export default {
       masterWorkOrderVisible: false,
       // 完成时间修改记录表格列
       changeRecordColumns: [
-        { dataIndex: 'f_apply_id', title: '任务id' },
+        { dataIndex: 'f_workflow_id', title: '任务id' },
         { dataIndex: 'f_complete_oldtime', title: '原整体完成时间' },
         { dataIndex: 'f_set_time', title: '修改后完成时间', customRender (text) { return formatDate(text, 'yyyy-MM-dd') } },
         { dataIndex: 'f_name', title: '节点名称' },
@@ -211,8 +211,8 @@ export default {
         this.$message.info('当前环节截止时间不能晚于整体完成时间')
         return
       }
-      post(applyDetailViewApi.updateApplyCompleteTime, {
-        applyId: this.details.id,
+      postByServiceName(workFlowViewApi.updateWorkFlowCompleteTime, {
+        workflowId: this.details.id,
         completeTime: this.completeTime,
         overdueTime: this.overdueTime,
         name: this.currUser.name,
@@ -226,8 +226,8 @@ export default {
     showChangeRecord () {
       this.changeRecordLoading = true
       this.changeRecordVisible = true
-      post(applyDetailViewApi.getApplyCompleteTimeChange, {
-        applyId: this.details.id
+      postByServiceName(workFlowViewApi.getWorkFlowCompleteTimeChange, {
+        workflowId: this.details.id
       }).then(res => {
         this.changeRecordDataSource = res
         this.changeRecordLoading = false

package/src/pages/WorkflowDetail/WorkflowPageDetail/{ApplyBaseInformationDetails.vue → WorkFlowBaseInformationDetails.vue}

@@ -24,7 +24,7 @@
       <div class="info-tag" style="background: #34d6af">
         <div><a-icon type="carry-out" theme="filled" style="font-size: 16px" /></div>
         <div class="content">
-          <div class="title">{{ format(details.f_apply_date, 'yyyy-MM-dd') }}</div>
+          <div class="title">{{ format(details.f_workflow_date, 'yyyy-MM-dd') }}</div>
           <div class="sub-text">创建日期</div>
         </div>
       </div>
@@ -103,9 +103,9 @@
 <script>
 import { mapState } from 'vuex'
 import { formatDate } from '@vue2-client/utils/util'
-import { post } from '@vue2-client/services/api/restTools'
+import { postByServiceName } from '@vue2-client/services/api/restTools'
 import moment from 'moment'
-import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
+import { workFlowViewApi } from '@/services/api/workFlow'
 import WorkOrderParentDetails from './WorkOrderParentDetails'
 
 export default {
@@ -142,7 +142,7 @@ export default {
       changeRecordVisible: false,
       // 完成时间修改记录表格列
       changeRecordColumns: [
-        { dataIndex: 'f_apply_id', title: '任务id' },
+        { dataIndex: 'f_workflow_id', title: '任务id' },
         { dataIndex: 'f_complete_oldtime', title: '原整体完成时间' },
         { dataIndex: 'f_set_time', title: '修改后完成时间', customRender (text) { return formatDate(text, 'yyyy-MM-dd') } },
         { dataIndex: 'f_name', title: '节点名称' },
@@ -160,10 +160,6 @@ export default {
     }
   },
   props: {
-    visible: {
-      type: Boolean,
-      required: true
-    },
     details: {
       type: Object,
       required: true
@@ -197,8 +193,8 @@ export default {
         this.$message.info('当前环节截止时间不能晚于整体完成时间')
         return
       }
-      post(applyDetailViewApi.updateApplyCompleteTime, {
-        applyId: this.details.id,
+      postByServiceName(workFlowViewApi.updateWorkFlowCompleteTime, {
+        workflowId: this.details.id,
         completeTime: this.completeTime,
         overdueTime: this.overdueTime,
         name: this.currUser.name,
@@ -212,8 +208,8 @@ export default {
     showChangeRecord () {
       this.changeRecordLoading = true
       this.changeRecordVisible = true
-      post(applyDetailViewApi.getApplyCompleteTimeChange, {
-        applyId: this.details.id
+      postByServiceName(workFlowViewApi.getWorkFlowCompleteTimeChange, {
+        workflowId: this.details.id
       }).then(res => {
         this.changeRecordDataSource = res
         this.changeRecordLoading = false
@@ -221,11 +217,6 @@ export default {
     }
   },
   watch: {
-    visible (newVal) {
-      if (newVal) {
-        this.init()
-      }
-    },
     details: {
       deep: true,
       handler (newVal) {