|
|
@@ -18,14 +18,19 @@
|
|
|
<input v-model='detailData.contractNo' style="width: 200px;" class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
- <view class="left">提示</view>
|
|
|
- <view class="right">{{detailData.tips}}</view>
|
|
|
+ <view class="left" style="width: 100px;">提示</view>
|
|
|
+ <view class="right" style="text-align: right;">{{detailData.tips}}</view>
|
|
|
</view>
|
|
|
<view class="row">
|
|
|
<view class="left">货名</view>
|
|
|
<view class="right">{{detailData.goodsName ? detailData.goodsName : "选择合同，自动获取"}}
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view class="row row-bottom" v-if="detailData.inOutType == '销售出库'">
|
|
|
+ <view class="left">价格(元/吨)</view>
|
|
|
+ <input type="digit" v-model='detailData.cost' class="right-bottom"
|
|
|
+ placeholder="输入价格"></input>
|
|
|
+ </view>
|
|
|
<!-- <view class="row">
|
|
|
<view class="left">类型</view>
|
|
|
<view @click='show1=true'>{{detailData.type}}</view>
|
|
|
@@ -111,7 +116,7 @@
|
|
|
<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
|
|
|
<view class="left">车牌号</view>
|
|
|
<!-- 他运合同车牌号输入 -->
|
|
|
- <input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true" class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
|
|
|
+ <!-- <input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true" class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input> -->
|
|
|
<view v-show="showCar" @click="carno = true" v-if="detailData.inOutType == '移库出库'|| (showCar&&contractType=='1')"><!-- showCar = true时为自运 carjudge为切换状态 contractType==1 为销售合同-->
|
|
|
<view v-if="detailData.tranCarNo">
|
|
|
{{detailData.carNo?detailData.carNo +'（'+detailData.tranCarNo+'）':"请选择车牌号"}}
|
|
|
@@ -329,6 +334,7 @@
|
|
|
grossWeight: "",
|
|
|
tare: "",
|
|
|
tips: '',
|
|
|
+ cost:'',
|
|
|
carNo:'',
|
|
|
selfLoading:"0",
|
|
|
goodsName:"",
|
|
|
@@ -512,6 +518,9 @@
|
|
|
// "MYCGYMHLJ2021102401"
|
|
|
if (this.detailData.inOutType == '销售出库') {
|
|
|
this.detailData.tips = '买方' + res.data.data.buyer
|
|
|
+ if(res.data.data.unitContractPrice){
|
|
|
+ this.detailData.cost=res.data.data.unitContractPrice
|
|
|
+ }
|
|
|
} else if (this.detailData.inOutType == '移库出库') {
|
|
|
this.detailData.tips = '入货库' + this.inOutNoList[0].receiveWarehouse
|
|
|
}
|
|
|
@@ -588,13 +597,15 @@
|
|
|
if(uni.getStorageSync('compName1')){
|
|
|
this.weightbills.seller = uni.getStorageSync('compName1').company
|
|
|
}
|
|
|
- if (this.detailData.tips = '买方' + this.contractList.buyer) {
|
|
|
+ if (this.contractList.unitContractPrice) {
|
|
|
this.detailData.tips = '买方' + this.contractList.buyer +
|
|
|
'（ ' +
|
|
|
this.contractList.unitContractPrice +
|
|
|
'元/吨）'
|
|
|
+ this.detailData.cost=this.contractList.unitContractPrice
|
|
|
} else {
|
|
|
this.detailData.tips = '买方' + this.contractList.buyer
|
|
|
+ this.detailData.cost=''
|
|
|
}
|
|
|
} else if (this.detailData.inOutType == '移库出库') {
|
|
|
this.weightbills.buyer = this.inOutNoList[e[0]].receiveWarehouse
|
|
|
@@ -833,6 +844,10 @@
|
|
|
this.$api.msg('品级不能为空')
|
|
|
return
|
|
|
}
|
|
|
+ if (!this.detailData.cost && this.detailData.inOutType == '销售出库'&& num == 2) {
|
|
|
+ this.$api.msg('价格不能为空')
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.detailData.agent == "请选择经办人") {
|
|
|
this.$api.msg('经办人不能为空')
|
|
|
return
|
