Merge remote-tracking branch 'origin/master'

zhaowei

昨天 6e4b54ef350de163e4101558889d043d437e793c

 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>

@@ -265,25 +267,19 @@
              align: 'center',
              width: 100
            },
            // {
            //   title: '保养项分类',
            //   key: 'itemCategory',
            //   type: JVXETypes.slot,
            //   slotName: 'itemCategory',
            //   align: 'center',
            //   disabled: true
            // },
            {
              title: '保养项目',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            },
            {
              title: '保养规范或要求',
              key: 'itemDemand',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            }
          ],
          secondMaintenanceColumns: [
@@ -304,19 +300,12 @@
              align: 'center',
              width: 100
            },
            // {
            //   title: '保养项分类',
            //   key: 'itemCategory',
            //   type: JVXETypes.slot,
            //   slotName: 'itemCategory',
            //   align: 'center',
            //   disabled: true
            // },
            {
              title: '保养项目',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            }
          ],
          thirdMaintenanceColumns: [
@@ -340,13 +329,15 @@
              title: '保养内容',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            },
            {
              title: '验收标准',
              key: 'itemDemand',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            }
          ]
        },
@@ -420,12 +411,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)
      },

@@ -691,4 +684,13 @@
    text-align: center;
    margin: auto;
  }
  /* 保养项目列表头居中 */
  .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>