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

sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue

@@ -607,7 +607,7 @@ export default {
                 dictName: undefined,
                 dictType: undefined,
                 status: undefined,
-                keyWord: '', 
+                keyWord: '',
                 typeId: '',
                 // flag: 0,
             },
@@ -748,6 +748,7 @@ export default {
                 inputNum: row.checkNum,
                 maCode: row.maCode,
                 typeId: row.typeId,
+                num: row.num,
             }
 
             let param = {

sgzb-ui/vue.config.js

@@ -45,10 +45,10 @@ module.exports = {
 
         // target: `http://192.168.2.134:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
-        // target: `http://192.168.2.82:28080`,//旭/
+        target: `http://192.168.2.82:28080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅
         // target: `http://192.168.2.209:28080`, //福
-        target: `http://192.168.2.114:39080`, //王
+        // target: `http://192.168.2.114:39080`, //王
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;