Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue

@@ -276,29 +276,7 @@ export default {
       this.loading = true
       this.queryParams.taskId = this.taskId
       const { data: res } = await getMacodeList(this.queryParams)
-
-      /* 固定资产 */
-      let fixedAssetsList = res.filter(e => e.fixCode == '0') || null
-      /* 非固定资产 */
-      let noFixedAssetsList = res.filter(e => e.fixCode == '1') || null
-
-      let fixNum = 0
-      let noFixNum = 0
-      if (fixedAssetsList) {
-        fixedAssetsList.map(e => {
-          fixNum++
-        })
-
-        fixedAssetsList[0].bindNum = fixedAssetsList[0].checkNum = fixNum
-      }
-      if (noFixedAssetsList) {
-        noFixedAssetsList.map(e => {
-          noFixNum++
-        })
-
-        noFixedAssetsList[0].bindNum = noFixedAssetsList[0].checkNum = noFixNum
-      }
-      this.typeList = [fixedAssetsList[0] || {}, noFixedAssetsList[0] || {}]
+      this.typeList = res
       this.loading = false
     },
     // 取消按钮