高敬炎 2 年之前
父节点
当前提交
f958c86556

+ 16 - 23
src/views/outboundManagement/weighingManagementNew.vue

@@ -1534,27 +1534,22 @@
           //   })
           //   return
           // }
-          console.log(this.outContractNo,1111)
           if(this.weighingList.agreementType!='代储合同'&&this.tpyeNo == 1){
-            if(this.weighingList.agreementType=='销售合同'&&this.outContractNo.settlementWeightMethod==1||this.weighingList.agreementType!='销售合同'){
-              if (!this.weighingList.contractPrice && this.weighingList.inOutType != '移库出库'
-              ||this.weighingList.inOutType == '移库出库'&&this.weighingList.priceType=='随行就市'&&this.weighingList.warehouseType==2) {
-                this.$message({
-                  message: '价格不能为空',
-                  type: 'warning',
-                })
-                return
-              }
-              console.log(this.isNumber(this.weighingList.contractPrice))
-              if(!this.isNumber(this.weighingList.contractPrice)&&!this.priceedit){
-                this.$message({
-                  message: '价格不能为非数字',
-                  type: 'warning',
-                })
-                return
-              }
+            if (!this.weighingList.contractPrice && this.weighingList.inOutType == '销售出库'&&this.weighingList.priceType=='随行就市'&&this.weighingList.settlementWeightMethod==1) {
+              this.$message({
+                message: '价格不能为空',
+                type: 'warning',
+              })
+              return
             }
-            
+            // console.log(this.isNumber(this.weighingList.contractPrice))
+            // if(!this.isNumber(this.weighingList.contractPrice)&&!this.priceedit){
+            //   this.$message({
+            //     message: '价格不能为非数字',
+            //     type: 'warning',
+            //   })
+            //   return
+            // }
           }
           
           if (
@@ -2477,13 +2472,12 @@
                   }
                 })
               }
-              
+              this.weighingList.priceType=this.outContractNo.priceType
+              this.weighingList.settlementWeightMethod=this.outContractNo.settlementWeightMethod
               if(this.outContractNo.priceType=='随行就市'){
                 this.priceedit=false
               }else if(this.outContractNo.priceType=='定价销售'){
                 this.priceedit=false
-              }{
-
               }
               this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
               this.weighingList.numberLetter = 'XSCK'
@@ -2516,7 +2510,6 @@
                    }
                 }
               }
-              this.weighingList.priceType=this.outContractNo.priceType
               this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
               this.weighingList.numberLetter = 'YKCK'
 

+ 330 - 347
src/views/taskManagement/tranManagementLook.vue

@@ -6,50 +6,35 @@
         <h2 class="bg-left title">查看运输任务</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="revert()"
-          ><img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()"><img width="6" height="10"
+            style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
       </el-col>
     </el-row>
-    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+    <el-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
-        <ws-info-table>
-          <ws-form-item label="任务编号" span="1" prop="taskNo">
+        <ws-info-table class="el-table">
+          <el-form-item label="任务编号" span="1" prop="taskNo">
             {{ deptBudgetList.taskNo }}
-          </ws-form-item>
-          <ws-form-item label="合同编号/移库任务编号" span="1" prop="contractNo">
+          </el-form-item>
+          <el-form-item label="合同编号/移库任务编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
-          </ws-form-item>
-          <ws-form-item label="货名" span="1" prop="goodsName" class="readonly">
+          </el-form-item>
+          <el-form-item label="货名" span="1" prop="goodsName" class="readonly">
             {{ deptBudgetList.goodsName }}
-          </ws-form-item>
-          <ws-form-item label="重量(吨)" span="1" prop="weight">
+          </el-form-item>
+          <el-form-item label="重量(吨)" span="1" prop="weight">
             {{ deptBudgetList.weight }}
-          </ws-form-item>
+          </el-form-item>
         </ws-info-table>
         <div class="address">
