Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

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

@@ -53,9 +53,9 @@

            <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">
                          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">
@@ -93,9 +93,9 @@
              </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
                             :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
@@ -132,9 +132,9 @@
              </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
                             :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
@@ -323,7 +323,7 @@
    name: 'TechnicalStatusEvaluationApprovalModal',
    mixins: [JVxeTableModelMixin],
    components: {
      TechnicalStatusEquipmentSelect,
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {