ccjgmwz 3 년 전
부모
커밋
769b8636d6
2개의 변경된 파일13개의 추가작업 그리고 5개의 파일을 삭제
  1. 11 3
      src/components/balanceAlert.vue
  2. 2 2
      src/views/houseSelfCollect/inspectInfo.vue

+ 11 - 3
src/components/balanceAlert.vue

@@ -56,7 +56,7 @@ export default {
           // The Web Serial API is supported.
           console.log('the Web Serial API is supported.')
           const port = await navigator.serial.requestPort()
-          if (this.deptBudgetList.warehouseName == '白城内陆港') {
+          if (this.deptBudgetList.warehouseName == '白城内陆港'||this.deptBudgetList.warehouseName == '肇东金信库') {
             this.param = 1200
           } else {
             this.param = 9600
@@ -106,11 +106,18 @@ export default {
           //     this.deptBudgetList.tare = parseInt(result)
           //   }
           // }
+          
           if(value.length > 3){
-            console.log('value23:', value)
              if(value.length <= 6){
               continue
              }
+            if(this.deptBudgetList.warehouseName == '肇东金信库' && value.length < 10){
+              var start = (new Date()).getTime();
+              while((new Date()).getTime() - start < 200) {
+              }
+              continue
+            }
+            console.log('value23:', value)
           }
           else if(this.deptBudgetList.warehouseName == '白城内陆港'){
             console.log('value:', value)
@@ -127,7 +134,8 @@ export default {
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
-              this.deptBudgetList.warehouseName == '白城内陆港')
+              this.deptBudgetList.warehouseName == '白城内陆港'||
+              this.deptBudgetList.warehouseName == '肇东金信库')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])

+ 2 - 2
src/views/houseSelfCollect/inspectInfo.vue

@@ -95,11 +95,11 @@
             </ws-form-item>
             <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价"
-                maxlength="10" size="small" :disabled="disabled2" />
+                maxlength="10" size="small"  />
             </ws-form-item>
             <ws-form-item label="干粮单价(元/公斤)" span="2" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价"
-                maxlength="10" size="small" :disabled="disabled2" />
+                maxlength="10" size="small"  />
             </ws-form-item>
               <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />