1、二、三保工单增加批量打印及导出完工单和验收单功能 2、二保工单审批流程图展示增加滚动条 3、html导出成excel工具方法增加单元格换行展示以及...

zhaowei

21 小时以前 1cb38dbdb58bc3966453ca43585140323e50d1b8

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

@@ -154,8 +154,8 @@
              </a-tab-pane>

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

@@ -250,7 +250,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,7 +299,7 @@
          detail: '/eam/secondMaintenanceOrderDetail/queryList',
          approval: '/eam/secondMaintenanceOrder/approval',
          diagramView: '/assign/flow/diagramView',
          queryHisTaskList:'/assign/flow/queryHisTaskList',
          queryHisTaskList: '/assign/flow/queryHisTaskList'
        },
        disableSubmit: false,
        selectedOperatorMaintenanceRowKeys: [],
@@ -383,7 +383,7 @@
      },
      // 操作列仅在保养中状态下显示
      shouldShowActionColumn() {
        return this.model.maintenanceStatus === 'UNDER_MAINTENANCE';
        return this.model.maintenanceStatus === 'UNDER_MAINTENANCE'
      }
    },
    methods: {
@@ -444,7 +444,7 @@
              { handler: this.customValidator }
            ]
          }
        ];
        ]

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

        return columns;
        return columns
      },

      /**
@@ -469,7 +469,6 @@
        this.spinning = true
        this.model = {}
        this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
        this.handleTabToFirstTable()
        this.getBasicInformationByApi(record)
        this.getFlowChartImageByApi(record)
        this.getFlowTaskListByApi(record)
@@ -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({
@@ -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,6 +854,7 @@
    font-weight: bold;
    font-size: 20px; /* 或你需要的任何大小 */
  }

  .left_qiu{
    position: absolute;
    left: -74px;
@@ -868,15 +871,18 @@
    background: #0099ff;
    transform: translate(0, 0);
  }

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

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

  .img{
    width: 75%;
  }
@@ -889,6 +895,7 @@
    border: 1px solid #ccc;
    /* background-color: aqua; */
  }

  .box{
    width:21%;
    height:50px;