vue2-client 1.14.66 → 1.14.67

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,90 +1,47 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例页面"
-      :queryParamsName="queryParamsName"
-      :fixed-query-form="{
-        users_f_handler_id: currUser.id,
-      }"
-      @action="toDetail">
-      <template slot="button">
-        <a-button @click="add">
-          <a-icon type="plus"/>
-          发起报建
-        </a-button>
-      </template>
-    </x-form-table>
-    <a-modal
-      v-model="applyAddFlag"
-      :footer="null"
-      :dialog-style="{ top: '5rem' }"
-      :z-index="1001"
-      title="发起报建"
-      :destroyOnClose="true">
-      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
-    </a-modal>
-    <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
-  </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 XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
 
 export default {
-  name: 'Apply',
-  components: {
-    XFormTable,
-    XAddNativeForm,
-    WorkflowDetail
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'applyCRUD',
-      // 发起报建弹框控制
-      applyAddFlag: false
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
+  name: 'WorkFlowDemo',
+  components: { WorkflowDetail },
+  mounted () {
+    this.$refs.workFlow.init({
+      workflowId: '54'
+    })
   },
   methods: {
-    add () {
-      this.applyAddFlag = true
-      this.$nextTick(
-        () => {
-          getConfigByName('addApplyForm', 'af-apply', (res) => {
-            this.$refs.xForm.init({
-              businessType: '新增',
-              title: '发起报建',
-              ...res
-            })
-          })
-        }
-      )
-    },
-    applySubmit (formData) {
-      runLogic('addApply', formData).then(
-        res => {
-          this.$message.success('发起报建成功')
-          this.applyAddFlag = false
-        }
-      ).catch(() => {
-        this.applyAddFlag = false
-      })
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
     },
-    success () {
-      console.log('完工')
-    },
-    toDetail (record, id) {
-      this.$refs.workFlow.init({
-        workflowId: record.twf_id
-      })
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId 工作流id
+     * @param fromStepId 起ID
+     * @param toStepId 往ID
+     * @param successStepId 完成步骤id
+     * @param successStep 完成步骤名称
+     * @param fromStep 起步骤名称
+     * @param toStep 往步骤名称
+     */
+    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
+      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
     }
   }
 }
 </script>
+
+<template>
+  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -87,13 +87,11 @@
             </a-tab-pane>
 
             <!-- 查看附件标签页 -->
-            <!--            <a-tab-pane key="5" tab="查看附件">-->
-            <!--              <template v-if="details">-->
-            <!--                <XUploadFilesView-->
-            <!--                  :currUserInfo="{ f_userinfo_id: 90613 }"-->
-            <!--                />-->
-            <!--              </template>-->
-            <!--            </a-tab-pane>-->
+            <a-tab-pane key="5" tab="查看附件">
+              <template v-if="activeKey === '5' && details">
+                <file-item-group @search="getWorkFlowFiles"/>
+              </template>
+            </a-tab-pane>
           </a-tabs>
         </a-card>
       </div>
@@ -111,10 +109,12 @@ import { workFlowViewApi } from '@vue2-client/services/api/workFlow'
 import WorkflowLog from './WorkflowPageDetail/WorkflowLog.vue'
 import LeaveMessage from './WorkflowPageDetail/LeaveMessage'
 import XUploadFilesView from '@vue2-client/base-client/components/common/XUploadFilesView/index.vue'
+import FileItemGroup from '@vue2-client/components/FileImageItem/FileItemGroup.vue'
 
 export default {
   name: 'WorkflowDetail',
   components: {
+    FileItemGroup,
     workflowBaseInformation,
     WorkFlowHandle,
     XFormTable,
@@ -208,6 +208,15 @@ export default {
           console.log(err)
         })
     },
+    // 获取附件列表
+    getWorkFlowFiles (date, callback, errorCallback) {
+      postByServiceName(workFlowViewApi.getWorkFlowAttachments, {
+        workflowId: this.workflowId,
+        uploadDate: date
+      })
+        .then(res => callback(res))
+        .catch((e) => errorCallback(e))
+    },
     async reload () {
       await this.getSteps()
       await this.getBaseInfo()