排班bug

This commit is contained in:
朱菊兰 2025-01-03 09:04:21 +08:00
parent 466c822b0f
commit dfc8110410
5 changed files with 26 additions and 9 deletions

View File

@ -76,10 +76,10 @@ const tableProps = [
label: '班次状态',
subcomponent: StatusBtn,
},
{
prop: 'remark',
label: '备注',
},
// {
// prop: 'remark',
// label: '',
// },
];
export default {
name: 'GroupClass',

View File

@ -82,7 +82,7 @@
</div>
<!-- 班次班组 -->
<!-- class有两个样式一个是类似class1还有个是选中红框显示 -->
<el-row
<!-- <el-row
:gutter="2"
:class="
'class' +
@ -92,6 +92,14 @@
: '')
"
v-for="(item, index) in list[Number(data.day.split('-')[2])]"
:key="index"> -->
<el-row
:gutter="2"
:class="
'class' +
(index + 1)
"
v-for="(item, index) in list[Number(data.day.split('-')[2])]"
:key="index">
<el-col :span="12">
<div class="selectDiv">
@ -141,6 +149,9 @@
</el-col>
</el-row>
</div>
<div v-else style='font-size: 20px;font-weight: 500;text-align: right;'>
{{ Number(data.day.split('-')[2]) }}
</div>
</template>
</el-calendar>
</div>

View File

@ -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');
}
}
});

View File

@ -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;

View File

@ -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),