dasd

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']
-// 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

src/config/include.js

@@ -1,20 +1,20 @@
 /* eslint-disable */
 /**************************************************************** 通用引入，包含element-ui等 ***********************************************************************************/
-import Vue from 'vue';
-import ElementUI from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css'; // 2.4.2
+import Vue from 'vue'
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css' // 2.4.2
 
 /**************************************************************** 引入babel-polyfill转换es6 ***********************************************************************************/
-import 'babel-polyfill';
+import 'babel-polyfill'
 
 /**************************************************************** import 全局filter         ***********************************************************************************/
-import '@/utils/filter.js';
+import '@/utils/filter.js'
 
 /**************************************************************** import 全局方法           ***********************************************************************************/
-import '@/utils/method.js';
+import '@/utils/method.js'
 
 /**************************************************************** import 公共方法           ***********************************************************************************/
-import '@/utils/commonFunction.js';
+import '@/utils/commonFunction.js'
 
 /**************************************************************** 引入外部插件              ***********************************************************************************/
 import VueClipboard from 'vue-clipboard2'
@@ -23,14 +23,14 @@ import jsPlumb from 'jsplumb'
 
 import icorePlugin from 'icore-sdk/icore/index.js' // icore-sdk
 
-window.jsPlumb = jsPlumb.jsPlumb;
+window.jsPlumb = jsPlumb.jsPlumb
 
 Vue.use(VueClipboard)
 
 // use element-ui 2.4.2
-Vue.use(ElementUI);
-Vue.use(icorePlugin);
+Vue.use(ElementUI)
+//console.log('----------------------fffff')
+Vue.use(icorePlugin)
 
 /**************************************************************** 引入项目公用样式 简直覆盖Element-ui css ***********************************************************************/
-import '@/assets/css/index.css';
-
+import '@/assets/css/index.css'

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

@@ -444,6 +444,7 @@ export default {
           })
           this.getNoSpellingArray()
           this.getSpellingArray()
