|
|
@@ -529,7 +529,7 @@
|
|
|
placeholder="请输入参数上限"
|
|
|
size="mini"
|
|
|
></el-input>
|
|
|
- <span v-else-if="row.paramType == 7 && row.substanceId">{{
|
|
|
+ <span v-else-if="row.paramType == 7 && row.paramCode">{{
|
|
|
row.maxValue
|
|
|
}}</span>
|
|
|
</template>
|
|
|
@@ -540,7 +540,7 @@
|
|
|
placeholder="请输入参数下限"
|
|
|
size="mini"
|
|
|
></el-input>
|
|
|
- <span v-else-if="row.paramType == 7 && row.substanceId">{{
|
|
|
+ <span v-else-if="row.paramType == 7 && row.paramCode">{{
|
|
|
row.minValue
|
|
|
}}</span>
|
|
|
</template>
|
|
|
@@ -559,7 +559,7 @@
|
|
|
size="mini"
|
|
|
>
|
|
|
</DictSelection>
|
|
|
- <span v-else-if="row.paramType == 7 && row.substanceId">{{
|
|
|
+ <span v-else-if="row.paramType == 7 && row.paramCode">{{
|
|
|
row.unitName
|
|
|
}}</span>
|
|
|
</template>
|
|
|
@@ -1827,7 +1827,8 @@
|
|
|
if (this.formData.reportWorkType == 5) {
|
|
|
this.$refs.bindSubstanceRef.open(
|
|
|
this.formData.deviceId,
|
|
|
- this.formData.deviceName
|
|
|
+ this.formData.deviceName,
|
|
|
+ this.formData.deviceCode,
|
|
|
);
|
|
|
} else {
|
|
|
this.$refs.toolModalRef.open(row.toolCodes);
|
|
|
@@ -1837,7 +1838,8 @@
|
|
|
this.currentIndex = 9999;
|
|
|
this.$refs.bindSubstanceRef.open(
|
|
|
this.formData.deviceId,
|
|
|
- this.formData.deviceName
|
|
|
+ this.formData.deviceName,
|
|
|
+ this.formData.deviceCode,
|
|
|
);
|
|
|
},
|
|
|
bindSubstanceSuccess(list) {
|
|
|
@@ -1865,7 +1867,7 @@
|
|
|
productCode: '',
|
|
|
paramCode: item.paramCode,
|
|
|
substanceId: item.substanceId,
|
|
|
- substanceCode: item.paramCode,
|
|
|
+ substanceCode: item.substanceCode,
|
|
|
substanceName: item.substanceName,
|
|
|
// 1-成品统计,2-物料统计,3-工序统计"
|
|
|
statisticsType:
|