设备归还功能调整

Lius

2 天以前 ebdee541df438f35ae291bf136c91afc2c1fffae

 src/views/eam/dispose/EamEquipmentLeanOutList.vue

@@ -8,25 +8,15 @@
        @keyup.enter.native="searchQuery"
      >
        <a-row :gutter="24">
          <a-col
            :xl="4"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <a-form-item label="设备编号1">
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备编号">
              <lx-search-equipment-select
                placeholder="请输入设备编号或名称搜索"
                v-model="queryParam.equipmentId"
              ></lx-search-equipment-select>
            </a-form-item>
          </a-col>
          <a-col
            :xl="4"
            :lg="7"
            :md="8"
            :sm="24"
          >
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据号">
              <a-input
                placeholder="请输入单据号"
@@ -34,12 +24,13 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
          <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"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
@@ -145,7 +136,14 @@
              </a-menu>
            </a-dropdown>
          </template>
          <template v-else>
           <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'">
            <a
              href="javascript:;"
              @click="handleDetail(record)"
@@ -243,36 +241,6 @@
          dataIndex: 'leanEndTime'
        },
        {
          title: '审核人',
          align: 'center',
          dataIndex: 'approvalUser_dictText'
        },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'approvalComment'
        },
        {
          title: '审核时间',
          align: 'center',
          dataIndex: 'approvalTime'
        },
        {
          title: '归还确认人',
          align: 'center',
          dataIndex: 'confirmUser_dictText'
        },
        {
          title: '确认意见',
          align: 'center',
          dataIndex: 'confirmComment'
        },
        {
          title: '确认时间',
          align: 'center',
          dataIndex: 'confirmTime'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
@@ -291,11 +259,37 @@
        delete: '/eam/eamEquipmentLeanOut/delete',
        deleteBatch: '/eam/eamEquipmentLeanOut/deleteBatch',
        submit: '/eam/eamEquipmentLeanOut/submit',
        equipmentReturn: '/eam/eamEquipmentLeanOut/equipmentReturn',
      }
    }
  },
  computed: {},
  methods: {
    equipmentReturn(id) {
      if (!this.url.equipmentReturn) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      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
          })
        }
      })
    },
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')