+          this.getSpellingArrayTwo()
         } else {
           this.$message({
             message: '撤销失败',
@@ -471,12 +472,15 @@ export default {
     refresh() {
       this.getSpellingArray()
       this.getNoSpellingArray()
+      this.getSpellingArrayTwo()
       this.getSteelOrderNum()
       this.getStoreArray()
       this.redDotNum = null
       this.totalQueueNum = null
       this.totalQueueNumFirst = null
       this.isQueryCapacity = null
+      this.maplist = []
+      this.filterArr1 = []
       this.i = 0
       clearInterval(this.timer)
       this.start()
@@ -499,7 +503,11 @@ export default {
       } else {
         if (
           this.maplist.some(e => {
-            return e.ROW_ID == row.ROW_ID || e.ROW_ID + 1 == row.ROW_ID
+            return (
+              e.ROW_ID == row.ROW_ID ||
+              e.ROW_ID + 1 == row.ROW_ID ||
+              typeof row.ROW_ID == 'undefined'
+            )
           })
         ) {
           return true
@@ -832,9 +840,20 @@ export default {
     },
     filterArr(resultId) {
       console.log('fdhjsaj')
-      this.filterArr1 = this.filterArr1.concat(
-        this.tableData.filter(ele => ele.resultId == resultId)
-      )
+      this.filterArr1 = []
+      if (this.activeName == 'first') {
+        this.filterArr1 = this.filterArr1.concat(
+          this.tableData1.filter(ele => ele.resultId == resultId)
+        )
+      } else if (this.activeName == 'second') {
+        this.filterArr1 = this.filterArr1.concat(
+          this.tableData.filter(ele => ele.resultId == resultId)
+        )
+      } else if (this.activeName == 'fourth') {
+        this.filterArr1 = this.filterArr1.concat(
+          this.tableData2.filter(ele => ele.resultId == resultId)
+        )
+      }
     },
     allow() {
       if (this.maplist.length == 0) {
@@ -879,6 +898,7 @@ export default {
         }
         this.filterArr(this.maplist[i].resultId)
       }
+      console.log(this.filterArr1, 'this.fil')
       var filterArr2 = []
       this.filterArr1.forEach(e => {
         if (filterArr2.indexOf(e) === -1) {
@@ -895,36 +915,57 @@ export default {
       }
       console.log('勾选的数据')
       console.log(map)
-      this.axios.post('/api/v1/qms/allowEnFactory', map).then(res => {
-        if (res.data.code == '200') {
-          this.$message({
-            message: '放行成功，等待进厂',
-            type: 'success',
-            duration: 2000,
-            center: true,
-            offset: 100
-          })
-          this.maplist = []
-          this.$refs.mutiData.clearSelection()
-          this.$refs.spellData.clearSelection()
-          this.$refs.twoSpellData.clearSelection()
-          this.getNoSpellingArray()
-          this.getSpellingArray()
-          this.getStoreArray()
-          this.redDotNum = null
-          this.totalQueueNum = null
-          this.totalQueueNumFirst = null
-          this.i = 0
-          clearInterval(this.timer)
-          this.start()
-        } else {
-          this.$message({
-            message: '请按顺序勾选',
-            type: 'error',
-            duration: 2000,
-            center: true,
-            offset: 100
-          })
+      this.axios
+        .post('/api/v1/qms/allowEnFactory', map)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$message({
+              message: '放行成功，等待进厂',
+              type: 'success',
+              duration: 2000,
+              center: true,
+              offset: 100
+            })
+            this.maplist = []
+            this.$refs.mutiData.clearSelection()
+            this.$refs.spellData.clearSelection()
+            this.$refs.twoSpellData.clearSelection()
+            this.getNoSpellingArray()
+            this.getSpellingArray()
+            this.getSpellingArrayTwo()
+            this.getStoreArray()
+            this.redDotNum = null
+            this.totalQueueNum = null
+            this.totalQueueNumFirst = null
+            this.i = 0
+            clearInterval(this.timer)
+            this.start()
+          } else {
+            this.$message({
+              message: '请按顺序勾选',
+              type: 'error',
+              duration: 2000,
+              center: true,
+              offset: 100
+            })
+            this.maplist = []
+            this.$refs.mutiData.clearSelection()
+            this.$refs.spellData.clearSelection()
+            this.$refs.twoSpellData.clearSelection()
+            this.getNoSpellingArray()
+            this.getSpellingArray()
+            this.getStoreArray()
+            this.getSpellingArrayTwo()
+            this.redDotNum = null
+            this.totalQueueNum = null
+            this.totalQueueNumFirst = null
+            this.i = 0
+            clearInterval(this.timer)
+            this.start()
+          }
+        })
+        .catch(e => {
+          console.log(e)
           this.maplist = []
           this.$refs.mutiData.clearSelection()
           this.$refs.spellData.clearSelection()
@@ -932,14 +973,14 @@ export default {
           this.getNoSpellingArray()
           this.getSpellingArray()
           this.getStoreArray()
+          this.getSpellingArrayTwo()
           this.redDotNum = null
           this.totalQueueNum = null
           this.totalQueueNumFirst = null
           this.i = 0
           clearInterval(this.timer)
           this.start()
-        }
-      })
+        })
     },
     changePriority(row) {
       console.log('装货点：' + row.id)

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

@@ -91,7 +91,10 @@
           <!-- <el-button type="primary" @click="batchoperation()"
             ><i class="el-icon-edit"></i>批量更改</el-button
           > -->
-          <el-button type="primary" @click="checkPoint()"
+          <el-button
+            type="primary"
+            @click="checkPoint()"
+            v-if="!notRoutList.includes('checkPoint')"
             ><i class="el-icon-map-location"></i>实时路径</el-button
           >
         </el-form-item>
@@ -125,6 +128,10 @@
         @row-click="rowClick"
         :cell-style="cellStyle"
         @filter-change="filterChange"
+        :key="saleSteelKey"
+        id="salesLogisticsStat_saleSteelReports_table"
+        individual-panel
+        @resetTable="reset"
       >
         <el-table-column
           width="50"