提交代码

src/components/main.vue

@@ -339,7 +339,7 @@
               :hidden="badgeshow"
             >
               <el-button type="text" size="small" @click="goMyTaskPage"
-                > <i class="el-icon-message-solid" style="width:30px;height: 30px;"></i></el-button
+                > <i class="el-icon-message-solid" style="font-size:25px"></i></el-button
               >
             </el-badge>
             <div

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

@@ -510,12 +510,12 @@ export default {
       }
     },
     makeSure() {
-      if (this.haulDistance=="" || this.haulDistance==null){
-        this.$message({
-          type: "warning",
-          message: "请输入运输距离!",});
-        return;
-      }
+      // if (this.haulDistance=="" || this.haulDistance==null){
+      //   this.$message({
+      //     type: "warning",
+      //     message: "请输入运输距离!",});
+      //   return;
+      // }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }

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

@@ -456,12 +456,12 @@ export default {
       }
     },
     makeSure() {
-      if (this.haulDistance=="" || this.haulDistance==null){
-        this.$message({
-          type: "warning",
-          message: "请输入运输距离!",});
-        return;
-      }
+      // if (this.haulDistance=="" || this.haulDistance==null){
+      //   this.$message({
+      //     type: "warning",
+      //     message: "请输入运输距离!",});
+      //   return;
+      // }
       for (let i = 0; i < this.selectionList.length; i++) {
         this.carrierIdArray.push(this.selectionList[i].carrierId)
       }
@@ -512,6 +512,7 @@ export default {
         return
       }
       console.log("进入了修改单价的方法")
+      this.form1.haulDistance=this.haulDistance
       console.log(this.form1)
       this.axios.post("/api/v1/ams/updatePriceValue",this.form1).
       then(res=>{

src/views/index/components/printScan1.vue

@@ -188,17 +188,17 @@ export default {
           this.orderNumber.startsWith('WYSDD') == true ||
           this.orderNumber.startsWith('wysdd') == true
         ) {
-          let promise = await this.querynumber(this.orderNumber)
-          console.log(promise)
-          if (promise == 1) {
-            this.backgroundImgURL=this.backgroundImgURLList[1]
-            this.orderNumber = null
-            setTimeout(()=>{
-              this.backgroundImgURL=this.backgroundImgURLList[0]
-              console.log("进入该方法了")
-            },4000)
-            return
-          }
+          // let promise = await this.querynumber(this.orderNumber)
+          // console.log(promise)
+          // if (promise == 1) {
+          //   this.backgroundImgURL=this.backgroundImgURLList[1]
+          //   this.orderNumber = null
+          //   setTimeout(()=>{
+          //     this.backgroundImgURL=this.backgroundImgURLList[0]
+          //     console.log("进入该方法了")
+          //   },4000)
+          //   return
+          // }
           this.$router.push({
             path: '/printReceipt1?orderNumber=' + this.orderNumber
           })

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

@@ -1114,11 +1114,11 @@ export default {
         orderId:""
       }
       let mapValue1={
-        priceValue:""
+        detailsAmount:""
       }
       this.makeSurePriceOrderList = this.$refs.tableRef.selection.map(e => {
         //运价判断
-        mapValue1.priceValue=e.priceValue
+        mapValue1.detailsAmount=e.detailsAmount
         this.someOnePriceValueList.push(mapValue1)
         mapvalue.placeId=e.placeId
         mapvalue.priceValue=e.priceValue
@@ -1140,7 +1140,7 @@ export default {
       console.log(map)
       let flag=0;
       this.someOnePriceValueList.forEach((e)=>{
-        if(e.priceValue==null){
+        if(e.detailsAmount==null){
           console.log("进入了flag++")
           flag++
         }
@@ -1148,7 +1148,7 @@ export default {
       if(flag!=0){
         this.$message({
               type: 'error',
-              message: '没有单价',
+              message: '没有最终运费',
               duration: 2000,
               offset: '250'
             })