diff --git a/src/views/group/base/groupClasses/index.vue b/src/views/group/base/groupClasses/index.vue index a3c9a2fd..7474aa6e 100644 --- a/src/views/group/base/groupClasses/index.vue +++ b/src/views/group/base/groupClasses/index.vue @@ -76,10 +76,10 @@ const tableProps = [ label: '班次状态', subcomponent: StatusBtn, }, - { - prop: 'remark', - label: '备注', - }, + // { + // prop: 'remark', + // label: '备注', + // }, ]; export default { name: 'GroupClass', diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue index 747b231c..1e149f23 100644 --- a/src/views/group/base/groupTeamScheduling/index.vue +++ b/src/views/group/base/groupTeamScheduling/index.vue @@ -82,7 +82,7 @@ - --> +
@@ -141,6 +149,9 @@
+
+ {{ Number(data.day.split('-')[2]) }} +
diff --git a/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue b/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue index d1855f1c..7eb53a0c 100644 --- a/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue +++ b/src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue @@ -211,6 +211,9 @@ export default { this.$modal.msgSuccess('操作成功'); this.$emit('successSubmit'); }); + }else{ + this.$modal.msgSuccess('操作成功'); + this.$emit('successSubmit'); } } }); @@ -226,6 +229,9 @@ export default { this.$modal.msgSuccess('操作成功'); this.$emit('successSubmit'); }); + }else{ + this.$modal.msgSuccess('操作成功'); + this.$emit('successSubmit'); } } }); diff --git a/src/views/group/base/schedulingPlanConfig/index.vue b/src/views/group/base/schedulingPlanConfig/index.vue index 0bbd6c18..0969205e 100644 --- a/src/views/group/base/schedulingPlanConfig/index.vue +++ b/src/views/group/base/schedulingPlanConfig/index.vue @@ -176,7 +176,7 @@ export default { if (res.code === 0 && res.data.list && res.data.list.length > 0) { res.data.list.forEach(item => { if(item.isProduction){ - item.str = item.strList?item.strList.join(','):'-' + item.str = item.strList?item.strList.join(','):'-' } }); this.list = res.data.list; diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue index 44d88b2b..ede94465 100644 --- a/src/views/group/monitoring/teamProduction/index.vue +++ b/src/views/group/monitoring/teamProduction/index.vue @@ -18,7 +18,7 @@ v-if="tableBtn.length" slot="handleBtn" :width="80" - label="操作" + label="生产情况" :method-list="tableBtn" @clickBtn="handleClick" /> @@ -122,8 +122,8 @@ export default { tableBtn: [ this.$auth.hasPermi('base:team-production:detail') ? { - type: 'detail', - btnName: '详情' + type: 'prodDetail', + btnName: '查看' } : undefined ].filter((v) => v),