1、工作流我的待办页面 设备维修 分类详情弹窗样式调整完成100%
2、工作流我的待办页面 设备点检 分类详情弹窗样式与功能逻辑调整
3、工作流我的待办页面 设备点检 分类详情弹窗保养明细列表增加异常选项是否禁用由点检结果选中项决定
4、工作流我的待办页面 设备点检 分类详情弹窗保养明细列表增加批量选择点检结果功能
已修改4个文件
1026 ■■■■ 文件已修改
src/views/eam/equipment/EamEquipmentList.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/FlowTodo.vue 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue 751 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue 209 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/equipment/EamEquipmentList.vue
@@ -167,14 +167,16 @@
    <!-- table区域-end -->
    <a-tabs v-model="activeTabKey" @change="handleTabChange">
      <a-tab-pane tab="保养标准" :key="1">
        <eam-maintenance-standard-list ref="tabPaneTableListRef1" :isDisplayOperation="false"/>
      <a-tab-pane tab="设备文档" :key="1">设备文档</a-tab-pane>
      <a-tab-pane tab="点检工单" :key="2">
        <eam-inspection-order-list ref="tabPaneTableListRef2" :isDisplayOperation="false"/>
      </a-tab-pane>
      <a-tab-pane tab="维修工单" :key="2">
        <eam-repair-order-list ref="tabPaneTableListRef2" :isDisplayOperation="false"/>
      <a-tab-pane tab="周报工单" :key="3">周报工单</a-tab-pane>
      <a-tab-pane tab="维修工单" :key="4">
        <eam-repair-order-list ref="tabPaneTableListRef4" :isDisplayOperation="false"/>
      </a-tab-pane>
      <a-tab-pane tab="点检工单" :key="3">
        <eam-inspection-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>
      <a-tab-pane tab="保养标准" :key="5">
        <eam-maintenance-standard-list ref="tabPaneTableListRef5" :isDisplayOperation="false"/>
      </a-tab-pane>
    </a-tabs>
src/views/flowable/workflow/FlowTodo.vue
@@ -73,7 +73,7 @@
        bordered
        size="middle"
        rowKey="id"
        :scroll="{x:'max-content',y:465}"
        :scroll="{x:getTableColumnsTotalWidth,y:465}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
@@ -82,7 +82,7 @@
        @change="handleTableChange">
        <span slot="action" slot-scope="text, record">
            <a @click="handelDetial(record,text)">查看详情</a>
            <a @click="handelDetail(record,text)">查看详情</a>
        </span>
      </a-table>
