art: 设备管理-设备处置 借用 列表，新增

zhangherong

2025-05-16 196f9692aa3a607b4d0edf10945004fbe728547d

art: 设备管理-设备处置 借用 列表，新增

 src/views/eam/dispose/EamEquipmentLeanOutList.vue

@@ -5,45 +5,23 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="删除标记">
              <a-input placeholder="请输入删除标记" v-model="queryParam.delFlag"></a-input>
          <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="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备ID">
              <a-input placeholder="请输入设备ID" v-model="queryParam.equipmentId"></a-input>
            </a-form-item>
          </a-col>
        <template v-if="toggleSearchStatus">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据号">
              <a-input placeholder="请输入单据号" v-model="queryParam.code"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="借入部门">
              <a-input placeholder="请输入借入部门" v-model="queryParam.leanDepartId"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="借入责任人">
              <a-input placeholder="请输入借入责任人" v-model="queryParam.leanPerson"></a-input>
            </a-form-item>
          </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>

        </a-row>
      </a-form>
    </div>
@@ -51,22 +29,24 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备借出归还')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @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-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-button style="margin-left: 8px"> 批量操作
          <a-icon type="down" />
        </a-button>
      </a-dropdown>
    </div>

    <!-- table区域-begin -->
    <div>
      <div 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">清空</a>
      </div>

@@ -79,17 +59,24 @@
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :scroll="{ x: 'max-content' }"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <template v-if="record.leanStatus === 'WAIT_SUBMIT'">
          <a @click="handleEdit(record)">编辑</a>

            <a-divider type="vertical" />
            <a-popconfirm title="确定提交吗?" @confirm="() => handleSubmit(record.id)">
              <a>提交</a>
            </a-popconfirm>
          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
                 <a-menu-item>
                  <a href="javascript:;" @click="handleDetail(record)">详情</a>
                </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
@@ -97,6 +84,10 @@
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          </template>
           <template v-else>
              <a @click="handleDetail(record)">详情</a>
          </template>
        </span>

      </a-table>
@@ -112,11 +103,14 @@
  import '@/assets/less/TableExpand.less'
  import EamEquipmentLeanOutModal from './modules/EamEquipmentLeanOutModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { getAction } from '@api/manage'

  export default {
    name: "EamEquipmentLeanOutList",
  name: 'EamEquipmentLeanOutList',
    mixins:[JeecgListMixin],
    components: {
    LxSearchEquipmentSelect,
      EamEquipmentLeanOutModal
    },
    data () {
@@ -129,89 +123,138 @@
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
          fixed: 'left',
          align: 'center',
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            return parseInt(index) + 1
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
          title: '设备编号',
          align: 'center',
          dataIndex: 'equipmentCode',
          fixed: 'left',
           },
           {
            title: '设备ID',
            align:"center",
            dataIndex: 'equipmentId'
          title: '设备名称',
          align: 'center',
          dataIndex: 'equipmentName',
          fixed: 'left',
           },
           {
            title: '单据号',
            align:"center",
          align: 'center',
            dataIndex: 'code'
           },
           {
            title: '借入部门',
            align:"center",
            dataIndex: 'leanDepartId'
          title: '借入车间',
          align: 'center',
          dataIndex: 'leanDepartId_dictText'
           },
           {
            title: '借入责任人',
            align:"center",
            dataIndex: 'leanPerson'
          title: '借入人',
          align: 'center',
          dataIndex: 'leanPerson_dictText'
           },
           {
            title: '借出状态',
            align:"center",
            dataIndex: 'leanStatus'
          title: '借用原因',
          align: 'center',
          dataIndex: 'leanReason'
           },
           {
            title: '借出开始时间',
            align:"center",
          title: '借用状态',
          align: 'center',
          dataIndex: 'leanStatus_dictText'
        },
        {
          title: '借用开始时间',
          align: 'center',
            dataIndex: 'leanStartTime'
           },
           {
            title: '借出归还时间',
            align:"center",
          title: '借用归还时间',
          align: 'center',
            dataIndex: 'leanEndTime'
           },
           {
            title: '审核人',
            align:"center",
            dataIndex: 'approvalUser'
          align: 'center',
          dataIndex: 'approvalUser_dictText'
        },
        {
          title: '审核意见',
          align: 'center',
          dataIndex: 'approvalComment'
           },
           {
            title: '审核时间',
            align:"center",
          align: 'center',
            dataIndex: 'approvalTime'
           },
           {
          title: '归还确认人',
          align: 'center',
          dataIndex: 'confirmUser_dictText'
        },
        {
          title: '确认意见',
          align: 'center',
          dataIndex: 'confirmComment'
        },
        {
          title: '确认时间',
          align: 'center',
          dataIndex: 'confirmTime'
        },
        {
            title: '备注',
            align:"center",
          align: 'center',
            dataIndex: 'remark'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
          align: 'center',
          fixed: 'right',
          width: 200,
          scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/eam/eamEquipmentLeanOut/list",
          delete: "/eam/eamEquipmentLeanOut/delete",
          deleteBatch: "/eam/eamEquipmentLeanOut/deleteBatch",
          exportXlsUrl: "eam/eamEquipmentLeanOut/exportXls",
          importExcelUrl: "eam/eamEquipmentLeanOut/importExcel",
       },
        list: '/eam/eamEquipmentLeanOut/list',
        delete: '/eam/eamEquipmentLeanOut/delete',
        deleteBatch: '/eam/eamEquipmentLeanOut/deleteBatch',
        submit: '/eam/eamEquipmentLeanOut/submit',
      }
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
  computed: {},
    methods: {
     
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      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
          })
        }
      })
    }
    }
  }
