1、技术鉴定工单审批维修室主人确认单项检查流程增加展示以及限制条件 2、设备台账页面新增真空热处理炉字段

zhaowei

8 天以前 529061167e2cc6e67c7ee60a9355cdc0a7702502

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

@@ -4,8 +4,8 @@
           @cancel="handleCancel" centered cancelText="关闭">
    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="8">
        <a-row id="outer-row" :gutter="24">
          <a-col :span="8" class="scroll-col">
            <a-tabs>
              <a-tab-pane tab="基础信息">
                <a-row>
@@ -44,17 +44,20 @@
            </a-tabs>
          </a-col>

          <a-col :span="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'?10:16">
          <a-col
            :span="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION'?10:16"
            class="scroll-col">

            <a-tabs :active-key="activeTabKey" @change="handleTabChange">
              <a-tab-pane :key="1" tab="安全装置检查" forceRender
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check'||!Boolean(selectShenpiData.taskDefKey)">
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm'||!Boolean(selectShenpiData.taskDefKey)">
                <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source :height="300"
                             :dataSource="detail.safetyEquipmentCheckList"
                             :columns="detail.safetyEquipmentCheckColumns">
                  <template v-slot:safetyEquipmentCheckResult="props">
                    <j-dict-select-tag v-model="props.row.safetyEquipmentCheckResult" :disabled="disableSubmit"
                    <j-dict-select-tag v-model="props.row.safetyEquipmentCheckResult"
                                       placeholder="请选择检查结果"
                                       :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm')"
                                       @change="$refs['editableDetailTable'+activeTabKey].validateTable()"
                                       dictCode="yes_no_none" style="width: 100%"/>
                  </template>
@@ -72,8 +75,7 @@
                        </a-form-model-item>
                      </a-col>
                      <a-col :span="24">
                        <a-form-model-item prop="safetyCheckConfirmComment" :labelCol="labelColLong"
                                           :wrapperCol="wrapperColLong" label="确认意见">
                        <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="确认意见">
                          <a-textarea placeholder="请输入意见" v-model="model.safetyCheckConfirmComment"/>
                        </a-form-model-item>
                      </a-col>
@@ -83,12 +85,13 @@
              </a-tab-pane>

              <a-tab-pane :key="2" tab="设备精度检查" forceRender
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check'||!Boolean(selectShenpiData.taskDefKey)">
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='equipment_precision_check_confirm'||!Boolean(selectShenpiData.taskDefKey)">
                <j-vxe-table ref="editableDetailTable2" rowNumber bordered
                             alwaysEdit keep-source :height="300"
                             :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
                  <template v-slot:precisionCheckResult="props">
                    <a-input-number v-model="props.row.precisionCheckResult" :disabled="disableSubmit"
                    <a-input-number v-model="props.row.precisionCheckResult"
                                    :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm')"
                                    @blur="$refs['editableDetailTable'+activeTabKey].validateTable()"
                                    placeholder="请输入检查结果" style="width: 100%"/>
                  </template>
@@ -117,12 +120,13 @@
              </a-tab-pane>

              <a-tab-pane :key="3" tab="其他检查" forceRender
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check'||!Boolean(selectShenpiData.taskDefKey)">
                          v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey=='other_check_confirm'||!Boolean(selectShenpiData.taskDefKey)">
                <j-vxe-table ref="editableDetailTable3" rowNumber bordered
                             alwaysEdit keep-source :height="300"
                             :dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
                  <template v-slot:otherCheckResult="props">
                    <a-textarea v-model="props.row.otherCheckResult" :rows="1" :disabled="disableSubmit"
                    <a-textarea v-model="props.row.otherCheckResult" :rows="1"
                                :disabled="disableSubmit||(model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')||(model.evaluationStatus=='UNDER_EVALUATION'&&selectShenpiData.taskDefKey=='safety_equipment_check_confirm')"
                                @blur="$refs['editableDetailTable'+activeTabKey].validateTable()"
                                placeholder="请输入检查结果"
                                :autoSize="false"/>
@@ -159,7 +163,8 @@
            </a-tabs>
          </a-col>

          <a-col :span="6" v-if="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'">
          <a-col :span="6"
                 v-if="model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION'">
            <a-tabs>
              <a-tab-pane tab="维修工确认">
                <a-row>
@@ -349,8 +354,8 @@
        imageSrc: null,
        activeTabKey: 1,
        validatorRules: {
          confirmDealType: [
            { required: true, message: '请选择通过或驳回!' }
          safetyCheckConfirmResult: [
            { required: true, message: '请选择确认类型' }
          ],
          confirmComment: [
            { required: true, message: '请输入确认意见!' }
@@ -541,7 +546,7 @@
          .catch(err => {
            this.$notification.error({
              message: '消息',
              description: res.message
              description: err.message
            })
          })
      },
@@ -577,13 +582,15 @@
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = that.spinning = true
            for (let index = 1; index <= 3; index++) {
              if (that.$refs['editableDetailTable' + index]) {
                this.model.tableDetailList = that.$refs['editableDetailTable' + index].getTableData()
                break

            if (this.model.evaluationStatus == 'UNDER_EVALUATION') {
              for (let index = 1; index <= 3; index++) {
                if (that.$refs['editableDetailTable' + index]) {
                  this.model.tableDetailList = that.$refs['editableDetailTable' + index].getTableData()
                  break
                }
              }
            }
            console.log('model', this.model.tableDetailList)

            httpAction(this.url.approval, this.model, 'put')
              .then((res) => {
@@ -682,8 +689,29 @@
  }
</script>

<style scoped>
<style scoped lang="less">
  /deep/ .ant-select-dropdown-menu {
    text-align: left;
  }

  /deep/ .ant-spin-nested-loading {
    height: 100%;

    .ant-spin-container {
      height: 100%;

      .ant-form {
        height: 100%;

        #outer-row {
          height: 100%;

          .scroll-col {
            height: 100%;
            overflow: auto;
          }
        }
      }
    }
  }
</style>