修改

build/utils.js

@@ -20,9 +20,14 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "TMS", "appoint"];
 
 // let devModules = ["index", "appoint", "statisticalReport"];
-let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
+
+// let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 // let devModules = ["all"];
 
+
+// let devModules = ["index", "appoint", "statisticalReport", "WMS"];
+let devModules = ["all"];
+
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

config/index.js

@@ -66,7 +66,8 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://192.168.1.106:8080",
+    // target: "http://localhost:8080",
+    // target: "http://192.168.1.104:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/WMS/components/billingOrder/orderDetails.vue

@@ -0,0 +1,387 @@
+//钢材统计报表
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="tableTop">
+      <el-form :inline="true" style="margin-top :5px">
+        <el-form-item>
+          <span>车牌号</span>
+          <el-input
+            style="width:200px"
+            v-model="input"
+            placeholder="请输入查询条件"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <label class="el-form-item__label" style="width: auto;"
+            >订单时间：</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+            style="width:200px"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+            style="width:200px"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="refresh">
+            <i class="el-icon-refresh"></i>
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table">
+      <el-table
+        :data="tableData"
+        :span-method="objectSpanMethod"
+        ref="tableRef"
+        border
+        stripe
+        style="width: 100%; margin-top: 20px"
+        max-height="800px"
+        @cell-click="cellClik"
+        :row-style="{ height: '30px' }"
+        :cell-style="{ fontWeight: '700' }"
+      >
+        <el-table-column
+          width="50"
+          label="序号"
+          align="center"
+          fixed="left"
+          :resizable="false"
+        >
+          <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="capacityNumber"
+          column-key="capacityNo"
+          label="车牌号"
+          align="center"
+          width="250px"
+          fixed
+        >
+        </el-table-column>
+        <el-table-column
+          prop="materialName"
+          label="物资名称"
+          align="center"
+          width="150px"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="specificationModel"
+          label="物资规格"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="materialNumber"
+          label="物资件数"
+          align="center"
+          width="200px"
+        >
+          <template slot-scope="scope">
+            <button
+              type="primary"
+              @click="scope.row.materialNumber--"
+              v-if="scope.row.isNumShow == 1"
+              style="height:40px"
+            >
+              -
+            </button>
+            <input
+              v-model="scope.row.materialNumber"
+              disabled
+              style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
+            />
+            <button
+              type="primary"
+              @click="scope.row.materialNumber++"
+              v-if="scope.row.isNumShow == 1"
+              style="height:40px"
+            >
+              +
+            </button>
+            <el-button
+              type="primary"
+              @click="updateBillOrder(scope.row)"
+              v-if="scope.row.isNumShow == 1"
+              >提交</el-button
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="装货点" width="100">
+          <template slot-scope="scope">
+            <el-select size="mini" v-model="scope.row.warehouseId">
+              <el-option
+                v-for="item in option"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="grossWeight" label="毛重"> </el-table-column>
+        <el-table-column prop="grossWeightTime" label="毛重时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="tareWeight" label="皮重"> </el-table-column>
+        <el-table-column prop="tareWeightTime" label="皮重时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="netWeight" label="净重"> </el-table-column>
+        <el-table-column prop="entryGateTime" label="进厂时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="loadTime" label="装货时间" width="130px">
+        </el-table-column>
+        <el-table-column prop="outGateTime" label="出厂时间" width="130px">
+        </el-table-column>
+        <el-table-column
+          prop="orderNumber"
+          label="运输订单号"
+          width="180px"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          fixed="right"
+          width="120px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="disorderlyOutbound(scope.row)"
+              :disabled="!scope.row.materialName.includes('乱尺')"
+              >出库申请</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+
+export default {
+  data() {
+    return {
+      clickIndex: null,
+      input: null,
+      option: [],
+      startTime: null,
+      endTime: null,
+      tableData: [],
+      spanArr: [],
+      pos: 0,
+      isCellClick: 0,
+      columnIndexs: [0, 1, 11, 13, 14]
+    };
+  },
+  computed: {},
+  created() {},
+  mounted() {
+    this.getSteelReport();
+    this.infomation();
+  },
+  methods: {
+    infomation() {
+      this.axios.get("/api/v1/uc/getSteelWarehouse").then(res => {
+        console.log(res.data);
+        this.option = res.data;
+      });
+    },
+    cellClik(row, column, cell, event) {
+      if (row.group != this.clickIndex) {
+        this.tableData.forEach(item => {
+          if (item.group == this.clickIndex) {
+            this.$set(item, "isNumShow", 0);
+          }
+        });
+      }
+      if (column.property == "materialNumber") {
+        this.$set(row, "isNumShow", 1);
+        this.clickIndex = row.group;
+      }
+    },
+    //记录每一行的合并数
+    getSpanArr(data) {
+      //每次调用方法初始化
+      this.spanArr = [];
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          this.spanArr.push(1);
+          data[i].group = i;
+          this.pos = 0;
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].orderId === data[i - 1].orderId) {
+            this.spanArr[this.pos] += 1;
+            data[i].group = data[i - 1].group;
+            this.spanArr.push(0);
+          } else {
+            this.spanArr.push(1);
+            this.pos = i;
+            data[i].group = data[i - 1].group + 1;
+          }
+        }
+        this.totalCapacity = data[data.length - 1].group + 1;
+        this.totalNumber = data.reduce(function(prev, item) {
+          return prev + item.materialNum;
+        }, 0);
+      }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (this.columnIndexs.indexOf(columnIndex) != -1) {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    //减少物资件数
+    updateBillOrder(row) {
+      const loading = this.$loading({
+        lock: true,
+        text: "修改物资件数中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      let map = {
+        materialId: row.materialId,
+        materialNum: row.materialNumber
+      };
+      let arr = [];
+      arr.push(map);
+      let updateMap = {
+        orderId: row.orderId,
+        saleOrderMaterialId: row.saleOrderMaterialId,
+        mapList: arr
+      };
+      this.axios
+        .post("/api/v1/oms/updateMaterialMes", updateMap)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改物资数量成功");
+            this.getSteelReport();
+            loading.close();
+          } else {
+            this.$message.error("修改物资数量失败,请联系管理员");
+            this.getSteelReport();
+            loading.close();
+          }
+        })
+        .catch(() => {
+          this.$message.error("修改物资数量失败,请联系管理员");
+          this.getSteelReport();
+          loading.close();
+        });
+    },
+    //查询，输入查询条件
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      let capacityNo = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      this.axios
+        .post(
+          "/api/v1/tms/getSaleSteelReport?startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&carrierSsoId=" +
+            carrierSsoId +
+            "&i=" +
+            new Date() +
+            "&capacityNo=" +
+            capacityNo
+        )
+        .then(res => {
+          this.tableData = res.data.data;
+          this.getSpanArr(res.data.data);
+        });
+    },
+    //重新获取表格数据
+    refresh() {
+      this.getSteelReport();
+    },
+    //获取钢材统计报表
+    getSteelReport() {
+      this.axios
+        .post(
+          "/api/v1/oms/getWarehouseMes?startTime=" +
+            null +
+            "&endTime=" +
+            null +
+            "&i=" +
+            new Date()
+        )
+        .then(res => {
+          this.tableData = res.data.data;
+          console.log(this.tableData);
+          this.getSpanArr(res.data.data);
+        });
+    },
+    disorderlyOutbound(row) {
+      console.log(row);
+      if (row.warehouseId == null) {
+        this.$message.error("请先选择装货点");
+        return;
+      }
+      row.userId = getCookie("userId");
+      let title = `确定对${row.capacityNumber}的${row.materialNumber}${row.materialName}出库吗?`;
+      this.$confirm(title, "提醒", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        center: true
+      }).then(() => {
+        this.axios.post("/api/v1/wms/disorderlyOutbound", row).then(res => {
+          console.log(res);
+        });
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.purchasFuelNewMonitor {
+  .tableTop {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .address {
+    .button-box {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+}
+</style>

src/views/WMS/router/index.js

@@ -100,6 +100,7 @@ import bar2_addSteelInbound from "../components/steel/bar2_steel/bar2_addSteelIn
 import bar2_addSteelReserved from "../components/steel/bar2_steel/bar2_addSteelReserved.vue";
 import bar2_steel_inboundStatistics from "../components/steel/bar2_steel/bar2_steel_inboundStatistics.vue";
 import bar2_steel_outboundStatistics from "../components/steel/bar2_steel/bar2_steel_outboundStatistics.vue";
+import wmsOrderDetails from "../components/billingOrder/orderDetails.vue";
 Vue.use(Router);
 const constantRouterMap = [
   {
@@ -654,6 +655,12 @@ const constantRouterMap = [
         name: "editBill",
         meta: { code: "xtpzgl-yhgl" },
         component: editBill
+      },
+      {
+        path: "wmsOrderDetails",
+        name: "wmsOrderDetails",
+        meta: { code: "xtpzgl-yhgl" },
+        component: wmsOrderDetails
       }
     ]
   }

src/views/appoint/components/saleContract/addSaleOrderSteelSendCarrier.vue

@@ -169,6 +169,7 @@
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
 import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import returnResultVue from "../../../inward/components/offsetSteel/truckTransport/returnResult.vue";
 export default {
   components: { PageTitle },
   data() {
@@ -188,6 +189,7 @@ export default {
       driverTel1: null,
       //是否可发送请求
       canSend: 1,
+      statusStr: null,
       tableTop: [
         {
           prop: "truckNo",
@@ -313,6 +315,7 @@ export default {
               });
           }
           console.log("res.data.data", res.data.data);
+          this.statusStr = res.data.data[0].statusStr;
           //赋值派车表格
           res.data.data.forEach((e, i) => {
             if (e.saleOrderConsignee == "null") {
@@ -525,14 +528,17 @@ export default {
                 if (res.data.code == "200") {
                   this.cancel();
                   this.$message.success("派单成功！");
+                  this.isLoading = false;
                 } else {
                   this.$message.error("派单失败:" + res.data.data);
+                  this.isLoading = false;
                 }
                 this.isLoading = false;
               });
           })
           .catch(() => {
             this.$message({ type: "info", message: "取消!" });
+            this.isLoading = false;
           });
       }
     },

src/views/appoint/components/saleContract/saleOrder.vue

@@ -79,8 +79,7 @@ export default {
       input: "",
       option4: {
         // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=475&shipperId=2"
+        requestUrl: "/api/v1/ams/getSaleCokeOrder?apiId=475&shipperId=2"
         // &startDate="+sjTime(new Date().getTime() - 3600 * 1000 * 24 * 85)+"&endDate="+sjTime(new Date()),
       }
     };
@@ -104,7 +103,7 @@ export default {
         endTime = sjTime(this.endTime);
       }
       this.option4.requestUrl =
-        "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=475&shipperId=2&con=" +
+        "/api/v1/ams/getSaleCokeOrder?apiId=475&shipperId=2&con=" +
         this.input +
         "&startTime=" +
         startTime +
@@ -113,9 +112,6 @@ export default {
         "&i=" +
         new Date();
     },
-    seeclick(saleOrderId) {
-      this.$router.push("/saleOrderDetail/" + saleOrderId);
-    },
     click(saleOrderId) {
       this.$router.push("/editSaleOrder/" + saleOrderId);
     },
@@ -125,156 +121,6 @@ export default {
     sendClick(saleOrderId) {
       this.$router.push("/addSaleOrderSend/" + saleOrderId);
     },
-    // -------查看物资详情 (已审批)
-    detailclick(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      // 根据销售订单id查询物资信息
-      this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then(res => {
-          this.tableData = res.data.data;
-        });
-    },
-
-    // -------查看物资详情 (财务已审批)
-    detailclick1(row) {
-      // 记录重复点击次数
-      if (this.oldRow1 === row) {
-        this.oldRowCount1 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table1.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow1 != "") {
-        if (this.oldRow1 != row) {
-          if (this.oldRowCount1 % 2 === 1) {
-            this.$refs.table1.toggleRowExpansion(this.oldRow1);
-          } else {
-            this.oldRowCount1 = 1;
-          }
-        } else {
-          this.oldRow1 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow1 = row;
-      // 根据销售订单id查询物资信息
-      this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then(res => {
-          this.tableData1 = res.data.data;
-        });
-    },
-
-    // -------查看物资详情 (已上报)
-    detailclick2(row) {
-      // 记录重复点击次数
-      if (this.oldRow2 === row) {
-        this.oldRowCount2 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table2.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow2 != "") {
-        if (this.oldRow2 != row) {
-          if (this.oldRowCount2 % 2 === 1) {
-            this.$refs.table2.toggleRowExpansion(this.oldRow2);
-          } else {
-            this.oldRowCount2 = 1;
-          }
-        } else {
-          this.oldRow2 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow2 = row;
-      // 根据销售订单id查询物资信息
-      this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then(res => {
-          this.tableData2 = res.data.data;
-        });
-    },
-
-    // -------查看物资详情 (未上报)
-    detailclick3(row) {
-      // 记录重复点击次数
-      if (this.oldRow3 === row) {
-        this.oldRowCount3 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table3.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow3 != "") {
-        if (this.oldRow3 != row) {
-          if (this.oldRowCount3 % 2 === 1) {
-            this.$refs.table3.toggleRowExpansion(this.oldRow3);
-          } else {
-            this.oldRowCount3 = 1;
-          }
-        } else {
-          this.oldRow3 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow3 = row;
-      // 根据销售订单id查询物资信息
-      this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then(res => {
-          this.tableData3 = res.data.data;
-        });
-    },
-
-    // 上传
-    uploadclick(saleOrderId) {
-      this.$confirm("是否上传", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "上传成功!"
-          });
-          this.axios
-            .post("/api/v1/ams/uploadSaleOrder?saleOrderId=" + saleOrderId)
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消上传!"
-          });
-        });
-    },
     //删除
     deleteclick(scope) {
       let saleOrderId = scope;

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -182,10 +182,10 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  @click="updateSaleOrderStatusById(scope)"
+                  @click="closeSteelOrderAndEas(scope.row)"
                   type="text"
                   size="small"
-                  >撤销上报</el-button
+                  >关闭订单</el-button
                 >
                 <el-button
                   @click="updateReportedSaleOrder(scope)"
@@ -403,6 +403,46 @@ export default {
         return prev + item.materialNumber;
       }, 0);
     },
+    closeSteelOrderAndEas(row) {
+      this.$prompt("此操作将同步关闭金蝶和物流的销售订单,是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPlaceholder: "请输入关闭原因-必填！！！",
+        center: true,
+        type: "warning"
+      })
+        .then(({ value }) => {
+          if (value != null) {
+            let mapValue = {
+              number: row.saleNumber,
+              saleOrderId: row.saleOrderId,
+              reason: value
+            };
+            this.axios
+              .post("/api/v1/ams/deleteSaleOrderById", mapValue)
+              .then(res => {
+                if (res.data.code == 200) {
+                  this.$message.success("关闭成功");
+                  this.getRequestUrl();
+                } else {
+                  this.$message.error("关闭失败,请联系管理员");
+                }
+              })
+              .catch(() => {
+                this.$message.error("关闭失败,请联系管理员");
+                this.getRequestUrl();
+              });
+          } else {
+            this.$message.error("请输入理由");
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消输入"
+          });
+        });
+    },
     deleteSaleOrder(row) {
       this.$prompt("此操作将关闭订单且下面的待运输订单，是否继续?", "提示", {
         confirmButtonText: "确定",

src/views/appoint/components/saleContract/saleOrderSteelCar.vue

@@ -142,9 +142,9 @@ export default {
       },
       option0: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getNoCarTruckNoList?apiId=466",
+        requestUrl: "/api/v1/ams/getNoCarTruckNoList?apiId=495",
         comparison: "saleOrderMaterialId",
-        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       carrierOption: {
         requestUrl: "/api/v1/uc/getCarrierListByLike?apiId=412",
@@ -195,7 +195,7 @@ export default {
       this.option4.requestUrl =
         "/api/v1/ams/getSteelTruckNoList?apiId=411&i=" + new Date();
       this.option0.requestUrl =
-        "/api/v1/ams/getNoCarTruckNoList?apiId=466&i=" + new Date();
+        "/api/v1/ams/getNoCarTruckNoList?apiId=495&i=" + new Date();
     },
     handleClose() {},
     updateCarrier(scope) {
@@ -241,11 +241,25 @@ export default {
       }
       if (this.activeName == "four") {
         this.option4.requestUrl =
-          "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" + this.input;
+          "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" +
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
         // console.log("aaaa" + this.input);
       } else if (this.activeName == "five") {
         this.option0.requestUrl =
-          "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
+          "/api/v1/ams/getNoCarTruckNoList?apiId=495&con=" +
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       } else if (this.activeName == "first") {
         this.option.requestUrl =
           "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" +

src/views/appoint/components/saleContract/saleOrderSteelCarrier.vue

@@ -11,23 +11,18 @@
       </el-button>
     </div>
     <div class="table">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <!-- 已审批 -->
-        <el-tab-pane label="已审批" name="four">
-          <mergeRowTable v-bind.sync="option4" ref="table">
-            <el-table-column fixed="right" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button
-                  @click="steelSendClick(scope.row.saleOrderId)"
-                  type="text"
-                  size="small"
-                  >钢材派车</el-button
-                >
-              </template>
-            </el-table-column>
-          </mergeRowTable>
-        </el-tab-pane>
-      </el-tabs>
+      <mergeRowTable v-bind.sync="option4" ref="table">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="steelSendClick(scope.row.saleOrderId)"
+              type="text"
+              size="small"
+              >钢材派车</el-button
+            >
+          </template>
+        </el-table-column>
+      </mergeRowTable>
     </div>
   </div>
 </template>

src/views/appoint/components/saleContract/updateSaleOrderSteel.vue

@@ -177,7 +177,7 @@
               type="text"
               size="mini"
               @click="closeFlu(scope)"
-              v-if="deleted == 0"
+              v-if="deleted == 0 && scope.row.materialStatus == null"
             >
               关闭分录
             </el-button>

src/views/appoint/router/index.js

@@ -388,7 +388,7 @@ const constantRouterMap = [
       {
         path: "saleOrderSteel",
         name: "saleOrderSteel",
-        meta: { code: "xtpzgl-yhgl" },
+        meta: { code: "xtpzgl-yhgl", keepAlive: true },
         component: saleOrderSteel
       },
       {

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

@@ -259,7 +259,9 @@ export default {
       totalQueueNum: null,
       redDotNum: null,
       i: 0,
-      totalQueueNumFirst: null
+      totalQueueNumFirst: null,
+      //厂内钢材车辆总数
+      steelOrderNum: 0
     };
   },
   mounted() {
@@ -302,6 +304,7 @@ export default {
     refresh() {
       this.getSpellingArray();
       this.getNoSpellingArray();
+      this.getSteelOrderNum();
       this.redDotNum = null;
       this.totalQueueNum = null;
       this.totalQueueNumFirst = null;
@@ -309,6 +312,11 @@ export default {
       clearInterval(this.timer);
       this.start();
     },
+    getSteelOrderNum() {
+      this.axios.post("/api/v1/uc/getSteelOrderNum").then(res => {
+        this.steelOrderNum = res.data.data;
+      });
+    },
     getRowKey(row) {
       return row.ROW_ID;
     },

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

@@ -36,6 +36,14 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model="wareHouse"
+              style="width:200px"
+              placeholder="查询仓库"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>
           </el-button>
@@ -89,6 +97,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      wareHouse: null,
       inputMaterial: null,
       shiyHeigth: 140,
       isHeigth: true,
@@ -217,7 +226,9 @@ export default {
             "&receiveName=" +
             this.inputReceiveName +
             "&materialName=" +
-            this.inputMaterial;
+            this.inputMaterial +
+            "&wareHouse=" +
+            this.wareHouse;
         } else {
           this.option.requestUrl =
             "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
@@ -232,7 +243,9 @@ export default {
             "&receiveName=" +
             this.inputReceiveName +
             "&materialName=" +
-            this.inputMaterial;
+            this.inputMaterial +
+            "&wareHouse=" +
+            this.wareHouse;
         }
       } else {
         if (this.startTime) {
@@ -255,7 +268,9 @@ export default {
             "&receiveName=" +
             this.inputReceiveName +
             "&materialName=" +
-            this.inputMaterial;
+            this.inputMaterial +
+            "&wareHouse=" +
+            this.wareHouse;
         } else {
           this.option.requestUrl =
             "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
@@ -270,7 +285,9 @@ export default {
             "&receiveName=" +
             this.inputReceiveName +
             "&materialName=" +
-            this.inputMaterial;
+            this.inputMaterial +
+            "&wareHouse=" +
+            this.wareHouse;
         }
       }
     },

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

@@ -87,6 +87,8 @@
         style="width: 100%; margin-top: 20px"
         max-height="800px"
         @cell-click="cellClik"
+        :row-style="{ height: '30px' }"
+        :cell-style="{ fontWeight: '700' }"
       >
         <el-table-column
           width="50"
@@ -102,6 +104,7 @@
           label="下单客户"
           :width="flexColumnWidth('consigneeName', tableData, 'max')"
           align="center"
+          fixed
         >
         </el-table-column>
         <el-table-column
@@ -109,6 +112,7 @@
           label="承运商"
           align="center"
           width="250px"
+          fixed
         >
           <template slot-scope="scope">
             <el-autocomplete
@@ -134,6 +138,7 @@
           label="车牌号"
           align="center"
           width="250px"
+          fixed
         >
           <template slot-scope="scope">
             <el-autocomplete
@@ -156,7 +161,7 @@
           prop="materialName"
           label="物资名称"
           align="center"
-          :width="flexColumnWidth('materialName', tableData, 'max')"
+          width="150px"
         >
         </el-table-column>
         <el-table-column prop="materialSpe" label="物资规格" align="center">
@@ -212,37 +217,17 @@
         <el-table-column prop="orderStatus" label="运单状态" align="center">
         </el-table-column>
         <el-table-column prop="grossWeight" label="毛重"> </el-table-column>
-        <el-table-column
-          prop="grossWeightTime"
-          label="毛重时间"
-          :width="flexColumnWidth('grossWeightTime', tableData, 'max')"
-        >
+        <el-table-column prop="grossWeightTime" label="毛重时间" width="130px">
         </el-table-column>
         <el-table-column prop="tareWeight" label="皮重"> </el-table-column>
-        <el-table-column
-          prop="tareWeightTime"
-          label="皮重时间"
-          :width="flexColumnWidth('tareWeightTime', tableData, 'max')"
-        >
+        <el-table-column prop="tareWeightTime" label="皮重时间" width="130px">
         </el-table-column>
         <el-table-column prop="netWeight" label="净重"> </el-table-column>
-        <el-table-column
-          prop="entryGateTime"
-          label="进厂时间"
-          :width="flexColumnWidth('entryGateTime', tableData, 'max')"
-        >
+        <el-table-column prop="entryGateTime" label="进厂时间" width="130px">
         </el-table-column>
-        <el-table-column
-          prop="loadTime"
-          label="装货时间"
-          :width="flexColumnWidth('loadTime', tableData, 'max')"
-        >
+        <el-table-column prop="loadTime" label="装货时间" width="130px">
         </el-table-column>
-        <el-table-column
-          prop="outGateTime"
-          label="出厂时间"
-          :width="flexColumnWidth('outGateTime', tableData, 'max')"
-        >
+        <el-table-column prop="outGateTime" label="出厂时间" width="130px">
         </el-table-column>
         <el-table-column
           prop="arrivalAddress"
@@ -259,7 +244,7 @@
         <el-table-column
           prop="orderNo"
           label="运输订单号"
-          :width="flexColumnWidth('orderNo', tableData, 'max')"
+          width="180px"
           align="center"
         >
         </el-table-column>
@@ -289,16 +274,12 @@
         <el-table-column
           prop="shipperName"
           label="发货单位"
-          :width="flexColumnWidth('shipperName', tableData, 'max')"
+          width="170px"
           align="center"
         >
         </el-table-column>
         <el-table-column prop="truckNo" label="车序号"> </el-table-column>
-        <el-table-column
-          prop="consigneeTel"
-          label="收货客户电话"
-          :width="flexColumnWidth('consigneeTel', tableData, 'max')"
-        >
+        <el-table-column prop="consigneeTel" label="收货客户电话" width="120px">
         </el-table-column>
         <el-table-column prop="isSelfMention" label="是否自提" align="center">
         </el-table-column>
@@ -312,7 +293,7 @@
         <el-table-column
           prop="saleOrderStatus"
           label="销售订单状态"
-          :width="flexColumnWidth('saleOrderStatus', tableData, 'max')"
+          width="100px"
         >
         </el-table-column>
         <el-table-column