浏览代码

动参类型查询标识传参修改

haojianlong 5 年之前
父节点
当前提交
7341e6b61f

+ 1 - 1
src/components/point/dynamicdata/equipRules.vue

@@ -188,7 +188,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;

+ 1 - 1
src/components/point/dynamicdata/partsRules.vue

@@ -187,7 +187,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;

+ 1 - 1
src/components/point/dynamicdata/spaceRules.vue

@@ -187,7 +187,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;

+ 1 - 1
src/components/point/dynamicdata/systemRules.vue

@@ -185,7 +185,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;

+ 5 - 6
src/views/point/dynamicdata/addRelation/equipRela/index.vue

@@ -370,7 +370,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) {
-      //   pa.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 => {

+ 5 - 6
src/views/point/dynamicdata/addRelation/partsRela/index.vue

@@ -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 => {

+ 5 - 2
src/views/point/dynamicdata/addRelation/spaceRela/index.vue

@@ -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;
@@ -399,6 +399,9 @@ export default {
         Filters: 'not RoomID isNull'
       };
       //处理查询条件
+      if (this.form.SubTypeName.length) {
+        pa.Filters += `;ObjectType in ${JSON.stringify(this.form.SubTypeName)}`
+      }
       if (this.form.ObjectLocalName && this.form.ObjectLocalName.length) {
         pa.Filters += `;RoomLocalName contain "${this.form.ObjectLocalName}"`;
       }
@@ -412,7 +415,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 => {

+ 4 - 4
src/views/point/dynamicdata/addRelation/systemRela/index.vue

@@ -370,7 +370,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;
@@ -396,15 +396,15 @@ export default {
         PageSize: this.rPage.pageSize,
         Filters: 'not SysID isNull'
       };
-      //处理查询条件(todo)
+      //处理查询条件
       if (this.form.SubTypeName.length) {
-        pa.Filters += `;CategoryName in ${JSON.stringify(this.form.SubTypeName)}`
+        pa.Filters += `;Category in ${JSON.stringify(this.form.SubTypeName)}`
       }
       let pa2 = {
         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 => {