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

build/utils.js

@@ -20,7 +20,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 let devModules = ["all"];
-//let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS"];
+//let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -10,59 +10,56 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
-    <el-dialog title="车辆信息" :visible.sync="dialogTableVisible" :before-close="handleClose">
-    <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-    <span slot="footer" class="dialog-footer">
-    <el-button @click="cancelUpdate()">取 消</el-button>
-    <el-button type="primary" @click="updateTruckCapacity()">确 定</el-button>
-    </span>
+    <el-dialog
+      title="车辆信息"
+      :visible.sync="dialogTableVisible"
+      :before-close="handleClose"
+    >
+      <dilTable
+        v-bind.sync="truck"
+        @radio-change="currentRadioChange1"
+      ></dilTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancelUpdate()">取 消</el-button>
+        <el-button type="primary" @click="updateTruckCapacity()"
+          >确 定</el-button
+        >
+      </span>
     </el-dialog>
     <div class="transportOrder_bottom">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="未接收" name="first">
           <dilTable v-bind.sync="first">
-            <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
-          >
-            <template slot-scope="scope">
-               <el-button @click="updateClick(scope)" type="text" size="small">
-                修改
-              </el-button>
-             <el-button @click="deleteClick(scope)" type="text" size="small">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button @click="updateClick(scope)" type="text" size="small">
+                  修改
+                </el-button>
+                <el-button @click="deleteClick(scope)" type="text" size="small">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
           </dilTable>
         </el-tab-pane>
         <!-- 已接收 -->
         <el-tab-pane label="已接收" name="Received">
           <dilTable v-bind.sync="Received">
-            <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <el-button @click="deleteClick(scope)" type="text" size="small">
-                关闭
-              </el-button>
-            </template>
-          </el-table-column>      
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button @click="deleteClick(scope)" type="text" size="small">
+                  关闭
+                </el-button>
+              </template>
+            </el-table-column>
           </dilTable>
         </el-tab-pane>
-         <!-- 已完成 -->
+        <!-- 已完成 -->
         <el-tab-pane label="已完成" name="completed">
-          <dilTable v-bind.sync="completed">
-          </dilTable>
+          <dilTable v-bind.sync="completed"> </dilTable>
         </el-tab-pane>
       </el-tabs>
-    </div> 
+    </div>
   </div>
 </template>
 
@@ -71,7 +68,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      carrierUserId:'',
+      carrierUserId: "",
       //模态窗的框计算
       inputText: null,
       //是否弹出对话框
@@ -82,19 +79,20 @@ export default {
       activeName: "first",
       //已下发的表格
       first: {
-        requestUrl:"",
+        requestUrl: ""
       },
-      completed:{
-        requestUrl:"",
+      completed: {
+        requestUrl: ""
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
+        requestUrl:
+          "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
         // 控制显示当选列
-        selectionType: "radio",
+        selectionType: "radio"
       },
-      Received:{
-        requestUrl: "",
+      Received: {
+        requestUrl: ""
       },
       //物资信息的数据
       tableData: [],
@@ -103,18 +101,18 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 200,
+          width: 200
         },
         {
           prop: "materialModel",
           label: "规格型号",
-          width: 200,
+          width: 200
         },
         {
           prop: "weightNum",
           label: "物资数量",
-          width: 200,
-        },
+          width: 200
+        }
       ],
       //当前选中的订单id
       selectOrderId: null,
@@ -122,7 +120,7 @@ export default {
       capacityNumber: "",
       //选中的运力id
       capacityId: null,
-      orderId:null,
+      orderId: null,
       //是否关闭模态框
       drawer: false,
       //模态框从左往右打开
@@ -130,134 +128,195 @@ export default {
       //多选的选中的订单id
       selectionList: [],
       //区别点击的是添加运力，还是修改
-      index: null,
+      index: null
     };
   },
-  created(){
-       if (getCookie("orgCode") == "chengyunshang") {
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-      }else {
+    } else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-      }
-      if(getCookie('orgCode') == "chengyunshang"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId"),
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId")
-      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2"
-      }else{
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode")
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode")
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode")
-      }    
+    }
+    if (getCookie("orgCode") == "chengyunshang") {
+      (this.first.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" +
+        getCookie("userId")),
+        (this.Received.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" +
+          getCookie("userId")),
+        (this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" +
+          getCookie("userId"));
+    } else if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu"
+    ) {
+      this.first.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4";
+      this.Received.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5";
+      this.completed.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2";
+    } else {
+      this.first.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" +
+        getCookie("orgCode");
+      this.Received.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" +
+        getCookie("orgCode");
+      this.completed.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" +
+        getCookie("orgCode");
+    }
   },
-  
+
   methods: {
-    handleClose(done){
-      done()
-      this.$message.info("取消修改运力")
+    handleClose(done) {
+      done();
+      this.$message.info("取消修改运力");
     },
-    cancelUpdate(){
-      this.dialogTableVisible = false
-      this.$message.info("取消修改运力")
+    cancelUpdate() {
+      this.dialogTableVisible = false;
+      this.$message.info("取消修改运力");
     },
-    getRequestUrl(){
-      if(getCookie('orgCode') == "chengyunshang"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date(),
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
-      
-      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&test=" + new Date()
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&test=" + new Date()
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&test=" + new Date()
-      }else{
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
-        this.completed.requestUrl =  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()     
+    getRequestUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
+        (this.first.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date()),
+          (this.Received.requestUrl =
+            "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" +
+            getCookie("userId") +
+            "&test=" +
+            new Date());
+        this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
+      } else if (
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu"
+      ) {
+        this.first.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&test=" +
+          new Date();
+        this.Received.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&test=" +
+          new Date();
+        this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&test=" +
+          new Date();
+      } else {
+        this.first.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.Received.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
       }
     },
     //删除运输订单
-    deleteClick(scope){
-      this.$confirm('是否删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-            this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });     
-                this.getRequestUrl()
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
-        }).catch(() => {
+    deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
+            type: "info",
+            message: "已取消删除"
+          });
         });
-      console.log(scope.row.orderId)
+      console.log(scope.row.orderId);
     },
     //修改运输订单
