Skip to content

W
wangxiaolu-sfa-ui
提交 04adabff authored 作者: lidongxu's avatar lidongxu
浏览文件
操作

冲突解决

上级 34b85966 9c61ac9c
隐藏空白字符变更
内嵌 并排
正在显示 包含 227 行增加 和 125 行删除
src/App.vue
浏览文件 @ 04adabff
...@@ -53,5 +53,6 @@ onMounted(() => { ...@@ -53,5 +53,6 @@ onMounted(() => {
lang="scss"> lang="scss">
.wm-class{ .wm-class{
min-height: 100%; min-height: 100%;
height: 100%;
} }
</style> </style>
src/views/mobile/pages/licenses/report/index.vue
浏览文件 @ 04adabff
<template> <template>
<div> <div class="mobile-container">
123 <van-nav-bar right-text="搜索"
left-arrow
@click-left="clickBack"
@click-right="showSearch = true"
placeholder
fixed />
<!-- 计划列表 -->
<van-pull-refresh v-model="refreshLoading"
:pull-distance="100"
success-text="刷新成功"
@refresh="onRefresh">
<van-list v-model:loading="loading"
:finished="finished"
:immediate-check="false"
finished-text="没有更多了"
@load="onLoad">
<van-cell-group inset>
<van-swipe-cell v-for="item in planList"
:key="item.id">
<van-cell :title="item.prdName + '\n料号: ' + item.prdCode">
<template #label>
<p>批号：{{ item.manufactureBatchNo }}</p>
<p>厂家：{{ item.manufactureDate }}</p>
</template>
<template #value>
</template>
</van-cell>
</van-swipe-cell>
</van-cell-group>
</van-list>
</van-pull-refresh>
</div> </div>
</template> </template>
<script setup> <script setup>
import { getQualityInsPageList } from '@/api'
const router = useRouter()
/*************** 导航栏 ***************/
const showSearch = ref(false)
const clickBack = () => {
router.back()
}
/*************** 刷新+加载 ***************/
const refreshLoading = ref(false)
const onRefresh = async () => {
refreshLoading.value = true
await getPlanListFn()
refreshLoading.value = false
}
// 加载更多
const loading = ref(false)
const finished = ref(false)
const onLoad = async () => {
if (loading.value || finished.value) return
loading.value = true
await getPlanListFn()
loading.value = false
}
/*************** 计划列表 ***************/
const query = reactive({
pageNum: 1,
pageSize: 10,
})
const planList = ref([])
const getPlanListFn = async () => {
const res = await getQualityInsPageList(query)
if (res.code === 200) {
planList.value = res.data.rows || []
finished.value = res.data.rows.length < res.data.pageSize
}
}
getPlanListFn()
</script> </script>
<style scoped <style scoped
lang="scss"></style> lang="scss">
\ No newline at end of file ::v-deep(.van-cell__label) {
margin: 0;
}
</style>
\ No newline at end of file
src/views/promotion/display_schedule/tabs/display.vue
浏览文件 @ 04adabff
...@@ -464,6 +464,11 @@ ...@@ -464,6 +464,11 @@
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedMainShelfType || !row.plannedMainShelfQty) {
row.actualMainShelfExecuted = '-'
return '-';
}
row.actualMainShelfExecuted = ((parseInt(row.actualMainShelfType) >= parseInt(row.plannedMainShelfType)) && (parseInt(row.actualMainShelfQty) >= parseInt(row.plannedMainShelfQty))) ? '是' : '否'; row.actualMainShelfExecuted = ((parseInt(row.actualMainShelfType) >= parseInt(row.plannedMainShelfType)) && (parseInt(row.actualMainShelfQty) >= parseInt(row.plannedMainShelfQty))) ? '是' : '否';
return row.actualMainShelfExecuted; return row.actualMainShelfExecuted;
}, },
...@@ -540,6 +545,11 @@ ...@@ -540,6 +545,11 @@
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedEndCapQty) {
row.actualEndCapExecuted = '-'
return '-';
}
row.actualEndCapExecuted = ((parseFloat(row.actualEndCapQty) >= parseFloat(row.plannedEndCapQty))) ? '是' : '否'; row.actualEndCapExecuted = ((parseFloat(row.actualEndCapQty) >= parseFloat(row.plannedEndCapQty))) ? '是' : '否';
return row.actualEndCapExecuted; return row.actualEndCapExecuted;
}, },
...@@ -568,7 +578,7 @@ ...@@ -568,7 +578,7 @@
prop: "plannedThemedFloorStack", prop: "plannedThemedFloorStack",
visible: true, visible: true,
type: 'string', type: 'string',
fill: true, fill: false,
width: 140 width: 140
}, },
{ {
...@@ -668,10 +678,28 @@ ...@@ -668,10 +678,28 @@
// 请求时需要额外携带影响的列字段值 // 请求时需要额外携带影响的列字段值
requestKey: ["actualFloorStackExecuted", "regularDisplayExecuted"] requestKey: ["actualFloorStackExecuted", "regularDisplayExecuted"]
}, },
{
label: "实际地堆是否执行",
prop: "actualFloorStackExecuted",
visible: true,
type: 'formula',
func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedFloorStackArea || !row.plannedFloorStackQty) {
row.actualFloorStackExecuted = '-'
return '-';
}
row.actualFloorStackExecuted = ((parseFloat(row.actualFloorStackArea) >= parseFloat(row.plannedFloorStackArea)) && (parseInt(row.actualFloorStackQty) >= parseInt(row.plannedFloorStackQty))) ? '是' : '否';
return row.actualFloorStackExecuted;
},
formulaStr: '公式：（实际地堆平米数 >= 计划地堆平米数）并且（实际地堆数量 >= 计划地堆数量）',
fill: true,
width: 150
},
{ {
label: "实际主题地堆-是否", label: "实际主题地堆-是否",
prop: "actualThemedFloorStack", prop: "actualThemedFloorStack",
referenceKey: "actualFloorStackQty", referenceKey: "plannedThemedFloorStack",
visible: true, visible: true,
type: 'select', type: 'select',
options: [ options: [
...@@ -683,6 +711,7 @@ ...@@ -683,6 +711,7 @@
render: (_, row, col) => { render: (_, row, col) => {
return ( return (
<div> <div>
<span>{row[col.referenceKey] || '-'}</span>
<el-select modelValue={row[col.prop]} <el-select modelValue={row[col.prop]}
onUpdate:modelValue={(value) => { onUpdate:modelValue={(value) => {
row[col.prop] = value; row[col.prop] = value;
...@@ -702,19 +731,6 @@ ...@@ -702,19 +731,6 @@
) )
} }
}, },
{
label: "实际地堆是否执行",
prop: "actualFloorStackExecuted",
visible: true,
type: 'formula',
func: (row) => {
row.actualFloorStackExecuted = ((parseFloat(row.actualFloorStackArea) >= parseFloat(row.plannedFloorStackArea)) && (parseInt(row.actualFloorStackQty) >= parseInt(row.plannedFloorStackQty))) ? '是' : '否';
return row.actualFloorStackExecuted;
},
formulaStr: '公式：（实际地堆平米数 >= 计划地堆平米数）并且（实际地堆数量 >= 计划地堆数量）',
fill: true,
width: 150
},
{ {
label: "计划多点陈列-数量+形式", label: "计划多点陈列-数量+形式",
prop: "plannedMultiDisplay", prop: "plannedMultiDisplay",
...@@ -738,7 +754,7 @@ ...@@ -738,7 +754,7 @@
type: 'input', type: 'input',
func: (row) => { func: (row) => {
// 没有输入内容时，则是否执行设置为否 // 没有输入内容时，则是否执行设置为否
row.actualMultiDisplayExecuted = !row.actualMultiDisplay ? '否' : '是' // row.actualMultiDisplayExecuted = !row.actualMultiDisplay ? '否' : '是'
}, },
referenceKey: "plannedMultiDisplay", referenceKey: "plannedMultiDisplay",
fill: true, fill: true,
...@@ -766,36 +782,19 @@ ...@@ -766,36 +782,19 @@
prop: "actualMultiDisplayExecuted", prop: "actualMultiDisplayExecuted",
referenceKey: 'actualMultiDisplay', referenceKey: 'actualMultiDisplay',
visible: true, visible: true,
type: 'select', type: 'formula',
options: [ func: (row) => {
{ label: '是', value: '是' }, // 如果参考值是空则返回 '-'
{ label: '否', value: '否' } if (!row.plannedMultiDisplay) {
], row.actualMultiDisplayExecuted = '-'
fill: true, return '-';
width: 170, }
render: (_, row, col) => { row.actualMultiDisplayExecuted = (row.actualMultiDisplay) ? '是' : '否';
return ( return row.actualMultiDisplayExecuted;
<div>
<el-select modelValue={row[col.prop]}
onUpdate:modelValue={(value) => {
row[col.prop] = value;
submitChange(row, col);
}}
disabled={!row[col.referenceKey]}
placeholder="">
{col.options.map(item => (
<el-option
key={item.value}
label={item.label}
value={item.value}
/>
))}
</el-select>
</div>
)
}, },
// 请求时需要额外携带影响的列字段值 formulaStr: '公式：实际多点陈列-数量+形式，有值',
requestKey: ["actualMultiDisplayExecuted"] fill: true,
width: 180,
}, },
{ {
label: "合计费用-费用", label: "合计费用-费用",
...@@ -823,7 +822,7 @@ ...@@ -823,7 +822,7 @@
row.regularDisplayExecuted = (row.actualMainShelfExecuted === '是' && row.actualEndCapExecuted === '是' && row.actualFloorStackExecuted === '是' && row.actualMultiDisplayExecuted === '是') ? '是' : '否'; row.regularDisplayExecuted = (row.actualMainShelfExecuted === '是' && row.actualEndCapExecuted === '是' && row.actualFloorStackExecuted === '是' && row.actualMultiDisplayExecuted === '是') ? '是' : '否';
return row.regularDisplayExecuted; return row.regularDisplayExecuted;
}, },
formulaStr: '公式：（实际主货架执行，并且实际端架执行，并且实际地堆执行，并且实际多点陈列执行）', formulaStr: '公式：实际主货架执行，并且实际端架执行，并且实际地堆执行，并且实际多点陈列执行（某项无计划时，忽略该项）',
fill: true, fill: true,
width: 150 width: 150
}, },
......
src/views/promotion/display_schedule/tabs/schedule.vue
浏览文件 @ 04adabff
...@@ -330,6 +330,10 @@ ...@@ -330,6 +330,10 @@
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedPromotionSpec) {
return '-';
}
row.specExecutionStatus = row.plannedPromotionSpec === row.actualPromotionSpec ? '是' : '否'; row.specExecutionStatus = row.plannedPromotionSpec === row.actualPromotionSpec ? '是' : '否';
return row.specExecutionStatus; return row.specExecutionStatus;
}, },
...@@ -409,6 +413,10 @@ ...@@ -409,6 +413,10 @@
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedPromotionFlavor) {
return '-';
}
// 处理逗号的口味形成数组 // 处理逗号的口味形成数组
let ppromotionFlavor = splitAndFilter(row.plannedPromotionFlavor) let ppromotionFlavor = splitAndFilter(row.plannedPromotionFlavor)
if (!row.actualPromotionFlavor) { if (!row.actualPromotionFlavor) {
...@@ -599,6 +607,10 @@ ...@@ -599,6 +607,10 @@
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedPromotionStartDate || !row.plannedPromotionEndDate) {
return '-';
}
row.promotionImplementationStatus = row.actualPromotionStartDate && row.actualPromotionEndDate ? '是' : '否'; row.promotionImplementationStatus = row.actualPromotionStartDate && row.actualPromotionEndDate ? '是' : '否';
return row.promotionImplementationStatus; return row.promotionImplementationStatus;
}, },
...@@ -612,6 +624,10 @@ ...@@ -612,6 +624,10 @@
visible: true, visible: true,
type: 'formula', type: 'formula',
func: (row) => { func: (row) => {
// 如果参考值是空则返回 '-'
if (!row.plannedPromotionStartDate || !row.plannedPromotionEndDate) {
return '-';
}
row.timeExecutionStatus = (parseTime(row.actualPromotionStartDate) === parseTime(row.plannedPromotionStartDate)) && parseTime(row.actualPromotionEndDate) === parseTime(row.plannedPromotionEndDate) ? '是' : '否'; row.timeExecutionStatus = (parseTime(row.actualPromotionStartDate) === parseTime(row.plannedPromotionStartDate)) && parseTime(row.actualPromotionEndDate) === parseTime(row.plannedPromotionEndDate) ? '是' : '否';
return row.timeExecutionStatus; return row.timeExecutionStatus;
}, },
...@@ -658,39 +674,18 @@ ...@@ -658,39 +674,18 @@
label: "促销机制是否执行", label: "促销机制是否执行",
prop: "promotionMechanismExecutionStatus", prop: "promotionMechanismExecutionStatus",
visible: true, visible: true,
type: 'select', type: 'formula',
options: [ func: (row) => {
{ // 如果参考值是空则返回 '-'
label: '是', if (!row.plannedPromotionMechanism) {
value: '是' return '-';
},
{
label: '否',
value: '否'
} }
], row.promotionMechanismExecutionStatus = row.actualPromotionMechanism ? '是' : '否';
return row.promotionMechanismExecutionStatus;
},
formulaStr: '公式：实际促销机制，是否有值',
fill: true, fill: true,
width: 135, width: 145,
render: (_, row, col) => {
return (
<div>
<div style="width: 100%;">
<el-select modelValue={row[col.prop]}
onUpdate:modelValue={(value) => {
row[col.prop] = value;
submitChange(row, col);
}}
placeholder=""
clearable
>
{col.options.map((item) => (
<el-option key={item.value} label={item.label} value={item.value} />
))}
</el-select>
</div>
</div>
)
}
}, },
{ {
label: "预估袋数", label: "预估袋数",
...@@ -876,7 +871,7 @@ ...@@ -876,7 +871,7 @@
row.promotionExecutionStatus = row.promotionPriceExecutionStatus == '是' && row.promotionMechanismExecutionStatus == '是' && row.specExecutionStatus == '是' && row.promotionImplementationStatus == '是' ? '是' : '否'; row.promotionExecutionStatus = row.promotionPriceExecutionStatus == '是' && row.promotionMechanismExecutionStatus == '是' && row.specExecutionStatus == '是' && row.promotionImplementationStatus == '是' ? '是' : '否';
return row.promotionExecutionStatus; return row.promotionExecutionStatus;
}, },
formulaStr: '公式：（促销价是否执行 = 是，并且促销机制是否执行 = 是，并且档期规格是否执行 = 是，并且档期是否开展 = 是）', formulaStr: '公式：促销价执行，并且促销机制执行，并且促销规格执行，并且档期开展（某项无计划时，忽略该项）',
fill: true, fill: true,
width: 125 width: 125
} }
......
src/views/promotion/display_schedule/tabs/schedule_dis.vue
浏览文件 @ 04adabff
...@@ -445,6 +445,10 @@ ...@@ -445,6 +445,10 @@
"fill": true, "fill": true,
"width": 160, "width": 160,
func: (row) => { func: (row) => {
// 如果计划端架数量为空则返回 '-'
if (!row.plannedEndCapQty) {
return '-';
}
row.actualEndCapExecuted = row.actualEndCapQty >= row.plannedEndCapQty ? '是' : '否' row.actualEndCapExecuted = row.actualEndCapQty >= row.plannedEndCapQty ? '是' : '否'
return row.actualEndCapExecuted return row.actualEndCapExecuted
}, },
...@@ -594,6 +598,10 @@ ...@@ -594,6 +598,10 @@
"fill": true, "fill": true,
"width": 150, "width": 150,
func: (row) => { func: (row) => {
// 如果计划端架数量为空则返回 '-'
if (!row.plannedFloorStackArea || !row.plannedFloorStackQty) {
return '-';
}
row.actualFloorStackExecuted = row.actualFloorStackArea >= row.plannedFloorStackArea && row.actualFloorStackQty >= row.plannedFloorStackQty ? '是' : '否' row.actualFloorStackExecuted = row.actualFloorStackArea >= row.plannedFloorStackArea && row.actualFloorStackQty >= row.plannedFloorStackQty ? '是' : '否'
return row.actualFloorStackExecuted return row.actualFloorStackExecuted
}, },
...@@ -651,10 +659,13 @@ ...@@ -651,10 +659,13 @@
"fill": true, "fill": true,
"width": 190, "width": 190,
func: (row) => { func: (row) => {
row.actualOtherDisplayExecuted = !row.actualOtherDisplay ? '否' : '是' if (!row.plannedOtherDisplay) {
return '-';
}
row.actualOtherDisplayExecuted = row.actualOtherDisplay ? '是' : '否'
return row.actualOtherDisplayExecuted return row.actualOtherDisplayExecuted
}, },
formulaStr: "执行其他陈列数量 + 形式，是否等于计划其他陈列数量 + 形式" formulaStr: "公式：实际其他陈列-数量+形式，有值"
}, },
{ {
"label": "合计费用 - 费用", "label": "合计费用 - 费用",
...@@ -676,7 +687,7 @@ ...@@ -676,7 +687,7 @@
row.promotionDisplayExecuted = row.actualEndShelfExecuted === '是' && row.actualFloorStackExecuted === '是' && row.actualOtherDisplayExecuted === '是' ? '是' : '否' row.promotionDisplayExecuted = row.actualEndShelfExecuted === '是' && row.actualFloorStackExecuted === '是' && row.actualOtherDisplayExecuted === '是' ? '是' : '否'
return row.promotionDisplayExecuted return row.promotionDisplayExecuted
}, },
formulaStr: "实际端架-是否执行 === '是'，并且 实际地堆是否执行 === '是'，并且 实际其他陈列-是否执行 === '是'" formulaStr: "公式：实际端架执行，并且实际地堆执行，并且实际其他陈列执行（某项无计划时，忽略该项）"
}, },
{ {
"label": "付费陈列 - 是否", "label": "付费陈列 - 是否",
......
src/views/promotion/display_schedule/tabs/snack.vue
浏览文件 @ 04adabff
...@@ -261,51 +261,68 @@ ...@@ -261,51 +261,68 @@
"label": "实际 - 陈列形式", "label": "实际 - 陈列形式",
"prop": "actualDisplay", "prop": "actualDisplay",
"visible": true, "visible": true,
"type": "select", "type": "input",
referenceKey: "plannedDisplay", referenceKey: "plannedDisplay",
"fill": true,
"width": 160,
"options": [
{
"label": "端架",
"value": "端架"
},
{
"label": "收银台",
"value": "收银台"
},
{
"label": "端架和收银台",
"value": "端架和收银台"
}
],
render: (_, row, col) => { render: (_, row, col) => {
return ( return (
<div> <div>
<el-tooltip placement="top" content={row[col.referenceKey] || '-'} disabled={!isContentOverflow(col.referenceKey, row[col.referenceKey], col)}> <span>{row[col.referenceKey] || '-'}</span>
<span style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: inline-block; max-width: 100%;"> <div>
{row[col.referenceKey] || '-'} <el-input modelValue={row[col.prop]}
</span> onUpdate:modelValue={(value) => {
</el-tooltip> row[col.prop] = value;
<el-select modelValue={row[col.prop]} submitChange(row, col);
onUpdate:modelValue={(value) => { }}
row[col.prop] = value; disabled={!row[col.referenceKey]}
submitChange(row, col); placeholder=""
}} clearable
disabled={!row[col.referenceKey]} />
placeholder="" </div>
clearable>
{col.options.map(item => (
<el-option
key={item.value}
label={item.label}
value={item.value}
/>
))}
</el-select>
</div> </div>
) )
}, },
"fill": true,
"width": 160,
// "options": [
// {
// "label": "端架",
// "value": "端架"
// },
// {
// "label": "收银台",
// "value": "收银台"
// },
// {
// "label": "端架和收银台",
// "value": "端架和收银台"
// }
// ],
// render: (_, row, col) => {
// return (
// <div>
// <el-tooltip placement="top" content={row[col.referenceKey] || '-'} disabled={!isContentOverflow(col.referenceKey, row[col.referenceKey], col)}>
// <span style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: inline-block; max-width: 100%;">
// {row[col.referenceKey] || '-'}
// </span>
// </el-tooltip>
// <el-select modelValue={row[col.prop]}
// onUpdate:modelValue={(value) => {
// row[col.prop] = value;
// submitChange(row, col);
// }}
// disabled={!row[col.referenceKey]}
// placeholder="">
// {col.options.map(item => (
// <el-option
// key={item.value}
// label={item.label}
// value={item.value}
// />
// ))}
// </el-select>
// </div>
// )
// },
requestKey: ["displayExecuted", "snackDisplayExecuted"] requestKey: ["displayExecuted", "snackDisplayExecuted"]
}, },
{ {
...@@ -316,7 +333,10 @@ ...@@ -316,7 +333,10 @@
"fill": true, "fill": true,
"width": 150, "width": 150,
func: (row) => { func: (row) => {
row.displayExecuted = row.actualDisplay === row.plannedDisplay ? '是' : '否' if (!row.plannedDisplay) {
return '-';
}
row.displayExecuted = row.actualDisplay ? '是' : '否'
return row.displayExecuted return row.displayExecuted
}, },
formulaStr: "实际陈列形式 === 计划陈列形式" formulaStr: "实际陈列形式 === 计划陈列形式"
...@@ -403,7 +423,7 @@ ...@@ -403,7 +423,7 @@
row.snackDisplayExecuted = row.displayExecuted === '是' && row.endCapQtyExecuted === '是' ? '是' : '否' row.snackDisplayExecuted = row.displayExecuted === '是' && row.endCapQtyExecuted === '是' ? '是' : '否'
return row.snackDisplayExecuted return row.snackDisplayExecuted
}, },
formulaStr: "陈列形式是否执行 === 是，并且端架数量是否执行 === 是" formulaStr: "公式：陈列形式执行，并且端架数量执行（某项无计划时，忽略该项）"
}, },
{ {
"label": "计划 - 陈列费用", "label": "计划 - 陈列费用",
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论