vue2-client 1.14.66 → 1.14.68

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: '11'
+    })
   },
   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()

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

@@ -37,33 +37,59 @@
           <a-tab-pane key="0" tab="步骤详情">
             <a-card :bordered="false" :loading="loadingHistory">
               <!--   当前步骤历史记录   -->
-              <template v-if="formCompletedDataPreview">
+              <template v-if="formCompletedDataPreview && formCompletedDataPreview.data.length > 0">
                 <a-descriptions
                   v-show="formCompletedDataPreview.data"
                   :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }"
-                  title="步骤历史记录"
                   bordered
+                  class="descriptionPreviewItem"
                 >
+                  <p slot="title" class="descriptionTitle">
+                    填写历史
+                  </p>
                   <a-descriptions-item
-                    v-for="item in formCompletedDataPreview.data"
-                    :key="item.label"
+                    v-for="(item, index) in formPreviewNoFileData"
+                    :key="`${item.label}-${index}`"
                   >
                     <span slot="label" style="color: #000">{{ item.label }}</span>
                     <div style="white-space: pre-wrap">{{ item.value }}</div>
                   </a-descriptions-item>
                 </a-descriptions>
-                <div v-if="formCompletedDataPreview.note">
-                  <div class="ant-descriptions-title complete-data-title">备注</div>
-                  <p style="white-space: pre-wrap">{{ formCompletedDataPreview.note }}</p>
-                </div>
-                <div v-if="formCompletedDataPreview.images.length">
-                  <div class="ant-descriptions-title complete-data-title">图片</div>
-                  <image-item :images="formCompletedDataPreview.images" @preview="handlePreviewFile"/>
-                </div>
-                <div v-if="formCompletedDataPreview.files.length">
-                  <div class="ant-descriptions-title complete-data-title">附件</div>
-                  <file-item :files="formCompletedDataPreview.files" @preview="handlePreviewFile"/>
-                </div>
+                <a-descriptions
+                  v-show="formCompletedDataPreview.note"
+                  bordered
+                  class="descriptionPreviewItem"
+                >
+                  <p slot="title" class="descriptionTitle">
+                    备注
+                  </p>
+                  <a-descriptions-item>
+                    <span slot="label" style="color: #000">备注信息</span>
+                    <p style="white-space: pre-wrap">{{ formCompletedDataPreview.note }}</p>
+                  </a-descriptions-item>
+                </a-descriptions>
+                <a-descriptions
+                  v-show="formCompletedDataPreview.images.length"
+                  class="descriptionPreviewItem allWidth"
+                >
+                  <p slot="title" class="descriptionTitle">
+                    图片
+                  </p>
+                  <a-descriptions-item>
+                    <image-item :images="formCompletedDataPreview.images" />
+                  </a-descriptions-item>
+                </a-descriptions>
+                <a-descriptions
+                  v-show="formCompletedDataPreview.files.length"
+                  class="descriptionPreviewItem allWidth"
+                >
+                  <p slot="title" class="descriptionTitle">
+                    附件
+                  </p>
+                  <a-descriptions-item>
+                    <file-item :files="formCompletedDataPreview.files" />
+                  </a-descriptions-item>
+                </a-descriptions>
               </template>
               <!--   当前步骤无记录   -->
               <template v-else>
@@ -75,7 +101,7 @@
         </template>
         <template v-else>
           <a-tab-pane key="1" tab="业务操作">
-            <a-card :bordered="false" :loading="loadingHistory">
+            <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
               <template v-if="showTab">
                 <x-tab :local-config="tabDesigner" :body-style="{ padding: 0 }" :tabBarGutter="24" default-active-key="workFlowTab">
                   <a-tab-pane
@@ -226,10 +252,6 @@
           <workflow-list-resolution :workflow-project-id="workflowId" :details="details"></workflow-list-resolution>
         </a-tab-pane>
       </a-tabs>
-      <!-- 文件预览 -->
-      <a-modal v-model="previewFileVisible" :footer="null" :dialog-style="{ top: '20px' }" width="85%" :z-index="1001">
-        <file-preview :path="filePath"/>
-      </a-modal>
     </template>
   </div>
 </template>
@@ -271,7 +293,7 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     canSubmit () {
       // 对于超级管理员直接认为可以提交
-      if (this.currUser.ename === '1') {
+      if (this.currUser.name === '超级管理员') {
         return true
       }
       // currentStepId可能还没初始化，此处拿不到先返回false
@@ -309,6 +331,9 @@ export default {
       }
 
       return false
+    },
+    formPreviewNoFileData () {
+      return this.formCompletedDataPreview.data.filter(item => item.label !== '附件上传')
     }
   },
   data () {
@@ -391,9 +416,6 @@ export default {
       deadlineHelp: '',
       // 当前任务是否延期
       // taskIsOverdue: moment().isAfter(this.completeTime, 'day'),
-      // 预览图片弹框
-      previewFileVisible: false,
-      filePath: '',
       // 操作类型，提交到下一步或跳过
       operationType: 'submit',
       // 获取微信推送是否成功信息
@@ -873,7 +895,7 @@ export default {
       if (this.checkedChargePerson) {
         // 使用 value 找到对应的 label
         stepHandler = this.chargePersonOptions.find(item => item.value === this.checkedChargePerson).label
-      } else if (this.chargePerson.personList.length > 0) {
+      } else if (this.chargePerson.personList && this.chargePerson.personList.length > 0) {
         stepHandler = this.chargePerson.personList.map(item => item.name).join(',')
       }
       return stepHandler
@@ -907,11 +929,6 @@ export default {
         ...extra
       })
     },
-    // 文件预览
-    handlePreviewFile (url) {
-      this.filePath = url
-      this.previewFileVisible = true
-    },
     // 获取默认截止时间
     getDefaultDeadline () {
       const date = new Date()
@@ -1064,4 +1081,30 @@ export default {
 :deep(.ant-result){
   padding: 0;
 }
+.descriptionPreviewItem {
+  margin-bottom: 22px;
+  :deep(.ant-descriptions-view) {
+    overflow: visible;
+  }
+}
+.allWidth {
+  :deep(.ant-descriptions-item-content) {
+    width: 100%;
+  }
+}
+.descriptionTitle {
+  position: relative;
+  padding-left: 12px;
+  &::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 4px;
+    height: 16px;
+    background-color: @primary-color;
+    border-radius: 2px;
+  }
+}
 </style>

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

@@ -154,7 +154,7 @@ export default {
       line-height: 8px;
     }
     .ant-steps-item-content {
-      min-width: 200px;
+      min-width: 195px;
       margin-top: 24px;
       .ant-steps-item-description {
         text-align: left;

package/src/services/api/workFlow.js

@@ -55,7 +55,9 @@ const workFlowViewApi = {
   // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
   getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
   // 表单提交到下一步
-  submitToNextStep: '/logic/submitToNextStep'
+  submitToNextStep: '/logic/submitToNextStep',
+  // 获取指定工作流的附件列表
+  getWorkFlowAttachments: '/logic/getWorkFlowAttachments',
 }
 
 export { workFlowViewApi }

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://192.168.50.67:31567'
+const v3Server = 'http://aote-office.8866.org:31567'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://192.168.50.67:31567'
+const revenue = 'http://aote-office.8866.org:31567'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川