doctor-admin-components 1.0.12-beta.21 → 1.0.12-beta.22
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/package.json
CHANGED
|
@@ -355,7 +355,10 @@
|
|
|
355
355
|
{{ "包裹" + (scope.$index + 1) }}
|
|
356
356
|
</template>
|
|
357
357
|
</el-table-column>
|
|
358
|
-
<el-table-column
|
|
358
|
+
<el-table-column align="center">
|
|
359
|
+
<template slot="header">
|
|
360
|
+
<span style="color: red">*</span> 毛重(t)
|
|
361
|
+
</template>
|
|
359
362
|
<template slot-scope="scope2">
|
|
360
363
|
<el-form-item
|
|
361
364
|
label=""
|
|
@@ -386,7 +389,10 @@
|
|
|
386
389
|
</el-form-item>
|
|
387
390
|
</template>
|
|
388
391
|
</el-table-column>
|
|
389
|
-
<el-table-column
|
|
392
|
+
<el-table-column align="center">
|
|
393
|
+
<template slot="header">
|
|
394
|
+
<span style="color: red">*</span> 皮重(t)
|
|
395
|
+
</template>
|
|
390
396
|
<template slot-scope="scope2">
|
|
391
397
|
<el-form-item
|
|
392
398
|
label=""
|
|
@@ -417,7 +423,10 @@
|
|
|
417
423
|
</el-form-item>
|
|
418
424
|
</template>
|
|
419
425
|
</el-table-column>
|
|
420
|
-
<el-table-column
|
|
426
|
+
<el-table-column align="center">
|
|
427
|
+
<template slot="header">
|
|
428
|
+
<span style="color: red">*</span> 净重(t)
|
|
429
|
+
</template>
|
|
421
430
|
<template slot-scope="scope2">
|
|
422
431
|
<el-form-item
|
|
423
432
|
label=""
|
|
@@ -491,7 +500,10 @@
|
|
|
491
500
|
</el-table>
|
|
492
501
|
</template>
|
|
493
502
|
</el-table-column>
|
|
494
|
-
<el-table-column
|
|
503
|
+
<el-table-column align="center">
|
|
504
|
+
<template slot="header">
|
|
505
|
+
<span style="color: red">*</span> 货物
|
|
506
|
+
</template>
|
|
495
507
|
<template slot-scope="scope">
|
|
496
508
|
<el-form-item
|
|
497
509
|
label=""
|
|
@@ -522,7 +534,10 @@
|
|
|
522
534
|
</el-form-item>
|
|
523
535
|
</template>
|
|
524
536
|
</el-table-column>
|
|
525
|
-
<el-table-column
|
|
537
|
+
<el-table-column align="center">
|
|
538
|
+
<template slot="header">
|
|
539
|
+
<span style="color: red">*</span> 货物毛重(t)
|
|
540
|
+
</template>
|
|
526
541
|
<template slot-scope="scope">
|
|
527
542
|
<el-form-item
|
|
528
543
|
label=""
|
|
@@ -551,7 +566,10 @@
|
|
|
551
566
|
</el-form-item>
|
|
552
567
|
</template>
|
|
553
568
|
</el-table-column>
|
|
554
|
-
<el-table-column
|
|
569
|
+
<el-table-column align="center">
|
|
570
|
+
<template slot="header">
|
|
571
|
+
<span style="color: red">*</span> 货物皮重(t)
|
|
572
|
+
</template>
|
|
555
573
|
<template slot-scope="scope">
|
|
556
574
|
<el-form-item
|
|
557
575
|
label=""
|
|
@@ -580,7 +598,10 @@
|
|
|
580
598
|
</el-form-item>
|
|
581
599
|
</template>
|
|
582
600
|
</el-table-column>
|
|
583
|
-
<el-table-column
|
|
601
|
+
<el-table-column align="center">
|
|
602
|
+
<template slot="header">
|
|
603
|
+
<span style="color: red">*</span> 货物净重(t)
|
|
604
|
+
</template>
|
|
584
605
|
<template slot-scope="scope">
|
|
585
606
|
<el-form-item
|
|
586
607
|
label=""
|
|
@@ -609,7 +630,10 @@
|
|
|
609
630
|
</el-form-item>
|
|
610
631
|
</template>
|
|
611
632
|
</el-table-column>
|
|
612
|
-
<el-table-column
|
|
633
|
+
<el-table-column align="center">
|
|
634
|
+
<template slot="header">
|
|
635
|
+
<span style="color: red">*</span> 货物包裹件数
|
|
636
|
+
</template>
|
|
613
637
|
<template slot-scope="scope">
|
|
614
638
|
<el-form-item
|
|
615
639
|
label=""
|
|
@@ -657,12 +681,12 @@
|
|
|
657
681
|
type="primary"
|
|
658
682
|
@click="submitShipment"
|
|
659
683
|
style="margin-right: 10px"
|
|
660
|
-
>{{ title == "
|
|
684
|
+
>{{ title == "生成装运" ? "仅生成装运" : "保存" }}</el-button
|
|
661
685
|
>
|
|
662
686
|
<el-dropdown
|
|
663
687
|
@command="(command) => handleTemplate(command)"
|
|
664
688
|
trigger="click"
|
|
665
|
-
v-if="title == '
|
|
689
|
+
v-if="title == '生成装运'"
|
|
666
690
|
style="margin-right: 10px"
|
|
667
691
|
>
|
|
668
692
|
<el-button type="primary">
|
|
@@ -675,7 +699,7 @@
|
|
|
675
699
|
</el-dropdown>
|
|
676
700
|
|
|
677
701
|
<el-button
|
|
678
|
-
v-if="title == '
|
|
702
|
+
v-if="title == '生成装运'"
|
|
679
703
|
type="primary"
|
|
680
704
|
@click="submitForm"
|
|
681
705
|
style="margin-right: 10px"
|
|
@@ -1172,7 +1196,7 @@ export default {
|
|
|
1172
1196
|
this.addContainerRow();
|
|
1173
1197
|
}
|
|
1174
1198
|
this.open = true;
|
|
1175
|
-
this.title = "
|
|
1199
|
+
this.title = "生成装运";
|
|
1176
1200
|
},
|
|
1177
1201
|
/** 修改按钮操作 */
|
|
1178
1202
|
handleUpdate(row) {
|
|
@@ -170,11 +170,11 @@
|
|
|
170
170
|
</el-row>
|
|
171
171
|
<el-row>
|
|
172
172
|
<el-col :span="18">
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
173
|
+
<el-form-item :label="$t('contractDetail.preferredQuoteMethod')">
|
|
174
|
+
{{
|
|
175
|
+
getPreferredQuoteMethodLabel(dealRecord.preferredQuoteMethod)
|
|
176
|
+
}}
|
|
177
|
+
</el-form-item>
|
|
178
178
|
</el-col>
|
|
179
179
|
<!-- <el-col :span="6">
|
|
180
180
|
<div class="share" v-if="channel === 'official-website'" style="right:100px;" @click.stop="openPriceFix">开始点价</div>
|
|
@@ -535,7 +535,10 @@
|
|
|
535
535
|
type="expand"
|
|
536
536
|
v-if="channel == 'official-website'"
|
|
537
537
|
>
|
|
538
|
-
<template
|
|
538
|
+
<template
|
|
539
|
+
slot-scope="{ row }"
|
|
540
|
+
v-if="row && row.claimList && row.claimList.length"
|
|
541
|
+
>
|
|
539
542
|
<div class="claim-list">
|
|
540
543
|
<div>
|
|
541
544
|
{{ $t("contract.Claim_records") }}({{
|
|
@@ -719,7 +722,10 @@
|
|
|
719
722
|
</el-button>
|
|
720
723
|
<!-- v-if="channel == 'official-website' && scope.row.showFallbackQuality" -->
|
|
721
724
|
<el-button
|
|
722
|
-
v-if="
|
|
725
|
+
v-if="
|
|
726
|
+
channel == 'official-website' &&
|
|
727
|
+
scope.row.showFallbackQuality
|
|
728
|
+
"
|
|
723
729
|
size="mini"
|
|
724
730
|
type="primary"
|
|
725
731
|
style="padding-left: 5px; padding-right: 5px"
|
|
@@ -1000,7 +1006,7 @@ export default {
|
|
|
1000
1006
|
this.$refs.shipmentDetail.handleShow(row);
|
|
1001
1007
|
},
|
|
1002
1008
|
//查看合同详情
|
|
1003
|
-
|
|
1009
|
+
|
|
1004
1010
|
viewContractDetail(contractNo) {
|
|
1005
1011
|
getBizContractByNo(contractNo).then((res) => {
|
|
1006
1012
|
this.$router.push({
|
|
@@ -1060,7 +1066,11 @@ export default {
|
|
|
1060
1066
|
const blNumber = invoice.billOfLadingNo || "待补充";
|
|
1061
1067
|
const containerNo = invoice.containerNoList || "待补充";
|
|
1062
1068
|
const eta = this.parseTime(invoice.eta, "{y}-{m}-{d}") || "待补充";
|
|
1063
|
-
|
|
1069
|
+
const pod =
|
|
1070
|
+
(invoice.terminal ? invoice.terminal : "") + invoice?.destination;
|
|
1071
|
+
const askNames = invoice.containerDetailList
|
|
1072
|
+
.map((item) => item.askName)
|
|
1073
|
+
.join("/");
|
|
1064
1074
|
const englishText = `更新时间 ${
|
|
1065
1075
|
invoice.geekUpdateTime || invoice.shipmentCreateTime
|
|
1066
1076
|
}
|
|
@@ -1072,6 +1082,8 @@ Value: $${value}
|
|
|
1072
1082
|
BL#: ${blNumber}
|
|
1073
1083
|
Container#: ${containerNo}
|
|
1074
1084
|
ETA: ${eta}
|
|
1085
|
+
POD: ${pod}
|
|
1086
|
+
Descriptions: ${askNames}
|
|
1075
1087
|
|
|
1076
1088
|
温馨提示:到货通知。请贵司收到此通知后的7个工作日内安排支付货款，以便安排提单电放，避免产生不必要的滞箱费用。
|
|
1077
1089
|
致：收货公司${invoice.receiveCompanyName || "待补充"}
|
|
@@ -1080,7 +1092,10 @@ ${invoiceNoTitleZh}：${invoiceNo}
|
|
|
1080
1092
|
发票金额：$${value}
|
|
1081
1093
|
提单号：${blNumber}
|
|
1082
1094
|
集装箱号：${containerNo}
|
|
1083
|
-
预计到港：${eta}
|
|
1095
|
+
预计到港：${eta}
|
|
1096
|
+
目的港: ${pod}
|
|
1097
|
+
品名: ${askNames}
|
|
1098
|
+
`;
|
|
1084
1099
|
|
|
1085
1100
|
// 创建临时 <textarea> 元素，将链接写入其中
|
|
1086
1101
|
const textArea = document.createElement("textarea");
|
|
@@ -1288,11 +1303,10 @@ ${invoiceNoTitleZh}：${invoiceNo}
|
|
|
1288
1303
|
processedData.push(shipmentMap[key]);
|
|
1289
1304
|
}
|
|
1290
1305
|
}
|
|
1291
|
-
console.log(
|
|
1306
|
+
console.log("===processedData==", processedData);
|
|
1292
1307
|
return processedData;
|
|
1293
1308
|
},
|
|
1294
1309
|
|
|
1295
|
-
|
|
1296
1310
|
//获取合同信息
|
|
1297
1311
|
getContract(contractId) {
|
|
1298
1312
|
getBizContract(contractId).then((res) => {
|
|
@@ -1312,11 +1326,11 @@ ${invoiceNoTitleZh}：${invoiceNo}
|
|
|
1312
1326
|
activeNameFun(v) {
|
|
1313
1327
|
this.activeName = "" + v;
|
|
1314
1328
|
},
|
|
1315
|
-
openPriceFix
|
|
1316
|
-
this.$buryingPoint({data:{funcKey:
|
|
1317
|
-
this.$store.commit(
|
|
1318
|
-
this.$store.commit(
|
|
1319
|
-
}
|
|
1329
|
+
openPriceFix() {
|
|
1330
|
+
this.$buryingPoint({ data: { funcKey: "click_fixprice_buyer" } });
|
|
1331
|
+
this.$store.commit("setPriceFixAskId", this.contract.askId);
|
|
1332
|
+
this.$store.commit("setFixPriceDialogVisible", true);
|
|
1333
|
+
},
|
|
1320
1334
|
},
|
|
1321
1335
|
};
|
|
1322
1336
|
</script>
|
|
@@ -1345,13 +1359,13 @@ ${invoiceNoTitleZh}：${invoiceNo}
|
|
|
1345
1359
|
}
|
|
1346
1360
|
}
|
|
1347
1361
|
.share {
|
|
1348
|
-
|
|
1349
|
-
|
|
1350
|
-
|
|
1351
|
-
|
|
1352
|
-
|
|
1353
|
-
|
|
1354
|
-
|
|
1355
|
-
|
|
1362
|
+
width: 120px;
|
|
1363
|
+
height: 30px;
|
|
1364
|
+
background: #4d904d;
|
|
1365
|
+
color: #fff;
|
|
1366
|
+
border-radius: 6px 6px 6px 6px;
|
|
1367
|
+
line-height: 30px;
|
|
1368
|
+
text-align: center;
|
|
1369
|
+
cursor: pointer;
|
|
1356
1370
|
}
|
|
1357
1371
|
</style>
|