Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

 src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue

@@ -1,5 +1,5 @@
<template>
  <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading"
  <j-modal :title="title" :visible="visible" :confirmLoading="confirmLoading"
           :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" fullscreen @ok="handleOk"
           @cancel="handleCancel" centered cancelText="关闭">
    <a-spin :spinning="spinning">
@@ -53,10 +53,10 @@

            <a-tabs :active-key="activeTabKey" @change="handleTabChange">
              <a-tab-pane :key="1" tab="安全装置检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.safetyEquipmentCheckList.length>0">
                <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source :height="300"
                          v-if="(disableSubmit&&detail.safetyEquipmentCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm'))||
                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source
                             :dataSource="detail.safetyEquipmentCheckList"
                             :columns="detail.safetyEquipmentCheckColumns">
                  <template v-slot:safetyEquipmentCheckResult="props">
@@ -93,11 +93,11 @@
              </a-tab-pane>

              <a-tab-pane :key="2" tab="设备精度检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.precisionCheckList.length>0">
                          v-if="(disableSubmit&&detail.precisionCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm'))||
                         (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable2" rowNumber bordered
                             alwaysEdit keep-source :height="300"
                             alwaysEdit keep-source
                             :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
                  <template v-slot:precisionCheckResult="props">
                    <a-input-number v-model="props.row.precisionCheckResult"
@@ -132,11 +132,11 @@
              </a-tab-pane>

              <a-tab-pane :key="3" tab="其他检查" forceRender
                          v-if="disableSubmit||
                          selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
                          model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
                          v-if="(disableSubmit&&detail.otherCheckList.length>0)||
                          (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm'))||
                          (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
                <j-vxe-table ref="editableDetailTable3" rowNumber bordered
                             alwaysEdit keep-source :height="300"
                             alwaysEdit keep-source
                             :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
                  <template v-slot:otherCheckResult="props">
                    <a-textarea v-model="props.row.otherCheckResult" :rows="1"
@@ -317,15 +317,13 @@
  import { downFile, getAction, httpAction } from '@/api/manage'
  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
  import { JVXETypes } from '@comp/jeecg/JVxeTable'
  import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect'
  import TechnicalStatusEquipmentSelect from '../../../eam/equipment/modules/TechnicalStatusEquipmentSelect'

  export default {
    name: 'TechnicalStatusEvaluationApprovalModal',
    mixins: [JVxeTableModelMixin],
    components: {
      TechnicalStatusEquipmentSelect,
      MaintenanceEquipmentSelect
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {