Commit 69108bc2 authored by 何远江's avatar 何远江

添加是否拆分/核心名称字段

parent c73c6180
...@@ -83,7 +83,6 @@ export function handleRangeTitle(range: any) { ...@@ -83,7 +83,6 @@ export function handleRangeTitle(range: any) {
const title = { const title = {
title: '', title: '',
sheet: sheetNum, sheet: sheetNum,
numFlag: 'N',
row: !isVertical ? +beginRow + rowLen - 1 : endRow - rowLen - 1, row: !isVertical ? +beginRow + rowLen - 1 : endRow - rowLen - 1,
colum: isVertical ? +beginColum + columnLen - 1 : endColum - columnLen - 1 colum: isVertical ? +beginColum + columnLen - 1 : endColum - columnLen - 1
} }
......
...@@ -130,7 +130,18 @@ ...@@ -130,7 +130,18 @@
</vxe-column> </vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70"> <vxe-column title="是否数量" field="numFlag" width="70">
<template #default="{ row }"> <template #default="{ row }">
<el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox> <el-checkbox
size="small"
true-label="Y"
false-label="N"
v-model="row.numFlag"
@change="(e) => numFlagChange(e, row)"
></el-checkbox>
</template>
</vxe-column>
<vxe-column title="核心" field="numTitle" width="120">
<template #default="{ row }">
<el-input v-model="row.numTitle" size="small"></el-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column title="操作" field="action" width="50"> <vxe-column title="操作" field="action" width="50">
...@@ -205,7 +216,18 @@ ...@@ -205,7 +216,18 @@
</vxe-column> </vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70"> <vxe-column title="是否数量" field="numFlag" width="70">
<template #default="{ row }"> <template #default="{ row }">
<el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox> <el-checkbox
size="small"
true-label="Y"
false-label="N"
v-model="row.numFlag"
@change="(e) => numFlagChange(e, row)"
></el-checkbox>
</template>
</vxe-column>
<vxe-column title="核心" field="numTitle" width="90">
<template #default="{ row }">
<el-input v-model="row.numTitle" size="small"></el-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column title="操作" field="action" width="50"> <vxe-column title="操作" field="action" width="50">
...@@ -272,10 +294,9 @@ const delAreaTitle = (index: number) => { ...@@ -272,10 +294,9 @@ const delAreaTitle = (index: number) => {
// 删除说明单元格和排除单元格 // 删除说明单元格和排除单元格
const delCaptionAndExclude = (row: any, index: number, type: number) => { const delCaptionAndExclude = (row: any, index: number, type: number) => {
delCapAndExc.value.push({...row, type }); delCapAndExc.value.push({ ...row, type })
// 删除本行 // 删除本行
(type == 1 ? currentForm.dataTitles : currentForm.excludeArea).splice(index, 1) ;(type == 1 ? currentForm.dataTitles : currentForm.excludeArea).splice(index, 1)
} }
const delGroupAreaTitle = (index: number) => { const delGroupAreaTitle = (index: number) => {
attchInfo.areaTitles.splice(index, 1) attchInfo.areaTitles.splice(index, 1)
...@@ -297,6 +318,14 @@ onMounted(() => { ...@@ -297,6 +318,14 @@ onMounted(() => {
queryDict('excel_area_type') queryDict('excel_area_type')
}) })
const numFlagChange = ([val], row: any) => {
if (val == 'Y') {
!row.numTitle && (row.numTitle = '尺码')
} else {
row.numTitle = ''
}
}
const getAreaData = () => { const getAreaData = () => {
return { return {
...currentForm, ...currentForm,
......
...@@ -53,9 +53,14 @@ ...@@ -53,9 +53,14 @@
{{ getRangetxt(row.row, row.row, row.colum, row.colum) }} {{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70"> <vxe-column title="是否拆分" field="numFlag" width="70">
<template #default="{ row }"> <template #default="{ row }">
<el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox> <el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag" @change="(e) => numFlagChange(e, row)"></el-checkbox>
</template>
</vxe-column>
<vxe-column title="核心" field="numTitle" width="90">
<template #default="{ row }">
<el-input v-model="row.numTitle" size="small"></el-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column title="操作" field="action" width="50"> <vxe-column title="操作" field="action" width="50">
...@@ -115,6 +120,15 @@ const setAttch = () => { ...@@ -115,6 +120,15 @@ const setAttch = () => {
luckysheet.setRangeFormat('bg', areaMarksColor['attch']) luckysheet.setRangeFormat('bg', areaMarksColor['attch'])
Object.assign(formState, position) Object.assign(formState, position)
} }
const numFlagChange = ([val], row: any) => {
if (val == 'Y') {
!row.numTitle && (row.numTitle = '尺码')
} else {
row.numTitle = ''
}
}
/** /**
* 设置附加信息标题 * 设置附加信息标题
*/ */
...@@ -141,7 +155,11 @@ const setAttchTitle = () => { ...@@ -141,7 +155,11 @@ const setAttchTitle = () => {
} }
const rangeData = luckysheet.getRangeValue() const rangeData = luckysheet.getRangeValue()
const aTitles = handleRangeTitle(rangeData, unref(formState)) const aTitles = handleRangeTitle(rangeData).map((item) => {
Reflect.set(item, 'numTitle', '')
Reflect.set(item, 'numFlag', 'N')
return item
})
areaTitles.value = aTitles areaTitles.value = aTitles
luckysheet.setRangeFormat('bg', areaMarksColor['attch_title']) luckysheet.setRangeFormat('bg', areaMarksColor['attch_title'])
......
...@@ -18,9 +18,20 @@ ...@@ -18,9 +18,20 @@
{{ getRangetxt(row.row, row.row, row.colum, row.colum) }} {{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70"> <vxe-column title="是否拆分" field="numFlag" width="70">
<template #default="{ row }"> <template #default="{ row }">
<el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox> <el-checkbox
size="small"
true-label="Y"
false-label="N"
v-model="row.numFlag"
@change="(e) => numFlagChange(e, row)"
></el-checkbox>
</template>
</vxe-column>
<vxe-column title="核心" field="numTitle" width="90">
<template #default="{ row }">
<el-input v-model="row.numTitle" size="small"></el-input>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column title="操作" field="action" width="50"> <vxe-column title="操作" field="action" width="50">
...@@ -53,7 +64,7 @@ const props = defineProps({ ...@@ -53,7 +64,7 @@ const props = defineProps({
}) })
const luckysheet = (window as any).luckysheet const luckysheet = (window as any).luckysheet
const emits = defineEmits(['next']) const emits = defineEmits(['next'])
const excelAreaTitle = ref([]) const excelAreaTitle = ref<Recordable[]>([])
const titleArea = ref<Recordable[]>([]) const titleArea = ref<Recordable[]>([])
const setAreaTitle = () => { const setAreaTitle = () => {
...@@ -65,7 +76,11 @@ const setAreaTitle = () => { ...@@ -65,7 +76,11 @@ const setAreaTitle = () => {
const [sr, er] = sheet.luckysheet_select_save[0].row const [sr, er] = sheet.luckysheet_select_save[0].row
const [sc, ec] = sheet.luckysheet_select_save[0].column const [sc, ec] = sheet.luckysheet_select_save[0].column
const rangeData = luckysheet.getRangeValue() const rangeData = luckysheet.getRangeValue()
const titles = handleRangeTitle(rangeData) const titles = handleRangeTitle(rangeData).map((item) => {
Reflect.set(item, 'numTitle', '')
Reflect.set(item, 'numFlag', 'N')
return item
})
titleArea.value.push({ titleArea.value.push({
excelAreaNicname: props.currentAreaMark.excelAreaNicname, excelAreaNicname: props.currentAreaMark.excelAreaNicname,
...@@ -104,6 +119,14 @@ const setAreaTitle = () => { ...@@ -104,6 +119,14 @@ const setAreaTitle = () => {
setAreaTitleBg('head') setAreaTitleBg('head')
} }
const numFlagChange = ([val], row: any) => {
if (val == 'Y') {
!row.numTitle && (row.numTitle = '尺码')
} else {
row.numTitle = ''
}
}
const delAreaTitle = (index: number, row: Recordable) => { const delAreaTitle = (index: number, row: Recordable) => {
excelAreaTitle.value.splice(index, 1) excelAreaTitle.value.splice(index, 1)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment