commit by yzf

master
Yang 3 years ago
parent b1980ae61e
commit a6b195f59d

@ -1,6 +1,6 @@
<template>
<lay-container fluid="true" class="content-box">
<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
<FormulaView v-if="isFormula" :teamId="dataInfoObj.FTeamID" @changeFormula="changeFormula" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
:freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
@ -180,6 +180,7 @@ export default {
const idx = ref([]);
const materialInfoList=ref([]);
const dataRowsList=ref("");
const isFormula=ref(true);
return {
dataColumn,
dataList,
@ -201,7 +202,8 @@ export default {
tmpDataColumn,
materialInfoList,
idx,
dataRowsList
dataRowsList,
isFormula
};
},
props: {
@ -629,7 +631,12 @@ export default {
},
deepCopy(arr) {
return JSON.parse(JSON.stringify(arr))
},
changeFormula(val){
debugger
this.isFormula=val;
}
}
}
</script>

@ -110,6 +110,11 @@
// this.dataColumn = dataColumn;
this.dataList = dataList;
if(formulaList.length==0)
{
this.$emit('changeFormula', false);
}
}
}
}

Loading…
Cancel
Save