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

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

parent c73c6180
......@@ -83,7 +83,6 @@ export function handleRangeTitle(range: any) {
const title = {
title: '',
sheet: sheetNum,
numFlag: 'N',
row: !isVertical ? +beginRow + rowLen - 1 : endRow - rowLen - 1,
colum: isVertical ? +beginColum + columnLen - 1 : endColum - columnLen - 1
}
......
......@@ -129,10 +129,21 @@
</template>
</vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70">
<template #default="{ row }">
<el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox>
</template>
</vxe-column>
<template #default="{ row }">
<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>
</vxe-column>
<vxe-column title="操作" field="action" width="50">
<template #default="{ row, $rowIndex }">
<el-link style="font-size: 12px" type="danger" @click="delAreaTitle($rowIndex)"
......@@ -204,10 +215,21 @@
</template>
</vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70">
<template #default="{ row }">
<el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox>
</template>
</vxe-column>
<template #default="{ row }">
<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>
</vxe-column>
<vxe-column title="操作" field="action" width="50">
<template #default="{ row, $rowIndex }">
<el-link style="font-size: 12px" type="danger" @click="delGroupAreaTitle($rowIndex)"
......@@ -272,10 +294,9 @@ const delAreaTitle = (index: 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) => {
attchInfo.areaTitles.splice(index, 1)
......@@ -297,6 +318,14 @@ onMounted(() => {
queryDict('excel_area_type')
})
const numFlagChange = ([val], row: any) => {
if (val == 'Y') {
!row.numTitle && (row.numTitle = '尺码')
} else {
row.numTitle = ''
}
}
const getAreaData = () => {
return {
...currentForm,
......
......@@ -53,9 +53,14 @@
{{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
</template>
</vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70">
<vxe-column title="是否拆分" field="numFlag" width="70">
<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>
</vxe-column>
<vxe-column title="操作" field="action" width="50">
......@@ -115,6 +120,15 @@ const setAttch = () => {
luckysheet.setRangeFormat('bg', areaMarksColor['attch'])
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 = () => {
}
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
luckysheet.setRangeFormat('bg', areaMarksColor['attch_title'])
......
......@@ -18,9 +18,20 @@
{{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
</template>
</vxe-column>
<vxe-column title="是否数量" field="numFlag" width="70">
<vxe-column title="是否拆分" field="numFlag" width="70">
<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>
</vxe-column>
<vxe-column title="操作" field="action" width="50">
......@@ -53,7 +64,7 @@ const props = defineProps({
})
const luckysheet = (window as any).luckysheet
const emits = defineEmits(['next'])
const excelAreaTitle = ref([])
const excelAreaTitle = ref<Recordable[]>([])
const titleArea = ref<Recordable[]>([])
const setAreaTitle = () => {
......@@ -65,7 +76,11 @@ const setAreaTitle = () => {
const [sr, er] = sheet.luckysheet_select_save[0].row
const [sc, ec] = sheet.luckysheet_select_save[0].column
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({
excelAreaNicname: props.currentAreaMark.excelAreaNicname,
......@@ -104,6 +119,14 @@ const setAreaTitle = () => {
setAreaTitleBg('head')
}
const numFlagChange = ([val], row: any) => {
if (val == 'Y') {
!row.numTitle && (row.numTitle = '尺码')
} else {
row.numTitle = ''
}
}
const delAreaTitle = (index: number, row: Recordable) => {
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