Browse Source

出入库查询+首页消息+部分页面显示

dev
kilo 2 years ago
parent
commit
46cac7fea0
  1. 33
      src/views/accessrecords/LndustrialExplosiveCome.vue
  2. 27
      src/views/accessrecords/LndustrialExplosiveEnter.vue
  3. 33
      src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
  4. 31
      src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
  5. 19
      src/views/accessrecords/ProcessMaterialsPlanRecord.vue
  6. 44
      src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
  7. 42
      src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
  8. 64
      src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
  9. 28
      src/views/dashboard/HomePage.vue
  10. 21
      src/views/dictionaries/ProcessMerchandiseNewsList.vue
  11. 2
      src/views/dictionaries/ProcessSupplierList.vue
  12. 4
      src/views/system/LogList.vue
  13. 36
      src/views/system/RoleUserList.vue
  14. 1
      src/views/system/SysCategoryList.vue

33
src/views/accessrecords/LndustrialExplosiveCome.vue

@ -4,30 +4,35 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="4"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type" <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
placeholder="请选择物资类型" /> placeholder="请选择物资类型" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('民爆出库记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <!-- <div class="table-operator">-->
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button> <!-- <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>-->
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!-- <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-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- &lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>--> <!-- &lt;!&ndash; <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- </a-upload>--> <!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;--> <!-- &lt;!&ndash; &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> <!-- &lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
</div> <!-- </div>-->
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>

27
src/views/accessrecords/LndustrialExplosiveEnter.vue

@ -4,12 +4,17 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="4"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type" <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
placeholder="请选择物资类型" /> placeholder="请选择物资类型" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('民爆入库记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">--> <!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="供应商">--> <!-- <a-form-item label="供应商">-->
<!-- <a-input placeholder="请输入供应商信息" v-model="queryParam.supplier"></a-input>--> <!-- <a-input placeholder="请输入供应商信息" v-model="queryParam.supplier"></a-input>-->
@ -71,19 +76,17 @@
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <!-- <div class="table-operator">-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- &lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- </a-upload>--> <!-- &lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
<!-- 高级查询区域 --> <!-- </div>-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>

33
src/views/accessrecords/ProcessMaterialWarehousingRecord.vue

@ -4,7 +4,7 @@ aq<template>
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="4"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type" <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
placeholder="请选择物资类型" /> placeholder="请选择物资类型" />
@ -48,7 +48,7 @@ aq<template>
<!--&lt;!&ndash; </a-form-item>&ndash;&gt;--> <!--&lt;!&ndash; </a-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; </a-col>&ndash;&gt;--> <!--&lt;!&ndash; </a-col>&ndash;&gt;-->
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="流程发起人"> <a-form-item label="流程发起人">
<a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/> <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
</a-form-item> </a-form-item>
@ -63,27 +63,28 @@ aq<template>
<!-- />--> <!-- />-->
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('入库记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- &lt;!&ndash; 操作按钮区域 &ndash;&gt;-->
<div class="table-operator"> <!-- <div class="table-operator">-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!--&lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<a-button type="primary" icon="download" @click="handleExportXls('采购记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!--&lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <!--&lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!--&lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- </a-upload>--> <!--&lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
<!-- 高级查询区域 --> <!-- </div>-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>

31
src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue

@ -4,35 +4,38 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="4"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type" <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
placeholder="请选择物资类型" /> placeholder="请选择物资类型" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="流程发起人"> <a-form-item label="流程发起人">
<a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/> <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <!-- <div class="table-operator">-->
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!--&lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <!--&lt;!&ndash; <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>&ndash;&gt;-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!--&lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>--> <!--&lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!--&lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!--&lt;!&ndash; &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
<!-- </a-upload>--> <!--&lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;--> <!-- </div>-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>

19
src/views/accessrecords/ProcessMaterialsPlanRecord.vue

@ -4,17 +4,22 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="4"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type" <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
placeholder="请选择物资类型" /> placeholder="请选择物资类型" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="流程发起人"> <a-form-item label="流程发起人">
<a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/> <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('采购记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
@ -22,9 +27,7 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
<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-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
@ -333,9 +336,9 @@
}, },
handleEnterDetail(records){ handleEnterDetail(records){
let parm ={}; // let parm ={};
parm.id = records.id // parm.id = records.id
getAction("/hy/processUdgetPlan/getPlanTableId",parm); // getAction("/hy/processUdgetPlan/getPlanTableId",parm);
// this.$router.push({ // this.$router.push({
// name:'src-views-accessrecords-plan-ProcessMaterialsDeliveryPlan', // name:'src-views-accessrecords-plan-ProcessMaterialsDeliveryPlan',
// params:{ // params:{

44
src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue

@ -4,22 +4,22 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="供应商"> <a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input> <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="物料组"> <a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/> <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" > <!-- <a-col :xl="5" :lg="7" :md="8" :sm="24" hidden="hidden" >-->
<a-form-item label="物料号"> <!-- <a-form-item label="物料号">-->
<a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/> <!-- <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>-->
</a-form-item> <!-- </a-form-item>-->
</a-col> <!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="物料名称"> <a-form-item label="物料名称">
<a-input placeholder="请输入物料名称" v-model="queryParam.merchandiseName"/> <a-input placeholder="请输入物料名称" v-model="queryParam.merchandiseName"/>
</a-form-item> </a-form-item>
@ -42,11 +42,17 @@
<!-- </a-form-item>--> <!-- </a-form-item>-->
<!-- </a-col>--> <!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="入库人"> <a-form-item label="入库人">
<a-input placeholder="请选择入库人" v-model="queryParam.librarySign"/> <a-input placeholder="请选择入库人" v-model="queryParam.librarySign"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">--> <!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">--> <!-- <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-range-picker--> <!-- <a-range-picker-->
@ -66,18 +72,16 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="float: left;"> <!-- <div class="table-operator" style="float: left;">-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- &lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- </a-upload>--> <!-- &lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
<!-- 高级查询区域 --> <!-- </div>-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>

42
src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue

@ -4,26 +4,32 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="6" :lg="7" :md="8" :sm="16">
<a-form-item label="供应商"> <a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input> <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="6" :lg="7" :md="8" :sm="16">
<a-form-item label="物料组"> <a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/> <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" > <!-- <a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" >-->
<a-form-item label="物料号"> <!-- <a-form-item label="物料号">-->
<a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/> <!-- <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>-->
</a-form-item> <!-- </a-form-item>-->
</a-col> <!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="6" :lg="7" :md="8" :sm="16">
<a-form-item label="物料名称"> <a-form-item label="物料名称">
<a-input placeholder="请输入物料名称" v-model="queryParam.materialName"/> <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="16">
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">--> <!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="出库人">--> <!-- <a-form-item label="出库人">-->
@ -48,17 +54,15 @@
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="float: left;"> <!-- <div class="table-operator" style="float: left;">-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>--> <!-- &lt;!&ndash; <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- &lt;!&ndash; &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
<!-- </a-upload>--> <!-- &lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;--> <!-- </div>-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>

64
src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue

@ -4,27 +4,26 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="供应商"> <a-form-item label="供应商">
<a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input> <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16"> <a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="物料组"> <a-form-item label="物料组">
<a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/> <a-input placeholder="请输入物料组" v-model="queryParam.materialClassify"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" > <a-col :xl="5" :lg="7" :md="8" :sm="24">
<a-form-item label="物料号">
<a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料名称"> <a-form-item label="物料名称">
<a-input placeholder="请输入物料名称" v-model="queryParam.materialName"/> <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" icon="download" @click="handleExportXls('物资采购记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
</a-col>
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">--> <!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="出库人">--> <!-- <a-form-item label="出库人">-->
<!-- <a-input placeholder="请选择出库人" v-model="queryParam.librarySign"/>--> <!-- <a-input placeholder="请选择出库人" v-model="queryParam.librarySign"/>-->
@ -48,17 +47,14 @@
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="float: left;"> <!-- <div class="table-operator" style="float: left;">-->
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button> <!-- &lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <!-- &lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <!-- &lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!-- &lt;!&ndash; &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- &lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
<!-- </a-upload>--> <!-- </div>-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
@ -190,12 +186,12 @@
{ {
title:'物料组', title:'物料组',
align:"center", align:"center",
dataIndex: 'descriptionName', dataIndex: 'materialClassify',
}, },
{ {
title:'物料号', title:'物料号',
align:"center", align:"center",
dataIndex: 'materialClassify', dataIndex: 'materialsNumber',
}, },
{ {
title:'物料名称及规格型号', title:'物料名称及规格型号',
@ -248,7 +244,7 @@
}, },
], ],
url: { url: {
list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId", list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainIdDetail",
delete: "/hy/processUdgetPlan/deleteProcessUdgetPlanMaterial", delete: "/hy/processUdgetPlan/deleteProcessUdgetPlanMaterial",
deleteBatch: "/hy/processUdgetPlan/deleteBatchProcessUdgetPlanMaterial", deleteBatch: "/hy/processUdgetPlan/deleteBatchProcessUdgetPlanMaterial",
exportXlsUrl: "/hy/processUdgetPlan/exportProcessUdgetPlanMaterial", exportXlsUrl: "/hy/processUdgetPlan/exportProcessUdgetPlanMaterial",
@ -275,9 +271,22 @@
superFieldList:[], superFieldList:[],
} }
}, },
created() { created() {
console.log("=============",this.deliveryDetailId); // console.log("=============",this.deliveryDetailId);
this.getSuperFieldList(); this.getSuperFieldList();
this.loadData();
},
watch:{
materPlanId:function (newData, oldData) {
//newData
//oldData
if(newData !== oldData){
this.loadData();
}
}
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function(){
@ -336,14 +345,15 @@
this.ipagination.current = 1; this.ipagination.current = 1;
} }
this.onClearSelected() this.onClearSelected()
this.queryParam.id = this.materPlanId; this.queryParam.processUdgetPlanId = this.materPlanId;
var params = this.getQueryParams();// var params = this.getQueryParams();//
this.loading = true; this.loading = true;
console.log("=====>",params) console.log("=====>",params)
console.log(params)
getAction(this.url.list, params).then((res) => { getAction(this.url.list, params).then((res) => {
console.log(res,"//////////////////////////"); console.log(res,"//////////////////////////");
if (res.success) { if (res.success) {
this.dataSource = res.result; this.dataSource = res.result.records;
this.ipagination.total = res.result.total; this.ipagination.total = res.result.total;
} }
if(res.code===510){ if(res.code===510){

28
src/views/dashboard/HomePage.vue

@ -37,6 +37,7 @@
> >
</a-table> </a-table>
</div> </div>
<show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
</a-card> </a-card>
<!--登录日志--> <!--登录日志-->
<a-card id="log" style="width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}"> <a-card id="log" style="width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}">
@ -74,10 +75,10 @@
<script> <script>
import { getAction, putAction } from '@api/manage'
import { getAction } from '@api/manage'
import { JVXETypes } from '@/components/jeecg/JVxeTable/index' import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
import { colorList } from '@/components/tools/setting' import { colorList } from '@/components/tools/setting'
import ShowAnnouncement from '@comp/tools/ShowAnnouncement'
export default { export default {
@ -85,6 +86,7 @@ export default {
// mixins:[JeecgListMixin], // mixins:[JeecgListMixin],
components:{ components:{
JVXETypes, JVXETypes,
ShowAnnouncement
}, },
data() { data() {
@ -95,6 +97,7 @@ export default {
}, },
// //
url: { url: {
listCementByUser:"/sys/annountCement/listByUser",
todoManger: '/actTask/todoList', todoManger: '/actTask/todoList',
lists: '/sys/log/listHomePage', lists: '/sys/log/listHomePage',
listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend', listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
@ -172,6 +175,8 @@ export default {
}, },
methods: { methods: {
modalFormOk(){
},
// //
heightScrollTodo(){ heightScrollTodo(){
if (document.getElementById("todoDiv").scrollTop + document.getElementById("todoDiv").offsetHeight >= document.getElementById("todoDiv").scrollHeight) { if (document.getElementById("todoDiv").scrollTop + document.getElementById("todoDiv").offsetHeight >= document.getElementById("todoDiv").scrollHeight) {
@ -276,12 +281,19 @@ export default {
on: { on: {
click: () => { click: () => {
console.log(record) console.log(record)
putAction(this.url.editCementSend,{anntId:record.id}).then((res)=>{
// this.$router.push({name:'activiti-todoManage', if(res.success){
// params:{ this.loadData();
// businessKey: record.busId }
// } });
// }) this.hovered = false;
if(record.openType==='component'){
this.openPath = record.openPage;
this.formData = {id:record.busId};
this.$refs.showDynamNotice.detail(record.openPage);
}else{
this.$refs.ShowAnnouncement.detail(record);
}
}, },
} }
} }

21
src/views/dictionaries/ProcessMerchandiseNewsList.vue

@ -103,7 +103,7 @@
<a-table <a-table
ref="table" ref="table"
size="middle" size="middle"
:scroll="{x:true}" :scroll="{y:460}"
bordered bordered
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
@ -111,11 +111,19 @@
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
<span slot="merchandiseName" slot-scope="text, record"> <span slot="merchandiseName" slot-scope="text, record">
<j-ellipsis :value="text" :length="20"/> <j-ellipsis :value="text" :length="7"/>
</span> </span>
<span slot="supplierId" slot-scope="text, record">
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="type" slot-scope="text, record">
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="specification" slot-scope="text, record">
<j-ellipsis :value="text" :length="7"/>
</span>
<template slot="htmlSlot" slot-scope="text"> <template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div> <div v-html="text"></div>
@ -209,6 +217,7 @@ export default {
{ {
title:'供应商', title:'供应商',
align:"center", align:"center",
scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId' dataIndex: 'supplierId'
}, },
{ {
@ -234,11 +243,13 @@ export default {
{ {
title:'型号', title:'型号',
align:"center", align:"center",
scopedSlots: { customRender: 'type' },
dataIndex: 'type' dataIndex: 'type'
}, },
{ {
title:'规格', title:'规格',
align:"center", align:"center",
scopedSlots: { customRender: 'specification' },
dataIndex: 'specification' dataIndex: 'specification'
}, },
// { // {

2
src/views/dictionaries/ProcessSupplierList.vue

@ -59,7 +59,7 @@
size="middle" size="middle"
bordered bordered
rowKey="id" rowKey="id"
:scroll="{x:true}" :scroll="{y:460}"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"

4
src/views/system/LogList.vue

@ -71,8 +71,8 @@
</div> </div>
<!-- 字符串超长截取省略号显示--> <!-- 字符串超长截取省略号显示-->
<span slot="logContent" slot-scope="text, record"> <span slot="logContent" slot-scope="text, record">
<j-ellipsis :value="text" :length="40"/> <j-ellipsis :value="text" :length="10"/>
</span> </span>
</a-table> </a-table>
<!-- table区域-end --> <!-- table区域-end -->
</a-card> </a-card>

36
src/views/system/RoleUserList.vue

@ -8,36 +8,36 @@
<!-- 搜索区域 --> <!-- 搜索区域 -->
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="12" :sm="8"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}"> <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="" v-model="queryParam.roleName"></a-input> <a-input placeholder="" v-model="queryParam.roleName"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="11" :sm="12"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-form-item label="创建时间" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}"> <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date v-model="queryParam.createTime_begin" date-format="YYYY-MM-DD " style="width:45%" placeholder="请选择开始时间" ></j-date> <j-date v-model="queryParam.createTime_begin" date-format="YYYY-MM-DD " style="width:45%" placeholder="请选择开始时间" ></j-date>
<span style="width: 10px;">~</span> <span style="width: 10px;">~</span>
<j-date v-model="queryParam.createTime_end" date-format="YYYY-MM-DD " style="width:45%" placeholder="请选择结束时间"></j-date> <j-date v-model="queryParam.createTime_end" date-format="YYYY-MM-DD " style="width:45%" placeholder="请选择结束时间"></j-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24"> <a-col :xl="8" :lg="7" :md="8" :sm="24">
<a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator" style="margin: 5px 0 10px 2px"> <!-- <div class="table-operator" style="margin: 5px 0 10px 2px">-->
<a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button> <!-- &lt;!&ndash;<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>&ndash;&gt;-->
<!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>--> <!--&lt;!&ndash; <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <!--&lt;!&ndash; <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!--&lt;!&ndash; </a-upload>&ndash;&gt;-->
<!-- </a-upload>--> <!--&lt;!&ndash; <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>&ndash;&gt;-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>--> <!-- </div>-->
</div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"> <i class="anticon anticon-info-circle ant-alert-icon">
@ -316,7 +316,15 @@
deleteBatch2: '/sys/user/deleteUserRoleBatch', deleteBatch2: '/sys/user/deleteUserRoleBatch',
exportXlsUrl: 'sys/role/exportXls', exportXlsUrl: 'sys/role/exportXls',
importExcelUrl: 'sys/role/importExcel' importExcelUrl: 'sys/role/importExcel'
} },
labelCol: {
xs: { span: 4 },
sm: { span: 4 },
},
wrapperCol: {
xs: { span: 20 },
sm: { span: 20 },
},
} }
}, },
computed: { computed: {

1
src/views/system/SysCategoryList.vue

@ -27,6 +27,7 @@
ref="table" ref="table"
size="middle" size="middle"
rowKey="id" rowKey="id"
:scroll="{y:460}"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"

Loading…
Cancel
Save