</script>

 src/views/eam/dispose/modules/EamEquipmentLeanOutModal.vue

@@ -11,57 +11,50 @@
    
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
      
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备ID">
          <a-input placeholder="请输入设备ID" v-model="model.equipmentId" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="单据号">
          <a-input placeholder="请输入单据号" v-model="model.code" />
          <a-input placeholder="编码系统自动生成" v-model="model.code" disabled />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId" label="借入部门">
          <a-input placeholder="请输入借入部门" v-model="model.leanDepartId" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编号">
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
                                      v-model="model.equipmentId"></lx-search-equipment-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanPerson" label="借入责任人">
          <a-input placeholder="请输入借入责任人" v-model="model.leanPerson" />

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId" label="借入车间">
          <a-tree-select v-model="model.leanDepartId"
                         style="width: 100%"
                         :tree-data="treeData"
                         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                         placeholder="请选择借入车间"
                         allow-clear
                         tree-default-expand-all
          >
          </a-tree-select>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanStatus" label="借出状态">
          <a-input placeholder="请输入借出状态" v-model="model.leanStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanStartTime" label="借出开始时间">
          <a-input placeholder="请输入借出开始时间" v-model="model.leanStartTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanEndTime" label="借出归还时间">
          <a-input placeholder="请输入借出归还时间" v-model="model.leanEndTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="审核人">
          <a-input placeholder="请输入审核人" v-model="model.approvalUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="审核时间">
          <a-input placeholder="请输入审核时间" v-model="model.approvalTime" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanReason" label="借用原因">
          <a-textarea placeholder="请输入借用原因" v-model="model.leanReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
          <a-textarea placeholder="请输入备注" v-model="model.remark" />
        </a-form-model-item>
		
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { httpAction } from '@/api/manage'
import { getAction, httpAction } from '@/api/manage'
  import moment from "moment"
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

  export default {
    name: "EamEquipmentLeanOutModal",
    components: { LxSearchEquipmentSelect },
    data () {
      return {
        title:"操作",
        visible: false,
        model: {},
        editable: false,
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
@@ -70,26 +63,42 @@
          xs: { span: 24 },
          sm: { span: 16 },
        },

        confirmLoading: false,
        treeData: [],
        validatorRules:{
          equipmentId: [
            { required: true, message: '请选择设备！' }
          ],
          leanDepartId: [
            { required: true, message: '请选择车间！' }
          ],
          leanReason: [
            { required: true, message: '请输入借用原因！' }
          ],
        },
        url: {
          add: "/eam/eamEquipmentLeanOut/add",
          edit: "/eam/eamEquipmentLeanOut/edit",
          loadProductionOptions:'/mdc/mdcProduction/loadProductionTreeOptions',
        },
      }
    },
    created () {
      this.loadAllProductionTree();
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
        //初始化默认值
        this.model = {}
        this.visible = true
        this.editable = false
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
        this.model = Object.assign({}, record)
        this.visible = true
        this.editable = true
        this.loadDetail(record.id)
      },
      close () {
        this.$emit('close');
@@ -115,12 +124,12 @@
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
                that.close();
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false;
@@ -130,7 +139,16 @@
      handleCancel () {
        this.close()
      },

      loadAllProductionTree() {
        //加载车间选择树
        getAction(this.url.loadProductionOptions).then(res => {
          if (res.success) {
            this.treeData = [...res.result]
          }else {
            that.$message.warning(res.message)
          }
        })
      },

    }
  }