Merge branch 'fix/price_query' into dev

# Conflicts:
#	src/views/ecw/order/prepayDeal.vue

src/views/ecw/order/prepayDeal.vue

@@ -1140,7 +1140,7 @@
               <!-- <span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span> -->
               <div v-if="orderExceptionData.orderExceptionStatus == 0">
                 <div>
-                  <el-form-item v-if="unitChangable" :label="$t('是否预付')">
+                  <el-form-item v-if="unitChangable && handlerParams.orderExceptionHandlerResult != 'confirmed_return'" :label="$t('是否预付')">
                     <el-radio-group v-model="row.needPay">
                       <el-radio :label="1">{{ $t("预付") }}</el-radio>
                       <el-radio :label="0">{{ $t("均可") }}</el-radio>
@@ -1148,7 +1148,7 @@
                   </el-form-item>
                 </div>
                 <div>
-                  <el-form-item v-if="unitChangable" :label="$t('单价模式')">
+                  <el-form-item v-if="unitChangable && handlerParams.orderExceptionHandlerResult != 'confirmed_return'" :label="$t('单价模式')">
                     <dict-selector
                       :type="DICT_TYPE.ECW_PRICE_TYPE"
                       v-model="row.charging"
@@ -1157,7 +1157,7 @@
                     />
                   </el-form-item>
                 </div>
-                <div class="price_list">
+                <div class="price_list" v-if="handlerParams.orderExceptionHandlerResult != 'confirmed_return'">
                   <div class="price_label">{{ row.charging == 1 ? $t('全包价') : $t("运费") }}:</div>
                   <div class="price_list">
                     <div
@@ -1184,7 +1184,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="price_list" v-if="row.charging === 0 || row.charging === '0'">
+                <div class="price_list" v-if="(row.charging === 0 || row.charging === '0') && handlerParams.orderExceptionHandlerResult != 'confirmed_return'">
                   <div class="price_label">{{ $t("清关费") }}:</div>
                   <div class="price_list">
                     <div