修改

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

@@ -794,8 +794,8 @@ export default {
       let map = {
         materialList: materialIdList
       }
-      this.materialList = []
-      this.materialList1 = []
+      // this.materialList = []
+      // this.materialList1 = []
       if (this.activeName == 'first') {
         this.axios
           .post('/api/v1/qms/getQueueListByQueueUp?isSpelling=0', map)
@@ -1136,7 +1136,8 @@ export default {
             this.$refs.mutiData.clearSelection()
             this.$refs.spellData.clearSelection()
             this.$refs.twoSpellData.clearSelection()
-            this.getNoSpellingArray()
+            // this.getNoSpellingArray()
+            this.makeSureMaterial()
             this.getSpellingArray()
             this.getSpellingArrayTwo()
             this.getStoreArray()
@@ -1159,7 +1160,8 @@ export default {
             this.$refs.mutiData.clearSelection()
             this.$refs.spellData.clearSelection()
             this.$refs.twoSpellData.clearSelection()
-            this.getNoSpellingArray()
+            // this.getNoSpellingArray()
+            this.makeSureMaterial()
             this.getSpellingArray()
             this.getStoreArray()
             this.getSpellingArrayTwo()

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

@@ -81,10 +81,12 @@
             <i class="el-icon-refresh"></i>
           </el-button>
         </el-form-item>
-        <el-form-item v-if="isShowOperate">
+        <el-form-item>
           <el-button type="primary" @click="checkTrans()"
             ><i class="el-icon-truck"></i>轨迹</el-button
           >
+        </el-form-item>
+        <el-form-item v-if="isShowOperate">
           <el-button type="primary" @click="operation()"
             ><i class="el-icon-edit"></i>更改</el-button
           >
@@ -120,6 +122,7 @@
         border
         style="width: 100%; margin-top: 20px"
         :height="maxHeight"
+        :max-height="maxHeight"
         :row-class-name="tableRowClassName"
         @cell-click="cellClik"
         @cell-mouse-enter="cellMouse1"
@@ -170,14 +173,22 @@
         >
         </el-table-column>
         <el-table-column
+          prop="orderStatus"
+          column-key="orderStatus"
+          label="运单状态"
+          align="center"
+          :filters="filterorderStatus"
+        >
+        </el-table-column>
+        <!-- <el-table-column
           prop="areaName"
           label="销售片区"
           width="150px"
           align="center"
           column-key="saleAreaList"
           :filters="filterSaleAreaList"
-        >
-        </el-table-column>
+        > -->
+        <!-- </el-table-column> -->
         <el-table-column
           prop="carrierName"
           label="承运商"
@@ -236,14 +247,7 @@
           :filters="filteraddressPlace"
         >
         </el-table-column>
-        <el-table-column
-          prop="orderStatus"
-          column-key="orderStatus"
-          label="运单状态"
-          align="center"
-          :filters="filterorderStatus"
-        >
-        </el-table-column>
+
         <el-table-column
           prop="saleRemark"
           column-key="saleRemark"
@@ -599,7 +603,8 @@
                 @select="handleSelect()"
                 :disabled="
                   notRoutList.includes('capacityNo') &&
-                    steelMap.capacityId != null
+                    steelMap.capacityId != null &&
+                    steelMap.capacityNoFlag != null
                 "
               ></el-autocomplete>
               <el-button
@@ -609,7 +614,8 @@
                 v-if="
                   !(
                     notRoutList.includes('capacityNo') &&
-                    steelMap.capacityId != null
+                    steelMap.capacityId != null &&
+                    steelMap.capacityNoFlag != null
                   )
                 "
                 >提交</el-button
@@ -1399,7 +1405,7 @@ export default {
     this.$nextTick(() => {
       window.onresize = () => {
         return (() => {
-          this.maxHeight = window.innerHeight - 150
+          this.maxHeight = window.innerHeight - 130
         })()
       }
     })
@@ -1414,7 +1420,7 @@ export default {
     })
   },
   activated() {
-    this.maxHeight = window.innerHeight - 150
+    this.maxHeight = window.innerHeight - 130
   },
   computed: {},
   methods: {
@@ -2180,7 +2186,8 @@ export default {
       if (
         (queryString != null && queryString != '' && queryString.length > 3) ||
         queryString == '取消' ||
-        queryString == '待定'
+        queryString == '待定' ||
+        queryString == '空白'
       ) {
         this.axios
           .post('/api/v1/uc/getCapacityByLike?index=' + queryString)
@@ -2229,7 +2236,8 @@ export default {
         !(
           isVehicleNumber(this.steelMap.capacityNo) ||
           this.steelMap.capacityNo == '取消' ||
-          this.steelMap.capacityNo == '待定'
+          this.steelMap.capacityNo == '待定' ||
+          this.steelMap.capacityNo == '空白'
         )
       ) {
         this.$message.error('请输入正确格式的车牌号!')
@@ -2882,6 +2890,9 @@ export default {
           console.log(this.visibleList, 'this.visibleList')
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
+          console.log(this.maxHeight, 'this.maxHeight')
+          this.maxHeight = window.innerHeight - 130
+          console.log(this.maxHeight, 'this.maxHeight')
           loading.close()
           console.log(this.visibleList)
         })
@@ -2980,9 +2991,13 @@ export default {
           console.log(this.visibleList)
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
+          console.log(this.maxHeight, 'this.maxHeight')
+          this.maxHeight = window.innerHeight - 130
+          console.log(this.maxHeight, 'this.maxHeight')
           loading.close()
         })
         .catch(() => {
+          this.maxHeight = window.innerHeight - 130
           loading.close()
         })
     }