ytajsd

build/utils.js

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

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

@@ -241,6 +241,9 @@
 
     <!-- 新增物资和生成一车 -->
     <div class="button-box">
+      <el-button type="primary" class="btn" @click="singleDistribute"
+        >单拼分配到每车</el-button
+      >
       <el-button type="primary" class="btn" @click="createACar"
         >添加到订单</el-button
       >
@@ -1216,20 +1219,104 @@ export default {
       //调用记录每一行的合并数的方法
       this.getSpanArr(this.selectionList);
     },
-    //准备生成部分订单
-    createACar() {
+    singleDistribute() {
+      let ml = this.materialList.length;
+      if (ml == 0) {
+        this.$message.warning("请至少填入一车物资");
+        return;
+      }
+      let singleArr = this.materialList;
+      this.$confirm(
+        `以上${ml}车物资将分配到不同的${ml}车,确定继续分配?`,
+        "提醒",
+        {
+          cancelButtonText: "取消",
+          confirmButtonText: "确定",
+          center: true
+        }
+      ).then(() => {
+        this.creatArtSingle(singleArr);
+      });
+    },
+    async creatArtSingle(singleArr) {
       let i = 0;
-      this.materialList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
+      singleArr.forEach(e => {
+        if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
+          e.orderPlanWeight = null;
           i++;
         }
       });
       if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
+        this.$message.error("件数必填且请输入正整数");
+        return;
+      }
+      singleArr.forEach(e => {
+        if (e.materialName.includes("定尺")) {
+          if (!e.meterNumber) {
+            i++;
+          }
+        }
+      });
+      if (i != 0) {
+        this.$message.error("定尺必须填写米数");
         return;
       }
+      if (
+        !this.saleOrderConsigneeTel &&
+        this.ignoreSaleOrderConsigneeTel == 0
+      ) {
+        this.$confirm(
+          "收货客户电话未填写会导致无法接收车辆发货短信, 是否继续?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        )
+          .then(() => {
+            this.ignoreSaleOrderConsigneeTel = 1;
+            this.addMaterialToSaleOrderSingle();
+          })
+          .catch(() => {
+            this.$message.info("已取消！");
+          });
+      } else {
+        this.addMaterialToSaleOrderSingle();
+      }
+    },
+    addMaterialToSaleOrderSingle() {
+      this.materialList.forEach(e => {
+        var addmap = {
+          cxh: this.maxCxh,
+          materialName: e.materialName,
+          Specification: e.Specification,
+          materialCode: e.materialCode,
+          orderPlanWeight: e.orderPlanWeight,
+          meterNumber: e.meterNumber,
+          isPound: e.isPound,
+          saleShipperAddressId: this.saleShipperAddressId,
+          place: this.place1,
+          saleShipperAddressName: this.saleShipperAddressName,
+          saleDateOfReceipt: this.saleDateOfReceipt,
+          saleOrderConsigneeTel: this.saleOrderConsigneeTel,
+          truckRemark: this.truckRemark,
+          materialId: e.materialId,
+          haveMeter: e.haveMeter,
+          isDisable: e.isDisable
+        };
+        console.log(addmap);
+        this.selectionList.push(addmap);
+        //最大车序号加1
+        this.maxCxh += 1;
+        this.onblur();
+      });
+      this.materialList = [];
+      this.getSpanArr(this.selectionList);
+    },
+    //准备生成部分订单
+    createACar() {
+      let i = 0;
       this.materialList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1340,8 +1427,8 @@ export default {
             haveMeter: e.haveMeter,
             isDisable: e.isDisable
           };
+          console.log(addmap);
           this.selectionList.push(addmap);
-          console.log(this.selectionList);
         });
         //清空materialList
         this.materialList = [];
@@ -1636,17 +1723,6 @@ export default {
         return;
       }
       let i = 0;
-      this.selectionList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.selectionList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;

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

