|
@@ -371,7 +371,7 @@ export default {
|
|
|
param.EquipmentMark = this.form.EquipmentMark;
|
|
|
}
|
|
|
if (this.form.SubTypeName.length) {
|
|
|
- param.SubTypeNameList = this.form.SubTypeName;
|
|
|
+ param.SubTypeCodeList = this.form.SubTypeName;
|
|
|
}
|
|
|
if (this.form.LocationFlag.length) {
|
|
|
param.LocationFlagList = this.form.LocationFlag;
|
|
@@ -401,10 +401,9 @@ export default {
|
|
|
if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
|
|
|
pa.Filters += `;EquipLocalName contain "${this.form.ObjectLocalName}"`;
|
|
|
}
|
|
|
- //TODO
|
|
|
- // if (this.form.SubTypeName.length) {
|
|
|
- // param.SubTypeNameList = this.form.SubTypeName;
|
|
|
- // }
|
|
|
+ if (this.form.SubTypeName.length) {
|
|
|
+ pa.Filters += `;Category in ${JSON.stringify(this.form.SubTypeName)}`;
|
|
|
+ }
|
|
|
if (this.form.locationVal.length > 0) {
|
|
|
pa.Filters += `;BuildingId='${this.form.locationVal[0]}'`;
|
|
|
}
|
|
@@ -415,7 +414,7 @@ export default {
|
|
|
Filters: `TypeName='${this.typeName}'`
|
|
|
}
|
|
|
if (this.form.SubTypeName.length) {
|
|
|
- pa2.Filters += `;SubTypeName in ${JSON.stringify(this.form.SubTypeName)}`
|
|
|
+ pa2.Filters += `;SubTypeCode in ${JSON.stringify(this.form.SubTypeName)}`
|
|
|
}
|
|
|
this.rTableLoading = true;
|
|
|
dynamicRelatedObj(pa2, response => {
|