430详情点进流转节点与流程图

lyh

8 小时以前 385e27c9b88f33088bb9dc5e81801c8e9de7e187

430详情点进流转节点与流程图

 src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue

@@ -153,24 +153,23 @@
                <a-tab-pane key='3' tab='流程图'>
                  <img :src="imageSrc" v-if="imageSrc"/>
                </a-tab-pane>

                <a-tab-pane key='4' tab='流转节点'>
                  <a-card>
                    <a-timeline style="padding:0 1% 0 12%" >
                      <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                        <div class="bottom">
                          <p>处理人：{{item.assignee_dictText}}</p>
                          <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                          <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                          <p v-if="item.description != null">处理意见：{{item.description}}</p>
                          <div class="left_qiu"><span>{{item.taskName}}</span></div>
                        </div>
                      </a-timeline-item>
                    </a-timeline>
                  </a-card>
                </a-tab-pane>
              </template>

              <a-tab-pane key='4' tab='流转节点'>
                <a-card>
                  <a-timeline style="padding:0 1% 0 12%" >
                    <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                      <div class="bottom">
                        <p>处理人：{{item.assignee_dictText}}</p>
                        <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                        <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                        <p v-if="item.description != null">处理意见：{{item.description}}</p>
                        <div class="left_qiu"><span>{{item.taskName}}</span></div>
                      </div>
                    </a-timeline-item>
                  </a-timeline>
                </a-card>
              </a-tab-pane>


              <a-button
                v-if="activeTabKey=='1'||activeTabKey=='2'"
@@ -432,6 +431,7 @@
        this.model = Object.assign({}, record)
        this.getDayInspectionOrderListByApi(record.id)
        this.getWeekInspectionOrderListByApi(record.standardId)
        this.getFlowChartImageByApi(record)
        this.getFlowTaskListByApi(record)
      },


 src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue

@@ -126,27 +126,29 @@
                </a-tab-pane>
              </template>

              <template v-if="selectShenpiData.processDefinitionKey">
              <template v-if="selectShenpiData.procInstId">
                <a-tab-pane key='3' tab='流程图'>
                  <img :src="imageSrc" alt="Fetched Image"/>
                </a-tab-pane>

                <a-tab-pane key='4' tab='流转节点'>
                  <a-card>
                    <a-timeline style="padding:0 1% 0 12%">
                      <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                        <div class="bottom">
                          <p>处理人：{{item.assignee_dictText}}</p>
                          <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                          <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                          <p v-if="item.description != null">处理意见：{{item.description}}</p>
                          <div class="left_qiu"><span>{{item.taskName}}</span></div>
                        </div>
                      </a-timeline-item>
                    </a-timeline>
                  </a-card>
                </a-tab-pane>
              </template>

              <a-tab-pane key='4' tab='流转节点'>
                <a-card>
                  <a-timeline style="padding:0 1% 0 12%">
                    <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                      <div class="bottom">
                        <p>处理人：{{item.assignee_dictText}}</p>
                        <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                        <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                        <p v-if="item.description != null">处理意见：{{item.description}}</p>
                        <div class="left_qiu"><span>{{item.taskName}}</span></div>
                      </div>
                    </a-timeline-item>
                  </a-timeline>
                </a-card>
              </a-tab-pane>

            </a-tabs>
          </a-col>

@@ -420,12 +422,14 @@
      /**
       * 主页面点击详情时触发
       * @param record 主页面列表行记录
       *
       */
      handleDetail(record) {
        this.activeTabKey = '1'
        this.detail.dataSource1 = this.detail.dataSource2 = []
        this.model = Object.assign({}, record)
        this.getFlowTaskListByApi(record)
        this.getFlowChartImageByApi(record)
        this.loadDetail(record.id)
      },


 src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue

