tijiao

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/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

@@ -332,7 +332,8 @@ export default {
         "saleRemark",
         "saleOrderReceiveCustomer",
         "salerName",
-        "saleOrderNo"
+        "saleOrderNo",
+        "saleArea"
       ],
       saleOrderMapList: [
         "truckNo",
@@ -491,6 +492,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 +511,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 +546,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("物资件数")) {
@@ -567,6 +590,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 +623,17 @@ 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) {
+              that.tableData.push(map);
+            }
           } catch (e) {
             that.$message.error(e.message);
           }
@@ -609,6 +645,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 +662,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 +717,8 @@ export default {
       }, {});
       // result即为所求
       let result = Object.values(map1);
+      console.log(result);
+      debugger;
       //遍历数组
       let saleOrderListMap = [];
       result.forEach((saleOrderList, index) => {
@@ -983,6 +1077,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/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/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -95,7 +95,6 @@
           width="50"
           label="序号"
           align="center"
-          fixed="left"
           :resizable="false"
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>