修改

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // let devModules = ['all']
 // let devModules = ['index', 'OYE']
 let devModules = ['all']
-// let devModules = ['index', 'OYE', 'RMS']
+// let devModules = ['index', 'OYE', 'statisticalReport']
 
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/views/OYE/components/oYeTransResult.vue

@@ -375,6 +375,16 @@
           :render-header="renderHeader"
         >
         </el-table-column>
+        <el-table-column
+          prop="materialNum"
+          column-key="materialNum"
+          key="materialNum"
+          label="物资件数"
+          align="center"
+          width="50px"
+          v-if="!columnNoRoutList.includes('物资件数')"
+        >
+        </el-table-column>
         <el-table-column
           prop="steelMeters"
           column-key="steelMeters"
@@ -395,16 +405,7 @@
           v-if="!columnNoRoutList.includes('单重')"
         >
         </el-table-column>
-        <el-table-column
-          prop="materialNum"
-          column-key="materialNum"
-          key="materialNum"
-          label="物资件数"
-          align="center"
-          width="50px"
-          v-if="!columnNoRoutList.includes('物资件数')"
-        >
-        </el-table-column>
+
         <el-table-column
           prop="materialWeight"
           column-key="materialWeight"
@@ -1006,28 +1007,28 @@
                   type="primary"
                   @click="scope.row.materialNumber--"
                   style="height:40px"
-                  v-if="!notRoutList.includes('materialNum')"
+                  v-privilege="activeMenu + 'editMaterialNum'"
                 >
                   -
                 </button>
                 <input
                   v-model="scope.row.materialNumber"
                   style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
-                  :disabled="notRoutList.includes('materialNum')"
+                  :disabled="true"
                 />
                 <button
                   type="primary"
                   @click="scope.row.materialNumber++"
                   style="height:40px"
                   :disabled="scope.row.saleOrderStatus == 4"
-                  v-if="!notRoutList.includes('materialNum')"
+                  v-privilege="activeMenu + 'editMaterialNum'"
                 >
                   +
                 </button>
                 <el-button
                   type="primary"
                   @click="updateBillOrder(scope.row)"
-                  v-if="!notRoutList.includes('materialNum')"
+                  v-privilege="activeMenu + 'editMaterialNum'"
                   >提交</el-button
                 >
               </template>
@@ -2018,6 +2019,7 @@ export default {
         '出库理重',
         '订单日期',
         '客户',
+        '收货单位',
         '物资名称',
         '物资规格',
         '物资件数',

src/views/OYE/components/queueStart.vue

@@ -544,6 +544,7 @@ export default {
   },
   created() {
     this.i = 0
+
     this.infomation()
     this.getReleaseFlag()
     this.getSpellingArray()
@@ -931,10 +932,14 @@ export default {
       }
     },
     getNoSpellingArray() {
+      let inboundWarehouse = null
+      if (getCookie('orgCode') == 'ouyechangwaiku') {
+        inboundWarehouse = getCookie('loginName')
+      }
       this.axios
         .post(
           '/api/v1/qms/getQueueListByQueueUp?isSpelling=0&i=' + new Date(),
-          { oYeFlag: 1 }
+          { oYeFlag: 1, inboundWarehouse: inboundWarehouse }
         )
         .then(res => {
           this.tableData1 = res.data.data
@@ -943,11 +948,15 @@ export default {
         })
     },
     getSpellingArray() {
+      let inboundWarehouse = null
+      if (getCookie('orgCode') == 'ouyechangwaiku') {
+        inboundWarehouse = getCookie('loginName')
+      }
       this.axios
         .post(
           '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=' +
             new Date(),
-          { oYeFlag: 1 }
+          { oYeFlag: 1, inboundWarehouse: inboundWarehouse }
         )
         .then(res => {
           this.tableData = res.data.data
@@ -957,11 +966,15 @@ export default {
         })
     },
     getSpellingArrayTwo() {
+      let inboundWarehouse = null
+      if (getCookie('orgCode') == 'ouyechangwaiku') {
+        inboundWarehouse = getCookie('loginName')
+      }
       this.axios
         .post(
           '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2&i=' +
             new Date(),
-          { oYeFlag: 1 }
+          { oYeFlag: 1, inboundWarehouse: inboundWarehouse }
         )
         .then(res => {
           this.tableData2 = res.data.data
@@ -977,6 +990,10 @@ export default {
       })
     },
     onclick() {
+      let inboundWarehouse = null
+      if (getCookie('orgCode') == 'ouyechangwaiku') {
+        inboundWarehouse = getCookie('loginName')
+      }
       if (this.activeName == 'first') {
         this.axios
           .post(
@@ -984,7 +1001,7 @@ export default {
               new Date() +
               '&capacityNumber=' +
               this.capacityNo,
-            { oYeFlag: 1 }
+            { oYeFlag: 1, inboundWarehouse: inboundWarehouse }
           )
           .then(res => {
             this.isQueryCapacity = 1
@@ -998,7 +1015,7 @@ export default {
               new Date() +
               '&capacityNumber=' +
               this.capacityNo,
-            { oYeFlag: 1 }
+            { oYeFlag: 1, inboundWarehouse: inboundWarehouse }
           )
           .then(res => {
             this.isQueryCapacity = 1
@@ -1012,7 +1029,7 @@ export default {
               new Date() +
               '&capacityNumber=' +
               this.capacityNo,
-            { oYeFlag: 1 }
+            { oYeFlag: 1, inboundWarehouse: inboundWarehouse }
           )
           .then(res => {
             this.isQueryCapacity = 1
@@ -1101,16 +1118,6 @@ export default {
           value => value.materialPriority === this.maplist[i].id
         )
         console.log('warehouse', warehouse)
-        if (warehouse && warehouse.carQueue >= this.allowMaxNum) {
-          this.$message({
-            message: `该仓库已经有${this.allowMaxNum}辆车在排队，不允许放行！或重新调整限制`,
-            type: 'error',
-            duration: 2000,
-            center: true,
-            offset: 100
-          })
-          return
-        }
         this.filterArr(this.maplist[i].resultId)
       }
       console.log(this.filterArr1, 'this.fil')