提交 e8ca781b authored 作者: lidongxu's avatar lidongxu

refactor(promotion): 修复:店内执行上报_已知问题并在看板部分加深头部颜色

上级 95fffa10
...@@ -3791,7 +3791,8 @@ export const getSixLittleDiamondsConfig = (submitChange) => { ...@@ -3791,7 +3791,8 @@ export const getSixLittleDiamondsConfig = (submitChange) => {
) )
}, },
fill: true, fill: true,
width: 210 width: 210,
requestKey: ['gwExecuted6']
}, },
{ {
label: '六小金刚批发挂网陈列费', label: '六小金刚批发挂网陈列费',
...@@ -3803,15 +3804,13 @@ export const getSixLittleDiamondsConfig = (submitChange) => { ...@@ -3803,15 +3804,13 @@ export const getSixLittleDiamondsConfig = (submitChange) => {
}, },
{ {
label: '六小金刚批发挂网是否', label: '六小金刚批发挂网是否',
subLabel: '按实际执行', subLabel: '按计划执行',
prop: 'gwExecuted6', prop: 'gwExecuted6',
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 判断区间,未执行,部分执行,执行 // 实际不等于计划的都是未执行
if (!row.actualGw6 || row.actualGw6 == 0) { if (row.actualGw6 !== row.plannedGw6) {
row.gwExecuted6 = '未执行'
} else if (row.actualGw6 !== row.plannedGw6) {
row.gwExecuted6 = '未执行' row.gwExecuted6 = '未执行'
} else { } else {
row.gwExecuted6 = '执行' row.gwExecuted6 = '执行'
......
...@@ -101,9 +101,7 @@ const getTableList = () => { ...@@ -101,9 +101,7 @@ const getTableList = () => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
}
/* 因为表格会被挪走,所以必须独立样式无法嵌套在别人内 */
/* 表格样式 */ /* 表格样式 */
.table-container { .table-container {
flex: 1; flex: 1;
...@@ -242,65 +240,18 @@ const getTableList = () => { ...@@ -242,65 +240,18 @@ const getTableList = () => {
margin: 10px; margin: 10px;
} }
} }
}
</style> /* 加深表头背景颜色 */
::v-deep(.el-table__header-wrapper) {
<style lang="scss"> .el-table__header {
/* 表格弹窗 */ th {
.table-dialog-modal { background-color: #dcdfe6 !important;
padding: 0; color: #303133 !important;
font-weight: bold;
/* 关键:覆盖Element Plus对话框的默认最大宽度 */
.el-dialog {
width: 100% !important;
max-width: none !important;
margin: 0 !important;
height: 100vh;
display: flex;
flex-direction: column;
.el-dialog__body {
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden !important;
padding-bottom: 5px;
.dialog-table-container {
flex: 1;
height: 100%;
.table-container {
flex: 1;
display: flex;
flex-direction: column;
height: 100%;
.pagination-container {
margin-left: auto;
}
}
} }
} }
} }
}
// 不显示数字输入框的 spinner
.no-spinner input::-webkit-inner-spin-button,
.no-spinner input::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
.no-spinner {
-moz-appearance: textfield;
}
// 填入数字超过计划值时,红色文字提示
.red-text {
input {
color: red !important;
}
}
</style> </style>
...@@ -46,6 +46,7 @@ const handleClickTabs = (tab) => { ...@@ -46,6 +46,7 @@ const handleClickTabs = (tab) => {
} }
</script> </script>
<style scoped <style scoped
lang="scss"> lang="scss">
.app-container { .app-container {
...@@ -53,6 +54,24 @@ const handleClickTabs = (tab) => { ...@@ -53,6 +54,24 @@ const handleClickTabs = (tab) => {
.container { .container {
padding: 10px; padding: 10px;
.el-tabs {
height: 100%;
display: flex;
flex-direction: column-reverse;
.el-tabs__content {
display: flex;
flex-direction: column;
height: 100%;
.el-tab-pane {
height: 100%;
display: flex;
flex-direction: column;
}
}
}
} }
} }
</style> </style>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论