Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao

src/views/ecw/order/prepayDeal.vue

@@ -1160,12 +1160,6 @@
                 <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
-                      v-if="!row.seaFreightCurrency || !row.seaFreightVolume"
-                    >
-                      /
-                    </div>
-                    <div v-else>
                       <inputor
                         style="width: 100px"
                         default2="0"
@@ -1178,24 +1172,26 @@
                         {{ unitMap[row.seaFreightVolume] }}
                       </span>
                       <template v-else>
-                        <selector style="width:100px" v-model="row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 />
-                       / <selector style="width:100px" v-model="row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 />
+                          <!--不能直接用v-model，默认未0的时候会显示0-->
+                        <selector style="width:100px"
+                                  @input="handleChangeUnit(row, 'seaFreightCurrency', $event)"
+                                  :value="row.seaFreightCurrency || null"
+                                  :options="currencyList"
+                                  :label-field="$l('title')"
+                                  value-field="id"
+                                  />
+                       / <selector style="width:100px"
+                                   @input="handleChangeUnit(row, 'seaFreightVolume', $event)"
+                                   :value="row.seaFreightVolume || null"
+                                   :options="unitList"
+                                   :label-field="$l('title')"
+                                   value-field="id" />
                       </template>
                   </div>
                 </div>
-                </div>
                 <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
-                      v-if="
-                        !row.clearanceFreightCurrency ||
-                        !row.clearanceFreightVolume
-                      "
-                    >
-                      /
-                    </div>
-                    <div v-else>
                       <inputor
                         style="width: 100px"
                         default2="0"
@@ -1208,13 +1204,23 @@
                         {{ unitMap[row.clearanceFreightVolume] }}
                       </span>
                       <template v-else>
-                        <selector style="width:100px" v-model="row.clearanceFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id"  />
-                       / <selector style="width:100px" v-model="row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id"  />
+                        <selector style="width:100px"
+                                  :value="row.clearanceFreightCurrency || null"
+                                  @input="handleChangeUnit(row, 'clearanceFreightCurrency', $event)"
+                                  :options="currencyList"
+                                  :label-field="$l('title')"
+                                  value-field="id"  />
+                       / <selector style="width:100px"
+                                   :value="row.clearanceFreightVolume || null"
+                                   @input="handleChangeUnit(row, 'clearanceFreightVolume', $event)"
+                                   :options="unitList"
+                                   :label-field="$l('title')"
+                                   value-field="id"
+                      />
                       </template>
                   </div>
                 </div>
               </div>
-              </div>
               <div v-else>
                 <div class="price_list">
                   <div v-if="!row.oneSeaFreight">
@@ -3191,6 +3197,9 @@ export default {
         });
       }
     },
+    handleChangeUnit(row, field, val){
+      row[field] = val
+    }
   },
 };
 </script>