Merge remote-tracking branch 'origin/master'

lyh

5 天以前 b1c4b9509b3b84594bbc9a541f308101d3a17140

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -117,12 +117,19 @@
              </a-popconfirm>
          </template>

          <template v-if="record.standardStatus != 'WAIT_SUBMIT'">
          <template v-if="record.standardStatus !== 'WAIT_SUBMIT'">
            <a-divider v-has="'standard:delete'" type="vertical" v-if="record.standardStatus=='START'"/>

          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
            <a v-has="'standard:delete'" @click.stop="event=>event.stopPropagation()">删除</a>
          </a-popconfirm>
          </template>

          <template
            v-if="record.standardStatus !== 'WAIT_SUBMIT'&&record.standardStatus!=='ABOLISH'&&record.standardStatus!=='START'">
            <a-divider type="vertical"/>

            <a @click.stop="handleDetail(record)">详情</a>
          </template>
        </span>
      </a-table>
@@ -160,6 +167,9 @@

    <!-- 表单区域 -->
    <eamMaintenanceStandard-modal ref="modalForm" @ok="modalFormOk"/>

    <!--审批窗口-->
    <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/>
  </a-card>
</template>

@@ -170,6 +180,8 @@
  import EamMaintenanceStandardDetailList from '@views/eam/base/modules/EamMaintenanceStandardDetailList'
  import { deleteAction, getAction, templateXlsDownload } from '@api/manage'
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
  import MaintenanceStandardApprovalModal
    from '../../flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal'


  export default {
@@ -182,6 +194,7 @@
      }
    },
    components: {
      MaintenanceStandardApprovalModal,
      LxSearchEquipmentSelect,
      EamMaintenanceStandardModal,
      EamMaintenanceStandardDetailList
@@ -190,22 +203,28 @@
      return {
        description: '保养规范页面',
        disableMixinCreated: true,
        selectedRowData: {},
        // 表头
        columns: [
          {
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentCode'
            dataIndex: 'equipmentCode',
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName'
            dataIndex: 'equipmentName',
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentModel'
            dataIndex: 'equipmentModel',
          },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText',
          },
          {
            title: '保养分类',
@@ -228,30 +247,21 @@
            title: '保养周期',
            align: 'center',
            dataIndex: 'maintenancePeriod',
            width: 100
          },
          {
            title: '保养周期单位',
            align: 'center',
            dataIndex: 'periodUnit',
            width: 120
          },
          {
            title: '初始日期',
            align: 'center',
            dataIndex: 'initialDate',
            width: 100
          },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText'
          },
          {
            title: '规范版本',
            align: 'center',
            dataIndex: 'standardVersion',
            width: 100
          }
        ],
        url: {
@@ -357,13 +367,28 @@
          })
      },

      /**
       * 点击升版时触发时触发
       * @param record
       */
      handleUpgrade(record) {
        //升版
        this.$refs.modalForm.upgrade(record)
        this.$refs.modalForm.title = '升版'
        this.$refs.modalForm.disableSubmit = false
      },

      /**
       * 点击详情时触发时触发
       * @param record
       */
      handleDetail(record) {
        this.selectedRowData = Object.assign({}, record)
        this.$refs.maintenanceStandardApprovalModal.title = '详情'
        this.$refs.maintenanceStandardApprovalModal.disableSubmit = true
        this.$refs.maintenanceStandardApprovalModal.visible = true
        this.$refs.maintenanceStandardApprovalModal.handleDetail(record)
      },

      batchDel() {
        var ids = ''
        for (var a = 0; a < this.selectedRowKeys.length; a++) {