@@ -153,27 +153,26 @@
                </j-vxe-table>
              </a-tab-pane>

              <template v-if="selectShenpiData.processDefinitionKey">
              <template v-if="selectShenpiData.procInstId">
                <a-tab-pane key='3' tab='流程图' style="overflow: auto">
                  <img :src="imageSrc" v-if="imageSrc"/>
                </a-tab-pane>
                <a-tab-pane key='4' tab='流转节点'>
                  <a-card>
                    <a-timeline style="padding:0 1% 0 12%">
                      <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                        <div class="bottom">
                          <p>处理人：{{item.assignee_dictText}}</p>
                          <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                          <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                          <p v-if="item.description != null">处理意见：{{item.description}}</p>
                          <div class="left_qiu"><span>{{item.taskName}}</span></div>
                        </div>
                      </a-timeline-item>
                    </a-timeline>
                  </a-card>
                </a-tab-pane>
              </template>

              <a-tab-pane key='4' tab='流转节点'>
                <a-card>
                  <a-timeline style="padding:0 1% 0 12%">
                    <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                      <div class="bottom">
                        <p>处理人：{{item.assignee_dictText}}</p>
                        <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                        <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                        <p v-if="item.description != null">处理意见：{{item.description}}</p>
                        <div class="left_qiu"><span>{{item.taskName}}</span></div>
                      </div>
                    </a-timeline-item>
                  </a-timeline>
                </a-card>
              </a-tab-pane>

              <a-button
                v-if="activeTabKey!=='3'"
@@ -484,6 +483,7 @@
        this.activeTabKey = 1
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
        this.model = Object.assign({}, record)
        this.getFlowChartImageByApi(record)
        this.getFlowTaskListByApi(record)
        this.loadDetail(record.id)
      },

 src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue

@@ -143,6 +143,22 @@
                <a-tab-pane key='3' tab='流程图'>
                  <img :src="imageSrc" alt="Fetched Image"/>
                </a-tab-pane>

                <a-tab-pane key='4' tab='流转节点'>
                  <a-card>
                    <a-timeline style="padding:0 1% 0 12%">
                      <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                        <div class="bottom">
                          <p>处理人：{{item.assignee_dictText}}</p>
                          <p v-if="index1 !==0">处理时长：{{item.duration}}</p>
                          <p v-if="item.name !== '提交申请'">处理类型：{{item.sequenceFlowName}}</p>
                          <p v-if="item.description != null">处理意见：{{item.description}}</p>
                          <div class="left_qiu"><span>{{item.taskName}}</span></div>
                        </div>
                      </a-timeline-item>
                    </a-timeline>
                  </a-card>
                </a-tab-pane>
              </template>

              <template slot="tabBarExtraContent">
@@ -293,10 +309,12 @@
          maintenanceDetail: '/eam/thirdMaintenanceOrderDetail/queryList',
          sparePartsDetail: '/eam/eamThirdMaintenanceSpare/queryList',
          approval: '/eam/thirdMaintenanceOrder/approval',
          diagramView: '/assign/flow/diagramView'
          diagramView: '/assign/flow/diagramView',
          queryHisTaskList: '/assign/flow/queryHisTaskList'
        },
        disableSubmit: false,
        selectedRowKeys: [],
        hitaskDataSource: [],
        detail: {
          maintenanceDetailList: [],
          sparePartsDetailList: [],
@@ -443,6 +461,7 @@
        this.detail.maintenanceDetailList = this.detail.sparePartsDetailList = []
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
        this.getFlowTaskListByApi(record)
      },

      /**
@@ -460,6 +479,8 @@
        }, record)
        this.handleDynamicColumns()
        this.loadMaintenanceDetail(record.id)
        this.getFlowChartImageByApi(record)
        this.getFlowTaskListByApi(record)
        this.loadSparePartsDetail(record.id)
      },

@@ -500,6 +521,22 @@
      },

      /**
       * 获取流转节点
       * @param record
       */
      getFlowTaskListByApi(record) {
        let parmhis = {
          'procInstId': record.procInstId
        }
        getAction(this.url.queryHisTaskList, parmhis).then(res => {
          this.hitaskDataSource = res.result
        }).finally(
          this.visible = true,
          console.log('this.approveData---->', this.approveData)
        )
      },

      /**
       * 获取保养明细
       * @param orderId 工单号
       */