-    updateClick(scope){
-      this.getTruckRequestUrl()
-      this.orderId = scope.row.orderId
-      this.dialogTableVisible = true
-      console.log(scope.row.orderId)
+    updateClick(scope) {
+      this.getTruckRequestUrl();
+      this.orderId = scope.row.orderId;
+      this.dialogTableVisible = true;
+      console.log(scope.row.orderId);
     },
-    updateTruckCapacity(){
-        if(this.capacityId == null){
-            this.$message.error("未选中运力")
-            return
-        }
-        this.axios.post("/api/v1/oms/updateCapacityId",{
-          capacityId:this.capacityId,
-          orderId :this.orderId
-        }).then((res) =>{
-          if(res.data.code == "200"){
-            this.$message.success("修改运力成功")
-            this.getRequestUrl()
-            this.dialogTableVisible = false
-          }else{
-            this.$message.error("修改运力失败")
-          }
+    updateTruckCapacity() {
+      if (this.capacityId == null) {
+        this.$message.error("未选中运力");
+        return;
+      }
+      this.axios
+        .post("/api/v1/oms/updateCapacityId", {
+          capacityId: this.capacityId,
+          orderId: this.orderId
         })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改运力成功");
+            this.getRequestUrl();
+            this.dialogTableVisible = false;
+          } else {
+            this.$message.error("修改运力失败");
+          }
+        });
     },
-    getTruckRequestUrl(){
-        if (getCookie("orgCode") == "chengyunshang") {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId") + "&test=" + new Date();
+    getTruckRequestUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
       } else {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          null +
+          "&test=" +
+          new Date();
       }
     },
-    currentRadioChange1(row){
-      console.log(row)
-      this.capacityId = row.capacityId
+    currentRadioChange1(row) {
+      console.log(row);
+      this.capacityId = row.capacityId;
     },
-    
-    onclick(){
-      console.log("dianji")
+
+    onclick() {
+      console.log("dianji");
     },
     handleClick(tab, event) {
-      this.getRequestUrl()
+      this.getRequestUrl();
     },
     // 查看物资详情
     detailclick(row) {
@@ -288,21 +347,20 @@ export default {
     materialDetails(orderId) {
       this.axios
         .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then((res) => {
+        .then(res => {
           if (res.data.code == "200") {
             this.tableData = res.data.data;
           }
         });
     },
-    Insert(){
-      this.$router.push("addMornThanTransportOrder")
+    Insert() {
+      this.$router.push("addMornThanTransportOrder");
     }
-  },
+  }
 };
 </script>
 
 <style lang="scss">
-
 .transportOrder {
   .transportOrder_top {
     width: 100%;
@@ -310,9 +368,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-input{
-  width: 20%;
-}
+    .el-input {
+      width: 20%;
+    }
   }
   .drawer_top {
     width: 100%;
@@ -322,4 +380,4 @@ export default {
     align-items: center;
   }
 }
-</style>
+</style>

src/views/SporadicManage/components/oldAreaSporadic/transportOrder/transportOrder.vue

@@ -639,28 +639,30 @@ export default {
     },
     //删除运输订单
     deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
       this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then(res => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!"
-                });
-                this.getRequestUrl();
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning"
-                });
-              }
-            });
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
         })
         .catch(() => {
           this.$message({

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -10,76 +10,69 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
-    <el-dialog title="车辆信息" :visible.sync="dialogTableVisible" :before-close="handleClose">
-    <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-    <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogTableVisible = false">取 消</el-button>
-    <el-button type="primary" @click="updateTruckCapacity()">确 定</el-button>
-    </span>
+    <el-dialog
+      title="车辆信息"
+      :visible.sync="dialogTableVisible"
+      :before-close="handleClose"
+    >
+      <dilTable
+        v-bind.sync="truck"
+        @radio-change="currentRadioChange1"
+      ></dilTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogTableVisible = false">取 消</el-button>
+        <el-button type="primary" @click="updateTruckCapacity()"
+          >确 定</el-button
+        >
+      </span>
     </el-dialog>
     <div class="transportOrder_bottom">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <!-- 已下发 -->
         <el-tab-pane label="未接收" name="first">
           <dilTable v-bind.sync="first">
-            <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
-          >
-            <template slot-scope="scope">
-               <el-button @click="updateClick(scope)" type="text" size="small">
-                修改
-              </el-button>
-             <el-button @click="deleteClick(scope)" type="text" size="small">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button @click="updateClick(scope)" type="text" size="small">
+                  修改
+                </el-button>
+                <el-button @click="deleteClick(scope)" type="text" size="small">
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
           </dilTable>
         </el-tab-pane>
         <!-- 已接收 -->
         <el-tab-pane label="已接收" name="Received">
           <dilTable v-bind.sync="Received">
-            <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <el-button @click="deleteClick(scope)" type="text" size="small">
-                关闭
-              </el-button>
-            </template>
-          </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button @click="deleteClick(scope)" type="text" size="small">
+                  关闭
+                </el-button>
+              </template>
+            </el-table-column>
           </dilTable>
         </el-tab-pane>
-         <!-- 已完成 -->
+        <!-- 已完成 -->
         <el-tab-pane label="已完成" name="completed">
-          <dilTable v-bind.sync="completed">
-          </dilTable>
+          <dilTable v-bind.sync="completed"> </dilTable>
         </el-tab-pane>
-         <!-- 已拒绝 -->
+        <!-- 已拒绝 -->
         <el-tab-pane label="已拒绝" name="refused">
           <dilTable v-bind.sync="refused">
-            <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <el-button @click="ctrlZClick(scope)" type="text" size="small">
-                撤销
-              </el-button>
-            </template>
-          </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button @click="ctrlZClick(scope)" type="text" size="small">
+                  撤销
+                </el-button>
+              </template>
+            </el-table-column>
           </dilTable>
         </el-tab-pane>
       </el-tabs>
-    </div> 
+    </div>
   </div>
 </template>
 
@@ -88,7 +81,7 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      carrierUserId:'',
+      carrierUserId: "",
       //模态窗的框计算
       inputText: null,
       //是否弹出对话框
@@ -99,27 +92,27 @@ export default {
       activeName: "first",
       //已下发的表格
       first: {
-        requestUrl:"",
+        requestUrl: ""
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "" ,
+        requestUrl: "",
         // 控制显示当选列
-        selectionType: "radio",
+        selectionType: "radio"
       },
-      Received:{
-        requestUrl: "",
+      Received: {
+        requestUrl: ""
       },
-      completed:{
-        requestUrl:"",
+      completed: {
+        requestUrl: ""
       },
-      refused:{
-        requestUrl:"",
+      refused: {
+        requestUrl: ""
       },
-       //车辆的表格
+      //车辆的表格
       truck: {
         requestUrl: "",
-        selectionType: "radio",
+        selectionType: "radio"
       },
       //物资信息的数据
       tableData: [],
@@ -128,18 +121,18 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 200,
+          width: 200
         },
         {
           prop: "materialModel",
           label: "规格型号",
-          width: 200,
+          width: 200
         },
         {
           prop: "weightNum",
           label: "物资数量",
-          width: 200,
-        },
+          width: 200
+        }
       ],
       //当前选中的订单id
       selectOrderId: null,
@@ -152,145 +145,230 @@ export default {
       //模态框从左往右打开
       direction: "rtl",
 
-      orderId:null,
+      orderId: null,
       //多选的选中的订单id
       selectionList: [],
       //区别点击的是添加运力，还是修改
-      index: null,
+      index: null
     };
   },
-  created(){
-      if (getCookie("orgCode") == "chengyunshang") {
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-      } else {
+    } else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
-      }
-      if(getCookie('orgCode') == "chengyunshang"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId"),
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId"),
-        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId")
-      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2"
-        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6"
-      }else{
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode")
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode")
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode")
-        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode")
-      }
+    }
+    if (getCookie("orgCode") == "chengyunshang") {
+      (this.first.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +
+        getCookie("userId")),
+        (this.Received.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +
+          getCookie("userId")),
+        (this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" +
+          getCookie("userId")),
+        (this.refused.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" +
+          getCookie("userId"));
+    } else if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "wuliuchuyunzhongxin"
+    ) {
+      this.first.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4";
+      this.Received.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5";
+      this.completed.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2";
+      this.refused.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6";
+    } else {
+      this.first.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" +
+        getCookie("orgCode");
+      this.Received.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" +
+        getCookie("orgCode");
+      this.completed.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" +
+        getCookie("orgCode");
+      this.refused.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" +
+        getCookie("orgCode");
+    }
   },
   methods: {
     //撤销已拒绝的运输订单
-    ctrlZClick(scope){
-        console.log(scope.row.orderId)
-        this.axios.post("/api/v1/oms/refuseCtrlZ",{
-          orderId:scope.row.orderId
-        }).then((res) => {
-          if(res.data.code == '200'){
-             this.$message.success("撤单成功")
-             this.getRequestUrl()
-          }
+    ctrlZClick(scope) {
+      console.log(scope.row.orderId);
+      this.axios
+        .post("/api/v1/oms/refuseCtrlZ", {
+          orderId: scope.row.orderId
         })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("撤单成功");
+            this.getRequestUrl();
+          }
+        });
     },
-    handleClose(done){
-      done()
-      this.$message.info("取消修改运力")
+    handleClose(done) {
+      done();
+      this.$message.info("取消修改运力");
     },
-    getRequestUrl(){
-        if(getCookie('orgCode') == "chengyunshang"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date() ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
-        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId") + "&test=" + new Date()
-      }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" + "&test=" + new Date()
-        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" + "&test=" + new Date()
-      }else{
-        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()
-        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode") + "&test=" + new Date()
+    getRequestUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
+        (this.first.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date()),
+          (this.Received.requestUrl =
+            "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +
+            getCookie("userId") +
+            "&test=" +
+            new Date());
+        this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
+        this.refused.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
+      } else if (
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu" ||
+        getCookie("orgCode") == "wuliuchuyunzhongxin"
+      ) {
+        this.first.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" +
+          "&test=" +
+          new Date();
+        this.Received.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" +
+          "&test=" +
+          new Date();
+        this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" +
+          "&test=" +
+          new Date();
+        this.refused.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" +
+          "&test=" +
+          new Date();
+      } else {
+        this.first.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.Received.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.completed.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.refused.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
       }
     },
-    getTruckRequestUrl(){
-        if (getCookie("orgCode") == "chengyunshang") {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId") + "&test=" + new Date();
+    getTruckRequestUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
       } else {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          null +
+          "&test=" +
+          new Date();
       }
     },
-    currentRadioChange1(row){
-      console.log(row)
-      this.capacityId = row.capacityId
+    currentRadioChange1(row) {
+      console.log(row);
+      this.capacityId = row.capacityId;
     },
-     //删除运输订单
-    deleteClick(scope){
-      this.$confirm('是否删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-            this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });     
-                this.getRequestUrl()
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
-        }).catch(() => {
+    //删除运输订单
+    deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
+            type: "info",
+            message: "已取消删除"
+          });
         });
     },
     //修改运输订单
