diff --git a/src/views/accessrecords/LndustrialExplosiveEnter.vue b/src/views/accessrecords/LndustrialExplosiveEnter.vue
index 3556f7f..b52cd8f 100644
--- a/src/views/accessrecords/LndustrialExplosiveEnter.vue
+++ b/src/views/accessrecords/LndustrialExplosiveEnter.vue
@@ -106,6 +106,10 @@
:customRow="clickThenSelect"
@change="handleTableChange">
+
+
+
+
@@ -229,6 +233,7 @@ export default {
{
title:'批次',
align:"center",
+ scopedSlots: { customRender: 'targetLibrary' },
dataIndex: 'targetLibrary'
},
{
diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
index 5c03057..e9eecad 100644
--- a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
@@ -57,6 +57,9 @@
+
+
+
@@ -272,7 +275,7 @@
{
title:'描述信息',
align:"center",
- scopedSlots: { customRender: 'component' },
+ scopedSlots: { customRender: 'describes' },
dataIndex: 'describes',
},
{
diff --git a/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue b/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
index b17a9b5..f588b10 100644
--- a/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
+++ b/src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
@@ -50,7 +50,7 @@
-
+
diff --git a/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue b/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
index e9ade53..ead6102 100644
--- a/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
+++ b/src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
@@ -102,10 +102,13 @@
-
+
+
+
+
-
+
@@ -278,6 +281,7 @@ export default {
{
title:'批次',
align:"center",
+ scopedSlots: { customRender: 'supplierBatch' },
dataIndex: 'supplierBatch'
},
{
diff --git a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
index b63b8fa..6872b71 100644
--- a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
@@ -103,7 +103,7 @@
@change="handleTableChange">
-
+
@@ -112,7 +112,7 @@
-
+
diff --git a/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
index 6e534da..6308210 100644
--- a/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
@@ -79,6 +79,13 @@
:loading="loading"
:customRow="clickThenSelect"
@change="handleTableChange">
+
+
+
+
+
+
+
@@ -193,11 +200,13 @@
{
title:'物料名称及规格型号',
align:"center",
+ scopedSlots: { customRender: 'materialName' },
dataIndex: 'materialName',
},
{
title:'系列',
align:"center",
+ scopedSlots: { customRender: 'materialSeries' },
dataIndex: 'materialSeries',
},
{
@@ -229,6 +238,7 @@
{
title:'供应商',
align:"center",
+ scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 5e1e81a..b23997d 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -68,6 +68,9 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
+
+
+
@@ -132,7 +135,7 @@
title: '序号',
dataIndex: '',
key:'rowIndex',
- width:60,
+ width:50,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
@@ -152,6 +155,7 @@
{
title:'物料名称及规格型号',
align:"center",
+ scopedSlots: { customRender: 'merchandiseName' },
dataIndex: 'merchandiseName'
},
// {
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index d5b6e40..d26e440 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -147,20 +147,21 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
-
- {{text}}111
+
+
+
-
+
-
+
-
+
@@ -172,10 +173,10 @@
-
+
-
+
@@ -262,7 +263,7 @@
title: '序号',
dataIndex: '',
key:'rowIndex',
- width:60,
+ width:50,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 924a165..9327237 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -4,12 +4,12 @@