whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
dev
lilu 2 years ago
parent 7879bd3149 46e83ac710
commit 7eea8da5a5
2 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File

47
src/views/main/BookingLedger/detail/modules/mailingInfo.vue
Unescape Escape View File

@ -16,7 +16,7 @@
class="customer-input"
:data-source="shipperDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px'}"
:dropdown-style="{ width: '200px' }"
@select="shipperSelect"
@change="shipperChange"
@focus="shipperChange"
@ -58,12 +58,14 @@
class="customer-input"
:data-source="consigneeDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px'}"
:dropdown-style="{ width: '200px' }"
@select="consigneeSelect"
@change="consigneeChange"
@focus="consigneeChange"
/>
<a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('consignee')">保存</a-button>
<a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('consignee')"
>保存</a-button
>
<div class="right">
<span class="btn-circle" @click="spliceMore('consignee')" :style="{ fontSize: '14px' }">*</span>
<span class="btn" @click="changeCode(35, 'consignee')">35</span>
@ -101,7 +103,9 @@
@change="notifyChange"
@focus="notifyChange"
/>
<a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('notifyparty')">保存</a-button>
<a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('notifyparty')"
>保存</a-button
>
<div class="right">
<span class="btn-circle" @click="spliceMore('notifyparty')" :style="{ fontSize: '14px' }">*</span>
<span class="btn" @click="changeCode(35, 'notifyparty')">35</span>
@ -185,7 +189,7 @@
class="customer-input"
:data-source="customserDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px'}"
:dropdown-style="{ width: '200px' }"
@select="customserSelect"
@change="customserChange"
@focus="customserChange"
@ -206,7 +210,7 @@
class="customer-input"
:data-source="truckerDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px'}"
:dropdown-style="{ width: '200px' }"
@select="truckerSelect"
@change="truckerChange"
@focus="truckerChange"
@ -227,7 +231,7 @@
class="customer-input"
:data-source="agentidDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px'}"
:dropdown-style="{ width: '200px' }"
@select="agentidSelect"
@change="agentidChange"
@focus="agentidChange"
@ -315,7 +319,7 @@
class="customer-input"
:data-source="placereceiptDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '300px'}"
:dropdown-style="{ width: '300px' }"
@select="placereceiptSelect"
@change="placereceiptChange"
@focus="placereceiptChange"
@ -347,7 +351,7 @@
class="customer-input"
:data-source="portloadDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '300px'}"
:dropdown-style="{ width: '300px' }"
@select="portloadSelect"
@change="portloadChange"
@focus="portloadChange"
@ -379,7 +383,7 @@
class="customer-input"
:data-source="transportDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '300px'}"
:dropdown-style="{ width: '300px' }"
@select="transportSelect"
@change="transportChange"
@focus="transportChange"
@ -411,7 +415,7 @@
class="customer-input"
:data-source="portdischargeDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '300px'}"
:dropdown-style="{ width: '300px' }"
@select="portdischargeSelect"
@change="portdischargeChange"
@focus="portdischargeChange"
@ -443,7 +447,7 @@
class="customer-input"
:data-source="destinationDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '300px'}"
:dropdown-style="{ width: '300px' }"
@select="destinationSelect"
@change="destinationChange"
@focus="destinationChange"
@ -475,7 +479,7 @@
class="customer-input"
:data-source="placedeliveryDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '300px'}"
:dropdown-style="{ width: '300px' }"
@select="placedeliverySelect"
@change="placedeliveryChange"
@focus="placedeliveryChange"
@ -501,7 +505,7 @@
:wrapperCol="wrapperCol"
has-feedback
>
<a-input :allowClear="true" v-model="details.pkgs" type="number"/>
<a-input :allowClear="true" v-model="details.pkgs" type="number" />
</a-form-item>
</a-col>
<a-col :span="12">
@ -518,7 +522,7 @@
class="customer-input"
:data-source="kindpkgsDataArr"
:dropdown-match-select-width="false"
:dropdown-style="{ width: '200px'}"
:dropdown-style="{ width: '200px' }"
@select="kindpkgsSelect"
@change="kindpkgsChange"
@focus="kindpkgsChange"
@ -656,6 +660,7 @@ export default {
}
}
},
data() {
return {
senderInfo: 'Hope has always been like a young man, clean and pure.',
@ -1455,7 +1460,7 @@ export default {
this.details[type] = subValue
this.$forceUpdate()
},
textareaChange (e, type) {
textareaChange(e, type) {
this.details[type] = e.target.value
}
}
@ -1614,8 +1619,8 @@ export default {
cursor: pointer;
}
}
.content{
.label{
.content {
.label {
margin-bottom: 10px;
font-size: 14px;
}
@ -1634,9 +1639,9 @@ export default {
border-bottom: none;
}
.line-box{
.line-box {
display: flex;
span.unit{
span.unit {
font-size: 12px;
color: #999;
display: inline-block;
@ -1646,7 +1651,7 @@ export default {
}
}
@media (max-width: 1700px) {
.feeself{
.feeself {
top: 15px !important;
right: -22px !important;
}

56
src/views/main/BookingLedger/detail/modules/operationArea.vue
Unescape Escape View File

@ -614,6 +614,7 @@ export default {
this.BCvData = [...this.CvData]
// this.templateType = this.$options.filters['dictData']('booking_template_type')
BookingOrderPrintTemplateList().then(res => {
console.log(res.data)
this.templateType = res.data
})
// if (this.id) {
@ -638,28 +639,28 @@ export default {
methods: {
// ========== OCR ==========
FnClickCvBox(data) {
// let Arr = ['pkgs', 'cbm', 'kgs', 'portdischarge', 'destination', 'kindpkgs']
// let Type = false
// Arr.forEach(item => {
// if (data.code == item) {
// Type = true
// }
// })
// if (Type) {
// if (data.code == 'pkgs' || data.code == 'cbm' || data.code == 'kgs') {
// this.details[data.code] = parseInt(this.Rdata)
// } else {
// this.details[data.code] = this.Rdata
// }
// } else {
// this.details[data.code] = this.details[data.code] + this.Rdata
// }
// console.log(data)
// console.log(data.code)
// console.log(this.details)
// console.log(this.details[data.code])
// console.log(this.Rdata)
this.details[data.code] = this.details[data.code] + this.Rdata
let Arr = ['pkgs', 'cbm', 'kgs', 'portdischarge', 'destination', 'kindpkgs']
let Type = false
Arr.forEach(item => {
if (data.code == item) {
Type = true
}
})
if (Type) {
if (data.code == 'pkgs' || data.code == 'cbm' || data.code == 'kgs') {
this.details[data.code] = parseFloat(this.Rdata)
} else {
this.details[data.code] = this.Rdata
}
} else {
this.details[data.code] = this.details[data.code] + this.Rdata
}
console.log(data)
console.log(data.code)
console.log(this.details)
console.log(this.details[data.code])
console.log(this.Rdata)
// this.details[data.code] = this.details[data.code] + this.Rdata
this.CvBoxType = false
this.BCvData.forEach((item, index) => {
if (item.code == data.code) {
@ -724,7 +725,7 @@ export default {
}
},
beforeUpload(file) {
// console.log(this.details, 'this.details')
console.log(this.details, 'this.details')
// this.$bus.$emit('WebTest001', { upFileList: file, attachCode: 'other', attachName: '其他' })
},
uploadFile(file) {
@ -732,6 +733,7 @@ export default {
formData.append('file', file.file)
// formData.append('bookingId', this.id)
const type = file.file.type
console.log(type)
BookingOrderOcrUpFile({ data: formData, parameter: { bookingId: this.id } }).then(res => {
this.fileName = res.data
BookingOrderOcrGetImg({ fileName: this.fileName, scale: this.scale }).then(res => {
@ -1090,7 +1092,7 @@ export default {
this.saveBookingLetteryard()
} else if (this.modelType === 'vgmlink') {
// VGM 链接
// console.log('暂无接口')
console.log('暂无接口')
} else {
// 样单
this.saveBookingSampleBill()
@ -1104,10 +1106,10 @@ export default {
this.sendLetterYard()
} else if (this.modelType === 'vgmlink') {
// VGM 链接
// console.log('暂无接口')
console.log('暂无接口')
} else {
// 样单
// console.log('暂无接口')
console.log('暂无接口')
}
},
@ -1131,7 +1133,7 @@ export default {
})
} else if (this.modelType === 'vgmlink') {
// VGM 链接
// console.log('暂无接口')
console.log('暂无接口')
}
},

Write Preview
Loading…
Cancel
Save