修改

build/utils.js

@@ -21,9 +21,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // =======
 
 // let devModules = ['index', 'statisticalReport', 'appoint']
-let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'appoint']
 //let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
-// let devModules = ['all']
+let devModules = ['all']
 // >>>>>>> ecb211626d4aa9a51230114ced8866039cba10e1
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {

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

@@ -2035,8 +2035,6 @@ export default {
             var orderPlanWeightAllFill = 0
             //初始化maplist
             this.selectionList = this.temporarylist
-            console.log('以下是修改过后的数据')
-            console.log(this.selectionList)
             var mapList = []
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {

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

@@ -46,15 +46,7 @@
             >
               修改
             </el-button>
-            <el-button
-              @click="deleteClick(scope)"
-              type="text"
-              size="small"
-              v-if="
-                scope.row.carStatus == '未接单' ||
-                  scope.row.carStatus == '未进厂'
-              "
-            >
+            <el-button @click="deleteClick(scope)" type="text" size="small">
               关闭
             </el-button>
           </template>
@@ -65,11 +57,11 @@
 </template>
 
 <script>
-import { getCookie } from "@/utils/util.js";
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
-      carrierUserId: "",
+      carrierUserId: '',
       //模态窗的框计算
       inputText: null,
       //车辆输入框
@@ -77,181 +69,181 @@ export default {
       //是否弹出对话框
       dialogTableVisible: false,
       //输入框的值
-      input: "",
+      input: '',
       //选项卡的当前选中的值
-      activeName: "first",
+      activeName: 'first',
       //已下发的表格
       first: {
-        requestUrl: "",
-        comparison: "orderNumber",
+        requestUrl: '',
+        comparison: 'orderNumber',
         orderNumber: [0, 1]
       },
       //车辆信息的表格
       truck: {
-        requestUrl: "",
+        requestUrl: '',
         // 控制显示当选列
-        selectionType: "radio"
+        selectionType: 'radio'
       },
       //当前选中的订单id
       selectOrderId: null,
       //选中的车辆号
-      capacityNumber: "",
+      capacityNumber: '',
       //选中的运力id
       capacityId: null,
       //是否关闭模态框
       drawer: false,
       //模态框从左往右打开
-      direction: "rtl",
+      direction: 'rtl',
       orderId: null,
       //区别点击的是添加运力，还是修改
       index: null
-    };
+    }
   },
   created() {
-    this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429";
+    this.truck.requestUrl = '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429'
     this.first.requestUrl =
-      "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
-      "&saleOrderId=" +
-      this.$route.params.saleOrderId;
+      '/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4' +
+      '&saleOrderId=' +
+      this.$route.params.saleOrderId
   },
   methods: {
     onclick() {
       this.first.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
-        "&saleOrderId=" +
+        '/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4' +
+        '&saleOrderId=' +
         this.$route.params.saleOrderId +
-        "&con=" +
+        '&con=' +
         this.input +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     back() {
-      this.$router.go(-1);
+      this.$router.go(-1)
     },
     handleClose(done) {
-      done();
-      this.$message.info("取消修改运力");
+      done()
+      this.$message.info('取消修改运力')
     },
     getRequestUrl() {
       this.first.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
-        "&saleOrderId=" +
+        '/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4' +
+        '&saleOrderId=' +
         this.$route.params.saleOrderId +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     getTruckRequestUrl() {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
         null +
-        "&i=" +
-        new Date();
+        '&i=' +
+        new Date()
     },
     currentRadioChange1(row) {
-      console.log(row);
-      this.capacityId = row.capacityId;
+      console.log(row)
+      this.capacityId = row.capacityId
     },
     //删除运输订单
     deleteClick(scope) {
       let map = {
         orderId: scope.row.orderId,
-        userId: getCookie("userId")
-      };
-      this.$confirm("是否删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+        userId: getCookie('userId')
+      }
+      this.$confirm('是否删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          this.axios.post("/api/v1/oms/closeOmstruckOrder", map).then(res => {
+          this.axios.post('/api/v1/oms/closeOmstruckOrder', map).then(res => {
             if (res.data.code == 200) {
               this.$message({
-                type: "success",
-                message: "删除成功!"
-              });
-              this.getRequestUrl();
+                type: 'success',
+                message: '删除成功!'
+              })
+              this.getRequestUrl()
             } else {
               this.$message({
-                message: "删除失败",
-                type: "warning"
-              });
+                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);
+      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.$message.error('未选中运力')
+        return
       }
       this.axios
-        .post("/api/v1/oms/updateCapacityId", {
+        .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;
+          if (res.data.code == '200') {
+            this.$message.success('修改运力成功')
+            this.getRequestUrl()
+            this.dialogTableVisible = false
           } else {
-            this.$message.error("修改运力失败");
+            this.$message.error('修改运力失败')
           }
-        });
+        })
     },
     handleClick(tab, event) {
-      this.getRequestUrl();
+      this.getRequestUrl()
     },
     Insert() {
-      this.$router.push("addOldSporadicOrder");
+      this.$router.push('addOldSporadicOrder')
     },
     getCapacity() {
       if (this.truckText != null) {
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId") +
-            "&index=" +
-            this.truckText;
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+            getCookie('userId') +
+            '&index=' +
+            this.truckText
         } else {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
             null +
-            "&index=" +
-            this.truckText;
+            '&index=' +
+            this.truckText
         }
-        this.truckText = null;
+        this.truckText = null
       } else {
-        if (getCookie("orgCode") == "chengyunshang") {
+        if (getCookie('orgCode') == 'chengyunshang') {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId") +
-            "&i=" +
-            new Date();
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
+            getCookie('userId') +
+            '&i=' +
+            new Date()
         } else {
           this.truck.requestUrl =
-            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=' +
             null +
-            "&i=" +
-            new Date();
+            '&i=' +
+            new Date()
         }
       }
     }
   }
-};
+}
 </script>
 
 <style lang="scss">