doctor-admin-components 1.0.14-beta.8 → 1.0.14-beta.81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +25 -48
- package/package.json +1 -1
- package/packages/index.js +14 -3
- package/packages/src/api/biz/bizContract.js +36 -9
- package/packages/src/api/biz/bizShipment.js +30 -1
- package/packages/src/api/biz/dictData.js +4 -1
- package/packages/src/i18n/zh-CN/message.json +1 -1
- package/packages/src/index.js +18 -2
- package/packages/src/utils/index.js +1 -1
- package/packages/src/utils/zip.js +29 -11
- package/packages/src/views/biz/bizFileInfo/contract.vue +131 -151
- package/packages/src/views/biz/bizFileInfo/contractFile/IMGPreviewCheckBox.vue +8 -6
- package/packages/src/views/biz/bizFileInfo/fileShow.vue +5 -3
- package/packages/src/views/biz/bizShipment/add.vue +234 -142
- package/packages/src/views/biz/contractTracing/billInfo.vue +17 -9
- package/packages/src/views/biz/contractTracing/changrLogList.vue +67 -0
- package/packages/src/views/biz/contractTracing/companyBanks.vue +19 -8
- package/packages/src/views/biz/contractTracing/contractChangeLog.vue +29 -2
- package/packages/src/views/biz/contractTracing/contractClause.vue +356 -0
- package/packages/src/views/biz/contractTracing/contractClauseComponenrts/TextContent.vue +53 -0
- package/packages/src/views/biz/contractTracing/contractPdf.vue +16 -175
- package/packages/src/views/biz/contractTracing/contractSummary.vue +101 -73
- package/packages/src/views/biz/contractTracing/contractTracingDetail.vue +2 -2
- package/packages/src/views/biz/contractTracing/editBill.vue +35 -27
- package/packages/src/views/biz/contractTracing/info.vue +365 -0
- package/packages/src/views/biz/contractTracing/purchaseInvoiceUpload.vue +5 -2
- package/packages/src/views/biz/contractTracing/queryDeductionRecords.vue +103 -0
- package/packages/src/views/biz/contractTracing/shipmentPurchaseAmount.vue +361 -79
- package/packages/src/views/biz/contractTracing/shipmentPurchaseAmountEditDialog.vue +176 -0
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
<div class="app-container">
|
|
3
3
|
<!-- 添加或修改装运对话框 -->
|
|
4
4
|
<el-dialog :visible.sync="open" z-index="1000" width="80%" :before-close="handleClose" :title="title">
|
|
5
|
+
<slot name="billOfLadingUpload"></slot>
|
|
5
6
|
<slot name="">
|
|
6
7
|
<span v-if="isDraft" style="color: red">提示: 当前打开了【{{ form.lastUpdateUserName }}】在【{{ form.updateTime }}】保存的装运草稿</span>
|
|
7
8
|
<span v-if="voidInvoiceList" style="color: red">【快捷转卖】:系统检测到此销售合同关联的采购合同存在【已作废】的装运,</span>
|
|
8
9
|
<el-button v-if="voidInvoiceList" @click="handleReference" size="mini" type="text">点击这里直接复制并引用</el-button>
|
|
9
10
|
</slot>
|
|
11
|
+
|
|
10
12
|
<div v-if="reason" style="color: #f00; padding-left: 60px; margin-bottom: 10px">{{ reason }}</div>
|
|
11
13
|
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
|
|
12
14
|
<el-row>
|
|
@@ -34,6 +36,18 @@
|
|
|
34
36
|
</el-select>
|
|
35
37
|
</el-form-item>
|
|
36
38
|
</el-col>
|
|
39
|
+
<el-col :span="6">
|
|
40
|
+
<el-form-item label="起运港" prop="originPort">
|
|
41
|
+
<el-select v-model="form.originPort" style="width: 100%" placeholder="请选择起运港" clearable filterable size="small">
|
|
42
|
+
<el-option v-for="(item, i) in portOptionList" :key="'origin'+i" :value="item.dictValue" :label="item.dictValue" />
|
|
43
|
+
</el-select>
|
|
44
|
+
</el-form-item>
|
|
45
|
+
</el-col>
|
|
46
|
+
<el-col :span="6">
|
|
47
|
+
<el-form-item label="海运距离(KM)" prop="portDistance">
|
|
48
|
+
<el-input v-decimal="2" v-model="form.portDistance" placeholder="请输入海运距离" size="small" />
|
|
49
|
+
</el-form-item>
|
|
50
|
+
</el-col>
|
|
37
51
|
</el-row>
|
|
38
52
|
<el-row>
|
|
39
53
|
<el-col :span="6">
|
|
@@ -51,15 +65,18 @@
|
|
|
51
65
|
</el-col>
|
|
52
66
|
<el-col :span="6">
|
|
53
67
|
<el-form-item label="ETA" prop="eta" label-width="100">
|
|
54
|
-
<
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
68
|
+
<div style="display: flex; flex-direction: row; align-items: center">
|
|
69
|
+
<el-date-picker
|
|
70
|
+
style="width: 75%"
|
|
71
|
+
clearable
|
|
72
|
+
size="small"
|
|
73
|
+
v-model="form.eta"
|
|
74
|
+
type="date"
|
|
75
|
+
value-format="yyyy-MM-dd HH:mm:ss"
|
|
76
|
+
placeholder="请选择预计到港日期"
|
|
77
|
+
></el-date-picker>
|
|
78
|
+
<el-button type="text" @click="refreshUpdateTime">更新</el-button>
|
|
79
|
+
</div>
|
|
63
80
|
</el-form-item>
|
|
64
81
|
</el-col>
|
|
65
82
|
<el-col :span="6">
|
|
@@ -211,7 +228,7 @@
|
|
|
211
228
|
v-model="scope2.row.packageGrossWeight"
|
|
212
229
|
placeholder="请输入毛重"
|
|
213
230
|
size="mini"
|
|
214
|
-
|
|
231
|
+
v-decimal="3"
|
|
215
232
|
@input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageGrossWeight')"
|
|
216
233
|
></el-input>
|
|
217
234
|
</el-form-item>
|
|
@@ -226,13 +243,16 @@
|
|
|
226
243
|
:rules="rules.packageTareWeight"
|
|
227
244
|
:prop="'containerList.' + index + '.containerDetailList.' + scope1.$index + '.packageList.' + scope2.$index + '.packageTareWeight'"
|
|
228
245
|
>
|
|
229
|
-
|
|
246
|
+
<div>
|
|
247
|
+
{{ scope2.row.packageTareWeight ? scope2.row.packageTareWeight : '自动计算' }}
|
|
248
|
+
</div>
|
|
249
|
+
<!-- <el-input
|
|
230
250
|
v-model="scope2.row.packageTareWeight"
|
|
231
251
|
placeholder="请输入皮重"
|
|
232
252
|
size="mini"
|
|
233
|
-
|
|
253
|
+
v-decimal="3"
|
|
234
254
|
@input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageTareWeight')"
|
|
235
|
-
></el-input>
|
|
255
|
+
></el-input> -->
|
|
236
256
|
</el-form-item>
|
|
237
257
|
</template>
|
|
238
258
|
</el-table-column>
|
|
@@ -249,7 +269,7 @@
|
|
|
249
269
|
v-model="scope2.row.packageNetWeight"
|
|
250
270
|
placeholder="请输入净重"
|
|
251
271
|
size="mini"
|
|
252
|
-
|
|
272
|
+
v-decimal="3"
|
|
253
273
|
@input="limitDecimalPlaces(index, scope1.$index, scope2.$index, scope2.row, 'packageNetWeight')"
|
|
254
274
|
></el-input>
|
|
255
275
|
</el-form-item>
|
|
@@ -455,14 +475,15 @@ import {
|
|
|
455
475
|
updateWithContainer,
|
|
456
476
|
updateWithContainerAndInvoice,
|
|
457
477
|
saveDraft,
|
|
458
|
-
getDraft
|
|
478
|
+
getDraft,
|
|
479
|
+
refreshUpdateTime
|
|
459
480
|
} from '../../../api/biz/bizShipment'
|
|
460
481
|
import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
|
|
461
482
|
import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
|
|
462
483
|
import { queryPurchaseContracts } from '../../../api/biz/bizContract'
|
|
463
484
|
|
|
464
485
|
import { Loading } from 'element-ui'
|
|
465
|
-
import { listDictData } from '../../../api/biz/dictData'
|
|
486
|
+
import { listDictData, portDictList } from '../../../api/biz/dictData'
|
|
466
487
|
import selectBooking from './selectBooking.vue'
|
|
467
488
|
import { listBizBooking } from '../../../api/biz/bizBooking'
|
|
468
489
|
import ReferenceAlert from './referenceAlert.vue'
|
|
@@ -481,6 +502,7 @@ export default {
|
|
|
481
502
|
voidInvoiceList: null,
|
|
482
503
|
//目的地港口列表
|
|
483
504
|
destinationPortList: [],
|
|
505
|
+
portOptionList:[],
|
|
484
506
|
//折叠面板
|
|
485
507
|
activeName: ['1'],
|
|
486
508
|
//折叠面板
|
|
@@ -559,6 +581,10 @@ export default {
|
|
|
559
581
|
}
|
|
560
582
|
},
|
|
561
583
|
props: {
|
|
584
|
+
asyncGetDataFlag: {
|
|
585
|
+
type: Boolean,
|
|
586
|
+
default: false
|
|
587
|
+
},
|
|
562
588
|
billInfoSummary: {
|
|
563
589
|
type: Object,
|
|
564
590
|
default: () => {
|
|
@@ -571,11 +597,22 @@ export default {
|
|
|
571
597
|
}
|
|
572
598
|
},
|
|
573
599
|
created() {
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
600
|
+
if (this.asyncGetDataFlag) {
|
|
601
|
+
// 延时1s获取港口列表
|
|
602
|
+
setTimeout(() => {
|
|
603
|
+
this.getPortDatas()
|
|
604
|
+
}, 1200)
|
|
605
|
+
} else {
|
|
606
|
+
this.getPortDatas()
|
|
607
|
+
}
|
|
608
|
+
},
|
|
609
|
+
mounted() {
|
|
610
|
+
const channel = new BroadcastChannel('ocrInfo-channnel');
|
|
611
|
+
channel.addEventListener('message', event => {
|
|
612
|
+
console.log('event:', event.data)
|
|
613
|
+
this.OCRDataFilling(event.data)
|
|
614
|
+
// channel.close();
|
|
615
|
+
});
|
|
579
616
|
},
|
|
580
617
|
computed: {
|
|
581
618
|
containerList() {
|
|
@@ -608,6 +645,20 @@ export default {
|
|
|
608
645
|
}
|
|
609
646
|
},
|
|
610
647
|
methods: {
|
|
648
|
+
getPortDatas() {
|
|
649
|
+
if (this.destinationPortList.length == 0) {
|
|
650
|
+
listDictData({
|
|
651
|
+
dictType: 'DESTINATION PORT'
|
|
652
|
+
}).then((res) => {
|
|
653
|
+
this.destinationPortList = res.rows
|
|
654
|
+
})
|
|
655
|
+
}
|
|
656
|
+
if (this.portOptionList.length == 0) {
|
|
657
|
+
portDictList().then((res) => {
|
|
658
|
+
this.portOptionList = res.rows
|
|
659
|
+
})
|
|
660
|
+
}
|
|
661
|
+
},
|
|
611
662
|
// 已用的数据,赋值给form
|
|
612
663
|
handleReferenced(data) {
|
|
613
664
|
//shipment, copyFileTypeList
|
|
@@ -682,67 +733,77 @@ export default {
|
|
|
682
733
|
},
|
|
683
734
|
|
|
684
735
|
limitDecimalPlaces(index, scope1Index, scope2Index, data, type) {
|
|
685
|
-
let value = data[type]
|
|
686
|
-
const decimalPlaces = 3
|
|
687
|
-
if (!isNaN(value)) {
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
}
|
|
736
|
+
// let value = data[type]
|
|
737
|
+
// const decimalPlaces = 3
|
|
738
|
+
// if (!isNaN(value)) {
|
|
739
|
+
// value = parseFloat(value).toFixed(decimalPlaces)
|
|
740
|
+
// value = parseFloat(value).toString()
|
|
741
|
+
// data[type] = value
|
|
742
|
+
// }
|
|
692
743
|
if (type == 'packageGrossWeight') {
|
|
693
744
|
this.changePackageGrossWeight(index, scope1Index, scope2Index)
|
|
694
745
|
} else if (type == 'packageTareWeight') {
|
|
695
|
-
|
|
746
|
+
|
|
696
747
|
} else if (type == 'packageNetWeight') {
|
|
748
|
+
this.changePackageNetWeight(index, scope1Index, scope2Index)
|
|
697
749
|
}
|
|
698
750
|
},
|
|
699
751
|
|
|
700
752
|
changePackageGrossWeight(index, k, yindex) {
|
|
701
|
-
this.form.containerList[index].containerDetailList[k].goodsGrossWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
702
|
-
return total + Number(item.packageGrossWeight)
|
|
703
|
-
}, 0)
|
|
704
|
-
this.form.containerList[index].totalGoodsGrossWeight = this.form.containerList[index].containerDetailList.reduce((total, item) => {
|
|
705
|
-
return total + Number(item.goodsGrossWeight)
|
|
706
|
-
}, 0)
|
|
707
|
-
//计算净重
|
|
708
|
-
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
|
|
709
|
-
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
|
|
710
|
-
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
|
|
711
|
-
).toFixed(3)
|
|
712
|
-
|
|
713
|
-
this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList.reduce((total, item) => {
|
|
714
|
-
return total + Number(item.packageNetWeight)
|
|
715
|
-
}, 0)
|
|
716
|
-
|
|
717
|
-
this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
|
|
753
|
+
this.form.containerList[index].containerDetailList[k].goodsGrossWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
718
754
|
.reduce((total, item) => {
|
|
719
|
-
return total + Number(item.
|
|
755
|
+
return total + Number(item.packageGrossWeight)
|
|
756
|
+
}, 0)
|
|
757
|
+
.toFixed(3)
|
|
758
|
+
this.form.containerList[index].totalGoodsGrossWeight = this.form.containerList[index].containerDetailList
|
|
759
|
+
.reduce((total, item) => {
|
|
760
|
+
return total + Number(item.goodsGrossWeight)
|
|
720
761
|
}, 0)
|
|
721
762
|
.toFixed(3)
|
|
763
|
+
//计算皮重
|
|
764
|
+
this.changePackageTareWeight(index, k, yindex)
|
|
722
765
|
},
|
|
766
|
+
//计算皮重
|
|
723
767
|
changePackageTareWeight(index, k, yindex) {
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
|
|
735
|
-
|
|
768
|
+
if (this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight && this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight) {
|
|
769
|
+
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = (
|
|
770
|
+
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
|
|
771
|
+
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight
|
|
772
|
+
).toFixed(3)
|
|
773
|
+
// 小于0,则为0
|
|
774
|
+
if (this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight < 0) {
|
|
775
|
+
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = '0'
|
|
776
|
+
}
|
|
777
|
+
} else {
|
|
778
|
+
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight = ''
|
|
779
|
+
}
|
|
736
780
|
|
|
737
|
-
this.form.containerList[index].containerDetailList[k].
|
|
738
|
-
|
|
739
|
-
|
|
781
|
+
this.form.containerList[index].containerDetailList[k].goodsTareWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
782
|
+
.reduce((total, item) => {
|
|
783
|
+
return total + Number(item.packageTareWeight)
|
|
784
|
+
}, 0)
|
|
785
|
+
.toFixed(3)
|
|
740
786
|
|
|
787
|
+
this.form.containerList[index].totalGoodsTareWeight = this.form.containerList[index].containerDetailList
|
|
788
|
+
.reduce((total, item) => {
|
|
789
|
+
return total + Number(item.goodsTareWeight)
|
|
790
|
+
}, 0)
|
|
791
|
+
.toFixed(3)
|
|
792
|
+
},
|
|
793
|
+
changePackageNetWeight(index, k, yindex) {
|
|
794
|
+
//计算净重
|
|
795
|
+
this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
796
|
+
.reduce((total, item) => {
|
|
797
|
+
return total + Number(item.packageNetWeight)
|
|
798
|
+
}, 0)
|
|
799
|
+
.toFixed(3)
|
|
741
800
|
this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
|
|
742
801
|
.reduce((total, item) => {
|
|
743
802
|
return total + Number(item.goodsNetWeight)
|
|
744
803
|
}, 0)
|
|
745
804
|
.toFixed(3)
|
|
805
|
+
//计算皮重
|
|
806
|
+
this.changePackageTareWeight(index, k, yindex)
|
|
746
807
|
},
|
|
747
808
|
changeItem(item, index, k) {
|
|
748
809
|
this.form.containerList[index].containerDetailList[k].askName = item.askAliasName || item.askName
|
|
@@ -851,6 +912,8 @@ export default {
|
|
|
851
912
|
bookingNo: null,
|
|
852
913
|
billOfLadingNo: null,
|
|
853
914
|
destinationPort: null,
|
|
915
|
+
originPort: null, // 添加
|
|
916
|
+
portDistance: null, // 添加
|
|
854
917
|
purchaseContractNo: null,
|
|
855
918
|
etd: null,
|
|
856
919
|
eta: null,
|
|
@@ -860,7 +923,12 @@ export default {
|
|
|
860
923
|
updateTime: null,
|
|
861
924
|
containerList: [],
|
|
862
925
|
etaUpdateOn: true,
|
|
863
|
-
loadingTime: this.utc2local(new Date(), 'yyyy-MM-DD HH:mm:ss')
|
|
926
|
+
loadingTime: this.utc2local(new Date(), 'yyyy-MM-DD HH:mm:ss'),
|
|
927
|
+
bookingId: null, // 添加
|
|
928
|
+
citeShipmentId: null, // 添加
|
|
929
|
+
copyFileTypeList: null, // 添加
|
|
930
|
+
containerNum: 0, // 添加
|
|
931
|
+
contractIds: null // 添加
|
|
864
932
|
}
|
|
865
933
|
this.contract = {
|
|
866
934
|
purchaseContractNos: null
|
|
@@ -915,6 +983,7 @@ export default {
|
|
|
915
983
|
/** 新增按钮操作 */
|
|
916
984
|
handleAdd(contractDetailList, destinationPort, contract) {
|
|
917
985
|
this.reset()
|
|
986
|
+
this.getPortDatas()
|
|
918
987
|
if (contract.contractType == 'purchase') {
|
|
919
988
|
this.$modal.msgError('请选择销售合同')
|
|
920
989
|
return
|
|
@@ -1000,85 +1069,7 @@ export default {
|
|
|
1000
1069
|
|
|
1001
1070
|
// OCR识别数据汇总
|
|
1002
1071
|
if (this.billInfoSummary?.shipmentOcrType) {
|
|
1003
|
-
|
|
1004
|
-
this.form.shippingCompany = this.billInfoSummary.shippingCompany
|
|
1005
|
-
}
|
|
1006
|
-
|
|
1007
|
-
if (this.billInfoSummary.bookingNo) {
|
|
1008
|
-
this.form.bookingNo = this.billInfoSummary.bookingNo
|
|
1009
|
-
}
|
|
1010
|
-
|
|
1011
|
-
if (this.billInfoSummary.billOfLadingNo) {
|
|
1012
|
-
this.form.billOfLadingNo = this.billInfoSummary.billOfLadingNo
|
|
1013
|
-
}
|
|
1014
|
-
|
|
1015
|
-
if (this.billInfoSummary.destinationPort) {
|
|
1016
|
-
this.form.destinationPort = this.billInfoSummary.destinationPort
|
|
1017
|
-
}
|
|
1018
|
-
|
|
1019
|
-
// if (this.billInfoSummary.actualArrivalDate) {
|
|
1020
|
-
// this.form.actualArrivalDate = this.billInfoSummary.actualArrivalDate;
|
|
1021
|
-
// }
|
|
1022
|
-
|
|
1023
|
-
// if (this.billInfoSummary.loadingTime) {
|
|
1024
|
-
// this.form.loadingTime = this.billInfoSummary.loadingTime;
|
|
1025
|
-
// }
|
|
1026
|
-
|
|
1027
|
-
// if (this.billInfoSummary.etd) {
|
|
1028
|
-
// this.form.etd = this.billInfoSummary.etd;
|
|
1029
|
-
// }
|
|
1030
|
-
|
|
1031
|
-
// if (this.billInfoSummary.eta) {
|
|
1032
|
-
// this.form.eta = this.billInfoSummary.eta;
|
|
1033
|
-
// }
|
|
1034
|
-
|
|
1035
|
-
if (this.billInfoSummary?.containerOcrList?.length) {
|
|
1036
|
-
this.form.containerList = []
|
|
1037
|
-
this.billInfoSummary?.containerOcrList.forEach((containerItem, index) => {
|
|
1038
|
-
this.form.containerList.push({
|
|
1039
|
-
containerId: null,
|
|
1040
|
-
shipmentId: shipmentId,
|
|
1041
|
-
contractNo: containerItem.containerNo,
|
|
1042
|
-
invoiceNo: containerItem.invoiceNo,
|
|
1043
|
-
totalGoodsGrossWeight: containerItem.totalGoodsGrossWeight,
|
|
1044
|
-
totalGoodsNetWeight: containerItem.totalGoodsNetWeight,
|
|
1045
|
-
totalGoodsTareWeight: containerItem.totalGoodsTareWeight,
|
|
1046
|
-
totalGoodsNumber: containerItem.totalGoodsNumber,
|
|
1047
|
-
containerNo: containerItem.containerNo,
|
|
1048
|
-
containerTareWeight: containerItem.totalGoodsTareWeight ? containerItem.totalGoodsTareWeight * 1000 : null,
|
|
1049
|
-
sealNo: containerItem.sealNo,
|
|
1050
|
-
isGenerateInvoice: null,
|
|
1051
|
-
remark: containerItem.remark,
|
|
1052
|
-
createTime: null,
|
|
1053
|
-
updateTime: null,
|
|
1054
|
-
containerDetailList: []
|
|
1055
|
-
})
|
|
1056
|
-
if (containerItem?.containerDetailOcrList?.length) {
|
|
1057
|
-
containerItem?.containerDetailOcrList.forEach((containerDetailItem, index2) => {
|
|
1058
|
-
this.form.containerList[index].containerDetailList.push({
|
|
1059
|
-
contractDetailId: null,
|
|
1060
|
-
askDetailId: null,
|
|
1061
|
-
askName: containerDetailItem.askName,
|
|
1062
|
-
goodsNetWeight: containerDetailItem.goodsNetWeight,
|
|
1063
|
-
goodsTareWeight: containerDetailItem.goodsTareWeight,
|
|
1064
|
-
goodsGrossWeight: containerDetailItem.goodsGrossWeight,
|
|
1065
|
-
goodsNumber: containerDetailItem.goodsNumber,
|
|
1066
|
-
packageList: [
|
|
1067
|
-
{
|
|
1068
|
-
packageNetWeight: containerDetailItem.goodsNetWeight,
|
|
1069
|
-
packageTareWeight: containerDetailItem.goodsTareWeight,
|
|
1070
|
-
packageGrossWeight: containerDetailItem.goodsGrossWeight,
|
|
1071
|
-
remark: containerDetailItem.remark
|
|
1072
|
-
}
|
|
1073
|
-
]
|
|
1074
|
-
})
|
|
1075
|
-
})
|
|
1076
|
-
}
|
|
1077
|
-
})
|
|
1078
|
-
}
|
|
1079
|
-
}
|
|
1080
|
-
if (this.billInfoSummary) {
|
|
1081
|
-
this.addContainerRow()
|
|
1072
|
+
this.OCRDataFilling(this.billInfoSummary, shipmentId)
|
|
1082
1073
|
}
|
|
1083
1074
|
|
|
1084
1075
|
this.$emit('closeFullscreenLoading')
|
|
@@ -1317,6 +1308,107 @@ export default {
|
|
|
1317
1308
|
this.isDraft = false
|
|
1318
1309
|
}
|
|
1319
1310
|
}
|
|
1311
|
+
},
|
|
1312
|
+
refreshUpdateTime() {
|
|
1313
|
+
if (this.form.shipmentId) {
|
|
1314
|
+
const loading = this.openLoading()
|
|
1315
|
+
refreshUpdateTime(this.form.shipmentId)
|
|
1316
|
+
.then((res) => {
|
|
1317
|
+
loading.close()
|
|
1318
|
+
this.$modal.msgSuccess('更新成功')
|
|
1319
|
+
})
|
|
1320
|
+
.catch(() => {
|
|
1321
|
+
loading.close()
|
|
1322
|
+
})
|
|
1323
|
+
}
|
|
1324
|
+
},
|
|
1325
|
+
OCRDataFilling(billInfoSummary, shipmentId = null) {
|
|
1326
|
+
if (billInfoSummary?.shipmentOcrType) {
|
|
1327
|
+
if (billInfoSummary.shippingCompany) {
|
|
1328
|
+
this.form.shippingCompany = billInfoSummary.shippingCompany
|
|
1329
|
+
}
|
|
1330
|
+
|
|
1331
|
+
if (billInfoSummary.bookingNo) {
|
|
1332
|
+
this.form.bookingNo = billInfoSummary.bookingNo
|
|
1333
|
+
}
|
|
1334
|
+
|
|
1335
|
+
if (billInfoSummary.billOfLadingNo) {
|
|
1336
|
+
this.form.billOfLadingNo = billInfoSummary.billOfLadingNo
|
|
1337
|
+
}
|
|
1338
|
+
|
|
1339
|
+
if (billInfoSummary.destinationPort) {
|
|
1340
|
+
this.form.destinationPort = billInfoSummary.destinationPort
|
|
1341
|
+
}
|
|
1342
|
+
|
|
1343
|
+
if (billInfoSummary.originPort) {
|
|
1344
|
+
this.form.originPort = billInfoSummary.originPort
|
|
1345
|
+
}
|
|
1346
|
+
|
|
1347
|
+
if (billInfoSummary.portDistance) {
|
|
1348
|
+
this.form.portDistance = billInfoSummary.portDistance
|
|
1349
|
+
}
|
|
1350
|
+
|
|
1351
|
+
// if (billInfoSummary.actualArrivalDate) {
|
|
1352
|
+
// this.form.actualArrivalDate = billInfoSummary.actualArrivalDate;
|
|
1353
|
+
// }
|
|
1354
|
+
|
|
1355
|
+
// if (billInfoSummary.loadingTime) {
|
|
1356
|
+
// this.form.loadingTime = billInfoSummary.loadingTime;
|
|
1357
|
+
// }
|
|
1358
|
+
|
|
1359
|
+
// if (billInfoSummary.etd) {
|
|
1360
|
+
// this.form.etd = billInfoSummary.etd;
|
|
1361
|
+
// }
|
|
1362
|
+
|
|
1363
|
+
// if (billInfoSummary.eta) {
|
|
1364
|
+
// this.form.eta = billInfoSummary.eta;
|
|
1365
|
+
// }
|
|
1366
|
+
|
|
1367
|
+
if (billInfoSummary?.containerOcrList?.length) {
|
|
1368
|
+
this.form.containerList = []
|
|
1369
|
+
billInfoSummary?.containerOcrList.forEach((containerItem, index) => {
|
|
1370
|
+
this.form.containerList.push({
|
|
1371
|
+
containerId: null,
|
|
1372
|
+
shipmentId: shipmentId,
|
|
1373
|
+
contractNo: containerItem.containerNo,
|
|
1374
|
+
invoiceNo: containerItem.invoiceNo,
|
|
1375
|
+
totalGoodsGrossWeight: containerItem.totalGoodsGrossWeight,
|
|
1376
|
+
totalGoodsNetWeight: containerItem.totalGoodsNetWeight,
|
|
1377
|
+
totalGoodsTareWeight: containerItem.totalGoodsTareWeight,
|
|
1378
|
+
totalGoodsNumber: containerItem.totalGoodsNumber,
|
|
1379
|
+
containerNo: containerItem.containerNo,
|
|
1380
|
+
containerTareWeight: containerItem.totalGoodsTareWeight ? containerItem.totalGoodsTareWeight * 1000 : null,
|
|
1381
|
+
sealNo: containerItem.sealNo,
|
|
1382
|
+
isGenerateInvoice: null,
|
|
1383
|
+
remark: containerItem.remark,
|
|
1384
|
+
createTime: null,
|
|
1385
|
+
updateTime: null,
|
|
1386
|
+
containerDetailList: []
|
|
1387
|
+
})
|
|
1388
|
+
if (containerItem?.containerDetailOcrList?.length) {
|
|
1389
|
+
containerItem?.containerDetailOcrList.forEach((containerDetailItem, index2) => {
|
|
1390
|
+
this.form.containerList[index].containerDetailList.push({
|
|
1391
|
+
contractDetailId: null,
|
|
1392
|
+
askDetailId: null,
|
|
1393
|
+
askName: containerDetailItem.askName,
|
|
1394
|
+
goodsNetWeight: containerDetailItem.goodsNetWeight,
|
|
1395
|
+
goodsTareWeight: containerDetailItem.goodsTareWeight,
|
|
1396
|
+
goodsGrossWeight: containerDetailItem.goodsGrossWeight,
|
|
1397
|
+
goodsNumber: containerDetailItem.goodsNumber,
|
|
1398
|
+
packageList: [
|
|
1399
|
+
{
|
|
1400
|
+
packageNetWeight: containerDetailItem.goodsNetWeight,
|
|
1401
|
+
packageTareWeight: containerDetailItem.goodsTareWeight,
|
|
1402
|
+
packageGrossWeight: containerDetailItem.goodsGrossWeight,
|
|
1403
|
+
remark: containerDetailItem.remark
|
|
1404
|
+
}
|
|
1405
|
+
]
|
|
1406
|
+
})
|
|
1407
|
+
})
|
|
1408
|
+
}
|
|
1409
|
+
})
|
|
1410
|
+
}
|
|
1411
|
+
}
|
|
1320
1412
|
}
|
|
1321
1413
|
}
|
|
1322
1414
|
}
|
|
@@ -198,17 +198,17 @@
|
|
|
198
198
|
<el-row>
|
|
199
199
|
<el-col :span="8">
|
|
200
200
|
<el-form-item :label="$t('contract.company') + ':'">
|
|
201
|
-
{{
|
|
201
|
+
{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.companyName : ""}}
|
|
202
202
|
</el-form-item>
|
|
203
203
|
</el-col>
|
|
204
204
|
<el-col :span="8">
|
|
205
205
|
<el-form-item :label="$t('contract.taxId') + ':'">
|
|
206
|
-
{{
|
|
206
|
+
{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.taxNumber : "" }}
|
|
207
207
|
</el-form-item>
|
|
208
208
|
</el-col>
|
|
209
209
|
<el-col :span="8">
|
|
210
210
|
<el-form-item :label="$t('contract.address') + ':'">
|
|
211
|
-
{{
|
|
211
|
+
{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.address : "" }}
|
|
212
212
|
</el-form-item>
|
|
213
213
|
</el-col>
|
|
214
214
|
</el-row>
|
|
@@ -216,19 +216,19 @@
|
|
|
216
216
|
<el-row>
|
|
217
217
|
<el-col :span="8">
|
|
218
218
|
<el-form-item :label="$t('contract.contact') + ':'">
|
|
219
|
-
{{
|
|
219
|
+
{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.contactPerson : "" }}
|
|
220
220
|
</el-form-item>
|
|
221
221
|
</el-col>
|
|
222
222
|
<el-col :span="8">
|
|
223
223
|
<el-form-item :label="$t('contract.phoneNumber') + ':'">
|
|
224
|
-
{{
|
|
224
|
+
{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.phoneNumber : "" }}
|
|
225
225
|
</el-form-item>
|
|
226
226
|
</el-col>
|
|
227
227
|
<el-col :span="8"></el-col>
|
|
228
228
|
</el-row>
|
|
229
229
|
|
|
230
230
|
<el-row>
|
|
231
|
-
<el-form-item :label="$t('contract.email') + ':'">{{
|
|
231
|
+
<el-form-item :label="$t('contract.email') + ':'">{{ secondNotifyInfoInfo ? secondNotifyInfoInfo.email : "" }}</el-form-item>
|
|
232
232
|
</el-row>
|
|
233
233
|
<el-divider></el-divider>
|
|
234
234
|
<div class="sub-title mb20">{{ $t('contract.otherInfo') }}</div>
|
|
@@ -303,6 +303,7 @@ import { listBizContractCompany } from '../../../api/biz/bizContractCompany'
|
|
|
303
303
|
import BillPdf from './billPdf.vue'
|
|
304
304
|
import { listCompanyBillGoods } from '../../../api/biz/bizCompanyBillGoods'
|
|
305
305
|
import EditBill from './editBill.vue'
|
|
306
|
+
import { getSecondNotifyInfo } from '../../../api/biz/bizContract'
|
|
306
307
|
// import { getSaleContractInfo } from '../../../api/biz/bizContract'
|
|
307
308
|
|
|
308
309
|
export default {
|
|
@@ -368,7 +369,8 @@ export default {
|
|
|
368
369
|
notifierCompanyId: [{ required: true, trigger: 'blur' }],
|
|
369
370
|
goodsName: [{ required: true, trigger: 'blur' }]
|
|
370
371
|
},
|
|
371
|
-
isMobile: document.body.clientWidth <= 768
|
|
372
|
+
isMobile: document.body.clientWidth <= 768,
|
|
373
|
+
secondNotifyInfoInfo: null
|
|
372
374
|
}
|
|
373
375
|
},
|
|
374
376
|
created() {
|
|
@@ -378,6 +380,7 @@ export default {
|
|
|
378
380
|
if (printModel == 1) {
|
|
379
381
|
this.printModel = true
|
|
380
382
|
}
|
|
383
|
+
this.getSecondNotifyInfo();
|
|
381
384
|
// this.getSaleContractInfo(this.contract.dealId)
|
|
382
385
|
},
|
|
383
386
|
methods: {
|
|
@@ -436,6 +439,11 @@ export default {
|
|
|
436
439
|
}
|
|
437
440
|
})
|
|
438
441
|
},
|
|
442
|
+
getSecondNotifyInfo() {
|
|
443
|
+
getSecondNotifyInfo().then((res) => {
|
|
444
|
+
this.secondNotifyInfoInfo = res.data;
|
|
445
|
+
})
|
|
446
|
+
},
|
|
439
447
|
//更改收货人或者通知人公司时 相应显示变更
|
|
440
448
|
changeSubCompany(val, type) {
|
|
441
449
|
if (type == 'delivery') {
|
|
@@ -610,7 +618,7 @@ export default {
|
|
|
610
618
|
handleTemplate(command) {
|
|
611
619
|
if (command == 'EXCEL') {
|
|
612
620
|
this.download(
|
|
613
|
-
'biz/contract/downBill',
|
|
621
|
+
'biz/contract/bli/downBill',
|
|
614
622
|
{
|
|
615
623
|
contractId: this.billData.contractId,
|
|
616
624
|
templateType: command
|
|
@@ -620,7 +628,7 @@ export default {
|
|
|
620
628
|
}
|
|
621
629
|
if (command == 'PDF') {
|
|
622
630
|
this.download(
|
|
623
|
-
'biz/contract/downBill',
|
|
631
|
+
'biz/contract/bli/downBill',
|
|
624
632
|
{
|
|
625
633
|
contractId: this.billData.contractId,
|
|
626
634
|
templateType: command
|