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

src/views/ecw/order/prepayDeal.vue

@@ -272,8 +272,8 @@
             <!-- <el-select v-model="handlerParams.currency"  clearable>
               <el-option  v-for="dict in getDictDatas('shipping_price_unit') "
                       :key="dict.value" :label="dict.label" :value="dict.value"/>
-            </el-select> -->
-            <dict-tag type="shipping_price_unit" v-model="handlerParams.currency" class="w-100 ml-10"  />
+            </el-select> -->{{getCurrencyLabel(handlerParams.currency)}}
+            <!-- <dict-tag type="shipping_price_unit" v-model="handlerParams.currency" class="w-100 ml-10"  /> -->
           </el-form-item>
         </el-row>
 
@@ -281,8 +281,8 @@
           <el-form-item :label="$t('送货费用')+':'" size="medium">
             <el-input style="width: 100px;"  type="text" v-model="handlerParams.amount"  />
             <el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable>
-            <el-option  v-for="dict in getDictDatas('shipping_price_unit') "
-                        :key="dict.value" :label="dict.label" :value="dict.value"/>
+              <el-option  v-for="dict in currencyList "
+                        :key="dict.id" :label="dict.titleZh" :value="dict.id"/>
               </el-select>
           </el-form-item>
         </el-row>
@@ -430,6 +430,11 @@
     },
     methods: {
       /** 查询列表 */
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
       getList() {
         let that = this
         that.loading = true;