提交代码

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

@@ -125,7 +125,7 @@
       </el-form>
     </div>
     <div class="table11">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" style="margin-left: 20px;">
         <el-tab-pane label="未结算" name="first">
           <div class="table">
             <el-table
@@ -251,7 +251,7 @@
                 label="实际收货地址"
                 width="250px"
                 sortable
-                column-key="addressPlace"
+                column-key="actualAddress"
                 :filters="filteraddressPlace"
               >
               </el-table-column>
@@ -379,7 +379,7 @@
           <div class="table1">
             <el-table
               :data="visibleList1"
-              :span-method="objectSpanMethod"
+              :span-method="objectSpanMethod1"
               ref="tableRef1"
               border
               style="width: 100%; margin-top: 20px"
@@ -712,7 +712,8 @@
       </div>
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="makeSure">确 定</el-button>
+        <el-button type="primary" @click="makeSure">修改下货地址和单价</el-button>
+        <el-button type="primary" @click="makeSure">只修改单价</el-button>
       </div>
     </el-drawer>
   </div>
@@ -838,6 +839,40 @@ export default {
         '最终运价',
         '摘要'
       ],
+      //需要合并列的名称(已结算)
+      mergeList1: [
+        '选择',
+        '序号',
+        '整车操作',
+        '销售订单状态',
+        '销售订单号',
+        '发货单位',
+        '司机电话',
+        '运输订单号',
+        '签收地址',
+        '签收时间',
+        '抵达地址',
+        '抵达时间',
+        '出厂时间',
+        '进厂时间',
+        '运单状态',
+        '车牌号',
+        '承运商',
+        '客户',
+        '收货地址',
+        '实际收货地址',
+        '业务员',
+        '送货单打印',
+        '收货客户电话',
+        '是否自提',
+        '订单日期',
+        '短信发送',
+        '销售片区',
+        '抵达时间',
+        '签收时间',
+        '最终运价',
+        '摘要'
+      ],
       //钢材多拼车辆线路ID
       //索引从1-10为1-10拼路线ID
       lineSpelling: [
@@ -944,6 +979,7 @@ export default {
       makeSurePriceId: null,
       makeSurePlaceId: null,
       detailsAmount: null,
+      mapValuenew:{},
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -1119,7 +1155,7 @@ export default {
       }
     },
     updateDetailsOrderPrice() {
-      this.originalAddress = this.steelMap.addressPlace
+      this.originalAddress = this.steelMap.actualAddress
       this.originalPriceValue = this.steelMap.priceValue
       this.Address.requestUrl =
         '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
@@ -1139,14 +1175,9 @@ export default {
       this.makeSurePlaceId = val.placeId
       this.detailsAmount=val.detailsAmount
     },
+    //只修改单价
     makeSure() {
       //若没有单价Id
-      // let mapValue = {
-      //   orderId: this.steelMap.orderId,
-      //   priceId: this.steelMap.priceId,
-      //   placeId: this.steelMap.placeId,
-      //   detailsAmount: this.steelMap.mapList[0].detailsAmount
-      // }
       console.log(this.makeSurePriceOrderList)
       if (this.makeSurePriceOrderList.length == 0) {
         this.$message({
@@ -1158,46 +1189,63 @@ export default {
         return
       }
       let mapList = []
-      debugger
       this.makeSurePriceOrderList.forEach(e => {
         let map = {}
         map.orderId = e
         map.priceId = this.makeSurePriceId
         map.placeId = this.makeSurePlaceId
-        map.detailsAmount=this.detailsAmount
         mapList.push(map)
       })
       let mapValue = {}
       mapValue.mapList = mapList
-      //是否确定修改详单地址!
-      this.$confirm('确定修改', '提示', {
-        confirmButtonText: '仅修改单价',
-        cancelButtonText: '修改下货地址和单价',
-        distinguishCancelAndClose: true,
-        type: 'warning',
-        center: true
-      })
-        .then(() => {
+      // //是否确定修改详单地址!
+      // this.$confirm('确定修改', '提示', {
+      //   confirmButtonText: '仅修改单价',
+      //   cancelButtonText: '修改下货地址和单价',
+      //   distinguishCancelAndClose: true,
+      //   type: 'warning',
+      //   center: true
+      // })
+      //   .then(() => {
           //初始化修改详单地址对话框的信息
-          this.axios
-            .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
-            .then(res => {
-              if (res.data.code == '200') {
-                this.$message.success('修改详单单价成功!')
-                this.$refs.tableRef.clearSelection()
-                //重置未结算详单表单信息
-                // this.operation(this.steelMap)
-                this.getSteelReport()
-                this.dialogFormVisible = false
-              } else {
-                this.$message.error('修改失败:'+res.data.data)
-                this.dialogFormVisible = false
-              }
-            })
+      this.axios
+        .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.$message.success('修改详单单价成功!')
+            this.$refs.tableRef.clearSelection()
+            //重置未结算详单表单信息
+            // this.operation(this.steelMap)
+            this.getSteelReport()
+            this.dialogFormVisible = false
+          } else {
+            this.$message.error('修改失败:'+res.data.data)
+            this.dialogFormVisible = false
+          }
+        })
+    },
+    //修改单价和收货地址
+    makeSureAll(){
+      if (this.makeSurePriceOrderList.length == 0) {
+        this.$message({
+          type: 'success',
+          message: '请先选择需要修改的单价',
+          duration: 2000,
+          offset: '250'
         })
-        .catch(action => {
-          if (action === 'cancel') {
-            mapValue.updatePlace = 1
+        return
+      }
+      let mapList = []
+      this.makeSurePriceOrderList.forEach(e => {
+        let map = {}
+        map.orderId = e
+        map.priceId = this.makeSurePriceId
+        map.placeId = this.makeSurePlaceId
+        mapList.push(map)
+      })
+      let mapValue = {}
+      mapValue.mapList = mapList
+      mapValue.updatePlace = 1
             this.axios
               .post('/api/v1/bms/updateBatchDetailsOrder', mapValue)
               .then(res => {
@@ -1212,9 +1260,6 @@ export default {
                   this.dialogFormVisible = false
                 }
               })
-          }
-          //初始化修改详单地址对话框的信息
-        })
     },
     hanleScroll() {
       console.log('我滚动了')
@@ -1688,7 +1733,9 @@ export default {
         })
     },
     cellClik(row, column, cell, event) {
+      console.log("点击事件")
       console.log(row)
+      console.log(column)
       if (column.property == 'arrivalAddress') {
         if (row.orderNo && row.arrivalAddress) {
           this.downloadCapacityNo = row.capacityNo
@@ -1701,6 +1748,7 @@ export default {
           this.receipctPhotoClick(row.orderNo, 1)
         }
       }
+      this.$refs.tableRef.toggleRowSelection(row)
     },
     //反关闭运单
     reverseCloseOrder() {
@@ -2432,6 +2480,16 @@ export default {
         }
       }
     },
+    objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
+      if (this.mergeList1.indexOf(column.label) != -1) {
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
     //计算总件数和总车数
     getTotalNum(data) {
       //通过车序号的个数来计算车数
@@ -2622,7 +2680,6 @@ export default {
           console.log(this.visibleList, 'this.visibleList')
           this.getSpanArr(this.visibleList)
           this.getTotalNum(this.tableData)
-          loading.close()
           console.log(this.visibleList)
         })
       this.axios
@@ -2656,9 +2713,9 @@ export default {
           console.log(this.visibleList1, 'this.visibleList1')
           this.getSpanArr(this.visibleList1)
           this.getTotalNum(this.tableData)
-          loading.close()
           console.log(this.visibleList1)
         })
+        loading.close()
     },
     //重新获取表格数据
     refresh() {
@@ -2809,8 +2866,6 @@ export default {
     margin-top: 20px;
   }
   .table {
-    margin-left: 20px;
-    margin-top: 20px;
     .el-tooltip {
       width: auto !important;
     }