zhaowei
2 天以前 d77bd5a122ca72a8537bace6b2307bcececac04b
技术状态鉴定规范增加详情功能
已修改2个文件
154 ■■■■ 文件已修改
src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/base/EamTechnicalStatusEvaluationStandardList.vue
@@ -58,22 +58,11 @@
                @change="handleImportExcel">
        <a-button type="primary" icon="import">其他检查导入</a-button>
      </a-upload>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel">
            <a-icon type="delete"/>
            删除
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> 批量操作
          <a-icon type="down"/>
        </a-button>
      </a-dropdown>
    </div>
    <!-- table区域-begin -->
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" @change="handleTableChange">
             :scroll="{x:'max-content'}" :pagination="ipagination" :loading="loading" @change="handleTableChange">
      <!--是否有安全装置检查-->
      <template slot="hasSafetyEquipmentCheck" slot-scope="text">
@@ -98,10 +87,16 @@
          <a-popconfirm title="确定提交吗?" @confirm="handleSubmit(record)">
            <a @click.stop="event=>event.stopPropagation()">提交</a>
          </a-popconfirm>
          <a-divider type="vertical"/>
        </template>
        <a @click="handleUpgrade(record)" v-if="record.standardStatus=='ENABLE'">升版</a>
        </span>
        <template v-if="record.standardStatus=='ENABLE'">
          <a @click="handleUpgrade(record)">升版</a>
          <a-divider type="vertical"/>
        </template>
        <a @click="handleDetail(record)">详情</a>
        </span>
    </a-table>
    <!-- table区域-end -->
@@ -155,6 +150,12 @@
            dataIndex: 'equipmentModel'
          },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText',
            width: 150
          },
          {
            title: '规范编码',
            align: 'center',
            dataIndex: 'standardCode'
@@ -164,48 +165,39 @@
            align: 'center',
            dataIndex: 'standardName'
          },
          // {
          //   title: '鉴定周期(年)',
          //   align: 'center',
          //   dataIndex: 'evaluationPeriod',
          //   width: 150
          // },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText',
            width: 150
          },
          {
            title: '版本',
            align: 'center',
            dataIndex: 'standardVersion',
            width: 100
          },
          {
            title: '是否有安全装置检查',
            align: 'center',
            dataIndex: 'hasSafetyEquipmentCheck',
            scopedSlots: { customRender: 'hasSafetyEquipmentCheck' },
            width: 150
            width: 200
          },
          {
            title: '是否有设备精度检查',
            align: 'center',
            dataIndex: 'hasPrecisionCheck',
            scopedSlots: { customRender: 'hasPrecisionCheck' },
            width: 150
            width: 200
          },
          {
            title: '是否有其他检查',
            align: 'center',
            dataIndex: 'hasOtherCheck',
            scopedSlots: { customRender: 'hasOtherCheck' },
            width: 150
            width: 200
          },
          {
            title: '操作',
            dataIndex: 'action',
            align: 'center',
            fixed: 'right',
            width: 200,
            scopedSlots: { customRender: 'action' }
          }
        ],
@@ -214,7 +206,7 @@
          submit: '/eam/eamTechnicalStatusEvaluationStandard/submit',
          importSafetyEquipmentCheck: 'eam/eamTechnicalStatusEvaluationStandard/importSafetyEquipmentCheck',
          importPrecisionCheck: 'eam/eamTechnicalStatusEvaluationStandard/importPrecisionCheck',
          importOtherCheck: 'eam/eamTechnicalStatusEvaluationStandard/importOtherCheck',
          importOtherCheck: 'eam/eamTechnicalStatusEvaluationStandard/importOtherCheck'
        }
      }
@@ -252,6 +244,7 @@
      handleUpgrade(record) {
        this.$refs.modalForm.edit(record, true)
        this.$refs.modalForm.title = '升版'
        this.$refs.modalForm.disableSubmit = false
      }
    }
  }
