优惠翻译订单费用详情bug

src/views/ecw/coupon/edit.vue

@@ -296,7 +296,8 @@ export default {
 			readonly: false,
 			// 表单参数
 			form: {
-				status: 1
+				status: 1,
+				isSimilarSuperposition: true
 			},
 			// 表单校验
 			rules: {
@@ -590,7 +591,7 @@ export default {
 				validDays: undefined,
 				costType: undefined,
 				discountDetailed: undefined,
-				isSimilarSuperposition: undefined,
+				isSimilarSuperposition: true,
 				couponIds: undefined,
 				suitableUserType: undefined,
 				suitableLineType: undefined,

src/views/ecw/order/detail.vue

@@ -289,6 +289,33 @@
           </div>
         </el-col>
       </el-row>
+      
+      <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">优惠详情</div>
+      <el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
+        <el-table-column label="优惠ID" prop="couponId"></el-table-column>
+        <el-table-column label="优惠名称">
+          <template slot-scope="{row}">
+            {{ $l(row, 'title') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="类型">
+          <template slot-scope="{row}">
+            <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" ></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="运费优惠">
+          <template slot-scope="{row}">
+            {{ row.freightReduceAmount}}
+            {{currencyMap[row.freightReduceCurrencyId]}}
+          </template>
+        </el-table-column>
+        <el-table-column label="清关费优惠">
+          <template slot-scope="{row}">
+            {{ row.clearanceReduceAmount}}
+            {{ currencyMap[row.clearanceReduceCurrencyId] }}
+          </template>
+        </el-table-column>
+      </el-table>
     </el-dialog>
   </div>
 </template>
@@ -488,7 +515,7 @@ export default {
         label: this.$t('价格更新时间'),
         value: parseTime(row.updateTime)
       })
-      this.feeDetail = {freight, clearance, charging: row.charging}
+      this.feeDetail = {freight, clearance, charging: row.charging, coupons: row.couponInfoVOList}
 
     },
     closeFeeDetail(){

src/views/system/menu/index.vue

@@ -22,14 +22,18 @@
                    v-hasPermi="['system:menu:create']">{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">{{$t('展开')}}/{{$t('折叠')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column prop="name" :label="$t('菜单名称')" :show-overflow-tooltip="true" width="250"></el-table-column>
+      <el-table-column prop="name" :label="$t('菜单名称')" :show-overflow-tooltip="true" width="250">
+        <template slot-scope="{row}">
+          {{ $l(row, 'name') }}
+        </template>
+      </el-table-column>
       <el-table-column prop="icon" :label="$t('图标')" align="center" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
@@ -74,7 +78,7 @@
             <el-form-item :label="$t('菜单类型')" prop="type">
               <el-radio-group v-model="form.type">
                 <el-radio v-for="dict in menuTypeDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
-                  {{dict.label}}</el-radio>
+                  {{$l(dict, 'label')}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -135,7 +139,7 @@
             <el-form-item :label="$t('菜单状态')">
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                          :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+                          :key="dict.value" :label="parseInt(dict.value)">{{$l(dict, 'label')}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -241,12 +245,13 @@ export default {
       }
       return {
         id: node.id,
-        label: node.name,
+        label: this.$l(node, 'name'),
         children: node.children
       };
     },
     /** 查询菜单下拉树结构 */
     getTreeselect() {
+      console.log('this.handleTree', this.handleTree)
       listMenu().then(response => {
         this.menuOptions = [];
         const menu = { id: 0, name: this.$t('主类目'), children: [] };
@@ -327,10 +332,10 @@ export default {
             if (path && path.indexOf('http://') === -1 || path.indexOf('https://') === -1) {
               // 父权限为根节点，path 必须以 / 开头
               if (this.form.parentId === 0 && path.charAt(0) !== '/') {
-                this.$modal.msgSuccess('前端必须以 / 开头')
+                this.$modal.msgSuccess(this.$t('前端必须以 / 开头'))
                 return
               } else if (this.form.parentId !== 0 && path.charAt(0) === '/') {
-                this.$modal.msgSuccess('前端不能以 / 开头')
+                this.$modal.msgSuccess(this.$t('前端不能以 / 开头'))
                 return
               }
             }
@@ -339,13 +344,13 @@ export default {
           // 提交
           if (this.form.id !== undefined) {
             updateMenu(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess(this.$t("修改成功"));
               this.open = false;
               this.getList();
             });
           } else {
             addMenu(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess(this.$t("新增成功"));
               this.open = false;
               this.getList();
             });
@@ -355,11 +360,11 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() {
+      this.$modal.confirm(this.$t('是否确认删除此项?')).then(function() {
           return delMenu(row.id);
         }).then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess(this.$t("删除成功"));
       }).catch(() => {});
     }
   }

src/views/system/role/index.vue

@@ -111,15 +111,15 @@
             <el-option
               v-for="item in dataScopeDictDatas"
               :key="parseInt(item.value)"
-              :label="item.label"
+              :label="$l(item, 'label')"
               :value="parseInt(item.value)"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('数据权限')" v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM">
-          <el-checkbox :checked="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动(选中父节点，自动选择子节点)</el-checkbox>
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+          <el-checkbox :checked="!form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">{{$t('父子联动')}}({{$t('选中父节点，自动选择子节点')}})</el-checkbox>
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">{{$t('展开')}}/{{$t('折叠')}}</el-checkbox>
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">{{$t('全选')}}/{{$t('全不选')}}</el-checkbox>
           <el-tree
             class="tree-border"
             :data="deptOptions"
@@ -128,8 +128,11 @@
             ref="dept"
             node-key="id"
             :check-strictly="form.deptCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
+            :empty-text="$t('加载中，请稍后')"
+            :props="{
+              label: 'name',
+              children: 'children'
+            }"
           ></el-tree>
         </el-form-item>
       </el-form>
@@ -149,10 +152,10 @@
           <el-input v-model="form.code" :disabled="true" />
         </el-form-item>
         <el-form-item :label="$t('菜单权限')">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">{{$t('展开')}}/{{$t('折叠')}}</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">{{$t('全选')}}/{{$t('全不选')}}</el-checkbox>
           <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id"
-              :check-strictly="true" empty-text="加载中，请稍后" :props="defaultProps"></el-tree>
+              :check-strictly="true" :empty-text="$t('加载中，请稍后')" :props="defaultProps"></el-tree>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -223,10 +226,6 @@ export default {
       },
       // 表单参数
       form: {},
-      defaultProps: {
-        label: "name",
-        children: "children"
-      },
       // 表单校验
       rules: {
         name: [
@@ -249,6 +248,14 @@ export default {
       dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE)
     };
   },
+  computed:{
+    defaultProps(){
+      return {
+        label: this.$l("name"),
+        children: "children"
+      }
+    },
+  },
   created() {
     this.getList();
   },