doctor-admin-components 1.0.14-beta.33 → 1.0.14-beta.35
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
|
@@ -50,20 +50,20 @@
|
|
|
50
50
|
</el-form-item>
|
|
51
51
|
</el-col>
|
|
52
52
|
<el-col :span="6">
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
53
|
+
<el-form-item label="ETA" prop="eta" label-width="100">
|
|
54
|
+
<div style="display: flex; flex-direction: row; align-items: center">
|
|
55
|
+
<el-date-picker
|
|
56
|
+
style="width: 75%"
|
|
57
|
+
clearable
|
|
58
|
+
size="small"
|
|
59
|
+
v-model="form.eta"
|
|
60
|
+
type="date"
|
|
61
|
+
value-format="yyyy-MM-dd HH:mm:ss"
|
|
62
|
+
placeholder="请选择预计到港日期"
|
|
63
|
+
></el-date-picker>
|
|
64
|
+
<el-button type="text" @click="refreshUpdateTime">更新</el-button>
|
|
65
|
+
</div>
|
|
66
|
+
</el-form-item>
|
|
67
67
|
</el-col>
|
|
68
68
|
<el-col :span="6">
|
|
69
69
|
<el-form-item label="实际到港日" prop="actualArrivalDate" label-width="90px">
|
|
@@ -458,7 +458,8 @@ import {
|
|
|
458
458
|
updateWithContainer,
|
|
459
459
|
updateWithContainerAndInvoice,
|
|
460
460
|
saveDraft,
|
|
461
|
-
getDraft,
|
|
461
|
+
getDraft,
|
|
462
|
+
refreshUpdateTime
|
|
462
463
|
} from '../../../api/biz/bizShipment'
|
|
463
464
|
import { generateFinalInvoiceByShipmentId } from '../../../api/biz/bizInvoice'
|
|
464
465
|
import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
|
|
@@ -701,21 +702,27 @@ export default {
|
|
|
701
702
|
},
|
|
702
703
|
|
|
703
704
|
changePackageGrossWeight(index, k, yindex) {
|
|
704
|
-
this.form.containerList[index].containerDetailList[k].goodsGrossWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
705
|
+
this.form.containerList[index].containerDetailList[k].goodsGrossWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
706
|
+
.reduce((total, item) => {
|
|
707
|
+
return total + Number(item.packageGrossWeight)
|
|
708
|
+
}, 0)
|
|
709
|
+
.toFixed(3)
|
|
710
|
+
this.form.containerList[index].totalGoodsGrossWeight = this.form.containerList[index].containerDetailList
|
|
711
|
+
.reduce((total, item) => {
|
|
712
|
+
return total + Number(item.goodsGrossWeight)
|
|
713
|
+
}, 0)
|
|
714
|
+
.toFixed(3)
|
|
710
715
|
//计算净重
|
|
711
716
|
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
|
|
712
717
|
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
|
|
713
718
|
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
|
|
714
719
|
).toFixed(3)
|
|
715
720
|
|
|
716
|
-
this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
717
|
-
|
|
718
|
-
|
|
721
|
+
this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
722
|
+
.reduce((total, item) => {
|
|
723
|
+
return total + Number(item.packageNetWeight)
|
|
724
|
+
}, 0)
|
|
725
|
+
.toFixed(3)
|
|
719
726
|
|
|
720
727
|
this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
|
|
721
728
|
.reduce((total, item) => {
|
|
@@ -725,21 +732,27 @@ export default {
|
|
|
725
732
|
},
|
|
726
733
|
changePackageTareWeight(index, k, yindex) {
|
|
727
734
|
//计算皮重
|
|
728
|
-
this.form.containerList[index].containerDetailList[k].goodsTareWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
735
|
+
this.form.containerList[index].containerDetailList[k].goodsTareWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
736
|
+
.reduce((total, item) => {
|
|
737
|
+
return total + Number(item.packageTareWeight)
|
|
738
|
+
}, 0)
|
|
739
|
+
.toFixed(3)
|
|
740
|
+
this.form.containerList[index].totalGoodsTareWeight = this.form.containerList[index].containerDetailList
|
|
741
|
+
.reduce((total, item) => {
|
|
742
|
+
return total + Number(item.goodsTareWeight)
|
|
743
|
+
}, 0)
|
|
744
|
+
.toFixed(3)
|
|
734
745
|
//计算净重
|
|
735
746
|
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageNetWeight = (
|
|
736
747
|
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageGrossWeight -
|
|
737
748
|
this.form.containerList[index].containerDetailList[k].packageList[yindex].packageTareWeight
|
|
738
749
|
).toFixed(3)
|
|
739
750
|
|
|
740
|
-
this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
741
|
-
|
|
742
|
-
|
|
751
|
+
this.form.containerList[index].containerDetailList[k].goodsNetWeight = this.form.containerList[index].containerDetailList[k].packageList
|
|
752
|
+
.reduce((total, item) => {
|
|
753
|
+
return total + Number(item.packageNetWeight)
|
|
754
|
+
}, 0)
|
|
755
|
+
.toFixed(3)
|
|
743
756
|
|
|
744
757
|
this.form.containerList[index].totalGoodsNetWeight = this.form.containerList[index].containerDetailList
|
|
745
758
|
.reduce((total, item) => {
|
|
@@ -1324,12 +1337,14 @@ export default {
|
|
|
1324
1337
|
refreshUpdateTime() {
|
|
1325
1338
|
if (this.form.shipmentId) {
|
|
1326
1339
|
const loading = this.openLoading()
|
|
1327
|
-
refreshUpdateTime(this.form.shipmentId)
|
|
1328
|
-
|
|
1329
|
-
|
|
1330
|
-
|
|
1331
|
-
|
|
1332
|
-
|
|
1340
|
+
refreshUpdateTime(this.form.shipmentId)
|
|
1341
|
+
.then((res) => {
|
|
1342
|
+
loading.close()
|
|
1343
|
+
this.$modal.msgSuccess('更新成功')
|
|
1344
|
+
})
|
|
1345
|
+
.catch(() => {
|
|
1346
|
+
loading.close()
|
|
1347
|
+
})
|
|
1333
1348
|
}
|
|
1334
1349
|
}
|
|
1335
1350
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: zhangpengwei 15038779532@163.com
|
|
3
3
|
* @Date: 2023-07-31 17:40:56
|
|
4
4
|
* @LastEditors: zhangpengwei@1338418459736990.onaliyun.com zhangpengwei@1338418459736990.onaliyun.com
|
|
5
|
-
* @LastEditTime: 2024-08-
|
|
5
|
+
* @LastEditTime: 2024-08-26 15:40:49
|
|
6
6
|
* @FilePath: /doctor-admin-components/packages/src/views/biz/contractTracing/chargingDialog.vue
|
|
7
7
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
|
8
8
|
-->
|
|
@@ -195,6 +195,9 @@
|
|
|
195
195
|
</el-tooltip>
|
|
196
196
|
</el-form-item>
|
|
197
197
|
</el-col>
|
|
198
|
+
<el-col :span="8">
|
|
199
|
+
<span style="color:#fff">--</span>
|
|
200
|
+
</el-col>
|
|
198
201
|
<el-col :span="8">
|
|
199
202
|
<el-form-item label="签约总柜:">
|
|
200
203
|
<el-tooltip class="ml10" effect="dark" content="采购合同签了多少柜(根据最新的合同数据实时刷新)" placement="top">
|
|
@@ -219,6 +222,13 @@
|
|
|
219
222
|
</el-form-item>
|
|
220
223
|
</el-col>
|
|
221
224
|
<el-col :span="8">
|
|
225
|
+
<span style="color:#fff">--</span>
|
|
226
|
+
</el-col>
|
|
227
|
+
<el-col :span="8">
|
|
228
|
+
<span style="color:#fff">--</span>
|
|
229
|
+
</el-col>
|
|
230
|
+
<el-col :span="8">
|
|
231
|
+
<div style="width:66%"></div>
|
|
222
232
|
<el-form-item label="本次剩余定金:">
|
|
223
233
|
<el-tooltip class="ml10" effect="dark" content="本次还剩多少定金可供下次抵扣,不会随着下次的抵扣行为刷新,可为负数" placement="top">
|
|
224
234
|
<span>
|