@@ -1245,17 +1245,6 @@ export default {
     createACar() {
       this.onblur();
       let i = 0;
-      this.materialList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.materialList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1388,17 +1377,6 @@ export default {
     addMaterialToCxh(toCxh) {
       this.onblur();
       let i = 0;
-      this.materialList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.materialList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;
@@ -1773,17 +1751,6 @@ export default {
         return;
       }
       let i = 0;
-      this.selectionList.forEach(e => {
-        if (!/(^[1-9]\d*$)/.test(e.meterNumber) && e.meterNumber != null) {
-          e.meterNumber = null;
-          i++;
-        }
-      });
-      if (i != 0) {
-        i = 0;
-        this.$message.error("米数请输入正整数");
-        return;
-      }
       this.selectionList.forEach(e => {
         if (!/(^[1-9]\d*$)/.test(e.orderPlanWeight)) {
           e.orderPlanWeight = null;

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

@@ -563,7 +563,6 @@ export default {
   mounted() {
     console.log(this.$route);
     console.log(this.$route.params.deleted);
-
     this.getOrderList();
     this.getAllProvince();
   },
@@ -575,6 +574,9 @@ export default {
     //车辆变更
     updateCapacity(scope) {
       this.oldCapacityNum = scope.row.capacityNumber;
+      this.saleOrderMaterialId = scope.row.saleOrderMaterialId;
+      this.lineSequence = scope.row.lineSequence;
+      this.orderId = scope.row.orderId;
       this.$confirm("确定变更车辆吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -611,6 +613,7 @@ export default {
           .then(res => {
             if (res.data.code == 200) {
               this.$message.success("变更成功");
+              this.getOrderList();
               this.capacityDialog = false;
             } else {
               this.$message.success("变更失败，请联系管理员");
@@ -1164,9 +1167,9 @@ export default {
           console.log(res.data.data);
           this.tableData = [];
           this.tableData = res.data.data;
-          this.orderId = this.tableData[0].orderId;
-          this.lineSequence = this.tableData[0].lineSequence;
-          this.saleOrderMaterialId = this.tableData[0].saleOrderMaterialId;
+          // this.orderId = this.tableData[0].orderId;
+          // this.lineSequence = this.tableData[0].lineSequence;
+          // this.saleOrderMaterialId = this.tableData[0].saleOrderMaterialId;
           this.getSpanArr(this.tableData);
         });
     },

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

@@ -258,12 +258,18 @@ export default {
   watch: {
     activeName() {}
   },
+  created() {
+    this.myWebsocket();
+  },
   mounted() {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
   },
   methods: {
+    myWebsocket() {
+      let wss = new WebSocket("wss:wl.dasteel.cn:32322/websocket/socketServer");
+    },
     refresh() {
       this.getSpellingArray();
       this.getNoSpellingArray();

src/views/sale/components/transport_order/saleSteelOrder.vue

@@ -51,13 +51,6 @@
         >
           <el-table-column fixed="right" label="操作" width="180">
             <template slot-scope="scope">
-              <el-button
-                @click="updateCapacity(scope.row)"
-                type="text"
-                size="small"
-              >
-                修改运力
-              </el-button>
               <el-button
                 @click="detailclick2(scope.row)"
                 type="text"
@@ -65,13 +58,6 @@
               >
                 物资详情
               </el-button>
-              <el-button
-                @click="closeOrder(scope.row)"
-                type="text"
-                size="small"
-              >
-                关闭订单
-              </el-button>
             </template>
           </el-table-column>
           <!-- 物资详情抽屉 -->
@@ -113,13 +99,6 @@
               >
                 物资详情
               </el-button>
-              <el-button
-                @click="updateCapacity(scope.row)"
-                type="text"
-                size="small"
-              >
-                修改运力
-              </el-button>
             </template>
           </el-table-column>
           <!-- 物资详情抽屉 -->
@@ -202,13 +181,13 @@ export default {
         // option1请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&shipperId=1&carrierSsoId=" +
-          "",
+          ""
       },
       option2: {
         // option2请求数据的地址，承运商暂时设置为默认（运输订单状态为）
         requestUrl:
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
-          "",
+          ""
       },
       option3: {
         // option3请求数据的地址
@@ -216,11 +195,11 @@ export default {
           "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&&carrierSsoId=" +
           "",
         selectionType: "select",
-        mapList: [],
+        mapList: []
       },
       truck: {
         requestUrl: "",
-        selectionType: "radio",
+        selectionType: "radio"
       },
       activeName: "third",
       //记录旧的row对象(已接收)
@@ -239,30 +218,30 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150,
+          width: 150
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150,
+          width: 150
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100,
+          width: 100
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100,
-        },
+          width: 100
+        }
       ],
       tableData: [],
       tableData1: [],
       tableData2: [],
       capacityId: null,
       dialogTableVisible: false,
-      orderId: null,
+      orderId: null
     };
   },
 
@@ -361,34 +340,34 @@ export default {
       if (this.option3.mapList.length == 0) {
         this.$message({
           type: "warning",
-          message: "请先选择要关闭的订单!",
+          message: "请先选择要关闭的订单!"
         });
       } else {
         this.$confirm("是否关闭这些订单", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-          center: true,
+          center: true
         })
           .then(() => {
             //初始化maplist
             var mapList = [];
-            this.option3.mapList.forEach((item) => {
+            this.option3.mapList.forEach(item => {
               //初始化mapItem
               var mapItem = {
                 //销售订单物资中间表id
-                orderId: 0,
+                orderId: 0
               };
               mapItem.orderId = item.orderId;
               mapList.push(mapItem);
             });
             this.$message({
               type: "success",
-              message: "关闭成功!",
+              message: "关闭成功!"
             });
             this.axios
               .post("/api/v1/oms/batchCloseOrder", mapList)
-              .then((res) => {
+              .then(res => {
                 if (res.data.code == "200") {
                   this.getRequestUrl();
                 }
@@ -397,7 +376,7 @@ export default {
           .catch(() => {
             this.$message({
               type: "info",
-              message: "取消关闭!",
+              message: "取消关闭!"
             });
           });
       }
@@ -449,9 +428,9 @@ export default {
       this.axios
         .post("/api/v1/oms/updateCapacityId", {
           capacityId: this.capacityId,
-          orderId: this.orderId,
+          orderId: this.orderId
         })
-        .then((res) => {
+        .then(res => {
           if (res.data.code == "200") {
             this.$message.success("修改运力成功");
             this.getRequestUrl();
@@ -537,7 +516,7 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then((res) => {
+        .then(res => {
           console.log("res.data.data", res.data.data);
           this.tableData = res.data.data;
         });
@@ -569,7 +548,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then((res) => {
+        .then(res => {
           console.log("res.data.data", res.data.data);
           this.tableData1 = res.data.data;
         });
@@ -601,7 +580,7 @@ export default {
       // 根据销售订单物资中间表id查询物资信息
       this.axios
         .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
-        .then((res) => {
+        .then(res => {
           this.tableData2 = res.data.data;
         });
     },
@@ -611,17 +590,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
             .post("/api/v1/oms/closeOrder?orderId=" + row.orderId)
-            .then((res) => {
+            .then(res => {
               if (res.data.code == "200") {
                 this.getRequestUrl();
                 this.$message({
                   type: "success",
-                  message: "关闭成功!",
+                  message: "关闭成功!"
                 });
               }
             });
@@ -629,11 +608,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消关闭!",
+            message: "取消关闭!"
           });
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scode>