|
@@ -41,7 +41,8 @@
|
|
</view>
|
|
</view>
|
|
<view class="row row-bottom">
|
|
<view class="row row-bottom">
|
|
<view class="left">皮重(吨)</view>
|
|
<view class="left">皮重(吨)</view>
|
|
- <input type="digit" @input='calculate' v-model='detailData.tare' class="right-bottom" placeholder="输入皮重"></input>
|
|
|
|
|
|
+ <input type="digit" @input='calculate' v-model='detailData.tare' class="right-bottom"
|
|
|
|
+ placeholder="输入皮重"></input>
|
|
</view>
|
|
</view>
|
|
<view class="row row-bottom">
|
|
<view class="row row-bottom">
|
|
<view class="left">净重(吨)</view>
|
|
<view class="left">净重(吨)</view>
|
|
@@ -109,8 +110,10 @@
|
|
<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
|
|
<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
|
|
<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
|
|
<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
|
|
<!-- 自运合同车牌号需下拉 -->
|
|
<!-- 自运合同车牌号需下拉 -->
|
|
- <view v-if="!carno" v-show="showCar" @click="carno = true">{{detailData.carNo?detailData.carNo :"请选择车牌号"}}</view>
|
|
|
|
- <u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno" mode="selector">
|
|
|
|
|
|
+ <view v-if="!carno" v-show="showCar" @click="carno = true">
|
|
|
|
+ {{detailData.carNo?detailData.carNo :"请选择车牌号"}}</view>
|
|
|
|
+ <u-picker :range="carList" range-key="carNo" @confirm='carPicker($event)' v-model="carno"
|
|
|
|
+ mode="selector">
|
|
</u-picker>
|
|
</u-picker>
|
|
</view>
|
|
</view>
|
|
<view class="row row-bottom" v-if="detailData.outType=='火运'">
|
|
<view class="row row-bottom" v-if="detailData.outType=='火运'">
|
|
@@ -121,20 +124,18 @@
|
|
class="row row-bottom">
|
|
class="row row-bottom">
|
|
<view class="left">箱号</view>
|
|
<view class="left">箱号</view>
|
|
<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
|
|
<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号" type="digit"></input>
|
|
- <input v-model='detailData.boxNoOther' class="right-bottom" type="digit"
|
|
|
|
- placeholder="请输入箱号"></input>
|
|
|
|
|
|
+ <input v-model='detailData.boxNoOther' class="right-bottom" type="digit" placeholder="请输入箱号"></input>
|
|
</view>
|
|
</view>
|
|
- <view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"' class="row row-bottom">
|
|
|
|
|
|
+ <view v-if='!detailData.outType||detailData.outType=="汽运" || detailData.outType=="集装箱船"'
|
|
|
|
+ class="row row-bottom">
|
|
<view class="left">封号</view>
|
|
<view class="left">封号</view>
|
|
- <input v-model='detailData.titleNo' class="right-bottom"
|
|
|
|
- placeholder="请输入封号" type="digit"></input>
|
|
|
|
- <input v-model='detailData.titleNoOther' class="right-bottom"
|
|
|
|
- placeholder="请输入封号" type="digit"></input>
|
|
|
|
|
|
+ <input v-model='detailData.titleNo' class="right-bottom" placeholder="请输入封号" type="digit"></input>
|
|
|
|
+ <input v-model='detailData.titleNoOther' class="right-bottom" placeholder="请输入封号" type="digit"></input>
|
|
</view>
|
|
</view>
|
|
<view v-if='detailData.outType=="火运"' class="row row-bottom">
|
|
<view v-if='detailData.outType=="火运"' class="row row-bottom">
|
|
<view class="left">车厢号</view>
|
|
<view class="left">车厢号</view>
|
|
- <input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom"
|
|
|
|
- placeholder="请输入车厢号" type="digit"></input>
|
|
|
|
|
|
+ <input v-model='detailData.wingNumber' @input="toUpperCase2" class="right-bottom" placeholder="请输入车厢号"
|
|
|
|
+ type="digit"></input>
|
|
<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
|
|
<input v-model='detailData.wingNumberOther' @input="toUpperCase3" class="right-bottom"
|
|
placeholder="请输入车厢号" type="digit"></input>
|
|
placeholder="请输入车厢号" type="digit"></input>
|
|
</view>
|
|
</view>
|
|
@@ -198,6 +199,12 @@
|
|
<u-button type="primary" class="submit" hover-class="none" @click="submit(1)">暂存</u-button>
|
|
<u-button type="primary" class="submit" hover-class="none" @click="submit(1)">暂存</u-button>
|
|
<u-button type="primary" class="submit" hover-class="none" @click="submit(2)">提交</u-button>
|
|
<u-button type="primary" class="submit" hover-class="none" @click="submit(2)">提交</u-button>
|
|
</view>
|
|
</view>
|
|
|
|
+ <u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
|
|
|
|
+ <view class="buns_item">
|
|
|
|
+ <view class="but_css" @click="print">打印小票</view>
|
|
|
|
+ <view class="but_css" @click="close">返回</view>
|
|
|
|
+ </view>
|
|
|
|
+ </u-popup>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
@@ -212,6 +219,8 @@
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ weightbills: {},
|
|
|
|
+ isShowPrint: false,
|
|
show: false,
|
|
show: false,
|
|
show1: false,
|
|
show1: false,
|
|
show2: false,
|
|
show2: false,
|
|
@@ -222,7 +231,7 @@
|
|
show7: false,
|
|
show7: false,
|
|
isPC: true,
|
|
isPC: true,
|
|
show8: false,
|
|
show8: false,
|
|
- carno:false,
|
|
|
|
|
|
+ carno: false,
|
|
usestart: '',
|
|
usestart: '',
|
|
multiSelector: [{
|
|
multiSelector: [{
|
|
name: '汽运',
|
|
name: '汽运',
|
|
@@ -312,8 +321,8 @@
|
|
netWeight: "",
|
|
netWeight: "",
|
|
inOutShow: false,
|
|
inOutShow: false,
|
|
inOutNoList: [],
|
|
inOutNoList: [],
|
|
- carList:[],//车牌号下拉
|
|
|
|
- showCar:false,
|
|
|
|
|
|
+ carList: [], //车牌号下拉
|
|
|
|
+ showCar: false,
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -333,7 +342,7 @@
|
|
this.binNumber = helper.erpWarehouse.binNumber
|
|
this.binNumber = helper.erpWarehouse.binNumber
|
|
this.warehouseName = helper.erpWarehouse.warehouseName
|
|
this.warehouseName = helper.erpWarehouse.warehouseName
|
|
this.detailData.goodsName = _data.goodsName;
|
|
this.detailData.goodsName = _data.goodsName;
|
|
- this.detailData.inOutType = _data.inOutType;
|
|
|
|
|
|
+ this.detailData.inOutType = _data.inOutType ? _data.inOutType : '';
|
|
if (this.detailData.inOutType == '销售出库') {
|
|
if (this.detailData.inOutType == '销售出库') {
|
|
this.detailData.inOutTypeKey = 1
|
|
this.detailData.inOutTypeKey = 1
|
|
} else if (this.detailData.inOutType == '移库出库') {
|
|
} else if (this.detailData.inOutType == '移库出库') {
|
|
@@ -348,7 +357,7 @@
|
|
// if (_data.contractNo) {
|
|
// if (_data.contractNo) {
|
|
// this.detailData.contractNo = _data.contractNo;
|
|
// this.detailData.contractNo = _data.contractNo;
|
|
// }
|
|
// }
|
|
- this.detailData.goodsNameKey = _data.goodsNameKey;
|
|
|
|
|
|
+ this.detailData.goodsNameKey = _data.goodsNameKey ? _data.goodsNameKey : '';
|
|
if (!_data.tranCarInfoList) {
|
|
if (!_data.tranCarInfoList) {
|
|
this.isPC = false
|
|
this.isPC = false
|
|
_data.tranCarInfoList = []
|
|
_data.tranCarInfoList = []
|
|
@@ -390,14 +399,24 @@
|
|
this.handler()
|
|
this.handler()
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ print() {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: '/pages/erpbusiness/exbleConnect'
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ close() {
|
|
|
|
+ this.isShowPrint = false
|
|
|
|
+ uni.navigateBack({})
|
|
|
|
+ },
|
|
inOutNo() {
|
|
inOutNo() {
|
|
this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
|
|
this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
|
|
flag: 1,
|
|
flag: 1,
|
|
- warehouseName:this.warehouseName,
|
|
|
|
- agentKey : this.userInfo.id
|
|
|
|
|
|
+ warehouseName: this.warehouseName,
|
|
|
|
+ agentKey: this.userInfo.id
|
|
}).then(res => {
|
|
}).then(res => {
|
|
this.inOutNoList = res.data.data
|
|
this.inOutNoList = res.data.data
|
|
- this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
|
|
|
|
|
|
+ this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
|
|
|
|
+ .inOutTaskNo : ''
|
|
this.detailData.agent = this.inOutNoList[0].agent
|
|
this.detailData.agent = this.inOutNoList[0].agent
|
|
if (this.inOutNoList[0].contractNo) {
|
|
if (this.inOutNoList[0].contractNo) {
|
|
this.detailData.contractNo = this.inOutNoList[0].contractNo
|
|
this.detailData.contractNo = this.inOutNoList[0].contractNo
|
|
@@ -413,21 +432,21 @@
|
|
compId: helper.erpWarehouse.compId,
|
|
compId: helper.erpWarehouse.compId,
|
|
}).then(res => {
|
|
}).then(res => {
|
|
if (res.data.code == 200) {
|
|
if (res.data.code == 200) {
|
|
- for(let i = 0 ; i < res.data.data.length ; i++){
|
|
|
|
- // "MYCGYMHLJ2021102401"
|
|
|
|
- if(res.data.data[i].contractNo == this.detailData.contractNo){//如果查到该合同
|
|
|
|
- if(res.data.data[i].deliverType == '1'){//判断自运1,他运2合同
|
|
|
|
- this.showCar = true
|
|
|
|
- }else{
|
|
|
|
- this.showCar = false
|
|
|
|
- }
|
|
|
|
- if(res.data.data[i].tranCarInfoList){
|
|
|
|
- this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
|
|
|
|
|
|
+ for (let i = 0; i < res.data.data.length; i++) {
|
|
|
|
+ // "MYCGYMHLJ2021102401"
|
|
|
|
+ if (res.data.data[i].contractNo == this.detailData.contractNo) { //如果查到该合同
|
|
|
|
+ if (res.data.data[i].deliverType == '1') { //判断自运1,他运2合同
|
|
|
|
+ this.showCar = true
|
|
|
|
+ } else {
|
|
|
|
+ this.showCar = false
|
|
|
|
+ }
|
|
|
|
+ if (res.data.data[i].tranCarInfoList) {
|
|
|
|
+ this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- })
|
|
|
|
|
|
+ })
|
|
})
|
|
})
|
|
// this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
|
|
// this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
|
|
// this.contractNoList = res.data.data
|
|
// this.contractNoList = res.data.data
|
|
@@ -453,16 +472,21 @@
|
|
this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
|
|
this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
|
|
this.detailData.grade = this.inOutNoList[e[0]].grade
|
|
this.detailData.grade = this.inOutNoList[e[0]].grade
|
|
this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
|
|
this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
|
|
|
|
+ this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName
|
|
if (this.detailData.inOutType == '销售出库') {
|
|
if (this.detailData.inOutType == '销售出库') {
|
|
- if(this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer){
|
|
|
|
- this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer+
|
|
|
|
- '( ' +
|
|
|
|
- this.contractNoList[e[0]].unitContractPrice +
|
|
|
|
- '元/吨)'
|
|
|
|
- }else{
|
|
|
|
|
|
+ this.weightbills.buyer = this.inOutNoList[e[0]].buyer
|
|
|
|
+ this.weightbills.seller = uni.getStorageSync('compName')
|
|
|
|
+ if (this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer) {
|
|
|
|
+ this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer +
|
|
|
|
+ '( ' +
|
|
|
|
+ this.contractNoList[e[0]].unitContractPrice +
|
|
|
|
+ '元/吨)'
|
|
|
|
+ } else {
|
|
this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer
|
|
this.detailData.tips = '买方' + this.contractNoList[e[0]].buyer
|
|
}
|
|
}
|
|
} else if (this.detailData.inOutType == '移库出库') {
|
|
} else if (this.detailData.inOutType == '移库出库') {
|
|
|
|
+ this.weightbills.buyer = this.inOutNoList[e[0]].receiveWarehouse
|
|
|
|
+ this.weightbills.seller = uni.getStorageSync('compName')
|
|
this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
|
|
this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -571,7 +595,7 @@
|
|
carPicker(e) {
|
|
carPicker(e) {
|
|
// this.detailData.gradeKey = e[0] + 1
|
|
// this.detailData.gradeKey = e[0] + 1
|
|
this.detailData.carNo = this.carList[e].carNo
|
|
this.detailData.carNo = this.carList[e].carNo
|
|
- this.detailData.carId=this.carList[e].id
|
|
|
|
|
|
+ this.detailData.carId = this.carList[e].id
|
|
},
|
|
},
|
|
onProgress(e) {},
|
|
onProgress(e) {},
|
|
onRemove() {
|
|
onRemove() {
|
|
@@ -698,14 +722,17 @@
|
|
this.$api.msg('出库类型不能为空')
|
|
this.$api.msg('出库类型不能为空')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- if (!this.detailData.carNo && num == 2) {
|
|
|
|
- this.$api.msg('车牌号不能为空')
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
- if (this.detailData.carNo.length != 7) {
|
|
|
|
- this.$api.msg('车牌号输入有误!')
|
|
|
|
- return
|
|
|
|
|
|
+ if(this.detailData.outType=="集装箱船"||this.detailData.outType=="汽运"){
|
|
|
|
+ if (!this.detailData.carNo && num == 2) {
|
|
|
|
+ this.$api.msg('车牌号不能为空')
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if (this.detailData.carNo.length != 7) {
|
|
|
|
+ this.$api.msg('车牌号输入有误!')
|
|
|
|
+ return
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
if (!this.detailData.addressUrl && num == 2) {
|
|
if (!this.detailData.addressUrl && num == 2) {
|
|
this.$api.msg('请上传磅单')
|
|
this.$api.msg('请上传磅单')
|
|
return
|
|
return
|
|
@@ -842,10 +869,30 @@
|
|
that.detailData).then(res => {
|
|
that.detailData).then(res => {
|
|
console.log(res, "报异常")
|
|
console.log(res, "报异常")
|
|
if (res.data.code == 200) {
|
|
if (res.data.code == 200) {
|
|
|
|
+ that.weightbills.carNo = that.detailData.carNo
|
|
|
|
+ that.weightbills.boxNo = that.detailData.boxNo
|
|
|
|
+ that.weightbills.boxNoOther = that.detailData.boxNoOther
|
|
|
|
+ that.weightbills.wingNumber = that.detailData.wingNumber
|
|
|
|
+ that.weightbills.wingNumberOther = that.detailData.wingNumberOther
|
|
|
|
+ that.weightbills.shipName = that.detailData.shipName
|
|
|
|
+ that.weightbills.shipNumber = that.detailData.shipNumber
|
|
|
|
+ that.weightbills.type = that.detailData.type
|
|
|
|
+ that.weightbills.grossWeight = that.detailData.grossWeight
|
|
|
|
+ that.weightbills.tare = that.detailData.tare
|
|
|
|
+ that.weightbills.netWeight = that.detailData.netWeight
|
|
|
|
+ that.weightbills.outType = that.detailData.outType
|
|
|
|
+ that.weightbills.backOffice = that.detailData.outType
|
|
|
|
+ var date = new Date()
|
|
|
|
+ that.weightbills.updateDate = date.getFullYear() + '-' + (date
|
|
|
|
+ .getMonth() + 1) + '-' + date.getDate() + ' ' + date
|
|
|
|
+ .getHours() + ':' + date.getMinutes() + ':' + date.getSeconds()
|
|
|
|
+
|
|
that.$api.msg(title)
|
|
that.$api.msg(title)
|
|
- setTimeout(() => {
|
|
|
|
- uni.navigateBack()
|
|
|
|
- }, 1000)
|
|
|
|
|
|
+ that.isShowPrint = true
|
|
|
|
+ uni.setStorageSync("exWarehousing_print", that.weightbills)
|
|
|
|
+ // setTimeout(() => {
|
|
|
|
+ // uni.navigateBack()
|
|
|
|
+ // }, 1000)
|
|
} else {
|
|
} else {
|
|
that.$api.msg(res.data.message)
|
|
that.$api.msg(res.data.message)
|
|
}
|
|
}
|
|
@@ -964,4 +1011,19 @@
|
|
display: flex;
|
|
display: flex;
|
|
z-index: 9999;
|
|
z-index: 9999;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ .buns_item {
|
|
|
|
+ display: flex;
|
|
|
|
+ padding: 80rpx 0 50rpx 0;
|
|
|
|
+ justify-content: space-around;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .but_css {
|
|
|
|
+ background: #22C572;
|
|
|
|
+ width: 40%;
|
|
|
|
+ padding: 20rpx;
|
|
|
|
+ color: #fff;
|
|
|
|
+ text-align: center;
|
|
|
|
+ border-radius: 20rpx;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|