Merge remote-tracking branch 'origin/master'

zhaowei

昨天 6e4b54ef350de163e4101558889d043d437e793c

 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'"
@@ -412,7 +411,8 @@
            title: '保养项',
            key: 'itemName',
            type: JVXETypes.normal,
            align: 'center'
            headerAlign: 'center',
            align: 'left'
          },
          {
            title: '保养结果',
@@ -484,6 +484,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)
      },
@@ -913,5 +914,13 @@
    pointer-events: none;
    text-decoration: none;
  }
  /* 保养项目列表头居中 */
  .vxe-header--column[data-col="itemName"] .vxe-cell {
    text-align: center !important;
  }

  /* 保养项目列内容左对齐 */
  .vxe-body--column[data-col="itemName"] .vxe-cell {
    text-align: left !important;
  }
</style>