提交代码

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

@@ -651,12 +651,100 @@
       >
       <div>
         <!-- 查询所有的运输单价 -->
-        <dilTable
+        <!-- <dilTable
           v-bind.sync="Address"
           @radio-change="currentRadioChange2"
           :drawer="aaadrawer"
           style="overflow-y:scroll"
-        ></dilTable>
+        ></dilTable> -->
+        <div>
+        <!-- 查询所有的运输单价 -->
+        <el-table
+        :data="priceList"
+        style="width:100%"
+        max-height="400px"
+        @row-click="currentRadioChange2"
+        :border="true"
+        ref="carrierNameTable"
+        >
+        <el-table-column
+          label="选择项"
+          width="55">
+       <template slot-scope="scope">
+      	 <el-radio v-model="tableRadio" :label="scope.row">&nbsp;</el-radio>
+       </template>
+       </el-table-column>
+        <el-table-column
+        type="index"
+        label="序号"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="addressProvince"
+        label="省份"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="addressDistrict"
+        label="市\区"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="addressTown"
+        label="县镇"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="addressDeliveryAddress"
+        label="卸货地点"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="priceValue"
+        label="运价"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="haulDistance"
+        label="参考运距（公里）"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="priceTonKilometer"
+        label="吨公里（元/吨.km）"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="priceDate"
+        label="执行日期"
+        align="center"
+        >
+        </el-table-column>
+        <el-table-column
+        prop="carrierName"
+        label="承运商"
+        align="center"
+        >
+        </el-table-column>
+        </el-table>
+        <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        layout="total,prev,pager,next,sizes"
+        :total="carrierNametotal"
+        :page-sizes="[5, 10, 20, 50, 100]"
+        :page-size="currentPageSize"
+        >
+        </el-pagination>
+      </div>
       </div>
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -734,6 +822,8 @@ export default {
       itemHeight: 30,
       scrollTop: 0,
       totalHeight: 0,
+      //单选框
+      tableRadio:'',
       debounceS: false,
       carNumber: '',
       activeName: 'first',
@@ -749,6 +839,10 @@ export default {
       input: null,
       screen: '',
       screen1: '',
+      //存储单价信息的列表（分页前）
+      priceAllList:[],
+      //存储单价信息的列表（分页后）
+      priceList:[],
       options: [
         {
           value: '客户',
@@ -969,6 +1063,12 @@ export default {
       makeSurePriceOrderList: [],
       makeSurePriceId: null,
       makeSurePlaceId: null,
+      //当前页数
+      currentPage:1,
+      //当前共多少条
+      carrierNametotal:10,
+      //当前尺寸
+      currentPageSize:10,
       detailsAmount: null,
       mapValuenew: {},
       //存放要执行的单价的位置Id，以及价格
@@ -1124,6 +1224,22 @@ export default {
       console.log(this.amsPriceList)
       console.log(this.someOnePriceValueList)
     },
+    handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.currentPageSize=val
+        //计算分页尺寸
+        let startPageNum=(this.currentPage-1)*this.currentPageSize
+        let endPageNum=(this.currentPage)*this.currentPageSize
+        this.priceList=this.priceAllList.slice(startPageNum,endPageNum)
+      },
+    handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.currentPage=val
+        //计算分页尺寸
+        let startPageNum=(this.currentPage-1)*this.currentPageSize
+        let endPageNum=(this.currentPage)*this.currentPageSize
+        this.priceList=this.priceAllList.slice(startPageNum,endPageNum)
+    },
     makeSurePrice() {
       let map = {
         orderList: this.makeSurePriceOrderList,
@@ -1238,34 +1354,65 @@ export default {
       downloadFile(src, `${this.downloadCapacityNo}${title}照片`, '.jpg')
       // this.dialogVisible = true
     },
-    selectAddresClick() {
+    async selectAddresClick() {
+      //计算分页尺寸
+      let startPageNum=(this.currentPage-1)*this.currentPageSize
+      let endPageNum=(this.currentPage)*this.currentPageSize
       if (this.addresText) {
         if (!this.notRoutList.includes('capacityNo')) {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
-            this.addresText
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
+            this.addresText,this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )    
         } else {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&con=' +
             this.addresText +
             '&userId=' +
-            this.userId
+            this.userId,this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )
         }
       } else {
         if (!this.notRoutList.includes('capacityNo')) {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
-            new Date()
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+            new Date(),this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )
         } else {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
             new Date() +
             '&userId=' +
-            this.userId
+            this.userId,this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            ) 
         }
       }
+      this.priceList=this.priceAllList.slice(startPageNum,endPageNum)
     },
-    updateDetailsOrderPrice() {
+    async updateDetailsOrderPrice() {
+      //计算分页尺寸
+      let startPageNum=(this.currentPage-1)*this.currentPageSize
+      let endPageNum=(this.currentPage)*this.currentPageSize
       console.log(this.steelMap)
       if (this.steelMap.actualAddress == null) {
         this.originalAddress = this.steelMap.addressPlace
@@ -1278,15 +1425,25 @@ export default {
           typeof this.steelMap.addressTown != 'undefined' &&
           this.steelMap.addressTown != null
         ) {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
-            new Date() +
-            '&con=' +
-            this.steelMap.addressTown
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+            new Date() +'&con=' +this.steelMap.addressTown,this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )  
         } else {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
-            new Date()
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+            new Date(),this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )  
         }
       } else {
         console.log('进入了2')
@@ -1295,22 +1452,43 @@ export default {
           typeof this.steelMap.addressTown != 'undefined' &&
           this.steelMap.addressTown != null
         ) {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
             new Date() +
             '&con=' +
-            this.steelMap.addressTown
+            this.steelMap.addressTown+
+            '&userId=' +
+            this.userId,this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )
         } else {
-          this.Address.requestUrl =
-            '/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
+          await this.axios.post('/api/v1/ams/getAmsContractTransportPriceForDetail?apiId=519&i=' +
             new Date() +
             '&userId=' +
-            this.userId
+            this.userId,this.steelMap).then(
+              (res)=>{
+                if(res.data.code){
+                  this.priceAllList=res.data.data
+                  this.carrierNametotal=this.priceAllList.length
+                }
+              }
+            )
         }
       }
+      this.priceList=this.priceAllList.slice(startPageNum,endPageNum)
+      // console.log("获取分页后的数据")
+      // console.log(startPageNum)
+      // console.log(endPageNum)
+      // console.log(this.priceAllList)
+      // console.log(this.priceList)
       this.dialogFormVisible = true
     },
     currentRadioChange2(val) {
+      this.tableRadio=val
       console.log('进入了该方法')
       console.log(val)
       //若具体地址有值，清空值