-    updateClick(scope){
-      this.getTruckRequestUrl()
-      this.orderId = scope.row.orderId
-      this.dialogTableVisible = true
-      console.log(scope.row.orderId)
+    updateClick(scope) {
+      this.getTruckRequestUrl();
+      this.orderId = scope.row.orderId;
+      this.dialogTableVisible = true;
+      console.log(scope.row.orderId);
     },
-    updateTruckCapacity(){
-        if(this.capacityId == null){
-            this.$message.error("未选中运力")
-            return
-        }
-        this.axios.post("/api/v1/oms/updateCapacityId",{
-          capacityId:this.capacityId,
-          orderId :this.orderId
-        }).then((res) =>{
-          if(res.data.code == "200"){
-            this.$message.success("修改运力成功")
-            this.getRequestUrl()
-            this.dialogTableVisible = false
-          }else{
-            this.$message.error("修改运力失败")
-          }
+    updateTruckCapacity() {
+      if (this.capacityId == null) {
+        this.$message.error("未选中运力");
+        return;
+      }
+      this.axios
+        .post("/api/v1/oms/updateCapacityId", {
+          capacityId: this.capacityId,
+          orderId: this.orderId
         })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改运力成功");
+            this.getRequestUrl();
+            this.dialogTableVisible = false;
+          } else {
+            this.$message.error("修改运力失败");
+          }
+        });
     },
     handleClick(tab, event) {
-      this.getRequestUrl()
+      this.getRequestUrl();
     },
     // 查看物资详情
     detailclick(row) {
@@ -321,21 +399,20 @@ export default {
     materialDetails(orderId) {
       this.axios
         .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then((res) => {
+        .then(res => {
           if (res.data.code == "200") {
             this.tableData = res.data.data;
           }
         });
     },
-    Insert(){
-      this.$router.push("addSporadicTransportOrder")
+    Insert() {
+      this.$router.push("addSporadicTransportOrder");
     }
-  },
+  }
 };
 </script>
 
 <style lang="scss">
-
 .transportOrder {
   .transportOrder_top {
     width: 100%;
@@ -343,9 +420,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-input{
-  width: 20%;
-}
+    .el-input {
+      width: 20%;
+    }
   }
   .drawer_top {
     width: 100%;
@@ -355,4 +432,4 @@ export default {
     align-items: center;
   }
 }
-</style>
+</style>

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

@@ -110,19 +110,6 @@
         </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >可装货时间</label
-        >
-        <el-date-picker
-          class="textinput3"
-          v-model.number="saleDateOfReceipt"
-          type="datetime"
-          placeholder="选择日期时间"
-          disabled
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <label
           class="el-form-item__label"
@@ -151,6 +138,19 @@
           placeholder="(非必填)"
         ></el-input>
       </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;"
+          >可装货时间</label
+        >
+        <el-date-picker
+          class="textinput3"
+          v-model.number="saleDateOfReceipt"
+          type="datetime"
+          placeholder="选择日期时间"
+          disabled
+        >
+        </el-date-picker>
+      </el-form-item>
     </el-form>
 
     <div class="button-box">
@@ -314,12 +314,13 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
+                <!--更改-->
+                <i
+                  class="el-icon-edit"
                   @click="changeMaterial(scope.$index)"
+                  style="font-size: 20px"
                   v-if="isCellClick == 1"
-                  >更改</el-button
-                >
+                ></i>
               </template>
               <!--规格型号-->
               <template v-if="item.prop == 'Specification'">
@@ -372,12 +373,13 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
+                <!--增加-->
+                <i
+                  class="el-icon-folder-add"
                   @click="ondrawer(scope.row, scope.$index)"
                   v-if="isCellClick == 1"
-                  >选择</el-button
-                >
+                  style="font-size: 20px"
+                ></i>
               </template>
               <!-- 收货日期 -->
               <!-- <template v-if="item.prop == 'saleDateOfReceipt'">
@@ -413,7 +415,12 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200">
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="200"
+          v-if="isCellClick == 1"
+        >
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -435,7 +442,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column fixed="right" width="80">
+        <el-table-column fixed="right" width="80" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="copyRowfluAll(scope.$index, scope.row)"
@@ -874,6 +881,14 @@ export default {
         {
           values1: "dgsm",
           label1: "四川达钢商贸有限公司"
+        },
+        {
+          values1: "jxjl",
+          label1: "江西久隆贸易有限公司"
+        },
+        {
+          values1: "hnht",
+          label1: "海南瀚途贸易有限公司"
         }
       ],
       values1: "dzgt",
@@ -963,7 +978,7 @@ export default {
       saleAreaId: null,
       isNiTui: 0,
       datalistindex: 0,
-      temporarylist:[],
+      temporarylist: []
     };
   },
   created() {
@@ -1933,6 +1948,20 @@ export default {
     },
     //确定收货地址事件
     addAddressClick() {
+      //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
+      //定义一个正则表达式判断是否有电话
+      var est = /\d{11}/g;
+      var string2 = this.place.match(est);
+      console.log("-----------这是抓取到的数据----------");
+      console.log(string2);
+      if (string2 != null) {
+        for (i = 0; i < string2.length; i++) {
+          var reg = /^1[3456789]\d{9}$/;
+          if (reg.test(string2[i])) {
+            this.saleOrderConsigneeTel = string2;
+          }
+        }
+      }
       if (this.inOrOut % 2 == 0) {
         for (
           var i = this.row.index;
@@ -1998,15 +2027,15 @@ export default {
           i++;
         }
       });
-      let flag=0
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryFormat",this.selectionList)
-        .then(res=>{
-          if (res.data.code=="500"){
-            flag=1
+        .post("/api/v1/ams/queryFormat", this.selectionList)
+        .then(res => {
+          if (res.data.code == "500") {
+            flag = 1;
           }
-        })
-      if (flag== 1){
+        });
+      if (flag == 1) {
         this.$message.error("规格型号有问题，请重新输入");
         return;
       }
@@ -2052,25 +2081,25 @@ export default {
       var orderPlanWeightAllFill = 0;
       //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
       //先把暂存区的数据清空
-      this.temporarylist=[]
-      let flag=0
+      this.temporarylist = [];
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-        .then(res=>{
-          if (res.data.code === "500"){
-            flag=1
+        .post("/api/v1/ams/queryMaterial", this.selectionList)
+        .then(res => {
+          if (res.data.code === "500") {
+            flag = 1;
           }
-          console.log(res.data.code)
+          console.log(res.data.code);
           //给暂存区的数据赋值
-          this.temporarylist=res.data.data
-          console.log("以下是查询出来的数据")
-          console.log(res.data.data)
-        })
-      if (flag===1){
-        this.$message.error("规格型号不对")
-        return
+          this.temporarylist = res.data.data;
+          console.log("以下是查询出来的数据");
+          console.log(res.data.data);
+        });
+      if (flag === 1) {
+        this.$message.error("规格型号不对");
+        return;
       }
-      this.selectionList=this.temporarylist
+      this.selectionList = this.temporarylist;
       //初始化maplist
       var mapList = [];
       this.selectionList.forEach(item => {
@@ -2157,41 +2186,42 @@ export default {
         .catch(_ => {});
     },
     //点击事件（上）
-    clicks(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      console.log('clicks=e',arguments);
-      if (index==0){
-        console.log("向上1")
+    clicks(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      console.log("clicks=e", arguments);
+      if (index == 0) {
+        console.log("向上1");
         //this.datalistindex=this.materialTableTop.length-1
-        document.getElementById("input" + (this.materialList.length-1)).focus()
-      }else {
-        console.log("向上2")
+        document
+          .getElementById("input" + (this.materialList.length - 1))
+          .focus();
+      } else {
+        console.log("向上2");
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
-        document.getElementById("input" + (index-1)).focus()
+        document.getElementById("input" + (index - 1)).focus();
       }
-
     },
     //点击事件(下)
-    clickx(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      if (index ==this.materialList.length-1){
-        console.log("向下1")
-        document.getElementById("input" + 0).focus()
-      }else {
-        console.log("向下2")
+    clickx(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      if (index == this.materialList.length - 1) {
+        console.log("向下1");
+        document.getElementById("input" + 0).focus();
+      } else {
+        console.log("向下2");
         //this.datalistindex+=1
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
         //var tbl=document.getElementById("table").childNodes[0]
         //tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
         //const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
-          //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
+        //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
         //console.log(rowlist)
         var nextInput = document.getElementById("input" + (index + 1));
-        nextInput.focus()
+        nextInput.focus();
       }
     }
   }

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

@@ -109,19 +109,6 @@
         </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >可装货时间</label
-        >
-        <el-date-picker
-          class="textinput3"
-          v-model.number="saleDateOfReceipt"
-          type="datetime"
-          placeholder="选择日期时间"
-          disabled
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <label
           class="el-form-item__label"
@@ -150,6 +137,19 @@
           placeholder="(非必填)"
         ></el-input>
       </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;"
+        >可装货时间</label
+        >
+        <el-date-picker
+          class="textinput3"
+          v-model.number="saleDateOfReceipt"
+          type="datetime"
+          placeholder="选择日期时间"
+          disabled
+        >
+        </el-date-picker>
+      </el-form-item>
     </el-form>
 
     <div class="button-box">
@@ -183,6 +183,10 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
+                  :id="'input'+scope.$index"
+                  @keyup.up.native="clicks(scope.$index)"
+                  @keyup.down.native="clickx(scope.$index)"
+                  @keyup.enter.native="createACar"
                 ></el-input>
               </template>
               <!-- 米数 -->
@@ -308,12 +312,11 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="changeMaterial(scope.$index)"
-                  v-if="isCellClick == 1"
-                  >更改</el-button
-                >
+                <!--更改-->
+                <i class="el-icon-edit"
+                   @click="changeMaterial(scope.$index)"
+                   style="font-size: 20px"
+                   v-if="isCellClick == 1"></i>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -366,12 +369,12 @@
                   disabled
                 >
                 </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  v-if="isCellClick == 1"
-                  >选择</el-button
-                >
+                <!--增加-->
+                <i class="el-icon-folder-add"
+                   @click="ondrawer(scope.row, scope.$index)"
+                   v-if="isCellClick == 1"
+                   style="font-size: 20px"
+                ></i>
               </template>
               <!-- 收货客户电话号码 -->
               <template v-if="item.prop == 'saleOrderConsigneeTel'">
@@ -397,7 +400,8 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200">
+        <el-table-column fixed="right" label="操作" width="200"
+                         v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -419,7 +423,7 @@
             >
           </template>
         </el-table-column>
-        <el-table-column fixed="right" width="80">
+        <el-table-column fixed="right" width="80" v-if="isCellClick == 1">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="copyRowfluAll(scope.$index, scope.row)"
@@ -1827,6 +1831,20 @@ export default {
     },
     //确定收货地址事件
     addAddressClick() {
+      //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
+      //定义一个正则表达式判断是否有电话
+      var est=/\d{11}/g
+      var string2=this.place.match(est)
+      console.log("-----------这是抓取到的数据----------")
+      console.log(string2)
+      if (string2 != null){
+        for(i=0;i<string2.length;i++){
+          var reg=/^1[3456789]\d{9}$/
+          if(reg.test(string2[i])){
+            this.saleOrderConsigneeTel=string2
+          }
+        }
+      }
       if (this.inOrOut % 2 == 0) {
         for (
           var i = this.row.index;
@@ -2069,8 +2087,45 @@ export default {
         })
         .catch(_ => {});
     },
+    CloseClick() {},
+    //点击事件（上）
+    clicks(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      console.log('clicks=e',arguments);
+      if (index==0){
+        console.log("向上1")
+        //this.datalistindex=this.materialTableTop.length-1
+        document.getElementById("input" + (this.materialList.length-1)).focus()
+      }else {
+        console.log("向上2")
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
+        document.getElementById("input" + (index-1)).focus()
+      }
 
-    CloseClick() {}
+    },
+    //点击事件(下)
+    clickx(index){
+      console.log(index)
+      console.log(this.materialList)
+      console.log(this.materialList.length-1)
+      if (index ==this.materialList.length-1){
+        console.log("向下1")
+        document.getElementById("input" + 0).focus()
+      }else {
+        console.log("向下2")
+        //this.datalistindex+=1
+        //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
+        //var tbl=document.getElementById("table").childNodes[0]
+        //tbl.childNodes[len].childNodes[0].childNodes[0].focus()children[3]
+        //const rowlist=this.$refs.materialTableTop.$el.children[3].children[1].children[0]
+        //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
+        //console.log(rowlist)
+        var nextInput = document.getElementById("input" + (index + 1));
+        nextInput.focus()
+      }
+    }
   }
 };
 </script>

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

@@ -153,28 +153,30 @@ export default {
     },
     //删除运输订单
     deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
       this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then(res => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!"
-                });
-                this.getRequestUrl();
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning"
-                });
-              }
-            });
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
         })
         .catch(() => {
           this.$message({

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

@@ -255,20 +255,22 @@ export default {
       shipperId: 1,
       receivingCompany: [
         "四川省达州钢铁集团有限责任公司",
-        "四川达钢商贸有限公司"
+        "四川达钢商贸有限公司",
+        "江西久隆贸易有限公司",
+        "海南瀚途贸易有限公司"
       ],
       option: {
         // 表格请求数据的地址
         requestUrl: "",
         selectionType: "select",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 9, 10, 11, 12, 13, 14, 15, 16, 17]
+        columnIndexs: [0, 1, 2, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option2: {
         // 表格请求数据的地址
         requestUrl: "",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option4: {
         // 表格请求数据的地址
@@ -277,8 +279,8 @@ export default {
         columnIndexs: [
           0,
           1,
-          2,
-          3,
+          6,
+          7,
           8,
           9,
           10,
@@ -301,9 +303,7 @@ export default {
         comparison: "saleNumber",
         columnIndexs: [
           0,
-          1,
-          2,
-          3,
+          6,
           7,
           8,
           9,
@@ -332,7 +332,8 @@ export default {
         "saleRemark",
         "saleOrderReceiveCustomer",
         "salerName",
-        "saleOrderNo"
+        "saleOrderNo",
+        "saleArea"
       ],
       saleOrderMapList: [
         "truckNo",
@@ -479,7 +480,6 @@ export default {
       var workbook = null;
       //设置读取操作
       reader.onload = function(e) {
-        console.log(e);
         data = e.target.result;
         workbook = XLSX.read(data, {
           type: "binary"
@@ -491,6 +491,7 @@ export default {
         Array.from(rows).forEach((e, index) => {
           let map = {};
           try {
+            debugger;
             Object.keys(e).forEach(e1 => {
               if (e1.includes("销售订单编号")) {
                 map.saleOrderNo = e[e1];
@@ -509,11 +510,32 @@ export default {
                 }
                 //确定更改的物资有无米数
                 if (e[e1].includes("米")) {
-                  map.steelMeters = Number(e[e1].replace(/[^0-9]/gi, ""));
+                  map.steelMeters = Number(e[e1].replace(/[^0.0-9.0]/gi, ""));
                 } else {
                   map.steelMeters = null;
                 }
               }
+              if (e1.includes("规格型号")) {
+                console.log(e[e1]);
+                let str = e[e1];
+                let regex = /\((.+?)\)/g;
+                if (str.match(regex) != null) {
+                  let spa = str.replace(str.match(regex)[0], "");
+                  let model = str
+                    .match(regex)[0]
+                    .replace("(", "")
+                    .replace(")", "");
+                  map.materialModel = model;
+                  if ((spa + "").includes("Φ")) {
+                    map.materialSpecification = spa;
+                  } else {
+                    map.materialSpecification = "Φ" + spa;
+                  }
+                } else {
+                  map.materialSpecification = e[e1];
+                  map.model = null;
+                }
+              }
               if (e1.includes("下单客户")) {
                 map.receiveName = e[e1];
               }
@@ -523,14 +545,14 @@ export default {
               ) {
                 map.steelMeters = e[e1];
               }
-              if (e1.includes("物资规格")) {
+              if (e1.includes("物资规格") && !e1.includes("规格型号")) {
                 if ((e[e1] + "").includes("Φ")) {
                   map.materialSpecification = e[e1];
                 } else {
                   map.materialSpecification = "Φ" + e[e1];
                 }
               }
-              if (e1.includes("物资型号")) {
+              if (e1.includes("物资型号") && !e1.includes("规格型号")) {
                 map.materialModel = e[e1];
               }
               if (e1.includes("物资件数")) {
@@ -544,7 +566,7 @@ export default {
                 }
               }
               if (e1.includes("车序号")) {
-                if (isNumber(e[e1])) {
+                if (typeof e[e1] != "undefined" && isNumber(e[e1])) {
                   map.truckNo = e[e1];
                 } else {
                   throw new Error(
@@ -567,6 +589,16 @@ export default {
               }
               if (e1.includes("摘要")) {
                 map.saleRemark = e[e1];
+                let regex = /钢材.*组/g;
+                if (e[e1].match(regex)) {
+                  map.saleArea = e[e1].match(regex)[0];
+                }
+                let regex1 = /范围.*米/g;
+                if (e[e1].match(regex1)) {
+                  map.steelMeters = Number(
+                    str.match(regex)[0].match(/(\d+(\.\d+)?)/g)
+                  );
+                }
               }
               if (e1.includes("省")) {
                 map.province = e[e1];
@@ -590,14 +622,25 @@ export default {
                 if (e[e1] === "是" || e[e1] === "否") {
                   map.isSelfMention = e[e1];
                 } else {
-                  throw new Error(
-                    `该Excel第--${index + 2}--行-“是否自提”-错误,请核实后再输入`
-                  );
+                  map.isSelfMention = "否";
                 }
               }
             });
             map.shipperName = that.shipperName;
-            that.tableData.push(map);
+            if (typeof map.isSelfMention === "undefined") {
+              map.isSelfMention = "否";
+            }
+            if (
+              map.saleRemark &&
+              map.receiveName &&
+              map.materialName &&
+              map.truckNo &&
+              map.province &&
+              map.district &&
+              map.saleArea
+            ) {
+              that.tableData.push(map);
+            }
           } catch (e) {
             that.$message.error(e.message);
           }
@@ -609,6 +652,15 @@ export default {
       };
       reader.readAsBinaryString(file.raw); //以二进制方式读取
     },
+    //自己写一个比较函数排序
+    // 排序
+    compare(property) {
+      return function(a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value2 - value1;
+      };
+    },
     addExcelInport() {
       //加载虚拟
       const loading = this.$loading({
@@ -617,6 +669,53 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)"
       });
+      console.log(this.tableData);
+      debugger;
+      //遍历数组,根据摘要和下单客户自动给出销售订单编号
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (i === 0) {
+          this.tableData[i].saleOrderNo = 1;
+        } else {
+          let sortArr = this.tableData
+            .filter(e => {
+              return (
+                typeof e.saleOrderNo != "undefined" &&
+                e.saleOrderNo != "undefined" &&
+                isNumber(e.saleOrderNo)
+              );
+            })
+            .map(e => {
+              if (
+                typeof e.saleOrderNo != "undefined" &&
+                e.saleOrderNo != "undefined" &&
+                isNumber(e.saleOrderNo)
+              ) {
+                return e.saleOrderNo;
+              }
+            })
+            .sort((a, b) => {
+              return a - b;
+            });
+          //当大于0的时候,需要遍历整个数组,与之相等的有哪些
+          for (let j = 0; j < i; j++) {
+            if (
+              this.tableData[i].saleRemark === this.tableData[j].saleRemark &&
+              this.tableData[i].receiveName === this.tableData[j].receiveName
+            ) {
+              this.tableData[i].saleOrderNo = this.tableData[j].saleOrderNo;
+              break;
+            } else {
+              if (j == i - 1) {
+                this.tableData[i].saleOrderNo = sortArr[sortArr.length - 1] + 1;
+              }
+            }
+          }
+        }
+      }
+      console.log(this.tableData);
+      debugger;
+      // this.tableData = this.tableData.sort(this.compare("saleOrderNo"));
+      // debugger;
       //需要遍历数组，以销售订单编号为分类
       const map1 = this.tableData.reduce((result, item) => {
         result[item.saleOrderNo] = result[item.saleOrderNo] || [];
@@ -625,6 +724,8 @@ export default {
       }, {});
       // result即为所求
       let result = Object.values(map1);
+      console.log(result);
+      debugger;
       //遍历数组
       let saleOrderListMap = [];
       result.forEach((saleOrderList, index) => {
@@ -792,6 +893,7 @@ export default {
         });
     },
     deleteSaleOrder(row) {
+      console.log(row);
       this.$prompt("此操作将关闭订单且下面的待运输订单，是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -807,7 +909,9 @@ export default {
               reason: value
             };
             this.axios
-              .post("/api/v1/ams/deleteSaleOrderSame", mapValue)
+              .post(
+                "/api/v1/ams/deleteSaleOrderById?saleOrderId=" + row.saleOrderId
+              )
               .then(res => {
                 if (res.data.code == 200) {
                   this.$message.success("关闭成功");
@@ -983,6 +1087,44 @@ export default {
             "&i=" +
             new Date();
         }
+      } else if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+        if (this.activeName == "first") {
+          this.option.requestUrl =
+            "/api/v1/ams/getSaleOrderInfoes?apiId=408&saleType=1&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date() +
+            "saler=" +
+            getCookie("loginName");
+        } else if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/ams/getSaleOrderReportedes?apiId=408&saleType=1&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date() +
+            "saler=" +
+            getCookie("loginName");
+        } else if (this.activeName == "four") {
+          this.option4.requestUrl =
+            "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&saleType=1&shipperId=1&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date() +
+            "saler=" +
+            getCookie("loginName");
+        }
       } else {
         if (this.activeName == "first") {
           this.option.requestUrl =

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

@@ -10,6 +10,18 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
        <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+<!--      <el-upload
+        class="upload-excel"
+        action=""
+        :on-change="importExcel"
+        :show-file-list="false"
+        accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+        :auto-upload="false"
+      >
+        <el-button type="primary">
+          导入单价表
+        </el-button>
+      </el-upload>-->
     </div>
 
 <el-tabs v-model="activeName">
@@ -23,7 +35,7 @@
           <dilTable ref="excelDom" v-bind.sync="option2" :loading="loading" :isKuang="isKuang" @func="func">
           </dilTable>
       </el-tab-pane>
-      
+
     </el-tabs>
   </div>
 </template>
@@ -66,8 +78,148 @@ export default {
     btnclick() {
       this.$router.push("/addTransportPrice");
     },
+    /*importExcel(file){
+      let that = this;
+      if (!file) {
+        that.$message({
+          message: "文件错误!",
+          type: "warning"
+        });
+        return;
+      }
+      let excelData =[]
+      var reader=new FileReader();
+      var data=null;
+      var workbook = null;
+      //设置读取操作
+      reader.onload = function (e){
+        console.log(e);
+        data = e.target.result;
+        workbook=XLSX.read(data,{type:'binary'});
+        console.log(workbook)
+        //只取第一个表的数据
+        let rows= XLSX.utils.sheet_to_json(
+          workbook.Sheets[workbook.SheetNames[0]]
+        );
+        console.log(rows)
+        let index=1;
+        // for (index=1;index<rows.length;index++){
+        //   if (
+        //     typeof workbook.Sheets[workbook.SheetNames[0]]["A"+index] !=
+        //     "undefined"
+        //   ){
+        //     index++;
+        //     break
+        //   }
+        // }
+        // console.log("表头行数:" + index);
+        // if(index>=rows.length){
+        //   that.$message({
+        //     message: "文件错误!",
+        //     type: "warning",
+        //   });
+        //   return
+        // }
+        if (
+          typeof workbook.Sheets[workbook.SheetNames[0]]["A" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["B" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["C" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["D" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["E" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["F" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+          typeof workbook.Sheets[workbook.SheetNames[0]]["H" + index] == 'undefined' ||
+          workbook.Sheets[workbook.SheetNames[0]]["A" + index].v != "序号" ||
+          workbook.Sheets[workbook.SheetNames[0]]["B" + index].v != "省份" ||
+          workbook.Sheets[workbook.SheetNames[0]]["C" + index].v != "市/区" ||
+          workbook.Sheets[workbook.SheetNames[0]]["D" + index].v != "县/镇" ||
+          workbook.Sheets[workbook.SheetNames[0]]["E" + index].v != "卸货地点" ||
+          workbook.Sheets[workbook.SheetNames[0]]["F" + index].v != "参考运距（公里）" ||
+          workbook.Sheets[workbook.SheetNames[0]]["G" + index].v != "运价（元/吨）" ||
+          workbook.Sheets[workbook.SheetNames[0]]["H" + index].v != "吨公里（元/吨.km）"
+        ){
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["A" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["A" + index].v != "序号"
+          ) {
+            that.$message({
+              message: "表格格式错误:序号错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["B" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["B" + index].v != "省份"
+          ) {
+            that.$message({
+              message: "表格格式错误:省份错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["C" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["C" + index].v != "市/区"
+          ) {
+            that.$message({
+              message: "表格格式错误:市/区错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["D" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["D" + index].v != "县/镇"
+          ) {
+            that.$message({
+              message: "表格格式错误:县/镇错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["E" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["E" + index].v != "卸货地点"
+          ) {
+            that.$message({
+              message: "表格格式错误:卸货地点错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["F" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["F" + index].v != "参考运距（公里）"
+          ) {
+            that.$message({
+              message: "表格格式错误:参考运距（公里）错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["G" + index].v != "运价（元/吨）"
+          ) {
+            that.$message({
+              message: "表格格式错误:运价（元/吨）错误",
+              type: "warning"
+            });
+          }
+          if (
+            typeof workbook.Sheets[workbook.SheetNames[0]]["G" + index] == 'undefined' ||
+            workbook.Sheets[workbook.SheetNames[0]]["H" + index].v != "吨公里（元/吨.km）"
+          ) {
+            that.$message({
+              message: "表格格式错误:吨公里（元/吨.km）错误",
+              type: "warning"
+            });
+          }
+        }
+        //读取表格
+        for (let i = index+1; i <= rows.length+1 ; i++){
+          console.log(workbook.Sheets[workbook.SheetNames[0]]["B" + i].v)
+        }
+      }
+      reader.readAsBinaryString(file.raw);
+    }*/
   },
-  
+
 };
 </script>
 <style lang='scss' scoped>
@@ -80,4 +232,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/inward/components/truckAppoint/getRequirementOrder.vue

@@ -11,31 +11,28 @@
         返回
       </el-button>
     </div>
-     <!-- 车辆信息 -->
+    <!-- 车辆信息 -->
     <el-dialog
-        title="车辆信息"
-        :visible.sync="dialogTableVisible"
-        :before-close="handleClose"
+      title="车辆信息"
+      :visible.sync="dialogTableVisible"
+      :before-close="handleClose"
     >
       <el-input v-model="truckInput" style="width:250px"></el-input>
       <el-button type="primary" @click="clickTruck">查询</el-button>
-      <dilTable
-        v-bind.sync="truck"
-        @radio-change="currentRadioChange1"
-        >
+      <dilTable v-bind.sync="truck" @radio-change="currentRadioChange1">
       </dilTable>
       <span slot="footer" class="dialog-footer">
-      <el-button @click="cancelUpdate()">取 消</el-button>
-      <el-button type="primary" @click="updateTruckCapacity()"
-      >确 定</el-button>
+        <el-button @click="cancelUpdate()">取 消</el-button>
+        <el-button type="primary" @click="updateTruckCapacity()"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
     <template>
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="待接收" name="first">
-            <dilTable v-bind.sync="first" ref="table">
-            </dilTable>
+            <dilTable v-bind.sync="first" ref="table"> </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已接收" name="second">
             <dilTable v-bind.sync="second"> </dilTable>
@@ -54,134 +51,161 @@ export default {
   data() {
     return {
       inputText: "",
-      truckInput:null,
+      truckInput: null,
       userCarrierId: "",
       //是否弹出对话框
       dialogTableVisible: false,
       first: {
         //
-        requestUrl:
-          "" ,
+        requestUrl: ""
       },
       //车辆信息的表格
       truck: {
         requestUrl:
           "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
         // 控制显示当选列
-        selectionType: "radio",
+        selectionType: "radio"
       },
       //选中的运力id
       capacityId: null,
       activeName: "first",
       second: {
-        requestUrl: "",
+        requestUrl: ""
       },
       third: {
-        requestUrl: "",
-      },
+        requestUrl: ""
+      }
     };
   },
   created() {
-      this.first.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=4" + "&requirementId=" + this.$route.params.requirementId
-      this.second.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=5" + "&requirementId=" + this.$route.params.requirementId
-      this.third.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=2" + "&requirementId=" + this.$route.params.requirementId
+    this.first.requestUrl =
+      "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=4" +
+      "&requirementId=" +
+      this.$route.params.requirementId;
+    this.second.requestUrl =
+      "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=5" +
+      "&requirementId=" +
+      this.$route.params.requirementId;
+    this.third.requestUrl =
+      "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=2" +
+      "&requirementId=" +
+      this.$route.params.requirementId;
   },
   methods: {
     getRequest() {
       this.first.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=4" + "&i=" + new Date() + "&requirementId=" + this.$route.params.requirementId
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=4" +
+        "&i=" +
+        new Date() +
+        "&requirementId=" +
+        this.$route.params.requirementId;
       this.second.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=5" + "&i=" + new Date() + "&requirementId=" + this.$route.params.requirementId
+        "/api/v1/ams/getPlanOrder?apiId=455&orderStatus=5" +
+        "&i=" +
+        new Date() +
+        "&requirementId=" +
+        this.$route.params.requirementId;
     },
-    cancel(){
-        this.$router.go(-1)
+    cancel() {
+      this.$router.go(-1);
     },
     handleClick() {
-      this.getRequest()
+      this.getRequest();
     },
-    handleClose(done){
-      done()
-      this.$message.info("取消修改运力")
+    handleClose(done) {
+      done();
+      this.$message.info("取消修改运力");
     },
-    currentRadioChange1(row){
-      console.log(row)
-      this.capacityId = row.capacityId
+    currentRadioChange1(row) {
+      console.log(row);
+      this.capacityId = row.capacityId;
     },
-    getTruckRequestUrl(){
+    getTruckRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId") + "&test=" + new Date();
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
       } else {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          null +
+          "&test=" +
+          new Date();
       }
     },
     //修改运输订单
-    updatePlan(scope){
-      this.getTruckRequestUrl()
-      this.orderId = scope.row.orderId
-      this.dialogTableVisible = true
-      console.log(scope.row.orderId)
+    updatePlan(scope) {
+      this.getTruckRequestUrl();
+      this.orderId = scope.row.orderId;
+      this.dialogTableVisible = true;
+      console.log(scope.row.orderId);
     },
-    updateTruckCapacity(){
-        if(this.capacityId == null){
-            this.$message.error("未选中运力")
-            return
-        }
-        this.axios.post("/api/v1/oms/updateCapacityId",{
-          capacityId:this.capacityId,
-          orderId :this.orderId
-        }).then((res) =>{
-          if(res.data.code == "200"){
-            this.$message.success("修改运力成功")
-            this.dialogTableVisible = false
-            this.getRequest()
-            
-          }else{
-            this.$message.error("修改运力失败")
-            this.dialogTableVisible = false
-            this.getRequest()
-          }
+    updateTruckCapacity() {
+      if (this.capacityId == null) {
+        this.$message.error("未选中运力");
+        return;
+      }
+      this.axios
+        .post("/api/v1/oms/updateCapacityId", {
+          capacityId: this.capacityId,
+          orderId: this.orderId
         })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改运力成功");
+            this.dialogTableVisible = false;
+            this.getRequest();
+          } else {
+            this.$message.error("修改运力失败");
+            this.dialogTableVisible = false;
+            this.getRequest();
+          }
+        });
     },
-    clickTruck(){
-      this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index=" + this.truckInput
+    clickTruck() {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        null +
+        "&index=" +
+        this.truckInput;
     },
-      //删除运输订单
-    deleteClick(scope){
-      this.$confirm('是否删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-            this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });     
-                this.getRequest()
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
-        }).catch(() => {
+    //删除运输订单
+    deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequest();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
+            type: "info",
+            message: "已取消删除"
+          });
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss">

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -288,28 +288,30 @@ export default {
     },
     //删除运输订单
     deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
       this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then(res => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!"
-                });
-                this.getRequest();
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning"
-                });
-              }
-            });
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequest();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
         })
         .catch(() => {
           this.$message({

src/views/inward/components/truckOrder/getPlanOrder.vue

@@ -11,23 +11,21 @@
         返回
       </el-button>
     </div>
-     <!-- 车辆信息 -->
+    <!-- 车辆信息 -->
     <el-dialog
-        title="车辆信息"
-        :visible.sync="dialogTableVisible"
-        :before-close="handleClose"
+      title="车辆信息"
+      :visible.sync="dialogTableVisible"
+      :before-close="handleClose"
     >
       <el-input v-model="truckInput" style="width:250px"></el-input>
       <el-button type="primary" @click="clickTruck">查询</el-button>
-      <dilTable
-        v-bind.sync="truck"
-        @radio-change="currentRadioChange1"
-        >
+      <dilTable v-bind.sync="truck" @radio-change="currentRadioChange1">
       </dilTable>
       <span slot="footer" class="dialog-footer">
-      <el-button @click="cancelUpdate()">取 消</el-button>
-      <el-button type="primary" @click="updateTruckCapacity()"
-      >确 定</el-button>
+        <el-button @click="cancelUpdate()">取 消</el-button>
+        <el-button type="primary" @click="updateTruckCapacity()"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
     <template>
@@ -40,7 +38,11 @@
                   <el-button type="text" size="mini" @click="updatePlan(scope)">
                     修改
                   </el-button>
-                  <el-button type="text" size="mini" @click="deleteClick(scope)">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="deleteClick(scope)"
+                  >
                     删除
                   </el-button>
                 </template>
@@ -64,134 +66,162 @@ export default {
   data() {
     return {
       inputText: "",
-      truckInput:null,
+      truckInput: null,
       userCarrierId: "",
       //是否弹出对话框
       dialogTableVisible: false,
       first: {
         //
-        requestUrl:""
+        requestUrl: ""
       },
       //车辆信息的表格
       truck: {
         requestUrl:
           "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + "",
         // 控制显示当选列
-        selectionType: "radio",
+        selectionType: "radio"
       },
       //选中的运力id
       capacityId: null,
       activeName: "first",
       second: {
-        requestUrl: "",
+        requestUrl: ""
       },
       third: {
-        requestUrl: "",
-      },
+        requestUrl: ""
+      }
     };
   },
   created() {
-      this.first.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=4" + "&planId=" + this.$route.params.planId
-      this.second.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=5" + "&planId=" + this.$route.params.planId
-      this.third.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=2" + "&planId=" + this.$route.params.planId
+    this.first.requestUrl =
+      "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=4" +
+      "&planId=" +
+      this.$route.params.planId;
+    this.second.requestUrl =
+      "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=5" +
+      "&planId=" +
+      this.$route.params.planId;
+    this.third.requestUrl =
+      "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=2" +
+      "&planId=" +
+      this.$route.params.planId;
   },
   methods: {
     getRequest() {
       this.first.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=4" + "&i=" + new Date() + "&planId=" + this.$route.params.planId
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=4" +
+        "&i=" +
+        new Date() +
+        "&planId=" +
+        this.$route.params.planId;
       this.second.requestUrl =
-        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=5" + "&i=" + new Date() + "&planId=" + this.$route.params.planId
+        "/api/v1/ams/getPlanOrder?apiId=260&orderStatus=5" +
+        "&i=" +
+        new Date() +
+        "&planId=" +
+        this.$route.params.planId;
     },
-    cancel(){
-        this.$router.go(-1)
+    cancel() {
+      this.$router.go(-1);
     },
     handleClick() {
       this.getRequirementMaterial();
-      this.getRequest()
+      this.getRequest();
     },
-    handleClose(done){
-      done()
-      this.$message.info("取消修改运力")
+    handleClose(done) {
+      done();
+      this.$message.info("取消修改运力");
     },
-    currentRadioChange1(row){
-      console.log(row)
-      this.capacityId = row.capacityId
+    currentRadioChange1(row) {
+      console.log(row);
+      this.capacityId = row.capacityId;
     },
-    getTruckRequestUrl(){
+    getTruckRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-        getCookie("userId") + "&test=" + new Date();
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          getCookie("userId") +
+          "&test=" +
+          new Date();
       } else {
-      this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null +  "&test=" + new Date();
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+          null +
+          "&test=" +
+          new Date();
       }
     },
     //修改运输订单
-    updatePlan(scope){
-      this.getTruckRequestUrl()
-      this.orderId = scope.row.orderId
-      this.dialogTableVisible = true
-      console.log(scope.row.orderId)
+    updatePlan(scope) {
+      this.getTruckRequestUrl();
+      this.orderId = scope.row.orderId;
+      this.dialogTableVisible = true;
+      console.log(scope.row.orderId);
     },
-    updateTruckCapacity(){
-        if(this.capacityId == null){
-            this.$message.error("未选中运力")
-            return
-        }
-        this.axios.post("/api/v1/oms/updateCapacityId",{
-          capacityId:this.capacityId,
-          orderId :this.orderId
-        }).then((res) =>{
-          if(res.data.code == "200"){
-            this.$message.success("修改运力成功")
-            this.dialogTableVisible = false
-            this.getRequest()
-            
-          }else{
-            this.$message.error("修改运力失败")
-            this.dialogTableVisible = false
-            this.getRequest()
-          }
+    updateTruckCapacity() {
+      if (this.capacityId == null) {
+        this.$message.error("未选中运力");
+        return;
+      }
+      this.axios
+        .post("/api/v1/oms/updateCapacityId", {
+          capacityId: this.capacityId,
+          orderId: this.orderId
         })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("修改运力成功");
+            this.dialogTableVisible = false;
+            this.getRequest();
+          } else {
+            this.$message.error("修改运力失败");
+            this.dialogTableVisible = false;
+            this.getRequest();
+          }
+        });
     },
-    clickTruck(){
-      this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index=" + this.truckInput
+    clickTruck() {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        null +
+        "&index=" +
+        this.truckInput;
     },
-      //删除运输订单
-    deleteClick(scope){
-      this.$confirm('是否删除?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-            this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });     
-                this.getRequest()
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
-        }).catch(() => {
+    //删除运输订单
+    deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
+      this.$confirm("是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequest();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
+        })
+        .catch(() => {
           this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
+            type: "info",
+            message: "已取消删除"
+          });
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss">

src/views/inward/components/truckOrder/purInwardTruckOrder.vue

@@ -6,11 +6,12 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-badge  
-      :value="addPlanCount"
-      class="item"
-      v-if="activeName == 'first'"
-      style="margin-left:10px">
+      <el-badge
+        :value="addPlanCount"
+        class="item"
+        v-if="activeName == 'first'"
+        style="margin-left:10px"
+      >
         <el-button type="primary" @click="Insert" v-if="activeName == 'first'">
           <i class="el-icon-plus"></i>新增
         </el-button>
@@ -142,8 +143,8 @@ export default {
       index: null,
       // wssUrl: "wss:wl.dasteel.cn:32322/websocket/socketServer",
       // actiones: { username: "湘M99999" } //传入后台的数据
-      addPlanCount:0,
-      timer:null,
+      addPlanCount: 0,
+      timer: null
     };
   },
   created() {
@@ -192,19 +193,23 @@ export default {
     }
     // this.initWebSocket();
   },
-  mounted(){
+  mounted() {
     this.getAddPlan();
-    this.timer=setInterval(this.getAddPlan, 10000);
+    this.timer = setInterval(this.getAddPlan, 10000);
   },
-  beforeDestroy(){
+  beforeDestroy() {
     clearInterval(this.timer);
   },
   methods: {
     getAddPlan() {
-      this.axios.post( "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&pageNum=1&pageSize=10").then(res => {
-        console.log("data:",res.data.data);
-        this.addPlanCount = res.data.data.total;
-      });
+      this.axios
+        .post(
+          "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&pageNum=1&pageSize=10"
+        )
+        .then(res => {
+          console.log("data:", res.data.data);
+          this.addPlanCount = res.data.data.total;
+        });
     },
     //建立websocket连接
     initWebSocket() {
@@ -321,28 +326,30 @@ export default {
     },
     //删除运输订单
     deleteClick(scope) {
+      let map = {
+        orderId: scope.row.orderId,
+        userId: getCookie("userId")
+      };
       this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.axios
-            .post("/api/v1/oms/closeOmstruckOrder?orderId=" + scope.row.orderId)
-            .then(res => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!"
-                });
-                this.getRequestUrl();
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning"
-                });
-              }
-            });
+          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "删除成功!"
+              });
+              this.getRequestUrl();
+            } else {
+              this.$message({
+                message: "删除失败",
+                type: "warning"
+              });
+            }
+          });
         })
         .catch(() => {
           this.$message({

src/views/sale/components/dilNotice/addNotice1.vue

@@ -0,0 +1,70 @@
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="389" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/dilNotice/addNotice2.vue

@@ -0,0 +1,71 @@
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="390" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+

src/views/sale/components/dilNotice/clientNotice.vue

@@ -77,7 +77,7 @@ export default {
     },
     /*新增通知*/
     toInsert() {
-      this.$router.push("/addNotice");
+      this.$router.push("/addNotice2");
 
     },
 

src/views/sale/components/dilNotice/marketingNotice.vue

@@ -78,7 +78,7 @@ export default {
     },
     /*新增通知*/
     toInsert() {
-      this.$router.push("/addNotice");
+      this.$router.push("/addNotice1");
 
     },
 

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

@@ -1,10 +1,12 @@
 <template>
   <div class="tableAllDate">
-    <div id="pdfDom">
+    <div id="pdfDom1">
+    <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
       <div class="blank"></div>
+
       <div class="title">
-        <h1 align="center">{{ shippername }}</h1>
-        <h1 align="center">物资送货单</h1>
+        <h5 align="center">{{ shippername }} 物资送货单</h5>
+        <!--        <h5 align="center">物资送货单</h5>-->
       </div>
       <div>
         <!-- tablePart0 -->
@@ -34,13 +36,12 @@
         >
           <tr>
             <th style="width: 5%; text-align: center">序号</th>
-            <th style="width: 21.5%; text-align: center">物资名称</th>
-            <th style="width: 21.5%; text-align: center">规格型号</th>
+            <th style="width: 23.5%; text-align: center">物资名称</th>
+            <th style="width: 22.5%; text-align: center">规格型号</th>
             <th style="width: 14%">件数</th>
             <th style="width: 14%">重量</th>
-            <th style="width: 19%">订单日期</th>
+            <th style="width: 21%">订单日期</th>
           </tr>
-
           <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
             <td>{{ index + 1 }}</td>
             <td>{{ item.materialName }}</td>
@@ -61,8 +62,8 @@
           class="tablePart2"
         >
           <tr>
-            <th style="width: 19.25%">收货地点</th>
-            <td style="width: 50%">
+            <th style="width: 28.5%">收货地点</th>
+            <td style="width: 71.5%">
               {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
             </td>
           </tr>
@@ -78,16 +79,13 @@
           class="tablePart3"
         >
           <tr>
-            <th style="width: 21.65%">收货人</th>
-            <td style="width: 20%">{{ consignee }}</td>
-            <th style="width: 10.5%">电话</th>
-            <td style="width: 26%">{{ consigneeTel }}</td>
+            <th style="width: 28.5%">收货人</th>
+            <td style="width: 22.5%">{{ consignee }}</td>
+            <th style="width: 14%">电话</th>
+            <td style="width: 35%">{{ consigneeTel }}</td>
           </tr>
         </table>
 
-
-
-
         <!-- tablePart4 -->
         <table
           border="0"
@@ -98,15 +96,14 @@
           class="tablePart4"
         >
           <tr>
-            <th style="width: 27.75%">承运商</th>
+            <th style="width: 28.5%">承运商</th>
             <td style="width: 36.5%">{{ carrierName }}</td>
-            <th style="width: 13%">车牌号</th>
-            <td style="width: 40%">{{ capacityNumber }}</td>
+            <th style="width: 14%">车牌号</th>
+            <td style="width: 35%">{{ capacityNumber }}</td>
           </tr>
         </table>
 
-
-              <!-- tablePart9 -->
+        <!-- tablePart9 -->
         <table
           border="1"
           cellpadding="10"
@@ -116,34 +113,33 @@
           class="tablePart9"
         >
           <tr>
-            <th style="width: 7.62%">备注</th>
-            <td style="width: 20%">{{note}}</td>
-
+            <th style="width: 28.5%">备注</th>
+            <td style="width: 71.5%">{{ note }}</td>
           </tr>
         </table>
       </div>
 
-
-
       <div>
-        <!-- tablePart6 -->
+        <!-- tablePart6 margin-top: 10px-->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto; font-size: 20px; margin-top: 10px"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
-            <th style="width: 6.25%">发货单位：</th>
-            <td style="width: 53.5%">{{ shippername }}</td>
+            <th style="width: 8.25%">发货单位：</th>
+            <td style="width: 30.5%">{{ shippername }}</td>
+            <th style="width: 8.25%">收货单位：</th>
+            <td style="width: 30.5%">{{ consigeeName }}</td>
           </tr>
         </table>
-</div>
+      </div>
 
-          <div>
-        <!-- tablePart6 -->
+      <!--          <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
           cellpadding="10"
@@ -157,24 +153,25 @@
             <td style="width: 53.5%">{{ consigeeName }}</td>
           </tr>
         </table>
-      </div>
+      </div>-->
       <div>
-        <!-- tablePart6 -->
+        <!-- tablePart6 margin-top: 10px-->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto; font-size: 20px; margin-top: 10px"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
             <th style="width: 14.5%">签收人：</th>
+            <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
       </div>
-      <div>
-        <!-- tablePart6 -->
+      <!--      <div>
+        &lt;!&ndash; tablePart6 &ndash;&gt;
         <table
           border="0"
           cellpadding="10"
@@ -187,13 +184,14 @@
             <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
-      </div>
+      </div>-->
+    </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
     <div class="button-box">
-      <el-button type="primary" v-print="'#pdfDom'" @click="backScan()">
+      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()">
         <i class="el-icon-printer"></i>打印
       </el-button>
       <el-button type="primary" @click="backScan()">
@@ -225,8 +223,8 @@ export default {
           materialModel: "",
           materialNumber: 0,
           materialWeight: 0,
-          makeDate: "",
-        },
+          makeDate: ""
+        }
       ],
       carrierName: "",
       province: "",
@@ -238,7 +236,8 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
-      note: "",
+      note: ""
+      dataList:['1','2','3']
     };
   },
   created() {
@@ -258,7 +257,7 @@ export default {
       let orderNumber = this.$route.query.orderNumber;
       this.axios
         .post("/api/v1/tms/getDeliveryOrder?orderNumber=" + orderNumber)
-        .then((res) => {
+        .then(res => {
           console.log(res);
           this.orderNumber = res.data.orderNumber;
           this.carrierName = res.data.carrierName;
@@ -275,13 +274,13 @@ export default {
           this.town = res.data.town;
           this.deliveryAddress = res.data.deliveryAddress;
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList;
-          this.note=res.data.note;
+          this.note = res.data.note;
         });
     },
     backScan() {
       this.$router.go(-2);
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -1,97 +1,107 @@
 <template>
-    <div class="saleSelfMachine">
-        <div class="background">
-            <img :src="backgroundImgURL" width="100%" height="100%"/>
-        </div>
-        <div class="orderNumberData">
-            <el-input placeholder="请将二维码放置在扫描区" v-model="orderNumber" :focus="true" ref="inputs" :disabled="!isEdit">
-            </el-input>
-            <div style="display:block;width:120px">
-                手动输入开关：
-            </div>
-            <el-switch
-            v-model="isEdit"
-            active-color="#66ccff"
-            inactive-color="#ffffff">
-            </el-switch>
-        </div>
-    </div>    
+  <div class="saleSelfMachine">
+    <div class="background">
+      <img :src="backgroundImgURL" width="100%" height="100%" />
+    </div>
+    <div class="orderNumberData">
+      <el-input
+        placeholder="请将二维码放置在扫描区"
+        v-model="orderNumber"
+        :focus="true"
+        ref="inputs"
+        :disabled="!isEdit"
+      >
+      </el-input>
+      <div style="display:block;width:120px">
+        手动输入开关：
+      </div>
+      <el-switch
+        v-model="isEdit"
+        active-color="#66ccff"
+        inactive-color="#ffffff"
+      >
+      </el-switch>
+    </div>
+  </div>
 </template>
 <script>
 export default {
-    data(){
-        return{
-            orderNumber:null,
-            isEdit:false,
-            backgroundImgURL:require('@/assets/saleSelfMachine/scanCode.jpg'),
-        }
-    },
-    created(){
-        this.changfouce();
-    },
-    // watch:{
-    //    data:"toSaleSelfMachine"
-    // },
-    methods:{
-        //输入框自动聚焦
-        changfouce(){
-        this.$nextTick((x)=>{
+  data() {
+    return {
+      orderNumber: null,
+      isEdit: true,
+      backgroundImgURL: require("@/assets/saleSelfMachine/scanCode.jpg")
+    };
+  },
+  created() {
+    this.changfouce();
+  },
+  // watch:{
+  //    data:"toSaleSelfMachine"
+  // },
+  methods: {
+    //输入框自动聚焦
+    changfouce() {
+      this.$nextTick(x => {
         this.$refs.inputs.focus();
-        })
-        },
-        //失去焦点后自动执行获得焦点事件
-        // onInputBlur(){
-        //     console.log("获取焦点")
-        //     this.changfouce();
-        // }
-        // toSaleSelfMachine(){
-        //      this.$router.push({
-        //         path:'/saleSelfMachine',
-        //     })
-        // }
-    },
-    mounted(){
-        // this.changfouce();
-    const timer = setInterval(()=>{
-        // if(this.$refs.inputs.focus==false){
-        //     console.log("false")
-            this.changfouce();
-        //}
-         if(this.orderNumber!=null&&this.orderNumber.length==21){
-            if(this.orderNumber.startsWith('WYSDD')==true||this.orderNumber.startsWith('wysdd')==true){
-                this.$router.push({
-                        path:"/saleSelfMachine?orderNumber="+this.orderNumber,
-                })
-            }
-        }else if(this.orderNumber.length>21){
-            //清空输入框，免得一次多个重复订单还无法删除
-            this.orderNumber=null;
-        } 
-    },3000)
-    this.$once('hook:beforeDestroy', ()=>{
-        clearInterval(timer)
-    })
-} 
-}
+      });
+    }
+    //失去焦点后自动执行获得焦点事件
+    // onInputBlur(){
+    //     console.log("获取焦点")
+    //     this.changfouce();
+    // }
+    // toSaleSelfMachine(){
+    //      this.$router.push({
+    //         path:'/saleSelfMachine',
+    //     })
+    // }
+  },
+  mounted() {
+    // this.changfouce();
+    const timer = setInterval(() => {
+      // if(this.$refs.inputs.focus==false){
+      //     console.log("false")
+      this.changfouce();
+      //}
+      if (this.orderNumber != null && this.orderNumber.length == 21) {
+        if (
+          this.orderNumber.startsWith("WYSDD") == true ||
+          this.orderNumber.startsWith("wysdd") == true
+        ) {
+          this.$router.push({
+            path: "/saleSelfMachine?orderNumber=" + this.orderNumber
+          });
+        }
+      } else if (this.orderNumber.length > 21) {
+        //清空输入框，免得一次多个重复订单还无法删除
+        this.orderNumber = null;
+      }
+    }, 3000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+  }
+};
 </script>
 <style lang="scss">
-    .saleSelfMachine{
-        width: 100vh;
-        height: 100vh;
-        .background {
-            width: 100%;
-            height: 100%; 
-            z-index: -1;
-            position: absolute;
-            overflow: hidden;
-        }
-        .orderNumberData{
-            width: 100%;
-            color: #fff;
-            position: absolute;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-    }
-</style>
+.saleSelfMachine {
+  width: 100vh;
+  height: 100vh;
+  .background {
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    position: absolute;
+    overflow: hidden;
+  }
+  .orderNumberData {
+    width: 100%;
+    color: #fff;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+</style>

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -63,7 +63,7 @@
       append-to-body
     >
       <!-- 内层单价选择弹出框 -->
-      <el-dialog
+<!--      <el-dialog
         width="40%"
         title="地址筛选"
         :visible.sync="addressDrawer"
@@ -80,7 +80,7 @@
           :loading="selectLineLoading"
           ><i class="el-icon-search"></i>查询</el-button
         >
-        <!-- 已选中 省市(区)县 -->
+        &lt;!&ndash; 已选中 省市(区)县 &ndash;&gt;
         <el-form :inline="true" style="margin-top: 0.5rem;">
           <el-form-item>
             <label class="el-form-item__label" style="width: auto;"
@@ -96,7 +96,7 @@
             ></el-input>
           </el-form-item>
         </el-form>
-        <!-- 具体收货地址 -->
+        &lt;!&ndash; 具体收货地址 &ndash;&gt;
         <div v-if="address != null">
           <el-form :inline="true" style="margin-top: 0.5rem;">
             <el-form-item label="具体收货地址:">
@@ -116,13 +116,13 @@
         </div>
 
         <div class="tablecls">
-          <!-- 查询所有的运输单价 -->
+          &lt;!&ndash; 查询所有的运输单价 &ndash;&gt;
           <dilTable
             v-bind.sync="Address"
             @radio-change="currentRadioChange2"
           ></dilTable>
         </div>
-      </el-dialog>
+      </el-dialog>-->
       <!-- 内层单价选择弹出框 -->
 
       <el-form>
@@ -139,7 +139,26 @@
             disabled
           ></el-input>
         </el-form-item>
-        <el-form-item label="新详单地址" :label-width="formLabelWidth">
+        <el-input
+          v-model="addresText"
+          placeholder="请输入内容"
+          style="margin-top: 10px; margin-left: 20px; width: 250px"
+          @keyup.native.enter="selectAddresClick"
+        ></el-input>
+        <el-button
+          type="primary"
+          @click="selectAddresClick"
+          :loading="selectLineLoading"
+        ><i class="el-icon-search"></i>查询</el-button
+        >
+        <div class="tablecls">
+          <!-- 查询所有的运输单价 -->
+          <dilTable
+            v-bind.sync="Address"
+            @radio-change="currentRadioChange2"
+          ></dilTable>
+        </div>
+<!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input
             style="width:250px"
             v-model="newAddress"
@@ -154,7 +173,7 @@
           <el-button type="primary" placeholder="()" @click="select"
             >浏览</el-button
           >
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -240,7 +259,7 @@ export default {
       addressDrawer: false,
       //运输单价的表格
       Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
+        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=511",
         selectionType: "radio"
       },
       // addressText:null,
@@ -287,11 +306,11 @@ export default {
     selectAddresClick() {
       if (this.addresText) {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" +
+          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&con=" +
           this.addresText;
       } else {
         this.Address.requestUrl =
-          "/api/v1/ams/getAddressDeliveryAddress?apiId=255&i=" + new Date();
+          "/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=" + new Date();
       }
     },
     //以下是收货地址边输边查搜索
@@ -464,6 +483,7 @@ export default {
         this.place = null;
       }
       (this.address = val.address), (this.addressId = val.addressId);
+
       // this.priceMap = {};
       // this.priceMap = val;
     },

src/views/sale/router/index.js

@@ -48,6 +48,8 @@ import add_sale_dilNotice from "../components/dilNotice/add_sale_dilNotice.vue";
 import Carrier_dilNotice from "../components/dilNotice/Carrier_dilNotice.vue";
 import sale_dilNotice from "../components/dilNotice/sale_dilNotice.vue";
 import addNotice from "../components/dilNotice/addNotice.vue";
+import addNotice1 from "../components/dilNotice/addNotice1.vue";
+import addNotice2 from "../components/dilNotice/addNotice2.vue";
 import carrierNotice from "../components/dilNotice/carrierNotice.vue";
 import clientNotice from "../components/dilNotice/clientNotice.vue";
 import editNotice from "../components/dilNotice/editNotice.vue";
@@ -374,6 +376,18 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: addNotice
       },
+      {
+        path: "addNotice1",
+        name: "addNotice1",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addNotice1
+      },
+      {
+        path: "addNotice2",
+        name: "addNotice2",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addNotice2
+      },
       {
         path: "carrierNotice",
         name: "carrierNotice",

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

@@ -83,19 +83,17 @@
         :span-method="objectSpanMethod"
         ref="tableRef"
         border
-        stripe
         style="width: 100%; margin-top: 20px"
-        max-height="600px"
+        max-height="650px"
         @cell-click="cellClik"
         @row-click="rowClick"
         :row-style="{ height: '30px' }"
-        :cell-style="{ fontWeight: '700' }"
+        :cell-style="{ fontWeight: '500' }"
       >
         <el-table-column
           width="50"
           label="序号"
           align="center"
-          fixed="left"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
@@ -121,7 +119,6 @@
               :fetch-suggestions="querySearchCarrier"
               placeholder="请输入承运商"
               @select="handleSelectCarrier(scope.row, scope.$index)"
-              :disabled="scope.row.isCarrierShow != 1"
             >
             </el-autocomplete>
             <el-button
@@ -146,7 +143,6 @@
               :fetch-suggestions="querySearch"
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
-              :disabled="scope.row.isCapacityShow != 1"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"
@@ -182,7 +178,6 @@
             </button>
             <input
               v-model="scope.row.materialNum"
-              disabled
               style="width:40px;height: 40px;font-size:16px;line-height: 40px;text-align: center;"
             />
             <el-button
@@ -203,7 +198,6 @@
               style="width:280px"
               v-model="scope.row.addressPlace"
               placeholder="请输入收货地址"
-              :disabled="scope.row.isAddressShow != 1"
             ></el-input>
             <el-button
               @click="updateAddress(scope.row)"
@@ -260,7 +254,6 @@
               style="width:120px"
               v-model="scope.row.capacityTel"
               placeholder="请输入电话号码"
-              :disabled="scope.row.isTelShow != 1"
             ></el-input>
             <el-button
               @click="updateDriverTel(scope.row)"
@@ -714,6 +707,7 @@ export default {
       });
     },
     updateCapacity(row) {
+      row.capacityId = row.newsCapacityId;
       if (row.newsCapacityId == null) {
         this.$message.warning("请先注册车牌号或者选中弹出后再提交!");
         return;
@@ -1235,8 +1229,33 @@ export default {
     },
     //获取钢材统计报表
     getSteelReport() {
+      let startTime = null;
+      let endTime = null;
       let carrierSsoId = null;
+      let carrierName = null;
+      let consigneeName = null;
+      let capacityNo = null;
+      let remark = null;
       let saler = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (getCookie("orgCode") == "chengyunshang") {
+        carrierSsoId = getCookie("userId");
+      }
+      if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+        saler = getCookie("loginName");
+      }
+      if (this.screen == "下单客户") {
+        consigneeName = this.input;
+      } else if (this.screen == "承运商") {
+        carrierName = this.input;
+      } else if (this.screen == "车牌号") {
+        capacityNo = this.input;
+      } else {
+        remark = this.input;
+      }
       if (getCookie("orgCode") == "chengyunshang") {
         carrierSsoId = getCookie("userId");
       }
@@ -1254,7 +1273,15 @@ export default {
             "&saler=" +
             saler +
             "&i=" +
-            new Date()
+            new Date() +
+            "&remark=" +
+            remark +
+            "&consigneeName=" +
+            consigneeName +
+            "&carrierName=" +
+            carrierName +
+            "&capacityNo=" +
+            capacityNo
         )
         .then(res => {
           this.tableData = res.data.data;