-          <ws-info-table>
-            <ws-form-item label="始发地" span="1" prop="netWeight">
-              {{ deptBudgetList.startPrivate }}{{ deptBudgetList.startCity
-              }}{{ deptBudgetList.startArea 
-              }}{{ deptBudgetList.startDetailedAddress }}
-              ({{deptBudgetList.sendWarehouse}})
-            </ws-form-item>
-            <ws-form-item label="终到地" span="1" prop="netWeight">
-              {{ deptBudgetList.endPrivate }}{{ deptBudgetList.endCity
-              }}{{ deptBudgetList.endArea}}{{ deptBudgetList.endDetailedAddress }} 
-                ({{deptBudgetList.receiveWarehouse}})
-            </ws-form-item>
+          <ws-info-table class="el-table">
+            <el-form-item label="始发地" span="1" prop="netWeight">
+              {{ deptBudgetList.startPrivate }}{{ deptBudgetList.startCity}}{{ deptBudgetList.startArea}}{{ deptBudgetList.startDetailedAddress }}({{deptBudgetList.sendWarehouse?deptBudgetList.sendWarehouse:''}})
+            </el-form-item>
+            <el-form-item label="终到地" span="1" prop="netWeight">
+              {{ deptBudgetList.endPrivate }}{{ deptBudgetList.endCity}}{{ deptBudgetList.endArea}}{{ deptBudgetList.endDetailedAddress }}{{deptBudgetList.receiveWarehouse?deptBudgetList.receiveWarehouse:''}})
+            </el-form-item>
           </ws-info-table>
         </div>
         <div class="inspector">
@@ -61,368 +46,366 @@
           </el-checkbox-group>
         </div>
       </div>
-     <div
-        v-for="(item, index) in deptBudgetList.tranProcessInfoList"
-        :key="index"
-        class="datafor"
-      >
+      <div v-for="(item, index) in deptBudgetList.tranProcessInfoList" :key="index" class="datafor">
         <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }})
-          <!-- <el-checkbox
-            class="endflag"
-            true-label="1"
-            disabled
-            false-label="0"
-            v-model="item.endFlag"
-            :label="1"
-            >粮款结算阶段</el-checkbox
-          > -->
         </div>
-          <ws-info-table class="el-table">
-         <ws-form-item label="运输方式" span="1" prop="tranType">
+        <ws-info-table class="el-table">
+          <el-form-item label="运输方式" span="1" prop="tranType">
             {{ item.tranType }}
-          </ws-form-item>
-          <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          </el-form-item>
+          <el-form-item label="发货日期" span="1" prop="deliveryDateStart">
             {{ item.deliveryDateStart }}
-          </ws-form-item>
-          <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          </el-form-item>
+          <el-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
             {{ item.deliveryDateEnd }}
-          </ws-form-item>
-          <ws-form-item label="本阶段运输重量(吨)" span="1" prop="weight">
+          </el-form-item>
+          <el-form-item label="本阶段运输重量(吨)" span="1" prop="weight">
             {{ item.weight }}
-          </ws-form-item>
+          </el-form-item>
         </ws-info-table>
         <ws-info-table>
