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

src/i18n/languages/en_US.json

@@ -2641,7 +2641,7 @@
     "上级区域": "Superior Area",
     "选择上级区域": "Select superior area",
     "请输入简称": "Please enter the abbreviation",
-    "国家城市代码": "Country City Code",
+    "国家代码-城市代码": "Country City Code",
     "显示顺序": "Display order",
     "请输入显示顺序": "Please enter the display order",
     "部门状态": "Department Status",

src/views/ecw/box/indexFutureBox.vue

@@ -88,10 +88,13 @@
           {{row.orderReportNumber  || 0}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('已装柜方数')" align="center" prop="loadingNumber" >
+      <el-table-column :label="$t('装柜或出仓方数')" align="center" prop="loadingNumber" >
         <template slot-scope="{row}">
           {{row.loadingNumber  || 0}}
         </template>
+      </el-table-column>
+      <el-table-column  label="装柜或出仓重量">
+
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -108,6 +111,8 @@
       <el-table-column :label="$t('未来计划方数')" align="center" prop="futurePlanNumber" />
       <el-table-column :label="$t('未来实际方数')" align="center" prop="actualNumber" />
       <el-table-column :label="$t('创建人')" align="center" prop="createName" />
+      <el-table-column :label="$t('未来计划')" align="center" />
+      <el-table-column :label="$t('未来实际')" align="center" />
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -158,26 +163,29 @@
         <el-form-item :label="$t('自单代报订单方数')">
           {{form.orderReportNumber}} m³
         </el-form-item>
-        <el-form-item :label="$t('已装柜方数')">
+        <el-form-item :label="$t('装柜或出仓方数')">
           {{form.loadingNumber}} m³
         </el-form-item>
+        <el-form-item :label="$t('装柜或出仓重量')">
+          {{form.loadingNumber}} kG
+        </el-form-item>
 
         <el-form-item label="">
           <div>
-            {{$t('未来')}} <el-input v-model="form.futureNumber" class="w-100"></el-input> {{$t('天货柜数')}}
+            {{$t('未来')}} <el-input v-model="form.futureNumber" class="w-100"></el-input> {{$t('天')}}
           </div>
-          <div class="mt-10">
+          <div v-if="form.transportType !== '3'"  class="mt-10">
             <el-input v-model="form.gpNumber" class="w-100" /> &times; 40GP
             <el-input v-model="form.hqNumber" class="w-100 ml-10" /> &times; 40HQ
           </div>
           <div class="mt-10">
 
-            {{$t('未来{futureNumber}天计划方数',{futureNumber: form.futureNumber})}}：
-            <el-input v-model="form.futurePlanNumber" class="w-100"></el-input> m³
+            {{$t('未来{futureNumber}天计划{unit}',{futureNumber: form.futureNumber,unit:form.transportType === '1' ?  '立方' : '重量'})}}：
+            <el-input v-model="form.futurePlanNumber" class="w-100"></el-input> {{form.transportType === '1' ? 'm3' : 'kg'}}
           </div>
           <div class="mt-10">
-            {{$t('未来{futureNumber}天实际方数',{futureNumber: form.futureNumber})}}：
-            <el-input v-model="form.actualNumber" class="w-100"></el-input> m³
+            {{$t('未来{futureNumber}天实际{unit}',{futureNumber: form.futureNumber,unit:form.transportType === '1' ?  '立方' : '重量'})}}：
+            <el-input v-model="form.actualNumber" class="w-100"></el-input>  {{form.transportType === '1' ? 'm3' : 'kg'}}
           </div>
         </el-form-item>
       </el-form>

src/views/ecw/channel/index.vue

@@ -204,7 +204,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const channelId = row.channelId;
-      this.$modal.confirm(this.$t('是否确认删除渠道管理编号为{channelId}的数据项?'),{channelId} ).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除渠道管理编号为{channelId}的数据项?',{channelId})).then(function() {
           return deleteChannel(channelId);
         }).then(() => {
           this.getList();

src/views/ecw/region/index.vue

@@ -102,7 +102,7 @@
             <el-option v-for="dict in regionTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
           </el-select>
           </el-form-item>
-          <el-form-item :label="$t('国家城市代码')" prop="labelCode" v-if="form.type == '1' || form.type == '3' ">
+          <el-form-item :label="$t('国家代码-城市代码')" prop="labelCode" v-if="form.type == '1' || form.type == '3' ">
             <el-input v-model="form.labelCode" placeholder="请输入国家代码-城市代码" />
           </el-form-item>
           <el-form-item :label="$t('显示顺序')" prop="sort">