Commit a101de51 authored by xiejb's avatar xiejb

我的发票 高级搜索页面 调整

parent cec828c1
......@@ -18,6 +18,11 @@
<!-- <div contenteditable="true" class="inputInfo">{{orderNo}}</div> -->
<input :value="orderNo" class="input" type="text">
</div>
<div class="high-info">
<div class="title font-bold font-16">发票号</div>
<!-- <div contenteditable="true" class="inputInfo">{{orderNo}}</div> -->
<input :value="invoiceNo" class="input" type="text">
</div>
<div class="high-info" @click="showPost('supplier')">
<div class="title font-bold font-16">供应商</div>
<div contenteditable="true" class="inputInfo">{{supplier}}</div>
......@@ -133,10 +138,11 @@ export default {
},
moreSearchInfo: {
supplier: '', // 供应商
consignor: '', // 货主
consignor: [], // 货主
goods: '', // 商品
client: '', // 客户
orderNo: '', // 订单号
invoiceNo: '', // 发票号
time: {
start: getFormateDate(new Date(), 'yyyy-MM-dd'),
end: getFormateDate(new Date(), 'yyyy-MM-dd')
......@@ -159,8 +165,13 @@ export default {
},
// 货主
consignor () {
if (this.moreSearchInfo.consignor.comPartyId) {
return !this.moreSearchInfo.consignor ? '' : (this.moreSearchInfo.consignor.comPartyId + '/(' + this.moreSearchInfo.consignor.partyOpcode + ')' + this.moreSearchInfo.consignor.partyName)
// if (this.moreSearchInfo.consignor.comPartyId) {
// return !this.moreSearchInfo.consignor ? '' : (this.moreSearchInfo.consignor.comPartyId + '/(' + this.moreSearchInfo.consignor.partyOpcode + ')' + this.moreSearchInfo.consignor.partyName)
// } else {
// return ''
// }
if (this.moreSearchInfo.consignor) {
return this.fieldStitching()
} else {
return ''
}
......@@ -188,6 +199,14 @@ export default {
} else {
return ''
}
},
// 发票号
invoiceNo () {
if (this.moreSearchInfo.invoiceNo) {
return !this.moreSearchInfo.invoiceNo ? '' : this.moreSearchInfo.invoiceNo
} else {
return ''
}
}
},
props: {
......@@ -221,10 +240,11 @@ export default {
onCleanClick() {
this.moreSearchInfo = {
supplier: '', // 供应商
consignor: '', // 货主
consignor: [], // 货主
goods: '', // 商品
client: '', // 客户
orderNo: '',
invoiceNo: '',
time: {
start: getFormateDate(new Date(), 'yyyy-MM-dd'),
end: getFormateDate(new Date(), 'yyyy-MM-dd')
......@@ -271,6 +291,20 @@ export default {
}
this.showPost(data.page);
},
// 字段拼接
fieldStitching() {
let str = ''
if (this.moreSearchInfo.consignor.length === 1) {
str = this.consignorInfoStitching(this.moreSearchInfo.consignor[0])
} else if (this.moreSearchInfo.consignor.length > 1) {
str = this.consignorInfoStitching(this.moreSearchInfo.consignor[0]) + '......'
}
return str
},
// 商品信息拼接
consignorInfoStitching(model) {
return model.comPartyId + '/(' + model.partyOpcode + ')/' + model.partyName
}
}
}
</script>
......
......@@ -156,8 +156,6 @@ export default {
}
}
}
.goodsNum{
}
.quantity{
display: flex;
height: 30PX;
......
......@@ -164,7 +164,7 @@ export default {
// } else {
// return ''
// }
if (this.moreSearchInfo.consignor) {
if (this.moreSearchInfo.consignor) {
return this.fieldStitching()
} else {
return ''
......@@ -226,7 +226,7 @@ export default {
onCleanClick() {
this.moreSearchInfo = {
supplier: '', // 供应商
consignor: '', // 货主
consignor: [], // 货主
goods: '', // 商品
client: '', // 客户
orderNo: '',
......@@ -280,14 +280,14 @@ export default {
fieldStitching() {
let str = ''
if (this.moreSearchInfo.consignor.length === 1) {
str = this.goodsInfoStitching(this.moreSearchInfo.consignor[0])
str = this.consignorInfoStitching(this.moreSearchInfo.consignor[0])
} else if (this.moreSearchInfo.consignor.length > 1) {
str = this.goodsInfoStitching(this.moreSearchInfo.consignor[0]) + '......'
str = this.consignorInfoStitching(this.moreSearchInfo.consignor[0]) + '......'
}
return str
},
// 商品信息拼接
goodsInfoStitching(model) {
consignorInfoStitching(model) {
return model.comPartyId + '/(' + model.partyOpcode + ')/' + model.partyName
}
}
......
......@@ -125,7 +125,6 @@ export default {
},
// 查看 清货单
gotoOrderClearance(model) {
// console.log(window.location.href.split('?')[1])
this.$router.push({
path: '/clearance',
query: this.$store.state.linkInfo
......
......@@ -133,7 +133,7 @@ export default {
},
moreSearchInfo: {
supplier: '', // 供应商
consignor: '', // 货主
consignor: [], // 货主
goods: '', // 商品
client: '', // 客户
orderNo: '', // 订单号
......@@ -159,8 +159,13 @@ export default {
},
// 货主
consignor () {
if (this.moreSearchInfo.consignor.comPartyId) {
return !this.moreSearchInfo.consignor ? '' : (this.moreSearchInfo.consignor.comPartyId + '/(' + this.moreSearchInfo.consignor.partyOpcode + ')' + this.moreSearchInfo.consignor.partyName)
// if (this.moreSearchInfo.consignor.comPartyId) {
// return !this.moreSearchInfo.consignor ? '' : (this.moreSearchInfo.consignor.comPartyId + '/(' + this.moreSearchInfo.consignor.partyOpcode + ')' + this.moreSearchInfo.consignor.partyName)
// } else {
// return ''
// }
if (this.moreSearchInfo.consignor) {
return this.fieldStitching()
} else {
return ''
}
......@@ -221,7 +226,7 @@ export default {
onCleanClick() {
this.moreSearchInfo = {
supplier: '', // 供应商
consignor: '', // 货主
consignor: [], // 货主
goods: '', // 商品
client: '', // 客户
orderNo: '',
......@@ -271,6 +276,20 @@ export default {
}
this.showPost(data.page);
},
// 字段拼接
fieldStitching() {
let str = ''
if (this.moreSearchInfo.consignor.length === 1) {
str = this.consignorInfoStitching(this.moreSearchInfo.consignor[0])
} else if (this.moreSearchInfo.consignor.length > 1) {
str = this.consignorInfoStitching(this.moreSearchInfo.consignor[0]) + '......'
}
return str
},
// 商品信息拼接
consignorInfoStitching(model) {
return model.comPartyId + '/(' + model.partyOpcode + ')/' + model.partyName
}
}
}
</script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment