修改

build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
-//let devModules = ['index', 'statisticalReport', 'queue','appoint','sale','TMS','RMS']
-let devModules = ['all']
+let devModules = ['index', 'statisticalReport', 'queue']
+// let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址r
   '/api/v1': {
-    target: 'http://172.16.33.166:80',
-    //target: 'http://localhost:8080',
+    // target: 'http://172.16.33.166:80',
+    target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -523,12 +523,15 @@ export default {
       totalQueueNumFirst: null,
       //厂内钢材车辆总数
       steelOrderNum: 0,
-      isQueryCapacity: null
+      isQueryCapacity: null,
+      //排队放行限制
+      releaseFlag: false
     }
   },
-  mounted() {
+  created() {
     this.i = 0
     this.infomation()
+    this.getReleaseFlag()
     this.getSpellingArray()
     this.getNoSpellingArray()
     this.getStoreArray()
@@ -536,6 +539,7 @@ export default {
     this.wantEnfactory()
     this.start()
   },
+  mounted() {},
   computed: {
     wantS() {
       return this.totalQueueNum
@@ -552,6 +556,18 @@ export default {
     }
   },
   methods: {
+    //获取放行限制标志
+    getReleaseFlag() {
+      this.axios
+        .get('/api/v1/uc/getReleaseFlag')
+        .then(res => {
+          this.releaseFlag = res.data
+          console.log(res.data, 'res')
+        })
+        .catch(e => {
+          this.releaseFlag = false
+        })
+    },
     //单拼样式调整
     cellStyleSingle({ row, column, rowIndex, columnIndex }) {
       if (
@@ -653,6 +669,9 @@ export default {
       return row.ROW_ID
     },
     selectInit(row) {
+      if (!this.releaseFlag) {
+        return true
+      }
       //单拼的可勾选控制功能在这
       //过滤出处在同一个网格上的数据
       let gridData = this.tableData1.filter(e => {
@@ -702,6 +721,9 @@ export default {
       // }
     },
     selectInitSplleing(row) {
+      if (!this.releaseFlag) {
+        return true
+      }
       if (this.maplist.length == 0) {
         if (row.group + 1 == 1) {
           return true
@@ -955,7 +977,7 @@ export default {
             this.tableData1 = res.data.data
           })
         console.log('wzxxx')
-      } else if (this.activeName == "second") {
+      } else if (this.activeName == 'second') {
         this.axios
           .post(
             '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=1&i=' +
@@ -968,7 +990,7 @@ export default {
             this.tableData = res.data.data
             this.getSpanArr(this.tableData)
           })
-      } else if (this.activeName == "fourth") {
+      } else if (this.activeName == 'fourth') {
         this.axios
           .post(
             '/api/v1/qms/getQueueListByQueueUp?apiId=473&isSpelling=2&i=' +

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -98,7 +98,7 @@
             ><i class="el-icon-map-location"></i>实时路径</el-button
           >
         </el-form-item>
-        <el-form-item>
+        <el-form-item v-if="isShowOperate">
           <el-button type="primary" @click="openReceive()">
             <i class="el-icon-document"></i>签收抵达</el-button
           >
@@ -1252,7 +1252,6 @@ export default {
         'wuliuyunshubu',
         'dagangadmin',
         'shichangxinxibu',
-        'xiaoshouyewuyuan',
         'zidonghuabu',
         'chengyunshang'
       ],
@@ -2862,6 +2861,7 @@ export default {
       let carrierSsoId = null
       let carrierName = null
       let consigneeName = null
+      let consigneeSsoId = null
       let capacityNo = null
       let remark = null
       let saler = null
@@ -2875,6 +2875,10 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
+      if (getCookie('orgCode') == 'shouhuokehu') {
+        consigneeSsoId = getCookie('userId')
+        this.filterMap.consigneeSsoId = consigneeSsoId
+      }
       if (this.screen == '客户') {
         consigneeName = this.input
       } else if (this.screen == '承运商') {
@@ -2899,6 +2903,7 @@ export default {
       if (getCookie('orgCode') == 'xiaoshouyewuyuan') {
         saler = getCookie('loginName')
       }
+
       this.axios
         .post(
           '/api/v1/tms/getSaleSteelReport?startTime=' +
@@ -2918,7 +2923,8 @@ export default {
             '&carrierName=' +
             carrierName +
             '&capacityNo=' +
-            capacityNo
+            capacityNo,
+          this.filterMap
         )
         .then(res => {
           this.tableData = res.data.data