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

lyh

9 小时以前 385e27c9b88f33088bb9dc5e81801c8e9de7e187

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

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

              <template v-if="selectShenpiData.processDefinitionKey">
                <a-tab-pane key='3' tab='流程图'>
                  <img :src="imageSrc" alt="Fetched Image"/>
              <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'"
@@ -239,7 +238,7 @@
        </a-row>
      </a-form-model>

      <eamReportRepair-modal ref="modalForm"  @ok="handleRepairComplete" @close="handleRepairClose"/>
      <eamReportRepair-modal ref="modalForm" @ok="handleRepairComplete" @close="handleRepairClose"/>

    </a-spin>
  </j-modal>
@@ -250,7 +249,7 @@
  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'
  import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect'
  import EamReportRepairModal from "@views/eam/repair/modules/EamReportRepairList/EamReportRepairModal.vue";
  import EamReportRepairModal from '@views/eam/repair/modules/EamReportRepairList/EamReportRepairModal.vue'

  export default {
    name: 'SecondMaintenanceApprovalModal',
@@ -299,12 +298,12 @@
          detail: '/eam/secondMaintenanceOrderDetail/queryList',
          approval: '/eam/secondMaintenanceOrder/approval',
          diagramView: '/assign/flow/diagramView',
          queryHisTaskList:'/assign/flow/queryHisTaskList',
          queryHisTaskList: '/assign/flow/queryHisTaskList'
        },
        disableSubmit: false,
        selectedOperatorMaintenanceRowKeys: [],
        selectedRepairerMaintenanceRowKeys: [],
        hitaskDataSource:[],
        hitaskDataSource: [],
        detail: {
          operatorMaintenanceList: [],
          repairerMaintenanceList: [],
@@ -383,7 +382,7 @@
      },
      // 操作列仅在保养中状态下显示
      shouldShowActionColumn() {
        return this.model.maintenanceStatus === 'UNDER_MAINTENANCE';
        return this.model.maintenanceStatus === 'UNDER_MAINTENANCE'
      }
    },
    methods: {
@@ -444,7 +443,7 @@
              { handler: this.customValidator }
            ]
          }
        ];
        ]

        // 仅在保养中状态下添加操作列
        if (this.shouldShowActionColumn) {
@@ -455,10 +454,10 @@
            width: 150,
            slotName: 'action',
            fixed: 'right'
          });
          })
        }

        return columns;
        return columns
      },

      /**
@@ -469,7 +468,6 @@
        this.spinning = true
        this.model = {}
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
        this.handleTabToFirstTable()
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
        this.getFlowTaskListByApi(record)
@@ -485,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)
      },
@@ -503,6 +502,7 @@
              that.model.taskId = record.id
              that.model.userId = record.assignee
              that.model.instanceId = record.procInstId
              this.handleTabToFirstTable()
            }
            else {
              that.$notification.warning({
@@ -518,11 +518,11 @@
       * @param record
       */
      getFlowTaskListByApi(record) {
        let parmhis={
        let parmhis = {
          'procInstId': record.procInstId
        }
        getAction(this.url.queryHisTaskList,parmhis).then(res=>{
          this.hitaskDataSource=res.result
        getAction(this.url.queryHisTaskList, parmhis).then(res => {
          this.hitaskDataSource = res.result
        }).finally(
          this.visible = true,
          console.log('this.approveData---->', this.approveData)
@@ -720,15 +720,15 @@
          this.model.maintenanceStatus !== 'UNDER_MAINTENANCE' ||
          row.maintenanceResult === '1' ||
          row.reportFlag === '1'
        );
        )
      },

      handleRepairComplete(success) {
        if (success && this.currentRepairRow) {
          this.$set(this.currentRepairRow, 'reportFlag', '1');
          this.$message.success("报修已成功提交");
          this.$set(this.currentRepairRow, 'reportFlag', '1')
          this.$message.success('报修已成功提交')
        }
        this.currentRepairRow = null;
        this.currentRepairRow = null
      },

      /**
@@ -736,7 +736,7 @@
       * @param exceptionDescription
       */
      handleRepairReporting(row) {
        this.currentRepairRow = row; // 存储当前操作行
        this.currentRepairRow = row // 存储当前操作行
        let record = {
          faultDescription: row.exceptionDescription,
          equipmentId: this.model.equipmentId
@@ -746,7 +746,7 @@

      handleRepairClose(success) {
        if (!success && this.currentRepairRow) {
          this.currentRepairRow = null; // 清除未成功的操作
          this.currentRepairRow = null // 清除未成功的操作
        }
      },

@@ -789,6 +789,7 @@
      }
    }
  }

  /* 全局禁选样式 - 作用于整个页面 */
  html.submitting,
  html.submitting body {
@@ -834,6 +835,7 @@
    background-color: rgba(0, 0, 0, 0.1); /* 使用 RGBA 颜色，并设置较低的透明度 */
    margin: 20px 0; /* 分界线上下的外边距 */
  }

  .btn-custom {
    background-color: #4CAF50; /* 绿色背景 */
    color: white; /* 白色文字 */
@@ -852,13 +854,14 @@
    font-weight: bold;
    font-size: 20px; /* 或你需要的任何大小 */
  }
  .left_qiu{

  .left_qiu {
    position: absolute;
    left: -74px;
    top: 0;
    width:54px;
    width: 54px;
    border-radius: 50%;
    height:54px;
    height: 54px;
    font-size: 13px;
    margin: auto;
    display: flex;
@@ -868,20 +871,23 @@
    background: #0099ff;
    transform: translate(0, 0);
  }
  /deep/ .ant-timeline-item-tail{

  /deep/ .ant-timeline-item-tail {
    left: -29px !important;
  }
  .left_qiu span{

  .left_qiu span {
    width: 3em;
    display: block;
    color: #fff;
    text-align: center;
  }
  .img{

  .img {
    width: 75%;
  }

  .wrap{
  .wrap {
    clear: both;
    width: 100%;
    display: flex;
@@ -889,13 +895,14 @@
    border: 1px solid #ccc;
    /* background-color: aqua; */
  }
  .box{
    width:21%;
    height:50px;

  .box {
    width: 21%;
    height: 50px;
    border-right: 1px solid #ccc;
    line-height: 50px;
    /* background: red; */
    text-align:center;
    text-align: center;
    margin: auto;
  }