合并设备借出与归还流程，增加借出归还列表详情功能

zhaowei

19 小时以前 8905bdd0a74c4bd6cabc206c36a299341488041e

 src/views/eam/dispose/EamEquipmentLeanOutList.vue

@@ -26,7 +26,8 @@
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="借用状态">
              <j-dict-select-tag placeholder="请选择借用状态" dictCode="equipment_lean_out_status" v-model="queryParam.leanStatus"
              <j-dict-select-tag placeholder="请选择借用状态" dictCode="equipment_lean_out_status"
                                 v-model="queryParam.leanStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
@@ -58,7 +59,8 @@
        @click="handleAdd"
        type="primary"
        icon="plus"
      >新增</a-button>
      >新增
      </a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item
@@ -81,7 +83,8 @@
        class="ant-alert ant-alert-info"
        style="margin-bottom: 16px;"
      >
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
        selectedRowKeys.length }}</a>项
        <a
          style="margin-left: 24px"
          @click="onClearSelected"
@@ -136,14 +139,15 @@
              </a-menu>
            </a-dropdown>
          </template>

           <template v-if="record.leanStatus === 'WAIT_RETURN'">
             <a-popconfirm title='确定归还吗?' @confirm='() => equipmentReturn(record.id)'>
              <a>归还</a>
            </a-popconfirm>
             <a-divider type='vertical' />
              <a @click='handleDetail(record)'>详情</a>
          </template>
          <template v-if="record.leanStatus !== 'WAIT_RETURN' && record.leanStatus !== 'WAIT_SUBMIT'">

          <template v-if="record.leanStatus !== 'WAIT_SUBMIT'">
            <a
              href="javascript:;"
              @click="handleDetail(record)"
@@ -160,6 +164,10 @@
      ref="modalForm"
      @ok="modalFormOk"
    ></eamEquipmentLeanOut-modal>

    <!--审批弹窗-->
    <equipment-lean-out-and-return-approval-modal ref="approvalModal"
                                                  :selectShenpiData="selectRowData"/>
  </a-card>
</template>

@@ -169,17 +177,21 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { getAction } from '@api/manage'
  import EquipmentLeanOutAndReturnApprovalModal
    from '../../flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal'

export default {
  name: 'EamEquipmentLeanOutList',
  mixins: [JeecgListMixin],
  components: {
      EquipmentLeanOutAndReturnApprovalModal,
    LxSearchEquipmentSelect,
    EamEquipmentLeanOutModal
  },
  data() {
    return {
      description: '设备借出归还管理页面',
        selectRowData: {},
      // 表头
      columns: [
        {
@@ -197,13 +209,13 @@
          title: '设备编号',
          align: 'center',
          dataIndex: 'equipmentCode',
          fixed: 'left',
            fixed: 'left'
        },
        {
          title: '设备名称',
          align: 'center',
          dataIndex: 'equipmentName',
          fixed: 'left',
            fixed: 'left'
        },
        {
          title: '单据号',
@@ -259,30 +271,25 @@
        delete: '/eam/eamEquipmentLeanOut/delete',
        deleteBatch: '/eam/eamEquipmentLeanOut/deleteBatch',
        submit: '/eam/eamEquipmentLeanOut/submit',
        equipmentReturn: '/eam/eamEquipmentLeanOut/equipmentReturn',
          equipmentReturn: '/eam/eamEquipmentLeanOut/equipmentReturn'
      }
    }
  },
  computed: {},
  methods: {
    equipmentReturn(id) {
      if (!this.url.equipmentReturn) {
        this.$message.error('请设置url.submit属性!')
        return
      }
        this.loading = true
      let that = this
      getAction(that.url.equipmentReturn, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
@@ -291,29 +298,31 @@
      })
    },
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
      }
        this.loading = true
      let that = this
      getAction(that.url.submit, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
          })
        }
      })
      },

      handleDetail(record) {
        this.selectRowData = Object.assign({}, record)
        this.$refs.approvalModal.recordDetail(record)
        this.$refs.approvalModal.title = '详情'
        this.$refs.approvalModal.disableSubmit = true
    }
  }
}