diff --git a/src/assets/less/TableExpand.less b/src/assets/less/TableExpand.less
index 5097be8..50b1e5a 100644
--- a/src/assets/less/TableExpand.less
+++ b/src/assets/less/TableExpand.less
@@ -6,6 +6,7 @@
.ant-table-selection-column {
padding: 12px 22px !important;
+ ellipsis:true
}
/** 列自适应，弊端会导致列宽失效 */
@@ -20,6 +21,6 @@
.ant-table-body{
overflow-y: auto;
- max-height: 520px;
+ max-height: 460px;
}
}
diff --git a/src/components/layouts/RouteView.vue b/src/components/layouts/RouteView.vue
index 79968a1..ec20421 100644
--- a/src/components/layouts/RouteView.vue
+++ b/src/components/layouts/RouteView.vue
@@ -45,4 +45,17 @@
/deep/.ant-card{
height: 100%;
}
+
+/deep/.ant-card-body {
+ padding:12px 24px 24px 24px;
+}
+
+/deep/.ant-card-body .table-operator{
+ margin-bottom: 0px !important;
+}
+
+/deep/.ant-alert.ant-alert-info {
+ margin-bottom: 10px !important;
+}
+
</style>
\ No newline at end of file
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 95c5ffb..ab8563c 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -680,7 +680,7 @@
.ant-form-item {
display: flex;
- margin-bottom: 24px;
+ margin-bottom: 10px;
margin-right: 0;
.ant-form-item-control-wrapper {
@@ -703,7 +703,7 @@
.table-page-search-submitButtons {
display: block;
- margin-bottom: 24px;
+ margin-bottom: 10px;
white-space: nowrap;
}
@@ -712,7 +712,7 @@
.content {
.table-operator {
- margin-bottom: 18px;
+ margin-bottom: 8px;
button {
margin-right: 8px;
diff --git a/src/views/accessrecords/LndustrialExplosiveCome.vue b/src/views/accessrecords/LndustrialExplosiveCome.vue
index cd173cb..102fc3b 100644
--- a/src/views/accessrecords/LndustrialExplosiveCome.vue
+++ b/src/views/accessrecords/LndustrialExplosiveCome.vue
@@ -41,8 +41,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -271,7 +270,6 @@ export default {
title: '操作',
dataIndex: 'action',
align:"center",
- fixed:"right",
width:147,
scopedSlots: { customRender: 'action' },
}
diff --git a/src/views/accessrecords/LndustrialExplosiveEnter.vue b/src/views/accessrecords/LndustrialExplosiveEnter.vue
index 4250005..3556f7f 100644
--- a/src/views/accessrecords/LndustrialExplosiveEnter.vue
+++ b/src/views/accessrecords/LndustrialExplosiveEnter.vue
@@ -97,8 +97,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -247,7 +246,6 @@ export default {
title: '操作',
dataIndex: 'action',
align:"center",
- fixed:"right",
width:147,
scopedSlots: { customRender: 'action' },
}
diff --git a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
index 0cfcd38..4ba4338 100644
--- a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" style="height: 830px">
+ <a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -97,8 +97,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -107,6 +106,15 @@
:customRow="clickThenSelect"
@change="handleTableChange">
+ <span slot="describes" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="warehousingBatch" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="sysOrgCode_dictText" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -216,6 +224,7 @@
{
title:'流程发起部门',
align:"center",
+ scopedSlots: { customRender: 'sysOrgCode_dictText' },
dataIndex: 'sysOrgCode_dictText',
},
{
@@ -226,8 +235,8 @@
{
title:'描述信息',
align:"center",
- dataIndex: 'describes',
- scopedSlots: { customRender: 'component' }
+ scopedSlots: { customRender: 'describes' },
+ dataIndex: 'describes'
},
{
title:'物资类型',
@@ -242,6 +251,7 @@
{
title:'批次号',
align:"center",
+ scopedSlots: { customRender: 'warehousingBatch' },
dataIndex: 'warehousingBatch'
},
// {
@@ -254,7 +264,6 @@
title: '操作',
dataIndex: 'action',
align:"center",
- fixed:"right",
width:147,
scopedSlots: { customRender: 'action' },
}
diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
index 70414d4..6f65a4c 100644
--- a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" style="height: 830px">
+ <a-card :bordered="false" >
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -45,9 +45,8 @@
ref="table"
size="middle"
bordered
+ :scroll="{y:460}"
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -55,6 +54,18 @@
:customRow="clickThenSelect"
@change="handleTableChange">
+ <span slot="sysOrgCode_dictText" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="component" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="warehousingBatch" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="action" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -250,6 +261,7 @@
{
title:'流程发起部门',
align:"center",
+ scopedSlots: { customRender: 'sysOrgCode_dictText' },
dataIndex: 'sysOrgCode_dictText',
},
{
@@ -260,8 +272,8 @@
{
title:'描述信息',
align:"center",
+ scopedSlots: { customRender: 'component' },
dataIndex: 'describes',
- scopedSlots: { customRender: 'component' }
},
{
title:'物资类型',
@@ -271,6 +283,7 @@
{
title:'批次号',
align:"center",
+ scopedSlots: { customRender: 'warehousingBatch' },
dataIndex: 'warehousingBatch',
},
{
@@ -291,7 +304,6 @@
title: '操作',
dataIndex: 'action',
align:"center",
- fixed:"right",
width:147,
scopedSlots: { customRender: 'action' },
}
diff --git a/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue b/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
index 148d376..74aed31 100644
--- a/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
+++ b/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" style="height: 830px">
+ <a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -10,7 +10,7 @@
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
- <div class="table-operator">
+ <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">-->
@@ -32,8 +32,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -41,6 +40,18 @@
:customRow="clickThenSelect"
@change="handleTableChange">
+ <span slot="materialName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
+ <span slot="materialName1" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="materialName2" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="supplier" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -142,16 +153,19 @@ export default {
{
title:'物料名称',
align:"center",
+ scopedSlots: { customRender: 'materialName' },
dataIndex: 'materialName',
},
{
title:'规格',
align:"center",
+ scopedSlots: { customRender: 'materialName1' },
dataIndex: 'materialName1',
},
{
title:'型号',
align:"center",
+ scopedSlots: { customRender: 'materialName2' },
dataIndex: 'materialName2',
},
{
@@ -172,6 +186,7 @@ export default {
{
title:'供货商',
align:"center",
+ scopedSlots: { customRender: 'supplier' },
dataIndex: 'supplier',
},
{
diff --git a/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue b/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
index a35391f..e9ade53 100644
--- a/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
+++ b/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" style="height: 730px">
+ <a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -90,8 +90,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -99,7 +98,15 @@
:customRow="clickThenSelect"
@change="handleTableChange">
-
+ <span slot="materialName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
+ <span slot="materialDescription" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="supplierId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -209,11 +216,13 @@ export default {
{
title:'物料名称',
align:"center",
+ scopedSlots: { customRender: 'materialDescription' },
dataIndex: 'materialDescription'
},
{
title:'规格型号',
align:"center",
+ scopedSlots: { customRender: 'materialName' },
dataIndex: 'materialName',
},
{
@@ -263,6 +272,7 @@ export default {
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{
diff --git a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
index 4f406e2..34bb161 100644
--- a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" style="height: 730px">
+ <a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -66,7 +66,7 @@
<!-- 操作按钮区域 -->
- <div class="table-operator" style="width: 18%">
+ <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>
@@ -93,8 +93,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -103,6 +102,18 @@
:customRow="clickThenSelect"
@change="handleTableChange">
+ <span slot="materialDescription" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="specification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="type" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="supplierId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -212,16 +223,19 @@
{
title:'物料名称',
align:"center",
+ scopedSlots: { customRender: 'materialDescription' },
dataIndex: 'materialDescription'
},
{
title:'规格',
align:"center",
+ scopedSlots: { customRender: 'specification' },
dataIndex: 'specification'
},
{
title:'型号',
align:"center",
+ scopedSlots: { customRender: 'type' },
dataIndex: 'type'
},
{
@@ -271,6 +285,7 @@
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{
diff --git a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
index 72cd498..d7d82d0 100644
--- a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false" style="height: 830px">
+ <a-card :bordered="false" >
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -48,7 +48,7 @@
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
- <div class="table-operator" style="width: 18%">
+ <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>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -72,15 +72,25 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:customRow="clickThenSelect"
@change="handleTableChange">
-
+ <span slot="materialName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
+ <span slot="specification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="type" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="supplier" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -182,16 +192,19 @@ export default {
{
title:'物料名称',
align:"center",
+ scopedSlots: { customRender: 'materialName' },
dataIndex: 'materialName',
},
{
title:'规格',
align:"center",
+ scopedSlots: { customRender: 'specification' },
dataIndex: 'specification',
},
{
title:'型号',
align:"center",
+ scopedSlots: { customRender: 'type' },
dataIndex: 'type',
},
{
@@ -212,6 +225,7 @@ export default {
{
title:'供货商',
align:"center",
+ scopedSlots: { customRender: 'supplier' },
dataIndex: 'supplier',
},
{
diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index 6501a87..365b81d 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/src/views/activiti/processInsManage.vue
@@ -37,7 +37,8 @@
</a-form>
</div>
<a-row>
- <a-table :scroll="scroll" bordered
+ <a-table bordered
+ :scroll="{y:460}"
:loading="loading"
rowKey="id"
:dataSource="data"
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 2cc69cc..60dbe48 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -7,7 +7,7 @@
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">
待办
</div>
- <div id="todoDiv" style="height: 250px;overflow-y: auto;margin: 10px 0 0 0;" @scroll="heightScrollTodo()">
+ <div id="todoDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollTodo()">
<a-table
rowKey="id"
:loading="loading"
@@ -25,7 +25,7 @@
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">
站内消息
</div>
- <div id="messageDiv" style="height: 250px;overflow-y: auto;margin: 10px 0 0 0;" @scroll="heightScrollMessage()">
+ <div id="messageDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollMessage()">
<a-table
rowKey="id"
:loading="loading"
@@ -43,7 +43,7 @@
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">
登录日志
</div>
- <div id="logDiv" style="height: 250px;overflow-y: auto;margin: 10px 0 0 0;" @scroll="heightScroll()">
+ <div id="logDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScroll()">
<a-table
rowKey="id"
:loading="loading"
@@ -52,6 +52,9 @@
:dataSource="loginLogs"
:pagination="false"
>
+ <span slot="post" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="5"/>
+ </span>
</a-table>
</div>
</a-card>
@@ -59,7 +62,7 @@
</div>
<!--全部应用-->
<a-card class="bottom-card" title="全部应用" style="width: 100%; height:60%; margin-top: 11px; overflow-y: hidden" :headStyle="{}" :bodyStyle="{height:'100%' , overflow:'hidden'}" >
- <div style="max-height: 370px;overflow-y: auto;">
+ <div style="max-height: 380px;overflow-y: auto;">
<span class="ant-col-md-3" v-for="(item,index) in userChildren" @click="goRouteView(item.path)" :title="item.meta.title"
style="display: inline-block; margin: 20px;">
<a-icon :type="item.meta.icon" :style="{'color':item.color}" style="font-size: 25px"></a-icon> {{ item.meta.title }}
@@ -86,11 +89,6 @@ export default {
data() {
return {
- //登录日志查询条件
- queryParam:{
- logType:1,
- keyWord:'登录成功',
- },
isorter:{
column: 'createTime',
order: 'desc',
@@ -98,7 +96,7 @@ export default {
//待办 登录日志 站内消息查询地址
url: {
todoManger: '/actTask/todoList',
- lists: '/sys/log/list',
+ lists: '/sys/log/listHomePage',
listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
},
//待办显示内容
@@ -125,13 +123,14 @@ export default {
loginColumns:[
{
align:"left",
- dataIndex: 'logType_dictText',
+ scopedSlots: { customRender: 'post' },
+ dataIndex: 'post',
ellipsis: true,
sorter: true
},
{
align:"left",
- dataIndex: 'username',
+ dataIndex: 'userName',
ellipsis: true,
sorter: true
},
@@ -209,7 +208,7 @@ export default {
//登录日志无限滚动
heightScroll() {
if (document.getElementById("logDiv").scrollTop + document.getElementById("logDiv").offsetHeight >= document.getElementById("logDiv").scrollHeight) {
- let param = Object.assign({}, this.queryParam, this.isorter);
+ let param = Object.assign({});
this.pageSizeLog=this.pageSizeLog+1;
param.pageNo=this.pageSizeLog;
getAction(this.url.lists,param).then((res) => {
@@ -318,8 +317,7 @@ export default {
// 登录日志查询
loginList(){
- let param = Object.assign({}, this.queryParam, this.isorter);
-
+ let param = Object.assign({} );
getAction(this.url.lists,param).then((res) => {
if (res.success) {
console.log("resnew")
diff --git a/src/views/dictionaries/ProcessDictionariesList.vue b/src/views/dictionaries/ProcessDictionariesList.vue
index 375264c..540524c 100644
--- a/src/views/dictionaries/ProcessDictionariesList.vue
+++ b/src/views/dictionaries/ProcessDictionariesList.vue
@@ -50,8 +50,7 @@
size="middle"
bordered
rowKey="id"
- class="j-table-force-nowrap"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
diff --git a/src/views/dictionaries/ProcessLibraryAssociationList.vue b/src/views/dictionaries/ProcessLibraryAssociationList.vue
index 73e7390..4e3846f 100644
--- a/src/views/dictionaries/ProcessLibraryAssociationList.vue
+++ b/src/views/dictionaries/ProcessLibraryAssociationList.vue
@@ -56,7 +56,7 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
diff --git a/src/views/materialstorage/ProcessMaterialStorageList.vue b/src/views/materialstorage/ProcessMaterialStorageList.vue
index db98e01..7c4c523 100644
--- a/src/views/materialstorage/ProcessMaterialStorageList.vue
+++ b/src/views/materialstorage/ProcessMaterialStorageList.vue
@@ -84,6 +84,15 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
+ <span slot="supplierId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="merchandiseNewsId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="13"/>
+ </span>
+ <span slot="unit" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -165,11 +174,13 @@
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{
title:'物料描述',
align:"center",
+ scopedSlots: { customRender: 'merchandiseNewsId' },
dataIndex: 'merchandiseNewsId'
},
{
@@ -185,6 +196,7 @@
{
title:'单位',
align:"center",
+ scopedSlots: { customRender: 'unit' },
dataIndex: 'unit'
},
// {
diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
index d9ca692..3ec5a35 100644
--- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
+++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
@@ -114,6 +114,18 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
+ <span slot="merchandiseName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="supplierId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
+ <span slot="type" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
+ <span slot="specification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -200,11 +212,13 @@
{
title:'商品名称',
align:"center",
+ scopedSlots: { customRender: 'merchandiseName' },
dataIndex: 'merchandiseName'
},
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{
@@ -230,11 +244,13 @@
{
title:'型号',
align:"center",
+ scopedSlots: { customRender: 'type' },
dataIndex: 'type'
},
{
title:'规格',
align:"center",
+ scopedSlots: { customRender: 'specification' },
dataIndex: 'specification'
},
// {
diff --git a/src/views/modules/message/SysMessageList.vue b/src/views/modules/message/SysMessageList.vue
index 91a420c..1933824 100644
--- a/src/views/modules/message/SysMessageList.vue
+++ b/src/views/modules/message/SysMessageList.vue
@@ -70,6 +70,7 @@
ref="table"
size="middle"
bordered
+ :scroll="{y:460}"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index 3a2d345..9a8bd6c 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -76,6 +76,7 @@
ref="table"
size="middle"
bordered
+ :scroll="{y:460}"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
diff --git a/src/views/modules/oss/OSSFileList.vue b/src/views/modules/oss/OSSFileList.vue
index 52b9ad7..0eca8b5 100644
--- a/src/views/modules/oss/OSSFileList.vue
+++ b/src/views/modules/oss/OSSFileList.vue
@@ -77,11 +77,18 @@
size="middle"
bordered
rowKey="id"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
+ <span slot="name" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
+ <span slot="url" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
<span slot="action" slot-scope="text, record">
<a @click="handlePreview(record)">预览</a>
@@ -131,7 +138,7 @@
{
title: '文件名称',
align: "center",
- width:400,
+ scopedSlots: { customRender: 'name' },
dataIndex: 'name'
},
{
@@ -143,7 +150,6 @@
title:'上传时间',
align:"center",
default:'--',
- width:150,
dataIndex: 'createTime'
},
// {
@@ -157,19 +163,18 @@
title: '文件大小(kb)',
align: "center",
default:'--',
- width:100,
dataIndex: 'size'
},
{
title: '文件地址',
align: "center",
- width:600,
+ scopedSlots: { customRender: 'url' },
dataIndex: 'url'
},
{
title: '操作',
dataIndex: 'action',
- width:100,
+ width: 100,
align: "center",
scopedSlots: {customRender: 'action'},
}
diff --git a/src/views/supplier/ProcessSupplierList.vue b/src/views/supplier/ProcessSupplierList.vue
index a7c526b..992e65c 100644
--- a/src/views/supplier/ProcessSupplierList.vue
+++ b/src/views/supplier/ProcessSupplierList.vue
@@ -14,8 +14,7 @@
<a-input placeholder="请输入供应商名称" v-model="queryParam.supplierName"></a-input>
</a-form-item>
</a-col>
-
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="级别">
<!-- <a-input placeholder="请选择" v-model="queryParam.rank"></a-input>-->
<a-select v-model="queryParam.rank" placeholder="请选择级别" @mouseenter="getRake" >
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 73da89d..f082e45 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -58,7 +58,6 @@
<a-table
ref="table"
size="middle"
- :scroll="{y:460}"
bordered
rowKey="id"
:columns="columns"
@@ -66,6 +65,7 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index 87ee4a2..390f6a6 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -137,7 +137,6 @@
<a-table
ref="table"
size="middle"
- :scroll="{y:460}"
bordered
rowKey="id"
:columns="columns"
@@ -145,8 +144,38 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
@change="handleTableChange">
-
+ <span slot="processId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="supplierName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="5"/>
+ </span>
+ <span slot="descriptionName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="materialsNumber" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="merchandiseName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="specification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="5"/>
+ </span>
+ <span slot="type" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="5"/>
+ </span>
+ <span slot="unitWasteWarehouseCodeId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="7"/>
+ </span>
+ <span slot="productionTime" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="createTime" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -228,11 +257,13 @@
{
title:'流程表单号',
align:"center",
- dataIndex: 'processId'
+ scopedSlots: { customRender: 'processId' },
+ dataIndex: 'processId',
},
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierName' },
dataIndex: 'supplierName'
},
// {
@@ -243,26 +274,31 @@
{
title:'物料组',
align:"center",
+ scopedSlots: { customRender: 'descriptionName' },
dataIndex: 'descriptionName'
},
{
title:'物料编号',
align:"center",
+ scopedSlots: { customRender: 'materialsNumber' },
dataIndex: 'materialsNumber'
},
{
title:'物料名称',
align:"center",
+ scopedSlots: { customRender: 'merchandiseName' },
dataIndex: 'merchandiseName'
},
{
title:'规格',
align:"center",
+ scopedSlots: { customRender: 'specification' },
dataIndex: 'specification'
},
{
title:'型号',
align:"center",
+ scopedSlots: { customRender: 'type' },
dataIndex: 'type'
},
{
@@ -288,6 +324,7 @@
{
title:'仓储地点',
align:"center",
+ scopedSlots: { customRender: 'unitWasteWarehouseCodeId' },
dataIndex: 'unitWasteWarehouseCodeId'
},
// {
@@ -298,6 +335,7 @@
{
title:'生产时间',
align:"center",
+ scopedSlots: { customRender: 'productionTime' },
dataIndex: 'productionTime',
},
{
@@ -326,6 +364,7 @@
{
title:'入库时间',
align:"center",
+ scopedSlots: { customRender: 'createTime' },
dataIndex: 'createTime',
},
{
diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index e903c4d..62f577b 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -39,11 +39,11 @@
ref="table"
rowKey="id"
size="middle"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- class="j-table-force-nowrap"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">
diff --git a/src/views/system/RoleList.vue b/src/views/system/RoleList.vue
index f0117c8..de35f7a 100644
--- a/src/views/system/RoleList.vue
+++ b/src/views/system/RoleList.vue
@@ -58,6 +58,7 @@
size="middle"
bordered
rowKey="id"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
diff --git a/src/views/system/SysAnnouncementList.vue b/src/views/system/SysAnnouncementList.vue
index 220fe5b..f7dd235 100644
--- a/src/views/system/SysAnnouncementList.vue
+++ b/src/views/system/SysAnnouncementList.vue
@@ -60,14 +60,16 @@
size="middle"
bordered
rowKey="id"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- class="j-table-force-nowrap"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
-
+ <span slot="titile" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
<span slot="action" slot-scope="text, record">
<a v-if="record.sendStatus == 0" @click="handleEdit(record)">编辑</a>
@@ -139,6 +141,7 @@
{
title: '标题',
align: "center",
+ scopedSlots: { customRender: 'titile' },
dataIndex: 'titile'
},
{
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index b7e429c..58f1c49 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -40,7 +40,7 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- class="j-table-force-nowrap"
+ :scroll="{y:460}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="showAnnouncement(record)">查看</a>
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index f739cd3..924a165 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -82,6 +82,18 @@
:loading="loading"
@change="handleTableChange">
+ <span slot="materialName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="typeSpecification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="depositary" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="scrapDate" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -160,11 +172,13 @@
{
title:'名称',
align:"center",
+ scopedSlots: { customRender: 'materialName' },
dataIndex: 'materialName'
},
{
title:'型号规格',
align:"center",
+ scopedSlots: { customRender: 'typeSpecification' },
dataIndex: 'typeSpecification'
},
{
@@ -180,6 +194,7 @@
{
title:'存放地点',
align:"center",
+ scopedSlots: { customRender: 'depositary' },
dataIndex: 'depositary'
},
{
@@ -195,6 +210,7 @@
{
title:'报废日期',
align:"center",
+ scopedSlots: { customRender: 'scrapDate' },
dataIndex: 'scrapDate',
}
],
diff --git a/src/views/waste/ProcessWasteListCable.vue b/src/views/waste/ProcessWasteListCable.vue
index e485e1c..33565fd 100644
--- a/src/views/waste/ProcessWasteListCable.vue
+++ b/src/views/waste/ProcessWasteListCable.vue
@@ -82,6 +82,15 @@
:loading="loading"
@change="handleTableChange">
+ <span slot="scrapDate" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="scrappedBecause" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="typeSpecification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -166,6 +175,7 @@
{
title:'报废日期',
align:"center",
+ scopedSlots: { customRender: 'scrapDate' },
dataIndex: 'scrapDate'
},
{
@@ -181,6 +191,7 @@
{
title:'电缆规格',
align:"center",
+ scopedSlots: { customRender: 'typeSpecification' },
dataIndex: 'typeSpecification'
},
{
@@ -216,6 +227,7 @@
{
title:'报废原因',
align:"center",
+ scopedSlots: { customRender: 'scrappedBecause' },
dataIndex: 'scrappedBecause'
},
// {
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 2aca6bb..73e69b9 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -50,8 +50,8 @@
<a-table
ref="table"
size="middle"
- :scroll="{y:460}"
bordered
+ :scroll="{ y:470}"
rowKey="id"
:columns="columns"
:dataSource="dataSource"
@@ -60,6 +60,15 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
+ <span slot="materialDescription" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
+ <span slot="type" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
+ <span slot="specification" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="9"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -146,16 +155,19 @@
{
title:'物料名称',
align:"center",
+ scopedSlots: { customRender: 'materialDescription' },
dataIndex: 'materialDescription'
},
{
title:'型号',
align:"center",
+ scopedSlots: { customRender: 'type' },
dataIndex: 'type'
},
{
title:'规格',
align:"center",
+ scopedSlots: { customRender: 'specification' },
dataIndex: 'specification'
},
{
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 28e4826..c92e2c9 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -88,7 +88,6 @@
<a-table
ref="table"
size="middle"
- :scroll="{y:460}"
bordered
rowKey="id"
:columns="columns"
@@ -96,8 +95,24 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
@change="handleTableChange">
+ <span slot="supplierName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="merchandiseName" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="materialStorageId" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="productionDate" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
+ <span slot="storageTime" slot-scope="text, record">
+ <j-ellipsis :value="text" :length="10"/>
+ </span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@@ -186,6 +201,7 @@
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierName' },
dataIndex: 'supplierName'
},
// {
@@ -206,11 +222,13 @@
{
title:'物料描述',
align:"center",
+ scopedSlots: { customRender: 'merchandiseName' },
dataIndex: 'merchandiseName'
},
{
title:'库存位置',
align:"center",
+ scopedSlots: { customRender: 'materialStorageId' },
dataIndex: 'materialStorageId'
},
{
@@ -241,6 +259,7 @@
{
title:'生产日期',
align:"center",
+ scopedSlots: { customRender: 'productionDate' },
dataIndex: 'productionDate',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
@@ -254,6 +273,7 @@
{
title:'入库时间',
align:"center",
+ scopedSlots: { customRender: 'storageTime' },
dataIndex: 'storageTime'
},
{