Commit 0b28e20a authored by 何远江's avatar 何远江

修改设置产品对照带出默认客户

parent fdf85418
......@@ -6,6 +6,9 @@
<div class="w-[420px] h-full bg-white">
<p class="pl-2 text-lg font-bold leading-[40px] bg-slate-200">标注配置</p>
<SetArea @success="onSaveSuccess" :areaTypeLen="areaTypeLen" />
<div class="pl-2 pb-2">
<el-button type="primary" size="small" @click="setProdCompare">设置产品对照</el-button>
</div>
<div class="pt-2 pl-2 pr-2 pb-2 text-sm border-t-2 border-b-2">
<p class="font-bold">标记区域</p>
......@@ -89,7 +92,6 @@
</vxe-pager>
</div>
<el-button type="primary" size="small" @click="setProdCompare">设置产品对照</el-button>
<el-button type="primary" size="small" @click="toRun">执行解析</el-button>
</div>
</el-scrollbar>
......
......@@ -83,9 +83,11 @@ import { reactive, ref, watch } from 'vue'
import ProductModal from '@/components/ProductModal/ProductModal.vue'
import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
import { MoreFilled } from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus';
import { saveExcelProdFileConf } from '@/api/product';
import { ElMessage } from 'element-plus'
import { saveExcelProdFileConf } from '@/api/product'
import { useCommentExcel } from '@/stores/commentExcel'
const { getFileInfo } = useCommentExcel()
const props = defineProps(['visible'])
const emits = defineEmits(['confirm', 'update:visible', 'success'])
const formRef = ref()
......@@ -110,6 +112,9 @@ watch(
(val) => {
modalVisible.value = val
if (val) {
// 如果有客户,默认带出来
formState.customerId = getFileInfo.customerId || ''
formState.customerId_dictText = getFileInfo.customerId_dictText || ''
formState.excelFiled = getText()
}
}
......@@ -118,9 +123,9 @@ watch(
const getText = () => {
const rangeJson = luckysheet.getRangeJson()
const effectVal: any = []
rangeJson.forEach(item => {
rangeJson.forEach((item) => {
const vs = Object.values(item)
effectVal.push(...vs.filter(v => !!v))
effectVal.push(...vs.filter((v) => !!v))
})
return effectVal.join(';')
......
......@@ -114,7 +114,7 @@ const saveArea = async () => {
<style lang="scss">
.setdata-step {
.el-steps--simple {
padding: 8px 15px;
padding: 8px 15px 0;
}
.el-step.is-simple {
.el-step__title {
......
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