Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

 src/views/eam/technical/EamTechnicalStatusChangeList.vue

@@ -47,30 +47,37 @@

    <!-- table区域-begin -->
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}">
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
             :customRow="customRow">
        <span slot="action" slot-scope="text, record">
          <template v-if="record.changeStatus=='WAIT_SUBMIT'">
          <a @click="handleEdit(record)">编辑</a>
          <a @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定提交吗？" @confirm="handleSubmit(record.id)">
             <a>提交</a>
             <a @click="e=>e.stopPropagation()">提交</a>
          </a-popconfirm>

          <a-divider type="vertical"/>

          <a-popconfirm title="确定作废吗？" @confirm="handleAbolish(record.id)">
            <a>作废</a>
            <a @click="e=>e.stopPropagation()">作废</a>
          </a-popconfirm>
          </template>

          <a @click="handleDetail(record)"
          <a @click.stop="handleDetail(record)"
             v-if="record.changeStatus!='WAIT_SUBMIT'&&record.changeStatus!='ABOLISH'">详情</a>
        </span>
    </a-table>

    <!-- table区域-end -->

    <a-tabs v-if="selectedRowKeys.length>0">
      <a-tab-pane tab="设备明细">
        <eam-technical-status-change-equipment-detail :selectedRow="selectionRows[0]"/>
      </a-tab-pane>
    </a-tabs>

    <!-- 表单区域 -->
    <eamTechnicalStatusChange-modal ref="modalForm" @ok="modalFormOk" :productionTreeData="productionTreeData"/>
@@ -87,11 +94,13 @@
  import { getAction } from '@/api/manage'
  import TechnicalStatusChangeApprovalModal
    from '../../flowable/workflow/TechnicalStatus/TechnicalStatusChangeApprovalModal'
  import EamTechnicalStatusChangeEquipmentDetail from './modules/EamTechnicalStatusChangeEquipmentDetail'

  export default {
    name: 'EamTechnicalStatusChangeList',
    mixins: [JeecgListMixin],
    components: {
      EamTechnicalStatusChangeEquipmentDetail,
      TechnicalStatusChangeApprovalModal,
      EamTechnicalStatusChangeModal
    },
@@ -133,7 +142,7 @@
          {
            title: '使用单位室级主管签字',
            align: 'center',
            dataIndex: 'departHeaderSignature'
            dataIndex: 'departHeaderSignature_dictText'
          },
          {
            title: '使用单位室级主管签字时间',
@@ -143,7 +152,7 @@
          {
            title: '使用单位部级主管签字',
            align: 'center',
            dataIndex: 'departLeaderSignature'
            dataIndex: 'departLeaderSignature_dictText'
          },
          {
            title: '使用单位部级主管签字时间',
@@ -255,6 +264,19 @@
        this.$refs.technicalStatusChangeApprovalModal.handleDetail(record)
      },

      customRow(record) {
        return {
          style: {
            cursor: 'pointer'
          },
          on: {
            click: event => {
              this.onSelectChange([record.id], [record])
            }
          }
        }
      },

      /**
       * 申请时间发生改变时触发
       * @param dateStringArray