-          <ws-form-item label="发货地区" span="1" prop="waterContent">
+          <el-form-item label="发货地区" span="1" prop="waterContent">
             {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
-          </ws-form-item>
-           <!-- <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item>  -->
-          <ws-form-item label="发货人" span="1" prop="sender">
+          </el-form-item>
+          <el-form-item label="发货人" span="1" prop="sender">
             {{ item.sender }}
-          </ws-form-item>
-          <ws-form-item label="发货人电话" span="1" prop="senderPhone">
+          </el-form-item>
+          <el-form-item label="发货人电话" span="1" prop="senderPhone">
             {{ item.senderPhone }}
-          </ws-form-item>
-        </ws-info-table>    
+          </el-form-item>
+        </ws-info-table>
         <ws-info-table>
-          <ws-form-item label="收货地区" span="1" prop="waterContent">
+          <el-form-item label="收货地区" span="1" prop="waterContent">
             {{ item.receivePrivate }}/{{ item.receiveCity
             }}/{{ item.receiveArea }}
-          </ws-form-item>
-          <!-- <ws-form-item
-            label="收货地详细地址"
-            span="1"
-            prop="receiveDetailedAddress"
-          >
-            {{ item.receiveDetailedAddress }}
-          </ws-form-item> -->
-          <ws-form-item label="收货人" span="1" prop="receiver">
+          </el-form-item>
+          <el-form-item label="收货人" span="1" prop="receiver">
             {{ item.receiver }}
-          </ws-form-item>
-          <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          </el-form-item>
+          <el-form-item label="收货人电话" span="1" prop="receiverPhone">
             {{ item.receiverPhone }}
-          </ws-form-item>  
+          </el-form-item>
         </ws-info-table>
-      </div> 
+      </div>
       <div style="text-align: right; padding: 10px">
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="revert()"
-          >关闭</el-button
-        >
+        <el-button class="bg-bottom-up" type="primary" size="small" @click="revert()">关闭</el-button>
       </div>
-    </ws-form>
+    </el-form>
   </div>
 </template>
 <script>
-import { examinetran } from '@/model/tasksport/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
-    isShow(val) {
-      this.showType = val
+  import {
+    examinetran
+  } from '@/model/tasksport/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  // import { dayjs, fmoney, EventBus } from 'base-core-lib'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //多选按钮
-      checkList: [],
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      goodnameList: {},
-      // 提交类型
-      submitType: true,
-      storageType: [],
-      readonly: true,
-      appendixIdsAdd: '',
-      uploadSuccess: {},
-      onChange: {},
-      gradeList: [],
-      rules: {
-        netWeight: [
-          {
+    watch: {},
+    data() {
+      return {
+        //多选按钮
+        checkList: [],
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        goodnameList: {},
+        // 提交类型
+        submitType: true,
+        storageType: [],
+        readonly: true,
+        appendixIdsAdd: '',
+        uploadSuccess: {},
+        onChange: {},
+        gradeList: [],
+        rules: {
+          netWeight: [{
             required: true,
             type: 'number',
             message: '请输入活动名称',
             trigger: 'blur',
-          },
-        ],
-      },
-      size: 10,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      deptBudgetList: {},
-      historyList: [],
-
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
+          }, ],
         },
-      },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-  },
-  methods: {
-    //返回按钮
-    revert() {
-      this.$router.push({ path: 'tranManagementTransport' })
+        size: 10,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        packtypeList: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        contractList: [],
+        deptBudgetList: {},
+        historyList: [],
+        accessoryTFs: false,
+      }
+    },
+    activated() {
+      this.getList()
     },
-    getList() {
-      examinetran({ id: this.$route.query.id })
-        .toPromise()
-        .then((response) => {
-          this.checkList = response.tranType.split(',')
-          this.deptBudgetList = response
-          // for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
-          //   this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress='黑龙江省黑河市五大连池市沾河林业局'
-            
-          // }
+    methods: {
+      //返回按钮
+      revert() {
+        this.$router.push({
+          path: 'tranManagementTransport'
         })
+      },
+      getList() {
+        examinetran({
+            id: this.$route.query.id
+          })
+          .toPromise()
+          .then((response) => {
+
+            this.checkList = response.tranType.split(',')
+            this.deptBudgetList = response
+          })
+      },
+      approve() {},
+      listQuery() {},
     },
-    approve() {},
-    listQuery() {},
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .ws-info-table {
-    border: none;
-  }
-  .el-form-item {
-    width: 33.3333%;
-    border: none;
-    .el-form-item__label {
-      background: transparent;
+  /deep/.basicInformation {
+    .ws-info-table {
       border: none;
     }
-    .el-form-item__content {
+
+    .el-form-item {
+      width: 33.3333%;
       border: none;
+
+      .el-form-item__label {
+        background: transparent;
+        border: none;
+      }
+
+      .el-form-item__content {
+        border: none;
+      }
     }
   }
-}
-.title {
-  position: relative;
-  padding-left: 10px;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-form {
-  padding: 0 10%;
-  margin-top: 50px;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-.bg-right {
-  text-align: right;
-  padding: 16px 20px;
-}
-/deep/.address .ws-info-table .el-form-item {
-  width: 100%;
-  border: none;
-}
-/deep/.address .el-form-item .el-form-item__content {
-  width: 30%;
-}
-.container {
-  overflow: scroll;
-  height: 120vh;
-}
-
-.deliverydate {
-  display: inline-block;
-  width: 10%;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-  border: none;
-  width: -webkit-min-content;
-
-}
-
-.inspector {
-  margin-top: 10px;
-}
-.inspector .zi {
-  text-align: center;
-  margin-left: 22px;
-  color: #69708C;
-  font-size: 14px;
-}
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-  padding: 4px 2px;
-}
-.el-checkbox-group {
-  margin-left: 120px;
-  margin-top: -20px;
-}
-//底部表格
-/deep/.nei {
-  .ws-info-table {
+
+  .title {
+    position: relative;
+    padding-left: 10px;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-form {
+    padding: 0 10%;
+    margin-top: 50px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  .bg-right {
+    text-align: right;
+    padding: 16px 20px;
+  }
+
+  /deep/.address .ws-info-table .el-form-item {
+    width: 100%;
     border: none;
   }
-  .el-form-item {
-    // width: 33.3333%;
+
+  /deep/.address .el-form-item .el-form-item__content {
+    width: 30%;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 120vh;
+  }
+
+  .deliverydate {
+    display: inline-block;
+    width: 10%;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    text-align: center;
+    font-size: 14px;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
     border: none;
-    .el-form-item__label {
-      background: transparent;
+    width: -webkit-min-content;
+
+  }
+
+  .inspector {
+    margin-top: 10px;
+  }
+
+  .inspector .zi {
+    text-align: center;
+    margin-left: 22px;
+    color: #69708C;
+    font-size: 14px;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+    padding: 4px 2px;
+  }
+
+  .el-checkbox-group {
+    margin-left: 120px;
+    margin-top: -20px;
+  }
+
+  //底部表格
+  /deep/.nei {
+    .ws-info-table {
       border: none;
     }
-    .el-form-item__content {
+
+    .el-form-item {
+      // width: 33.3333%;
       border: none;
+
+      .el-form-item__label {
+        background: transparent;
+        border: none;
+      }
+
+      .el-form-item__content {
+        border: none;
+      }
     }
   }
-}
-/deep/.neifor {
-  .ws-info-table {
-    border: none;
-  }
-  .el-form-item {
-    // width: 33.3333%;
-    border: none;
-    .el-form-item__label {
-      background: transparent;
+
+  /deep/.neifor {
+    .ws-info-table {
       border: none;
     }
-    .el-form-item__content {
+
+    .el-form-item {
+      // width: 33.3333%;
       border: none;
+
+      .el-form-item__label {
+        background: transparent;
+        border: none;
+      }
+
+      .el-form-item__content {
+        border: none;
+      }
     }
   }
-}
-.ws-info-table .el-form-item {
-  width: 25%;
-  height: 50px;
-  color: #69708c;
-  font-size: 14px;
-}
-/deep/.basicInformation .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-/deep/.inspector .el-form-item .el-form-item__label {
-  width: 30%;
-}
-.datafor {
-  border: 1px solid #d8dce6;
-  border-radius: 5px;
-  margin-top: 30px;
-  border-left: 5px solid #8890B1;
-}
-/deep/.datafor .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 5px;
-}
-/deep/.datafor .ws-info-table .el-form-item .el-form-item__label {
-  background: #fafbfc;
-  background: none;
-}
-/deep/.ws-info-table,
-/deep/.ws-info-table .el-form-item {
-  border: none;
-}
-/deep/.ws-info-table{
-  width: 99%;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-.driver {
-  margin-left: 20px;
-  height: 32px;
-  line-height: 30px;
-  font-size: 16px;
-  color: #69708c;
-}
-.el-form{
-      height: 73vh;
+
+  .ws-info-table .el-form-item {
+    width: 25%;
+    height: 50px;
+    color: #69708c;
+    font-size: 14px;
+  }
+
+  /deep/.basicInformation .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+  }
+
+  /deep/.inspector .el-form-item .el-form-item__label {
+    width: 30%;
+  }
+
+  .datafor {
+    border: 1px solid #d8dce6;
+    border-radius: 5px;
+    margin-top: 30px;
+    border-left: 5px solid #8890B1;
+  }
+
+  /deep/.datafor .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 5px;
+  }
+
+  /deep/.datafor .ws-info-table .el-form-item .el-form-item__label {
+    background: #fafbfc;
+    background: none;
+  }
+
+  /deep/.ws-info-table,
+  /deep/.ws-info-table .el-form-item {
+    border: none;
+  }
+
+  /deep/.ws-info-table {
+    width: 99%;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  .driver {
+    margin-left: 20px;
+    height: 32px;
+    line-height: 30px;
+    font-size: 16px;
+    color: #69708c;
+  }
+
+  .el-form {
+    height: 73vh;
     overflow: scroll;
-}
+  }
 </style>

+ 7 - 7
src/views/tranManagement/tranManagementReceivingloading.vue

@@ -639,13 +639,13 @@ export default {
           return
         }
 
-        // if (this.deptBudgetList.priceType!=null&&this.deptBudgetList.priceType=='随行就市'&&!this.freightspace[i].contractPrice&&this.freightspace[i].unloadNetWeight>0) {
-            // this.$message({
-            //   message: '单价不能为空!',
-            //   type: 'warning',
-            // })
-            // return
-        // }
+        if (this.deptBudgetList.priceType!=null&&this.deptBudgetList.priceType=='随行就市'&&this.deptBudgetList.settlementWeightMethod=='2'&&!this.freightspace[i].contractPrice&&this.freightspace[i].unloadNetWeight>0) {
+            this.$message({
+              message: '单价不能为空!',
+              type: 'warning',
+            })
+            return
+        }
     }
       this.$confirm(
         `所有车辆完成卸车任务后,请及时修改任务状态,确定提交卸车信息?`,

+ 16 - 1
src/views/tranManagement/tranManagementthirdpartnarReceiving.vue

@@ -98,6 +98,14 @@
                 maxlength="20"
                 size="small"
               /></ws-form-item>
+              <ws-form-item label="单价(元/吨):" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+                <ws-input
+                  v-model="item.contractPrice"
+                  placeholder="请输入单价"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
           </ws-info-table>
         </div>
       </div>
@@ -471,6 +479,13 @@ export default {
             })
             return
           }
+           if (this.deptBudgetList.priceType!=null&&this.deptBudgetList.priceType=='随行就市'&&this.deptBudgetList.settlementWeightMethod=='2'&&!this.freightspace[i].contractPrice&&this.freightspace[i].unloadNetWeight>0) {
+            this.$message({
+              message: '单价不能为空!',
+              type: 'warning',
+            })
+            return
+        }
           // if (
           //   this.freightspace[i].unloadNetWeight > 200 ||
           //   this.freightspace[i].unloadNetWeight < 0
@@ -559,7 +574,7 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              posttranprocessinfo({id:this.deptBudgetList.id,contractNo:this.deptBudgetList.contractNo,tranCarInfoList1,tranCarInfoList2,tranCarInfoList3,tranCarInfoList4})
+              posttranprocessinfo({id:this.deptBudgetList.id,infoId:this.deptBudgetList.infoId,contractNo:this.deptBudgetList.contractNo,tranCarInfoList1,tranCarInfoList2,tranCarInfoList3,tranCarInfoList4})
                 .toPromise()
                 .then((response) => {
                   this.$message.success('提交成功')