luobang 1 سال پیش
والد
کامیت
51539df2c9

+ 1 - 1
build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-// let devModules = ['index', 'statisticalReport']
+// let devModules = ['index', 'queue']
 // let devModules = ['all']
 // let devModules = ['index', 'ADMINISTRATORS']
 

+ 16 - 3
src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -49,6 +49,13 @@
           <el-input disabled style="width:100px" v-model="steelOrderNum">
           </el-input>
         </el-form-item>
+        <el-form-item
+          ><el-button type="primary" class="btn" disabled>
+            各仓库允许放行数
+          </el-button>
+          <el-input style="width:100px" v-model.number="allowMaxNum">
+          </el-input>
+        </el-form-item>
       </el-form>
     </div>
     <!-- 物资选择模态框 -->
@@ -484,6 +491,7 @@
 </template>
 <script>
 import { getCookie } from '@/utils/util.js'
+import { isNumber } from '@/utils/sharedJsFile.js'
 export default {
   data() {
     return {
@@ -530,7 +538,8 @@ export default {
       steelOrderNum: 0,
       isQueryCapacity: null,
       //排队放行限制
-      releaseFlag: false
+      releaseFlag: false,
+      allowMaxNum: localStorage.getItem('allowMaxNum') || 30
     }
   },
   created() {
@@ -543,6 +552,7 @@ export default {
     this.getSteelOrderNum()
     this.wantEnfactory()
     this.start()
+    localStorage.setItem('allowMaxNum', 30)
   },
   mounted() {},
   computed: {
@@ -558,6 +568,9 @@ export default {
       if (this.totalQueueNum - this.totalQueueNumFirst > 0) {
         this.redDotNum = this.totalQueueNum - this.totalQueueNumFirst
       }
+    },
+    allowMaxNum() {
+      localStorage.setItem('allowMaxNum', this.allowMaxNum)
     }
   },
   methods: {
@@ -1079,9 +1092,9 @@ export default {
           value => value.materialPriority === this.maplist[i].id
         )
         console.log('warehouse', warehouse)
-        if (warehouse && warehouse.carQueue >= 30) {
+        if (warehouse && warehouse.carQueue >= this.allowMaxNum) {
           this.$message({
-            message: '该仓库已经有30辆车在排队,不允许放行!',
+            message: `该仓库已经有${this.allowMaxNum}辆车在排队,不允许放行!或重新调整限制`,
             type: 'error',
             duration: 2000,
             center: true,

+ 0 - 4
src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -2034,10 +2034,6 @@ export default {
         this.selecteddetailsOrderAmount = this.selecteddetailsOrderAmount.toFixed(
           2
         )
-        console.log(
-          this.selecteddetailsOrderAmount,
-          'selecteddetailsOrderAmount'
-        )
         this.showStatementUpLoad = true
       }
     },