|
@@ -165,7 +165,7 @@
|
|
|
<el-card class="main-card mt30" id="renderCard1001" style="min-height: 400px;max-height: 800px;" v-if="decoratePicList.length > 0">
|
|
|
<el-row>
|
|
|
<!-- 装潢包选择-->
|
|
|
- <el-col :span="7" style="overflow: auto;max-height: 780px">
|
|
|
+ <el-col :span="7" style="overflow: auto;max-height: 780px" v-if="!disableFlag">
|
|
|
<div v-for="(item,index) in decoratePicList" class="out-check-div" @click="decorateSelectionChange(item,true)">
|
|
|
<div class="check-div" style="z-index: 2"><img v-if="item.checked" src="@/assets/images/check.png" class="check-img br6"/></div>
|
|
|
<div style="z-index: 1" class="br6">
|
|
@@ -1225,7 +1225,12 @@ export default {
|
|
|
let resultList = []
|
|
|
for (let j = 0; j < ruleItemConditionList.length; j++) {
|
|
|
let condition = ruleItemConditionList[j]
|
|
|
- const otherItem = this.paramCategoryMap.get(condition.paraCode)
|
|
|
+ const otherItem = this.paramCategoryMap[condition.paraCode]
|
|
|
+
|
|
|
+ if (!otherItem) {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
//判断联动条件中,非当前修改的控件对应的项目,所选值是否满足联动条件
|
|
|
// 优先获取装潢包参数值
|
|
|
let calcValue = otherItem.decorateValue
|