Merge remote-tracking branch 'origin/release2.2' into release2.2

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

@@ -10,8 +10,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('装柜时间')" prop="ldBoxTime">
-        {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}}
-        <!-- <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> -->
+        <!-- {{cabinetObj.ldBoxTime?new Date(cabinetObj.ldBoxTime).format('yyyy-MM-dd hh:mm:ss'):new Date().format('yyyy-MM-dd hh:mm:ss')}} -->
+        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('出仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>

src/views/ecw/exchangeRate/index.vue

@@ -94,7 +94,7 @@
                        :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="币种2" prop="targetCurrencyId">
+        <el-form-item :label="$t('币种2')" prop="targetCurrencyId">
           <el-select v-model="form.targetCurrencyId" :placeholder="$t('请选择币种')">
             <el-option  :disabled="dict.status === 1"  @click.native="() => form.targetCurrencyCode = dict.fuhao" v-for="dict in currencyList"
                        :key="dict.id" :label="$l(dict,'title') + dict.fuhao" :value="dict.id" />

src/views/ecw/warehouse/index.vue

@@ -324,7 +324,6 @@
           </el-form-item>
           <el-form-item :label="$t('是否支持控货')">
             <el-radio-group v-model="lineform.controlStatus">
-
               <el-radio :label="0">支持</el-radio>
               <el-radio :label="1">不支持</el-radio>
             </el-radio-group>
@@ -862,6 +861,8 @@ export default {
         this.serviceOpen = true;
         this.lineform.lineId = row.lineId;
         this.lineform.transportType = row.transportType;
+         this.lineform.currencyUnit =  row.currencyUnit === 0 ? '' : row.currencyUnit
+         this.lineform.controlStatus = row.controlStatus
     },
 
     submitLineForm() {