|
|
@@ -118,11 +118,17 @@
|
|
|
<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
|
|
|
<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
|
|
|
<!-- 自运合同车牌号需下拉 -->
|
|
|
- <view v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo:"请选择车牌号"}}</view>
|
|
|
- <u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
|
|
|
+ <view v-show="showCar" @click="carno = true">{{detailData.carNo? detailData.carNo+'（'+detailData.tranCarNo+'）':"请选择车牌号"}}</view>
|
|
|
+ <u-picker :range="carList" range-key="carNo1" @confirm='carPicker($event)' v-model="carno"
|
|
|
mode="selector">
|
|
|
</u-picker>
|
|
|
</view>
|
|
|
+ <!-- 移库入库显示入库重量（） -->
|
|
|
+ <view class="row row-bottom">
|
|
|
+ <view class="left">入库重量（吨）</view>
|
|
|
+ <input type="digit" name="grossWeight" v-model='detailData.loadNetWeight'
|
|
|
+ class="right-bottom" placeholder="请输入入库重量"></input>
|
|
|
+ </view>
|
|
|
<view class="row row-bottom" v-if="detailData.outType=='火运'">
|
|
|
<view class="left">车号</view>
|
|
|
<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
|
|
|
@@ -484,12 +490,30 @@
|
|
|
// "MYCGYMHLJ2021102401"
|
|
|
if (res.data.data[i].contractNo == this.detailData
|
|
|
.contractNo) { //如果查到该合同
|
|
|
+ if (res.data.data[i].inOutType == '采购入库') {
|
|
|
+ if (res.data.data[i].unitContractPrice) {
|
|
|
+ this.detailData.tips = '卖方' + res.data.data[i].seller +
|
|
|
+ '（ ' +
|
|
|
+ res.data.data[i].unitContractPrice +
|
|
|
+ '元/吨）'
|
|
|
+ } else {
|
|
|
+ this.detailData.tips = '卖方' + res.data.data[i].seller
|
|
|
+ }
|
|
|
+
|
|
|
+ } else if (res.data.data[i].inOutType == '移库入库') {
|
|
|
+ this.detailData.tips = '出货库' + this.inOutNoList[0].sendWarehouse
|
|
|
+ } else if (res.data.data[i].inOutType == '退库') {
|
|
|
+ this.detailData.tips = '出货库' + this.inOutNoList[0].sendWarehouse
|
|
|
+ }
|
|
|
if (res.data.data[i].deliverType == "1") { //判断自运1，他运2合同
|
|
|
this.showCar = true
|
|
|
} else {
|
|
|
this.showCar = false
|
|
|
}
|
|
|
if (res.data.data[i].tranCarInfoList) {
|
|
|
+ for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
|
|
|
+ res.data.data[i].tranCarInfoList[num].carNo1 = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
|
|
|
+ }
|
|
|
this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
|
|
|
}
|
|
|
}
|
|
|
@@ -499,28 +523,6 @@
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
|
|
|
- this.contractNoList = res.data.data
|
|
|
- for (var i = 0; i < this.contractNoList.length; i++) {
|
|
|
- if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
|
|
|
- if (this.detailData.inOutType == '采购入库') {
|
|
|
- if (this.contractNoList[i].unitContractPrice) {
|
|
|
- this.detailData.tips = '卖方' + this.contractNoList[i].seller +
|
|
|
- '（ ' +
|
|
|
- this.contractNoList[i].unitContractPrice +
|
|
|
- '元/吨）'
|
|
|
- } else {
|
|
|
- this.detailData.tips = '卖方' + this.contractNoList[i].seller
|
|
|
- }
|
|
|
-
|
|
|
- } else if (this.detailData.inOutType == '移库入库') {
|
|
|
- this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
|
|
|
- } else if (this.detailData.inOutType == '退库') {
|
|
|
- this.detailData.tips = '出货库' + this.inOutNoList[0].warehouseName
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
},
|
|
|
inOutChange(e) {
|
|
|
this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
|
|
|
@@ -615,9 +617,17 @@
|
|
|
},
|
|
|
carPicker(e) {
|
|
|
// this.detailData.gradeKey = e[0] + 1
|
|
|
- this.detailData.carNo = this.carList[e].carNo
|
|
|
- this.detailData.tranCarNo = this.carList[e].tranCarNo
|
|
|
- this.detailData.carId = this.carList[e].id
|
|
|
+ this.detailData.carNo = this.carList[e[0]].carNo
|
|
|
+ this.detailData.tranCarNo = this.carList[e[0]].tranCarNo
|
|
|
+ // this.detailData.carNo = this.carList[e].carNo
|
|
|
+ // this.detailData.tranCarNo = this.carList[e].tranCarNo
|
|
|
+ this.detailData.carId = this.carList[e[0]].id
|
|
|
+ if(this.detailData.inOutType=='移库入库'){
|
|
|
+ if(!this.detailData.cost){
|
|
|
+ this.detailData.cost=this.carList[e[0]].cost
|
|
|
+ }
|
|
|
+ this.detailData.loadNetWeight=this.carList[e[0]].loadNetWeight
|
|
|
+ }
|
|
|
},
|
|
|
handlerPicker(e) {
|
|
|
console.log(e)
|
|
|
@@ -718,6 +728,10 @@
|
|
|
this.isEditYF = false
|
|
|
},
|
|
|
submit(num) {
|
|
|
+ if (!this.detailData.inOutTaskNo) {
|
|
|
+ this.$api.msg('暂无入库任务')
|
|
|
+ return
|
|
|
+ }
|
|
|
if (!this.detailData.contractNo) {
|
|
|
this.$api.msg('合同编号不能为空')
|
|
|
return
|
|
|
@@ -874,14 +888,24 @@
|
|
|
this.$api.msg('车牌号输入有误！')
|
|
|
return
|
|
|
}
|
|
|
+ if(this.detailData.moveTaskNo){
|
|
|
+ if (this.detailData.loadNetWeight) {
|
|
|
+ this.$api.msg('入库重量不能为空！')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (!this.detailData.addressUrl && num == 2) {
|
|
|
this.$api.msg('请上传磅单')
|
|
|
return
|
|
|
}
|
|
|
- if (!this.detailData.cost && num == 2) {
|
|
|
- this.$api.msg('未获取到成本，请编辑后提交')
|
|
|
- return
|
|
|
+ if(!this.detailData.cost){
|
|
|
+ this.detailData.cost=0
|
|
|
}
|
|
|
+ // if (!this.detailData.cost && num == 2) {
|
|
|
+ // this.$api.msg('未获取到成本，请编辑后提交')
|
|
|
+ // return
|
|
|
+ // }
|
|
|
if (String(this.detailData.cost).indexOf('.') != -1 && String(this.detailData
|
|
|
.cost).length - (String(
|
|
|
this.detailData.cost).indexOf('.') + 1) > 2) {
|
|
|
@@ -1084,6 +1108,9 @@
|
|
|
font-weight: 600;
|
|
|
color: #333333;
|
|
|
}
|
|
|
+ .left{
|
|
|
+ width: 220rpx;
|
|
|
+ }
|
|
|
|
|
|
.row {
|
|
|
display: flex;
|
wangchao