Merge remote-tracking branch 'origin/master'

zhaowei

昨天 6e4b54ef350de163e4101558889d043d437e793c

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

@@ -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"
@@ -323,7 +323,7 @@
    name: 'TechnicalStatusEvaluationApprovalModal',
    mixins: [JVxeTableModelMixin],
    components: {
      TechnicalStatusEquipmentSelect,
      TechnicalStatusEquipmentSelect
    },
    props: {
      selectShenpiData: {
@@ -411,7 +411,8 @@
              title: '检查项目',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            },
            {
              title: '检查结果',
@@ -444,13 +445,15 @@
              title: '检查项目',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            },
            {
              title: '检查子项目',
              key: 'subItemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            },
            {
              title: '允差值',
@@ -489,7 +492,8 @@
              title: '检查项目',
              key: 'itemName',
              type: JVXETypes.normal,
              align: 'center'
              headerAlign: 'center',
              align: 'left'
            },
            {
              title: '检查结果',
@@ -525,7 +529,7 @@
       * 主页面点击执行审批时触发
       * @param record 主页面列表行记录
       */
      async handleDetail(record) {
      async handleApprove(record) {
        this.model = {}
        this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
        this.handleTabToFirstTable()
@@ -537,7 +541,7 @@
       * 主页面点击详情时触发
       * @param record 主页面列表行记录
       */
      recordDetail(record) {
      handleDetail(record) {
        this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
        this.model = Object.assign({}, record)
        this.handleTabToFirstTable()
@@ -762,4 +766,20 @@
      }
    }
  }

  .vxe-header--column[data-col="itemName"] .vxe-cell {
    text-align: center !important;
  }

  .vxe-body--column[data-col="itemName"] .vxe-cell {
    text-align: left !important;
  }

  .vxe-header--column[data-col="subItemName"] .vxe-cell {
    text-align: center !important;
  }

  .vxe-body--column[data-col="subItemName"] .vxe-cell {
    text-align: left !important;
  }
</style>