diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index 982c5a8..e024355 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -213,7 +213,9 @@ export default {
align: 'center',
size: 'medium',
searchLabelWidth:120,
- simplePage: true,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
diff --git a/src/views/basicData/shiftManagement.vue b/src/views/basicData/shiftManagement.vue
index 5927f2c..2d06216 100644
--- a/src/views/basicData/shiftManagement.vue
+++ b/src/views/basicData/shiftManagement.vue
@@ -63,7 +63,9 @@ export default {
excelBox:false,
option:{
tip: false,
- simplePage: true,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue
index f7bf9fc..29ae96d 100644
--- a/src/views/basicData/teamManagement.vue
+++ b/src/views/basicData/teamManagement.vue
@@ -201,7 +201,9 @@ export default {
excelBox:false,
option:{
tip: false,
- simplePage: true,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
diff --git a/src/views/equiptManagement/equipmentLedger/index.vue b/src/views/equiptManagement/equipmentLedger/index.vue
index 829c351..f08176b 100644
--- a/src/views/equiptManagement/equipmentLedger/index.vue
+++ b/src/views/equiptManagement/equipmentLedger/index.vue
@@ -67,7 +67,9 @@ export default {
},
option: {
tip: false,
- simplePage: false,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
diff --git a/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue b/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue
index 20ceaeb..0eceabf 100644
--- a/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue
+++ b/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue
@@ -60,7 +60,9 @@ export default {
},
option: {
tip: false,
- simplePage: false,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
diff --git a/src/views/equiptManagement/measurementRecords/index.vue b/src/views/equiptManagement/measurementRecords/index.vue
index ed2f721..c2be02f 100644
--- a/src/views/equiptManagement/measurementRecords/index.vue
+++ b/src/views/equiptManagement/measurementRecords/index.vue
@@ -61,6 +61,8 @@ export default {
},
option: {
tip: false,
+ height: 'auto',
+ calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/equiptManagement/workwearManagement/index.vue b/src/views/equiptManagement/workwearManagement/index.vue
index 6df4082..952af62 100644
--- a/src/views/equiptManagement/workwearManagement/index.vue
+++ b/src/views/equiptManagement/workwearManagement/index.vue
@@ -37,7 +37,9 @@ export default {
},
option: {
tip: false,
- simplePage: true,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
diff --git a/src/views/oem/oemCustomer/index.vue b/src/views/oem/oemCustomer/index.vue
index 3f02f6f..056c833 100644
--- a/src/views/oem/oemCustomer/index.vue
+++ b/src/views/oem/oemCustomer/index.vue
@@ -75,7 +75,9 @@ export default {
},
option: {
tip: false,
- simplePage: false,
+ height: 'auto',
+ calcHeight: 32,
+ simplePage: false,
searchShow: true,
searchMenuSpan: 6,
dialogWidth: '60%',
diff --git a/src/views/oem/oemOrder/index.vue b/src/views/oem/oemOrder/index.vue
index 6ca4d51..3c7a012 100644
--- a/src/views/oem/oemOrder/index.vue
+++ b/src/views/oem/oemOrder/index.vue
@@ -104,6 +104,8 @@ export default {
},
option: {
tip: false,
+ height: 'auto',
+ calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/orderManagement/exceptionOrder.vue b/src/views/orderManagement/exceptionOrder.vue
index 205af41..87d378a 100644
--- a/src/views/orderManagement/exceptionOrder.vue
+++ b/src/views/orderManagement/exceptionOrder.vue
@@ -25,13 +25,13 @@
{{
row.curStatusText }}
{{ row.curStatusText
- }}
+ }}
{{ row.curStatusText
- }}
+ }}
{{ row.curStatusText
- }}
+ }}
{{ row.curStatusText
- }}
+ }}
-
{{ row.name }}
@@ -76,8 +76,10 @@ export default {
]
},
option: {
-
+
tip: false,
+ height: 'auto',
+ calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
@@ -314,7 +316,7 @@ export default {
},
// 打开弹框 前操作 打开表单前会执行beforeOpen方法
beforeOpen(done, type) {
- console.log(999,this.$refs.crud.data)
+ console.log(999, this.$refs.crud.data)
// if (['add', 'edit'].includes(type)) {
// this.initData();
// }
diff --git a/src/views/processManagement/processTemplate.vue b/src/views/processManagement/processTemplate.vue
index ba721a2..9f532ed 100644
--- a/src/views/processManagement/processTemplate.vue
+++ b/src/views/processManagement/processTemplate.vue
@@ -44,6 +44,8 @@ export default {
option: {
size: 'medium',
tip: false,
+ height: 'auto',
+ calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue
index 72e5a0c..8d23c4e 100644
--- a/src/views/processManagement/taskDispatch.vue
+++ b/src/views/processManagement/taskDispatch.vue
@@ -67,6 +67,8 @@ export default {
},
option: {
tip: false,
+ height: 'auto',
+ calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue
index 27edc6a..596edcc 100644
--- a/src/views/processManagement/taskProcessing.vue
+++ b/src/views/processManagement/taskProcessing.vue
@@ -76,6 +76,8 @@ export default {
},
option: {
tip: false,
+ height: 'auto',
+ calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,