|
|
@@ -232,6 +232,7 @@
|
|
|
v-model="row.paramType"
|
|
|
placeholder="请选择参数类型"
|
|
|
size="mini"
|
|
|
+ @change="paramTypeChange(row)"
|
|
|
>
|
|
|
<el-option label="数值" :value="1" />
|
|
|
<el-option label="选择" :value="2" />
|
|
|
@@ -1053,9 +1054,17 @@
|
|
|
return this.$message.warning('至少条件一条规则项');
|
|
|
}
|
|
|
|
|
|
+ if (this.formData.reportWorkType == 4) {
|
|
|
+ // 生产统计过滤掉非成品统计的明细
|
|
|
+ this.formData.details = this.formData.details.filter(
|
|
|
+ (i) => i.statisticsType
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
// 判断参数类型是否选择
|
|
|
for (const detail of this.formData.details) {
|
|
|
if (!detail.paramType) {
|
|
|
+ console.log('detail', detail);
|
|
|
return this.$message.warning('请选择规则明细中的参数类型!');
|
|
|
}
|
|
|
}
|
|
|
@@ -1584,6 +1593,14 @@
|
|
|
} else {
|
|
|
this.$set(row, 'activeIndex', index);
|
|
|
}
|
|
|
+ },
|
|
|
+ // 类型变化
|
|
|
+ paramTypeChange(row) {
|
|
|
+ if (row.pageType != 9) {
|
|
|
+ // 清空
|
|
|
+ row.formulaParts = [];
|
|
|
+ row.formula = '';
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
};
|