Merge remote-tracking branch 'origin/master'

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

@@ -70,9 +70,11 @@ export default {
       this.loading = true;
       this.isKuang = true;
       if(this.input){
-        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&con=" +this.input;
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&con=" +this.input+"&i="+new Date();
+        this.option2.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date();
       }else{
-        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&i="+new Date();
+        this.option.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=0&i="+new Date();
+        this.option2.requestUrl ="/api/v1/ams/getAmsContractTransportPrice1?apiId=109&deleted=1&con=" +this.input+"&i="+new Date();
       }
     },
     btnclick() {

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

@@ -1,5 +1,13 @@
 <template>
   <div class="tableAllDate">
+    <div class="button-box">
+      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()"
+                 style="width: 500px;height: 120px;font-size: 100px">
+        <!--class="el-icon-printer"-->
+        <!---->
+        打印
+      </el-button>
+    </div>
     <div id="pdfDom1">
       <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
         <div class="blank"></div>
@@ -190,15 +198,11 @@
     <!-- <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="'#pdfDom1'" @click="backScan()">
-        <i class="el-icon-printer"></i>打印
-      </el-button>
-      <el-button type="primary" @click="backScan()">
-        <i class="el-icon-back"></i>返回
-      </el-button>
-    </div>
+    <el-button type="primary" @click="backScan()">
+      <i class="el-icon-back"></i>返回
+    </el-button>
   </div>
+
 </template>
 
 <script>
@@ -278,7 +282,7 @@ export default {
         });
     },
     backScan() {
-      this.$router.go(-2);
+      this.$router.go(-1);
     }
   }
 };

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

@@ -70,7 +70,7 @@ export default {
           this.orderNumber.startsWith("wysdd") == true
         ) {
           this.$router.push({
-            path: "/saleSelfMachine?orderNumber=" + this.orderNumber
+            path: "/printReceipt?orderNumber=" + this.orderNumber
           });
         }
       } else if (this.orderNumber.length > 21) {

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

@@ -478,12 +478,14 @@ export default {
     },
     //运输单价模态框单选选中的事件
     currentRadioChange2(val) {
+      console.log(val);
       //若具体地址有值，清空值
       if (this.place != null) {
         this.place = null;
       }
       (this.address = val.address), (this.addressId = val.addressId);
 
+      this.priceId=val.priceid
       // this.priceMap = {};
       // this.priceMap = val;
     },
@@ -520,7 +522,14 @@ export default {
                     this.$message.success("修改详单单价成功!");
                     //重置未结算详单表单信息
                     this.options1.requestUrl =
-                      "/api/v1/bms/getUnFinishedTruckDetailsOrderList?apiId=176&orderType=1&i=" +
+                      "/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=" +
+                      this.input +
+                      "&startTime=" +
+                      startTime +
+                      "&endTime=" +
+                      endTime +
+                      "&status=0" +
+                      "&i=" +
                       new Date();
                   } else {
                     this.$message.error("修改详单单价失败,请联系管理员!");