Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

src/components/balanceAlert.vue

@@ -77,6 +77,7 @@ export default {
         }
         // 监听来自串行设备的数据
         while (true) {
+          
           const { value, done } = await this.reader.read()
           // console.log('value',value);
           if (done) {
@@ -149,6 +150,7 @@ export default {
                 result += tmp
               }
             }
+            debugger
             if (this.information.indexOf('毛重') > -1) {
               if (parseInt(result) || parseInt(result) == 0) {
                 this.grossWeightVal = parseInt(result)

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1888,7 +1888,7 @@
                         this.reader.cancel()
                       }
                       if(this.serviceManagementType==3){
-                        this.warehouseTradeCount+=1
+                        this.warehouseCount+=1
                       }
                       
                       this.$message.success('添加成功')

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -476,6 +476,8 @@
             this.monitorUrl1 = this.warehouseList[0].monitorUrl1
             this.monitorUrl2 = this.warehouseList[0].monitorUrl2
           }
+          
+          this.deptBudgetList.warehouseName = this.warehouseName
           if (this.allowEdit == 0) {
             this.disabled = true
           } else if (this.allowEdit == 1) {
@@ -589,6 +591,7 @@
         this.getList()
       },
       setVal(data) {
+        debugger
         if (this.information == '毛重') {
           this.weighingList.grossWeight = data
         } else {
@@ -648,7 +651,7 @@
           getweighingList({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: 9999,
+            pageSize: 99,
             searchKeyWord: '',
             warehouseName: this.warehouseName,
             managementType: 1,