提交代码

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

@@ -107,8 +107,7 @@
         <el-form-item v-show="activeName=='first'">
           <el-button type="primary" @click="makeSurePrice"
           v-if="!notRoutList.includes('capacityNo')"
-            ><i class="el-icon-circle-check"></i>确认执行价</el-button
-          >
+            ><i class="el-icon-circle-check"></i>确认执行价</el-button>
         </el-form-item>
          <el-form-item v-show="activeName=='second'">
           <el-button type="primary" @click="openStatement">
@@ -928,7 +927,7 @@ export default {
         startPointName: '',
         endPointName: ''
       },
-      someOnePriceValue:"",
+      someOnePriceValueList:[],
       saleSteelKey: false,
       tableRowIndex: '',
       isRowClick: 0,
@@ -978,6 +977,9 @@ export default {
       makeSurePlaceId: null,
       detailsAmount: null,
       mapValuenew:{},
+      //存放要执行的单价的位置Id，以及价格
+      amsPriceList:[],
+      placeIds:[],
       //用于赋予承运商的权限
       userId:'',
       ops: {
@@ -1102,20 +1104,48 @@ export default {
   computed: {},
   methods: {
     handleSelectionChange() {
+      this.amsPriceList=[]
       this.makeSurePriceOrderList = []
+      this.someOnePriceValueList=[]
       console.log(this.$refs.tableRef.selection, 'selection')
+      let mapvalue={
+        placeId:"",
+        priceValue:"",
+        orderId:""
+      }
+      let mapValue1={
+        priceValue:""
+      }
       this.makeSurePriceOrderList = this.$refs.tableRef.selection.map(e => {
         //运价判断
-        this.someOnePriceValue=e.priceValue
+        mapValue1.priceValue=e.priceValue
+        this.someOnePriceValueList.push(mapValue1)
+        mapvalue.placeId=e.placeId
+        mapvalue.priceValue=e.priceValue
+        mapvalue.orderId=e.orderId
+        this.amsPriceList.push(mapvalue)
         return e.orderId
       })
       console.log(this.makeSurePriceOrderList)
+      console.log(this.amsPriceList)
+      console.log(this.someOnePriceValueList)
     },
     makeSurePrice() {
       let map = {
-        orderList: this.makeSurePriceOrderList
+        orderList: this.makeSurePriceOrderList,
+        amsPriceList:this.amsPriceList
       }
-      if(this.priceValue==null){
+      console.log("确认执行价的顺序")
+      console.log(this.makeSurePriceOrderList)
+      console.log(map)
+      let flag=0;
+      this.someOnePriceValueList.forEach((e)=>{
+        if(e.priceValue==null){
+          console.log("进入了flag++")
+          flag++
+        }
+      })
+      if(flag!=0){
         this.$message({
               type: 'error',
               message: '没有单价',
@@ -1126,6 +1156,7 @@ export default {
       }
       console.log("确认执行价的顺序")
       console.log(this.makeSurePriceOrderList)
+      console.log(map)
       this.axios
         .post('/api/v1/bms/updateDetailsStatus', map)
         .then(res => {
@@ -1156,6 +1187,7 @@ export default {
             offset: '250'
           })
         })
+        this.amsPriceList=[]
     },
     openStatement(){
       console.log(this.$refs.tableRef1.selection, 'selection');
@@ -1275,6 +1307,7 @@ export default {
       console.log(this.userId)
       console.log(this.makeSurePriceOrderList)
       if (this.makeSurePriceOrderList.length == 0) {
+        this.amsPriceList=[]
         this.$message({
           type: 'success',
           message: '请先选择需要修改的单价',
@@ -1319,12 +1352,14 @@ export default {
             this.dialogFormVisible = false
           }
         })
+        this.amsPriceList=[]
     },
     //修改单价和收货地址
     makeSureAll(){
       console.log("获取数据")
       console.log(this.userId)
       if (this.makeSurePriceOrderList.length == 0) {
+        this.amsPriceList=[]
         this.$message({
           type: 'success',
           message: '请先选择需要修改的单价',
@@ -1361,6 +1396,7 @@ export default {
                   this.dialogFormVisible = false
                 }
               })
+              this.amsPriceList=[]
     },
     hanleScroll() {
       console.log('我滚动了')
@@ -2919,6 +2955,7 @@ export default {
     },
     //获取钢材统计报表
     getSteelReport() {
+      this.amsPriceList=[]
       const loading = this.$loading({
         lock: true,
         text: '正在获取数据,请稍候',