@@ -163,7 +163,9 @@
            title: '流程业务简要描述',
            align: 'center',
            dataIndex: 'title',
            width: 500
            width: 350,
            ellipsis: true
          },
          {
            title: '上一步处理人',
@@ -218,21 +220,24 @@
    computed: {
      importExcelUrl: function() {
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      },
      getTableColumnsTotalWidth() {
        return this.columns.reduce((total, item) => total + item.width, 0)
      }
    },
    methods: {
      handelDetial(item, index) {
      handelDetail(item, index) {
        console.log('点击了详情')
        console.log('item----->', item)
        console.log('index----->', index)
        let approcesstype = this.splitAprocessType(item.category)
        console.log('approcesstype--->', approcesstype)
        switch (approcesstype) {
        let processType = this.splitAprocessType(item.category)
        console.log('processType--->', processType)
        switch (processType) {
          case 'drApproval':
            this.handDrDetial(item)
            this.handDrDetail(item)
            break
          case 'ggApproval':
            this.handDispatchFileDetial(item)
            this.handDispatchFileDetail(item)
            break
          case 'sbdjApproval':
            this.handInspectionOrder(item)
@@ -252,31 +257,32 @@
        let result = parts[0]
        return result
      },
      handDrDetial(item) {
        this.selectShenpiData = item
        this.$refs.modalFormApproval.clearTableSource()
        this.$refs.modalFormApproval.getAllApproveData(item)
      handDrDetail(record) {
        this.selectShenpiData = Object.assign({}, record)
        this.$refs.modalFormApproval.visible = true
        this.$refs.modalFormApproval.getAllApproveData(record)
      },
      searchReset() {
        this.queryParam = {}
        this.loadData(1)
      },
      handDispatchFileDetial(item) {
      handDispatchFileDetail(item) {
        console.log('item----->', item)
        this.selectDispatchFileXqData = item
        this.$refs.modalFormDispatchFileXq.clearTableSource()
        this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
      },
      handInspectionOrder(item) {
        console.log('item----->', item)
        if (item.taskDefKey === 'Confirmed_completed') {
          this.selectInspectionOrderDataBzz = item
          this.$refs.modalFormInspectionOrderBzz.clearTableSource()
          this.$refs.modalFormInspectionOrderBzz.getAllApproveData(item)
      handInspectionOrder(record) {
        console.log('record----->', record)
        const tableRecord = Object.assign({}, record)
        if (record.taskDefKey === 'Confirmed_completed') {
          this.selectInspectionOrderDataBzz = tableRecord
          this.$refs.modalFormInspectionOrderBzz.getAllApproveData(record)
        } else {
          this.selectInspectionOrderData = item
          this.$refs.modalFormInspectionOrder.clearTableSource()
          this.$refs.modalFormInspectionOrder.getAllApproveData(item)
          this.selectInspectionOrderData = tableRecord
          this.$refs.modalFormInspectionOrder.visible = true
          this.$refs.modalFormInspectionOrder.getAllApproveData(record)
          this.$refs.modalFormInspectionOrder.getBasicInformation(record)
        }
      },
      batchHandle() {
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
@@ -1,15 +1,11 @@
<!--
 Description: 工作流-设备点检处理页面 List
 Author: 作者 liuyh
 Date:   2025-02-27
-->
<template>
  <a-modal
    :title="title"
    :width="width"
    :width="1000"
    :visible="visible"
    :footer="null"
    @ok="submitForm"
    @cancel="handCancel"
    :mask-closable="false"
    centered
  >
    <a-card :bordered="false">
      <div>
@@ -24,110 +20,101 @@
        </a-tag>
        <br>
        <br>
        <button @click="fetchAndShowBmp" class="btn-custom">打开流程图</button>
        <div v-if="imageSrc">
          <img :src="imageSrc" alt="Fetched Image" />
        <a-button @click="fetchAndShowBmp" class="btn-custom" :loading="showBmpButtonLoading">流程图</a-button>
        <div v-if="imageSrc&&isDisplayBmp">
          <img :src="imageSrc" alt="Fetched Image"/>
        </div>
        <hr class="shallow-hr">
        <!--<hr class="shallow-hr">-->
      </div>
      <div>
        <b>点检工单详情</b>
        <br>
        <a-form :form='form'>
          <a-spin :spinning="spinning">
            <a-tabs default-active-key='1' @change='callback'>
              <a-tab-pane key='1' tab='基本信息'>
                <a-form-model ref='form' :model='tableRowRecord' :rules='validatorRules'>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="standardCode" label="工单号">
                        <a-input placeholder="工单号自动生成" :disabled="true" v-model="tableRowRecord.orderNum" />
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编号">
                        <MaintenanceEquipmentSelect placeholder="请输入设备编号或名称搜索" v-model="tableRowRecord.equipmentId"
                                                    :maintenanceCategory="maintenanceCategory" :disabled="true"
                                                    @autocompleteForm="autocompleteForm"></MaintenanceEquipmentSelect>
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="standardName" label="标准名称">
                        <a-input placeholder="请输入标准名称" disabled v-model="this.standardName" />
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="standardCode" label="标准编码">
                        <a-input placeholder="请输入标准编码" disabled v-model="this.standardCode" />
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenancePeriod" label="保养周期">
                        <a-input-number v-model="this.maintenancePeriod" :min="1" :precision="0" disabled style="width: 100%" />
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator" label="点检人">
                        <j-dict-select-tag v-model="tableRowRecord.operator" placeholder="请选择用户" disabled dictCode="sys_user,realname,username,username!='admin' order by create_time"/>
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item label="点检日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inspectionDate">
                        <j-date placeholder="请选择点检日期" v-model="tableRowRecord.inspectionDate" disabled  style="width: 100%" />
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label="点检过期时间" :labelCol="{span:6}" :wrapperCol="{span:15}" prop="expirationTime">
                        <j-date placeholder="请选择点检过期时间" v-model="tableRowRecord.expirationTime" disabled style="width: 100%" />
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                  <a-row >
                    <a-col :span="24">
                      <a-form-model-item label="备注" :labelCol="{span:1}" :wrapperCol="{span:22}" prop="remark">
                        <a-textarea v-model="tableRowRecord.remark" rows="3" placeholder="请输入备注" disabled />
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                </a-form-model>
              </a-tab-pane>
              <a-tab-pane key='2' 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-spin>
        </a-form>
      </div>
      <div>
        <hr class="shallow-hr">
        <br>
        <b>保养项明细</b>
        <br>
        <a-form-model ref="form" :model="approveData" :rules="validatorRules" slot="detail">
          <a-row :gutter="24">
      <a-spin :spinning="spinning">
        <a-tabs default-active-key='1'>
          <a-tab-pane key='1' tab='基本信息'>
            <a-form-model ref='form' :model='tableRowRecord' :labelCol="labelCol"
                          :wrapperCol="wrapperCol">
              <a-row>
                <a-col :span='span'>
                  <a-form-model-item label="工单号">
                    <a-input readOnly v-model="tableRowRecord.orderNum"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span='span'>
                  <a-form-model-item label="设备编号">
                    <MaintenanceEquipmentSelect v-model="tableRowRecord.equipmentId"
                                                :maintenanceCategory="'POINT_INSPECTION'" disabled
                                                @autocompleteForm="autoCompleteForm"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
              <a-row>
                <a-col :span='span'>
                  <a-form-model-item label="标准名称">
                    <a-input readOnly v-model="tableRowRecord.standardName"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span='span'>
                  <a-form-model-item label="标准编码">
                    <a-input readOnly v-model="tableRowRecord.standardCode"/>
                  </a-form-model-item>
                </a-col>
              </a-row>
              <a-row>
                <a-col :span='span'>
                  <a-form-model-item label="保养周期">
                    <a-input v-model="tableRowRecord.maintenancePeriod" readOnly/>
                  </a-form-model-item>
                </a-col>
                <a-col :span='span'>
                  <a-form-model-item label="点检人">
                    <a-input v-model="tableRowRecord.operator" readOnly/>
                  </a-form-model-item>
                </a-col>
              </a-row>
              <a-row>
                <a-col :span='span'>
                  <a-form-model-item label="点检日期" prop="inspectionDate">
                    <a-input v-model="tableRowRecord.inspectionDate" readOnly/>
                  </a-form-model-item>
                </a-col>
                <a-col :span='span'>
                  <a-form-model-item label="点检过期时间">
                    <a-input v-model="tableRowRecord.expirationTime" readOnly/>
                  </a-form-model-item>
                </a-col>
              </a-row>
              <a-row>
                <a-col :span="24">
                  <a-form-model-item label="备注" :labelCol="{span:3}" :wrapperCol="{span:20}">
                    <a-textarea v-model="tableRowRecord.remark" rows="3" readOnly/>
                  </a-form-model-item>
                </a-col>
              </a-row>
            </a-form-model>
          </a-tab-pane>
          <a-tab-pane key='2' tab='流程节点'>
            <a-card :bordered="false">
              <a-timeline>
                <a-timeline-item v-for="(item,index) in hitaskDataSource" :key="index">
                  <div>
                    <h3 style="font-weight: bold;">{{item.taskName}}</h3>
                    <div>处理人:{{item.assignee_dictText}}</div>
                    <div v-if="index !==0">处理时长:{{item.duration}}</div>
                    <div v-if="item.name !== '提交申请'">处理类型:{{item.sequenceFlowName}}</div>
                    <div v-if="item.description">处理意见:{{item.description}}</div>
                  </div>
                </a-timeline-item>
              </a-timeline>
            </a-card>
          </a-tab-pane>
        </a-tabs>
        <a-tabs default-active-key='1'>
          <a-tab-pane key="1" tab="保养项明细">
            <j-vxe-table
              ref="editableDetailTable"
              :rowNumber="false"
              :rowSelection="false"
              :rowSelection="true"
              :bordered="true"
              :alwaysEdit="true"
              :toolbar="false"
@@ -136,311 +123,287 @@
              :loading="detail.loading"
              :dataSource="detail.dataSource"
              :columns="detail.columns"
              style="margin-top: 8px;" />
          </a-row>
          <div class="table-operator" style="text-align: right;">
            <a-button  @click="handleQueXiaoTask" type="primary" icon="close">取消</a-button>
            <a-button @click="submitForm">提 交</a-button>
          </div>
        </a-form-model>
      </div>
              @selectRowChange="handleTableSelectRowChange"
            >
              <template v-slot:inspectionResult="props">
                <j-dict-select-tag v-model="props.row.inspectionResult" dictCode="eam_inspection_result"
                                   placeholder="请选择点检结果"
                                   @change="handleInspectionResultSelectChange($event,props.row)"
                                   style="width: 100%"/>
              </template>
              <template v-slot:exceptionDescription="props">
                <a-textarea style="height: 32px" v-model="props.row.exceptionDescription"
                            :disabled="!props.row.inspectionResult||props.row.inspectionResult==='1'"/>
              </template>
              <template v-slot:reportFlag="props">
                <j-dict-select-tag v-model="props.row.reportFlag"
                                   :disabled="!props.row.inspectionResult||props.row.inspectionResult==='1'"
                                   dictCode="yn"
                                   style="width: 100%"/>
              </template>
            </j-vxe-table>
          </a-tab-pane>
          <a-button v-if="selectedRowKeys.length>0" slot="tabBarExtraContent" type="primary"
                    @click="handleSelectAllInspectionResult">批量点检正常
          </a-button>
          <!--<a-dropdown slot="tabBarExtraContent" v-if="selectedRowKeys.length>0">-->
          <!--<a-menu slot="overlay">-->
          <!--<a-menu-item key="1" @click="handleSelectAllInspectionResult('正常')">正常</a-menu-item>-->
          <!--<a-menu-item key="2" @click="handleSelectAllInspectionResult('异常')">异常</a-menu-item>-->
          <!--</a-menu>-->
          <!--<a-button> 批量选择点检结果-->
          <!--<a-icon type="down"/>-->
          <!--</a-button>-->
          <!--</a-dropdown>-->
        </a-tabs>
      </a-spin>
    </a-card>
  </a-modal>
</template>
<script>
  import '@assets/less/TableExpand.less'
  import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
  import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect.vue'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'
import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect.vue'
import { JVXETypes } from '@comp/jeecg/JVxeTable'
export default {
  name: 'FlowShenPi',
  components: { MaintenanceEquipmentSelect },
  mixins: [mixinDevice],
  props: {
    selectShenpiData: {
      type: Object,
      required: true
    }
  },
  data() {
    return {
      form: this.$form.createForm(this),
      span: 12,
      span1: 8,
      coldisabled: true,
      spinning: false,
      tableRowRecord: {},
      assignFileStream:{},
      tableDataSource: [],
      usageDataSource: [],
      hitaskDataSource:[],
      bomForm: {},
      approveContent:"",
      imageSrc: null,
      drawerVisible: true,
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 30 },
        sm: { span: 16 }
      },
      validatorRules: {
        status: {
          rules: [
            { required: true, message: '请选择审批状态!'},
  export default {
    name: 'InspectionOrderHandle',
    components: { MaintenanceEquipmentSelect },
    props: {
      selectShenpiData: {
        type: Object,
        required: true
      }
    },
    data() {
      return {
        span: 12,
        spinning: false,
        tableRowRecord: {},
        hitaskDataSource: [],
        imageSrc: null,
        labelCol: {
          xs: { span: 24 },
          sm: { span: 6 }
        },
        wrapperCol: {
          xs: { span: 30 },
          sm: { span: 16 }
        },
        visible: false,
        // 表头
        url: {
          queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
          diagramView: '/assign/flow/diagramView',
          queryHisTaskList: '/assign/flow/queryHisTaskList',
          approve: '/eam/eamInspectionOrder/approval'
        },
        detail: {
          loading: false,
          dataSource: [],
          columns: [
            {
              title: '序号',
              key: 'itemCode',
              type: JVXETypes.normal,
              width: '10%',
              align: 'center',
              fixed: 'left'
            },
            {
              title: '保养项',
              key: 'itemName',
              type: JVXETypes.normal,
              width: '20%',
              align: 'center',
              fixed: 'left'
            },
            {
              title: '保养要求',
              key: 'itemDemand',
              type: JVXETypes.normal,
              width: '30%',
              align: 'center',
              fixed: 'left'
            },
            {
              title: '点检结果',
              key: 'inspectionResult',
              type: JVXETypes.slot,
              slotName: 'inspectionResult',
              width: '20%',
              align: 'center'
            },
            {
              title: '异常描述',
              key: 'exceptionDescription',
              type: JVXETypes.slot,
              slotName: 'exceptionDescription',
              width: '30%',
              align: 'center'
            },
            {
              title: '异常是否报修',
              key: 'reportFlag',
              type: JVXETypes.slot,
              slotName: 'reportFlag',
              width: '20%',
              align: 'center'
            }
          ]
        },
      },
      approveData: {},
      flowData: {},
      title: '详情页面',
      width: 1000,
      visible: false,
      // 表头
      url: {
        queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
        diagramView: '/assign/flow/diagramView',
        queryHisTaskList:'/assign/flow/queryHisTaskList',
        approve:"/eam/eamInspectionOrder/approval",
        saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
      },
      dictOptions: {},
      superFieldList: [],
      workflowSource: [],
      maintenanceCategory: 'POINT_INSPECTION',
      standardName:"",
      maintenancePeriod:"",
      standardCode:"",
      detail: {
        loading: false,
        dataSource: [],
        columns: [
          {
            title: '序号',
            key: 'itemCode',
            type: JVXETypes.normal,
            width: '10%',
            align:"center",
          },
          {
            title: '保养项',
            key: 'itemName',
            type: JVXETypes.normal,
            width: '20%',
            align:"center",
          },
          {
            title: '保养要求',
            key: 'itemDemand',
            type: JVXETypes.normal,
            width: '30%',
            align:"center",
          },
          {
            title: "点检结果"
            ,key: 'inspectionResult'
            ,type: JVXETypes.selectSearch
            ,dictCode:'eam_inspection_result'
            ,width: '20%'
            ,align:"center"
          },
          {
            title: '异常描述',
            key: 'exceptionDescription',
            type: JVXETypes.textarea,
            width: '30%',
            align:"center",
          },
          {
            title: '异常是否报修',
            key: 'reportFlag',
            type: JVXETypes.selectSearch,
            dictCode:'yn',
            width: '20%',
            align:"center",
          }
        ]
      }
    }
  },
  created() {
  },
  computed: {},
  methods: {
    callback() {
    },
    handCancel() {
      this.visible = false
    },
    clearTableSource() {
      this.tableDataSource = []
      this.usageDataSource = []
    },
    fetchAndShowBmp() {
      console.log('flowData----->', this.flowData)
      try {
        let parm = {
          processDefinitionId: this.flowData.processDefinitionId,
          processInstanceId:this.flowData.processInstanceId,
          TaskDefinitionKey:this.flowData.processDefinitionKey
        }
        downFile(this.url.diagramView,parm,'get').then((res=>{
          console.log('Pica------>',res)
          const urlObject = window.URL.createObjectURL(new Blob([res]))
          this.imageSrc = urlObject
        }))
      } catch (error) {
        console.error('Error fetching image blob:', error)
        alert('无法加载图片,请稍后再试。')
        isDisplayBmp: false,
        showBmpButtonLoading: false,
        selectedRowKeys: []
      }
    },
    handleQueXiaoTask(){
      this.visible = false
      this.routeReload()
    },
    autocompleteForm(selectObj) {
      this.standardName = selectObj.standardName
      this.maintenancePeriod=selectObj.maintenancePeriod
      this.standardCode=selectObj.standardCode
    },
    submitForm () {
      const that = this;
      // 触发表单验证
      this.form.validateFields((err, values) => {
        if (!err) {
          that.confirmLoading = true;
          let url=this.url.approve
          let method = 'post';
          let flowTaskVo = {}
          let tableData = that.$refs.editableDetailTable.getTableData()
          flowTaskVo.comment =that.assignFileStream.approveContent;
          flowTaskVo.dataId = this.selectShenpiData.dataId
          flowTaskVo.taskId = this.selectShenpiData.id
          flowTaskVo.userId = this.selectShenpiData.assignee
          flowTaskVo.instanceId = this.selectShenpiData.procInstId
          flowTaskVo.values = this.selectShenpiData.variables
          flowTaskVo.tableDetailList=tableData
          console.log("表单提交数据",flowTaskVo)
          httpAction(url,flowTaskVo,method).then((res)=>{
            if(res.success){
              that.$message.success(res.message);
              that.visible = false
              //刷新表格
              that.$emit('searchReset')
            }else{
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
    methods: {
      /**
       * 获取流程节点
       * @param record 待办记录信息
       */
      getAllApproveData(record) {
        const param = { 'procInstId': record.procInstId }
        getAction(this.url.queryHisTaskList, param)
          .then(res => {
            this.hitaskDataSource = res.result
          })
      },
      /**
       * 获取待办记录的基本信息
       * @param record 待办记录信息
       */
      getBasicInformation(record) {
        this.tableRowRecord = {}
        this.detail.dataSource = []
        this.spinning = true
        const param = { id: record.dataId }
        const that = this
        getAction(this.url.queryBomDataById, param)
          .then((res => {
            if (res.success) {
              that.tableRowRecord = res.result[0]
              that.detail.dataSource = res.result[0].tableDetailList
              console.log('that.tableRowRecord----->', that.tableRowRecord)
            }
          }))
      },
      // 获取并展开流程图
      fetchAndShowBmp() {
        this.isDisplayBmp = !this.isDisplayBmp
        if (!this.imageSrc) {
          const { processDefinitionId, processInstanceId, processDefinitionKey } = this.selectShenpiData
          let param = { processDefinitionId, processInstanceId, TaskDefinitionKey: processDefinitionKey }
          this.showBmpButtonLoading = true
          const that = this
          downFile(this.url.diagramView, param, 'get')
            .then((res => {
              const urlObject = window.URL.createObjectURL(new Blob([res]))
              this.imageSrc = urlObject
            }))
            .catch(err => {
              that.$notification.error({
                message: '消息',
                description: res.message
              })
            })
            .finally(() => {
              this.showBmpButtonLoading = false
            })
        }
      })
    },
    getAllApproveData(item) {
      console.log('selectShenpiData----->', this.selectShenpiData)
      this.flowData = item
      let param = {
        'id': item.dataId
      }
      let parmhis={
        'procInstId': item.procInstId
      }
      getAction(this.url.queryHisTaskList,parmhis).then(res=>{
        this.hitaskDataSource=res.result
        getAction(this.url.queryBomDataById, param).then((res => {
          if (res.success) {
            this.tableRowRecord = res.result[0]
            this.detail.dataSource=res.result[0].tableDetailList
            console.log('this.tableRowRecord----->', this.tableRowRecord[0])
      },
      submitForm() {
        const flowTaskVo = {}
        flowTaskVo.dataId = this.selectShenpiData.dataId
        flowTaskVo.taskId = this.selectShenpiData.id
        flowTaskVo.userId = this.selectShenpiData.assignee
        flowTaskVo.instanceId = this.selectShenpiData.procInstId
        flowTaskVo.values = this.selectShenpiData.variables
        flowTaskVo.tableDetailList = this.$refs.editableDetailTable.getTableData()
        const that = this
        this.confirmLoading = true
        console.log('表单提交数据', flowTaskVo)
        // httpAction(this.url.approve, flowTaskVo, 'post')
        //   .then((res) => {
        //     if (res.success) {
        //       that.$message.success(res.message)
        //       //刷新表格
        //       that.$emit('searchReset')
        //       that.handleCancel()
        //     } else {
        //       that.$message.warning(res.message)
        //     }
        //   })
        //   .finally(() => {
        //     that.confirmLoading = false
        //   })
      },
      autoCompleteForm({ standardName, maintenancePeriod, standardCode }) {
        this.$set(this.tableRowRecord, 'standardName', standardName)
        this.$set(this.tableRowRecord, 'maintenancePeriod', maintenancePeriod)
        this.$set(this.tableRowRecord, 'standardCode', standardCode)
        this.spinning = false
      },
      // 批量选择所有点检结果
      handleSelectAllInspectionResult() {
        this.selectedRowKeys.forEach(key => {
          const dataItem = this.detail.dataSource.find(item => item.id === key)
          if (dataItem && dataItem.inspectionResult !== '1') {
            console.log('dataItem', dataItem)
            delete dataItem.exceptionDescription
            delete dataItem.reportFlag
            dataItem.inspectionResult = '1'
          }
        }))
      }).finally(
        this.visible = true,
        console.log('this.approveData---->', this.approveData)
      )
        })
        this.$refs.editableDetailTable.clearCheckboxRow()
        this.selectedRowKeys = []
      },
      /**
       * 表格多选框发生改变时触发
       * @param {selectedRowIds} 表格中已选择的ID列表
       */
      handleTableSelectRowChange({ selectedRowIds }) {
        this.selectedRowKeys = selectedRowIds
      },
      /**
       * 点检结果选择器发生改变时触发
       * @param value 改变后的值
       * @param record 保养明细行记录
       */
      handleInspectionResultSelectChange(value, record) {
        if (record.exceptionDescription) delete record.exceptionDescription
        if (record.reportFlag) delete record.reportFlag
      },
      handCancel() {
        this.selectedRowKeys = []
        this.visible = false
      }
    }
  }
}
</script>
<style scoped>
.shallow-hr {
  border: 0;
  height: 1px; /* 分界线的高度 */
  background-color: rgba(0, 0, 0, 0.1); /* 使用 RGBA 颜色,并设置较低的透明度 */
  margin: 20px 0; /* 分界线上下的外边距 */
}
.btn-custom {
  background-color: #4CAF50; /* 绿色背景 */
  color: white; /* 白色文字 */
  border: none; /* 无边框 */
  padding: 5px 15px; /* 内边距 */
  text-align: center; /* 文字居中 */
  text-decoration: none; /* 无下划线 */
  display: inline-block; /* 行内块元素 */
  font-size: 12px; /* 字体大小 */
  margin: 4px 2px; /* 外边距 */
  cursor: pointer; /* 鼠标悬停时显示手型 */
  border-radius: 4px; /* 圆角边框 */
}
  .btn-custom {
    background-color: #4CAF50; /* 绿色背景 */
    color: #fff; /* 白色文字 */
  }
.bold-large-label {
  font-weight: bold;
  font-size: 20px; /* 或你需要的任何大小 */
}
.left_qiu{
  position: absolute;
  left: -74px;
  top: 0;
  width:54px;
  border-radius: 50%;
  height:54px;
  font-size: 13px;
  margin: auto;
  display: flex;
  flex-wrap: wrap;
  align-items: center;
  justify-content: center;
  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%;
}
  /deep/ .ant-select-dropdown-menu {
    text-align: left;
  }
.wrap{
  clear: both;
  width: 100%;
  display: flex;
  height: 50px;
  border: 1px solid #ccc;
  /* background-color: aqua; */
}
.box{
  width:21%;
  height:50px;
  border-right: 1px solid #ccc;
  line-height: 50px;
  /* background: red; */
  text-align:center;
  margin: auto;
}
@import '~@assets/less/common.less';
  @import '~@assets/less/common.less';
</style>
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -3,6 +3,7 @@
    :width="1000"
    :visible="visible"
    @cancel="handCancel"
    @ok="submitForm"
    :mask-closable="false"
    centered
  >
@@ -23,118 +24,106 @@
        <div v-if="imageSrc&&isDisplayBmp">
          <img :src="imageSrc" alt="Fetched Image"/>
        </div>
        <hr class="shallow-hr"/>
        <!--<hr class="shallow-hr"/>-->
      </div>
      <div>
        <b>指派详情</b>
        <br>
        <a-form :form='form'>
          <a-spin :spinning="spinning">
            <a-tabs default-active-key='1'>
              <a-tab-pane key='1' tab='基本信息'>
                <a-form-model ref='form' :model='tableRowRecord' :rules='validatorRules' :labelCol='labelCol'
                              :wrapperCol='wrapperCol'>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item label='工单编号'>
                        <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.repairCode'/>
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label='设备编号'>
                        <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.equipmentId_dictText'/>
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label='单据状态'>
                        <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.repairStatus_dictText'/>
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label='维修负责人'>
                        <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.repairer'/>
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                </a-form-model>
              </a-tab-pane>
              <a-tab-pane key='2' 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.startTime}}</p>
                        <p>结束时间:{{item.endTime}}</p>
                        <p>处理人:{{item.assignee}}</p>
                        <p>办理类型:{{item.bllx_dictText}}</p>
                        <p v-if="item.name == '提交申请'">指派原因:{{item.cause}}</p>
                        <p v-else>处理意见:{{item.cause}}</p>
                        <div class="left_qiu"><span>{{item.name}}</span></div>
                      </div>
                    </a-timeline-item>
                  </a-timeline>
                </a-card>
              </a-tab-pane>
            </a-tabs>
          </a-spin>
        </a-form>
      </div>
      <div>
        <hr class="shallow-hr">
        <br>
        <b>审批详情</b>
        <br>
        <br>
        <a-form-model ref="form" :model="approveData" :rules="validatorRules" :labelCol='labelCol'
                      :wrapperCol='wrapperCol'>
          <a-row>
            <a-col :span="24">
              <a-form-model-item label="是否需要领用备件" prop="status">
                <a-radio-group v-model="approveData.status">
                  <a-radio :value="1">是</a-radio>
                  <a-radio :value="0">否</a-radio>
                </a-radio-group>
              </a-form-model-item>
            </a-col>
        <a-spin :spinning="spinning">
          <a-tabs default-active-key='1'>
            <a-tab-pane key='1' tab='基本信息'>
              <a-form-model :model='tableRowRecord' :rules='validatorRules' :labelCol='labelCol'
                            :wrapperCol='wrapperCol'>
                <a-row>
                  <a-col :span='span'>
                    <a-form-model-item label='工单编号'>
                      <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.repairCode'/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span='span'>
                    <a-form-model-item label='设备编号'>
                      <lx-search-equipment-select disabled v-model='tableRowRecord.equipmentId'/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span='span'>
                    <a-form-model-item label='单据状态'>
                      <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.repairStatus_dictText'/>
                    </a-form-model-item>
                  </a-col>
                  <a-col :span='span'>
                    <a-form-model-item label='维修负责人'>
                      <a-input :readOnly='inputReadOnly' v-model='tableRowRecord.repairer'/>
                    </a-form-model-item>
                  </a-col>
                </a-row>
              </a-form-model>
            </a-tab-pane>
            <template v-if="approveData.status===0">
              <a-col :span="24">
                <a-form-model-item label="故障原因" prop="faultReason">
                  <a-input v-model="approveData.faultReason" rows="4" placeholder="请输入故障原因"/>
                </a-form-model-item>
              </a-col>
              <a-col :span="24">
                <a-form-model-item label="维修结果描述" prop="repairResultDescription">
                  <a-textarea v-model="approveData.repairResultDescription" placeholder="请输入维修结果描述"/>
                </a-form-model-item>
              </a-col>
              <a-col :span="24">
                <a-form-model-item label="维修图片">
                  <j-image-upload v-model="approveData.imageFiles" :is-multiple="true" :number="3"/>
                </a-form-model-item>
              </a-col>
            </template>
          </a-row>
        </a-form-model>
            <a-tab-pane key='2' tab='流程节点'>
              <a-card :bordered="false">
                <a-timeline>
                  <a-timeline-item v-for="(item,index) in hitaskDataSource" :key="index">
                    <div>
                      <h3 style="font-weight: bold">{{item.taskName}}</h3>
                      <div>处理人:{{item.assignee_dictText}}</div>
                      <div v-if="index !==0">处理时长:{{item.duration}}</div>
                      <div v-if="item.name !== '提交申请'">处理类型:{{item.sequenceFlowName}}</div>
                      <div v-if="item.description">处理意见:{{item.description}}</div>
                    </div>
                  </a-timeline-item>
                </a-timeline>
              </a-card>
            </a-tab-pane>
          </a-tabs>
        </a-spin>
      </div>
      <a-tabs default-active-key='1'>
        <a-tab-pane key="1" tab="审批详情">
          <a-form-model ref="form" :model="approveData" :rules="validatorRules" :labelCol='labelCol'
                        :wrapperCol='wrapperCol'>
            <a-row>
              <a-col :span="24">
                <a-form-model-item label="是否需要领用备件" prop="status">
                  <a-radio-group v-model="approveData.status">
                    <a-radio :value="1">是</a-radio>
                    <a-radio :value="0">否</a-radio>
                  </a-radio-group>
                </a-form-model-item>
              </a-col>
              <template v-if="approveData.status===0">
                <a-col :span="24">
                  <a-form-model-item label="故障原因" prop="faultReason">
                    <a-input v-model="approveData.faultReason" rows="4" placeholder="请输入故障原因"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="24">
                  <a-form-model-item label="维修结果描述" prop="repairResultDescription">
                    <a-textarea v-model="approveData.repairResultDescription" placeholder="请输入维修结果描述"/>
                  </a-form-model-item>
                </a-col>
                <a-col :span="24">
                  <a-form-model-item label="维修图片">
                    <j-image-upload v-model="approveData.imageFiles" :is-multiple="true" :number="3"/>
                  </a-form-model-item>
                </a-col>
              </template>
            </a-row>
          </a-form-model>
        </a-tab-pane>
      </a-tabs>
    </a-card>
    <template slot="footer">
      <div>
        <a-button @click="handCancel">取消</a-button>
        <a-button @click="submitForm" type="primary">提 交</a-button>
      </div>
    </template>
  </a-modal>
</template>
<script>
  import '@assets/less/TableExpand.less'
  import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
  import LxSearchEquipmentSelect from '../../../eam/equipment/modules/LxSearchEquipmentSelect'
  export default {
    name: 'RepairOrderApprovalModal',
    components: { LxSearchEquipmentSelect },
    props: {
      selectShenpiData: {
        type: Object,
@@ -148,12 +137,11 @@
        inputReadOnly: true,
        spinning: false,
        tableRowRecord: {},
        assignFileStream: {},
        hitaskDataSource: [],
        imageSrc: null,
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 }
          sm: { span: 6 }
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -171,7 +159,6 @@
          ]
        },
        approveData: {},
        flowData: {},
        visible: false,
        // 表头
        url: {
@@ -184,16 +171,13 @@
        showBmpButtonLoading: false
      }
    },
    created() {
    },
    methods: {
      /**
       * 获取待办记录的基本信息
       * 获取流程节点
       * @param record 待办记录信息
       */
      getAllApproveData(record) {
        console.log('selectShenpiData----->', this.selectShenpiData)
        this.flowData = Object.assign({}, record)
        const param = { 'procInstId': record.dataId }
        getAction(this.url.queryHisTaskList, param)
          .then(res => {
@@ -209,7 +193,8 @@
        this.spinning = true
        const that = this
        const param = { id: record.dataId }
        this.tableRowRecord = this.approveData = {}
        this.tableRowRecord = {}
        this.approveData = { status: 0 }
        getAction(this.url.queryBomDataById, param)
          .then((res => {
            if (res.success) {
@@ -226,13 +211,10 @@
      fetchAndShowBmp() {
        this.isDisplayBmp = !this.isDisplayBmp
        if (!this.imageSrc) {
          const { processDefinitionId, processInstanceId, processDefinitionKey } = this.selectShenpiData
          let param = { processDefinitionId, processInstanceId, TaskDefinitionKey: processDefinitionKey }
          this.showBmpButtonLoading = true
          const that = this
          let param = {
            processDefinitionId: this.flowData.processDefinitionId,
            processInstanceId: this.flowData.processInstanceId,
            TaskDefinitionKey: this.flowData.processDefinitionKey
          }
          downFile(this.url.diagramView, param, 'get')
            .then((res => {
              const urlObject = window.URL.createObjectURL(new Blob([res]))
@@ -292,13 +274,6 @@
  }
</script>
<style scoped>
  .shallow-hr {
    border: 0;
    height: 1px; /* 分界线的高度 */
    background-color: rgba(0, 0, 0, 0.1); /* 使用 RGBA 颜色,并设置较低的透明度 */
    margin: 20px 0; /* 分界线上下的外边距 */
  }
  .btn-custom {
    background-color: #4CAF50; /* 绿色背景 */
    color: #fff; /* 白色文字 */