Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue

@@ -118,7 +118,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="500px"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
         class="table"

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -607,7 +607,8 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].wagonNo === data[i - 1].wagonNo
+          if (data[i].orderId === data[i - 1].orderId
+          &&  data[i].wagonNo === data[i - 1].wagonNo
           && data[i].OutStation === data[i - 1].OutStation) {
             this.spanArr[this.pos] += 1;
             data[i].group = data[i - 1].group;

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -67,7 +67,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="500px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
@@ -83,6 +83,13 @@
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
+        <el-table-column
+          prop="saleOrderNo"
+          label="单据编号"
+          width="200px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="consigneeName"
           label="收货单位"
@@ -132,12 +139,12 @@
               :fetch-suggestions="querySearch"
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
-              :disabled="scope.row.isCapacityShow != 1"
+              :disabled="scope.row.isCapacityShow != 1 || scope.row.orderStatus == 2"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"
               type="primary"
-              v-if="scope.row.isCapacityShow == 1"
+              v-if="scope.row.isCapacityShow == 1 && scope.row.orderStatus != 2"
               >提交</el-button
             >
           </template>
@@ -208,7 +215,7 @@
           column-key="transInWarehouse"
         >
         </el-table-column>
-        <el-table-column prop="netWeight" label="净重" align="center"></el-table-column>
+        <el-table-column prop="netWeight" label="净重" align="center">
         </el-table-column>
         <el-table-column
           prop="carrierName"
@@ -351,6 +358,7 @@ export default {
       isCellClick: 0,
       //需要合并的行
       mergeList: [
+        "saleOrderNo",
         "shipperName",
         "capacityTel",
         "orderNo",
@@ -802,6 +810,7 @@ export default {
       });
       if (row.capacityTel == null || row.capacityTel == "") {
         this.$message.error("电话号码不能为空");
+        loading.close();
         return;
       }
       this.axios
@@ -1196,7 +1205,8 @@ export default {
           selection.find(
             item =>
               item.lineId != selection[0].lineId ||
-              item.saleOrderId != selection[0].saleOrderId
+              item.saleOrderId != selection[0].saleOrderId ||
+              item.sendStation != selection[0].sendStation
           )
         ) {
           this.$message({

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()
         })
     }