src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue
@@ -1,65 +1,70 @@
<template>
  <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen centered
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭"
           :okButtonProps="{ class:{'jee-hidden': disableSubmit} }">
    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="规范编码">
              <a-input placeholder="规范编码自动生成" v-model="model.standardCode" disabled/>
            </a-form-model-item>
          </a-col>
      <j-form-container :disabled="disableSubmit">
        <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol"
                      slot="detail">
          <a-row>
            <a-col :span="8">
              <a-form-model-item label="规范编码">
                <a-input placeholder="规范编码自动生成" v-model="model.standardCode" disabled/>
              </a-form-model-item>
            </a-col>
          <a-col :span="8">
            <a-form-model-item prop="standardName" label="规范名称">
              <a-input placeholder="请输入规范名称" v-model="model.standardName"/>
            </a-form-model-item>
          </a-col>
            <a-col :span="8">
              <a-form-model-item prop="standardName" label="规范名称">
                <a-input placeholder="请输入规范名称" v-model="model.standardName"/>
              </a-form-model-item>
            </a-col>
          <a-col :span="8">
            <a-form-model-item prop="equipmentId" label="统一编码">
              <lx-search-equipment-select placeholder="请输入统一编码或名称搜索" v-model="model.equipmentId" :disabled="!editable"/>
            </a-form-model-item>
          </a-col>
        </a-row>
            <a-col :span="8">
              <a-form-model-item prop="equipmentId" label="统一编码">
                <lx-search-equipment-select placeholder="请输入统一编码或名称搜索" v-model="model.equipmentId"
                                            :disabled="!editable"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        <a-row>
          <a-col :span="8" v-for="item in checkList" :key="item.key">
            <a-form-model-item :label="item.label">
              <j-dict-select-tag @change="handleCheckListChange($event,item.key)" dict-code="yn" type="radio"
                                 :disabled="checkList.filter(i=>i.key!=item.key).every(i=>i.value=='0')"
                                 v-model="model[item.key]"/>
            </a-form-model-item>
          </a-col>
        </a-row>
          <a-row>
            <a-col :span="8" v-for="item in checkList" :key="item.key">
              <a-form-model-item :label="item.label">
                <j-dict-select-tag @change="handleCheckListChange($event,item.key)" dict-code="yn" type="radio"
                                   v-model="model[item.key]"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        <a-row>
          <a-col :span="24">
            <a-form-model-item :labelCol="{span:2}" :wrapperCol="{span:21}" label="备注">
              <a-textarea placeholder="请输入备注" v-model="model.remark"/>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
          <a-row>
            <a-col :span="24">
              <a-form-model-item :labelCol="{span:2}" :wrapperCol="{span:21}" label="备注">
                <a-textarea placeholder="请输入备注" v-model="model.remark"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </a-form-model>
      </j-form-container>
      <a-tabs :activeKey="activeTabKey" @change="handleTabChange">
        <a-tab-pane tab="安全装置检查" :key="1" v-if="+model.hasSafetyEquipmentCheck">
          <j-vxe-table ref="editableDetailTable1" rowNumber rowSelection bordered alwaysEdit toolbar
                       :toolbarConfig="detail.toolbarConfig" keep-source
                       :toolbarConfig="detail.toolbarConfig" keep-source :disabled="disableSubmit"
                       :height="300" :dataSource="detail.safetyEquipmentCheckList" :columns="detail.columns">
          </j-vxe-table>
        </a-tab-pane>
        <a-tab-pane tab="设备精度检查" :key="2" v-if="+model.hasPrecisionCheck" forceRender>
          <j-vxe-table ref="editableDetailTable2" rowNumber rowSelection bordered alwaysEdit toolbar
                       :toolbarConfig="detail.toolbarConfig" keep-source
                       :height="300" :dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
                       :toolbarConfig="detail.toolbarConfig" keep-source :disabled="disableSubmit"
                       :height="300" :dataSource="detail.precisionCheckList"
                       :columns="detail.precisionCheckColumns">
          </j-vxe-table>
        </a-tab-pane>
        <a-tab-pane tab="其他检查" :key="3" v-if="+model.hasOtherCheck" forceRender>
          <j-vxe-table ref="editableDetailTable3" rowNumber rowSelection bordered alwaysEdit toolbar
                       :toolbarConfig="detail.toolbarConfig" keep-source
                       :toolbarConfig="detail.toolbarConfig" keep-source :disabled="disableSubmit"
                       :height="300" :dataSource="detail.otherCheckList" :columns="detail.columns">
          </j-vxe-table>
        </a-tab-pane>
@@ -95,6 +100,7 @@
        },
        spinning: false,
        confirmLoading: false,
        disableSubmit: false,
        editable: true,
        validatorRules: {
          standardName: [{ required: true, message: '请输入规范名称', trigger: 'change' }],
@@ -123,6 +129,7 @@
            order: 3
          }
        ],
        hasCheckedCheckList: [],
        activeTabKey: 1,
        upgradeFlag: false,
        detail: {
@@ -241,7 +248,6 @@
       */
      edit(record, upgradeFlag = false) {
        this.upgradeFlag = upgradeFlag
        console.log('upgradeFlag', this.upgradeFlag)
        this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
        this.model = Object.assign({}, record)
        this.hasCheckedCheckList = []
@@ -270,6 +276,10 @@
        }
      },
      /**
       * 获取检查明细
       * @param standardId 规范编号
       */
      loadDetail(standardId) {
        this.spinning = true
        getAction(this.url.detail, { standardId })
@@ -298,6 +308,15 @@
      },
      async handleOk() {
        console.log('tis', this.hasCheckedCheckList)
        if (this.hasCheckedCheckList.findIndex(item => item.value === '1') < 0) {
          this.$notification.warning({
            message: '消息',
            description: '至少选择一项检查'
          })
          return
        }
        // 先校验当前tab下的表格
        let errMap = await this.$refs['editableDetailTable' + this.activeTabKey].validateTable()
        if (errMap) return false