Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

@@ -241,6 +241,7 @@ export default {
       ...this.shipmentObj[voName],
       documentInfo: this.shipmentObj.documentInfo?.split(",") ?? [],
     };
+    console.log(oldData)
 
     if (!this.shipmentObj[voName]) {
       oldData.dcCustomsType = oldData.dcCustomsType
@@ -564,7 +565,7 @@ export default {
     "cusDeclarationObj.dcCustomsStatus"(val) {
       if (val !== "3") {
         this.$set(this.cusDeclarationObj, "dcCheckStatus", "");
-        this.$set(this.cusDeclarationObj, "dcPassTime", "");
+        // this.$set(this.cusDeclarationObj, "dcPassTime", "");
       } else {
         const { customsInfo } = this.shipmentObj;
         this.$set(

src/views/ecw/order/detail.vue

@@ -460,7 +460,7 @@ export default {
       ]
       // 品牌加价
       if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
-        freightFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+        clearanceFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
       }
       if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
         clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})