diff --git a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
index 0c33d94..571fb80 100644
--- a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
@@ -250,7 +250,7 @@ export default {
{
title:'出库时间',
align:"center",
- dataIndex: 'createTime',
+ dataIndex: 'updateTime',
width:150,
// customRender:function (text) {
// return !text?"":(text.length>10?text.substr(0,10):text)
diff --git a/src/views/processmaterials/ProcessMaterialWarehousingListList.vue b/src/views/processmaterials/ProcessMaterialWarehousingListList.vue
index a41d056..2b3ad32 100644
--- a/src/views/processmaterials/ProcessMaterialWarehousingListList.vue
+++ b/src/views/processmaterials/ProcessMaterialWarehousingListList.vue
@@ -35,15 +35,19 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
+
-
+
+
+
+
@@ -141,8 +145,8 @@
{
title:'物料名称及规格型号',
align:"center",
- dataIndex: 'materialDescription',
scopedSlots: { customRender: 'materialDescription' },
+ dataIndex: 'materialDescription',
},
// {
// title:'仓储地点_id',
@@ -208,6 +212,7 @@
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{
diff --git a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
index ffd9866..f7f107f 100644
--- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
@@ -35,13 +35,19 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x:true}"
+ :scroll="{y:460}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
+
+
+
+
+
+
@@ -146,6 +152,7 @@
title:'物料名称及规格型号',
align:"center",
dataIndex: 'materialName',
+ scopedSlots: {customRender: 'materialName'},
},
{
title:'单位',
@@ -166,6 +173,7 @@
title:'供货商',
align:"center",
dataIndex: 'supplierId',
+ scopedSlots: {customRender: 'supplierId'},
},
{
title:'单价',
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index b3bc0e9..8a489e2 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -192,6 +192,18 @@
// return 0;
// }
},
+ {
+ title:'项目部消耗数量',
+ align:"center",
+ dataIndex: 'usageQuantity',
+ // customRender:function (t,r,index) {
+ // console.log(r)
+ // if(r.itemQuantity === undefined){
+ //
+ // }
+ // return 0;
+ // }
+ },
{
title:'核算属性',
align:"center",