提交修改

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

@@ -228,6 +228,19 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <el-tab-pane label="仓库排队列表" name="third">
+          <el-table
+            :data="tableData3"
+            :span-method="objectSpanMethod"
+            border
+            style="width: 100%; margin-top: 20px"
+            @selection-change="handleSelectionChange"
+            max-height="500px"
+          >
+            <el-table-column prop="warehouseName" label="仓库" fit></el-table-column>
+            <el-table-column prop="carQueue" label="排队车辆"></el-table-column>
+          </el-table>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -253,6 +266,7 @@ export default {
       activeName: "first",
       tableData: [],
       tableData1: [],
+      tableData3: [],
       //存放每一行记录的合并数
       spanArr: [],
       maplist: [],
@@ -460,8 +474,10 @@ export default {
       this.i = 0;
       if (this.activeName == "first") {
         this.getNoSpellingArray();
-      } else {
+      } else if(this.activeName == "second") {
         this.getSpellingArray();
+      } else {
+        this.getStoreArray();
       }
     },
     getNoSpellingArray() {
@@ -484,6 +500,16 @@ export default {
           this.getSpanArr(this.tableData);
         });
     },
+    getStoreArray() {
+      this.axios
+        .post(
+          "/api/v1/qms/getStoreQueueList"
+        )
+        .then(res => {
+          this.tableData3 = res.data.data;
+          console.log("getStoreArray "+this.tableData3);
+        });
+    },
     onclick() {
       if (this.activeName == "first") {
         this.axios

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -236,7 +236,7 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
-      note: ""
+      note: "",
       dataList:['1','2','3']
     };
   },