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

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -145,7 +145,7 @@
           </el-table-column>
           <el-table-column :label="$t('重量')" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.weight}}m³</span>
+              <span>{{scope.row.weight}}kg</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center">

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -238,9 +238,9 @@ export default {
             node.currStatus = "end";
             // 判断是否存在异常未处理
             if (
-              val.customsHasAbnormal ||
-              val.shippingHasAbnormal ||
-              val.arrivalHasAbnormal
+              (type === "cusDeclaration" && val.customsHasAbnormal) ||
+              (type === "departure" && val.shippingHasAbnormal) ||
+              (type === "arrival" && val.arrivalHasAbnormal)
             ) {
               continue;
             }

src/views/ecw/financial/receiptDetail.vue

@@ -220,7 +220,12 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="rate" />
-        <el-table-column :label="$t('核销货币金额')" align="center" prop="writeOffAmount" />
+<!--        <el-table-column :label="$t('核销货币金额')" align="center" prop="writeOffAmount" />-->
+        <el-table-column align="center" prop="writeOffAmount" >
+          <template #header>
+            {{ $t('兑核销基准金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('实收日期')" align="center" prop="amountDate">
           <!-- <template slot-scope="scope">
             <span>{{ parseTime(scope.row.amountDate, '{y}-{m}-{d}') }}</span>
@@ -353,10 +358,10 @@
           <el-form-item
             v-if="showCurrencyId != addForm.currencyId"
             prop="rate"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: $t('汇率不能为空') }"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: $t('兑核销基准币种汇率不能为空') }"
           >
             <template slot="label">
-              {{ $t('汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
+              {{ $t('兑核销基准币种汇率') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
             <el-input  v-if="!isView" v-model="addForm.rate" style="width: 220px"></el-input>
             <span v-else>{{ addForm.rate}}</span>
@@ -365,7 +370,7 @@
             v-if="showCurrencyId != addForm.currencyId"
           >
             <template slot="label">
-              {{ $t('金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
+              {{ $t('兑核销基准币种金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
             </template>
             <span>{{ addForm.writeOffAmount?parseFloat(addForm.writeOffAmount).toFixed(6):'' }}</span>
           </el-form-item>

src/views/ecw/productPrice/batchEdit.vue

@@ -361,7 +361,7 @@ export default {
         }
         let data = Object.assign({}, this.form, {
           // lineChannelList: this.selectedRoutes,
-          specialList: this.specialProducts,
+          // specialList: this.specialProducts,
           isAllProduct: this.isAllProduct ? 1:0
         })
         /* if(this.form.stepPrice == 1){

src/views/ecw/productPrice/index.vue

@@ -151,6 +151,27 @@
 
       <el-table-column prop="price" :label="$t('价格')" align="center">
           <template slot-scope="scope">
+            <template v-if="scope.row.stepPrice == 1">
+              {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
+                no: 1,
+                start: scope.row.priceStepList[0].startNum,
+                end: scope.row.priceStepList[0].endNum,
+                weightUnit:  getUnitTitle(scope.row.priceStepList[0].weightUnit),
+              })}}<br/>
+
+              <div v-if="scope.row.priceType == 0">
+                {{$t('运费')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].transportPriceUnit) + scope.row.priceStepList[0].transportPrice}}&nbsp; 
+                {{ getCurrencyTitle(scope.row.priceStepList[0].transportPriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].transportVolumeUnit)}}
+                <br />
+                {{$t('清关费')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].clearancePriceUnit) + scope.row.priceStepList[0].clearancePrice}}&nbsp; 
+                {{ getCurrencyTitle(scope.row.priceStepList[0].clearancePriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].clearanceVolumeUnit)}}
+              </div>
+              <div v-if="scope.row.priceType == 1">
+                {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.priceStepList[0].allPriceUnit) + scope.row.priceStepList[0].allPrice}}&nbsp; 
+                {{ getCurrencyTitle(scope.row.priceStepList[0].allPriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].allVolumeUnit)}}
+              </div>
+            </template>
+            <template v-else>
               <div v-if="scope.row.priceType == 0">
                 {{$t('运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp; 
                 {{ getCurrencyTitle(scope.row.transportPriceUnit) + '/' + getUnitTitle(scope.row.transportVolumeUnit)}}
@@ -163,6 +184,8 @@
                 {{ getCurrencyTitle(scope.row.allPriceUnit) + '/' + getUnitTitle(scope.row.allVolumeUnit)}}
               </div>
             </template>
+            
+          </template>
       </el-table-column>
 
       <el-table-column prop="auditStatus" align="center" :label="$t('状态')" width="120">