Merge remote-tracking branch 'origin/dev' into dev

src/api/infra/file.js

@@ -21,6 +21,7 @@ export function uploadFile(data) {
   return request({
     url: '/infra/file/upload',
     method: 'post',
+    timeout: 60000,
     data: data
   })
 }

src/api/system/version.js

+import request from '@/utils/request'
+
+// 创建app版本管理
+export function createVersion(data) {
+  return request({
+    url: '/system/version/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新app版本管理
+export function updateVersion(data) {
+  return request({
+    url: '/system/version/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除app版本管理
+export function deleteVersion(id) {
+  return request({
+    url: '/system/version/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得app版本管理
+export function getVersion(id) {
+  return request({
+    url: '/system/version/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得app版本管理分页
+export function getVersionPage(query) {
+  return request({
+    url: '/system/version/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出app版本管理 Excel
+export function exportVersionExcel(query) {
+  return request({
+    url: '/system/version/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/i18n/languages/en_US.json

@@ -3560,5 +3560,31 @@
     "渠道ID": "Channel ID",
     "预计时间(天)": "Estimate Days",
     "注意：运费/清关费 方案二选一": "Note: choose one of the two freight/customs clearance schemes",
-    "暂无优惠": "No discount"
-}
\ No newline at end of file
+    "暂无优惠": "No discount",
+    "客户跟进": "Customer follow-up",
+    "请选择跟进时间": "Please select the follow-up time",
+    "规则英文名称": "English name of the rule",
+    "请输入规则英文名称": "Please enter the English name of the rule",
+    "规则英文名称不能为空": "The English name of the rule cannot be empty",
+    "WEB端广告图片（建议尺寸长*宽": "WEB advertising image (recommended size: length * width",
+    "APP端广告图片（建议尺寸长*宽": "APP advertising image (recommended size: length * width",
+    "优惠券ID": "Coupon ID",
+    "发布人": "Publisher",
+    "更新人": "Updated by",
+    "是否确认删除优惠券信息编号为{couponId}的数据项?": "Are you sure to delete the data item with coupon information number {couponId}?",
+    "是否确认导出所有优惠券信息数据项?": "Are you sure to export all coupon information data items?",
+    "待回复": "To be replied",
+    "已回复": "Replied",
+    "确认修改": "Confirm modification",
+    "商标{index}分类": "Trademark {index} classification",
+    "请选择商标{index}分类": "Please select trademark {index} classification",
+    "商标{index}商品": "Trademark {index} commodity",
+    "请选择商标{index}商品": "Please select trademark {index} product",
+    "第{index}阶梯": "Step {index}",
+    "前端必须以 / 开头": "The front end must start with/",
+    "前端不能以 / 开头": "The front end cannot start with/",
+    "是否确认删除此项?": "Are you sure to delete this item?",
+    "父子联动": "Parent-child linkage",
+    "选中父节点，自动选择子节点": "Select the parent node and select the child node automatically",
+    "加载中，请稍后": "Loading, please wait"
+}

src/utils/dict.js

@@ -67,7 +67,7 @@ export const DICT_TYPE = {
   PAY_REFUND_ORDER_STATUS: 'pay_refund_order_status', // 退款订单状态
   PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type', // 退款订单类别
   ECW_BANK_TYPE: 'bank_type', // 银行账号类型
-  // ECW_DATA_SOURCE: 'data_source', // 数据来源
+  ECW_DATA_SOURCE: 'data_source', // 数据来源
   ECW_REGION_TYPE: 'region_trade_type', // 区域类型
   ECW_TRANSPORT_TYPE: 'transport_type', //货运方式
   ECW_CHARGE_TYPE: 'warehouse_charge_type',  //仓储收费方式
@@ -212,6 +212,8 @@ export const DICT_TYPE = {
   BOX_CUSTOMS_ERROR_TYPE: "customs_error_type",// 报关异常状态
   BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态
   BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
+
+  APP_TYPE:"app_type",   //系统类型
 }
 
 /**

src/views/customer/creditRule/index.vue

@@ -38,7 +38,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('主键')" align="center" prop="id" />
-      <el-table-column :label="$t('规则名称')" align="center" prop="name" />
+      <el-table-column :label="$t('规则名称')" align="center" prop="name">
+        <template slot-scope="scope">
+          {{ isChinese ? scope.row.name : scope.row.nameEn }}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('规则分类')" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE" :value="scope.row.type" />
@@ -66,10 +70,13 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('规则名称')" prop="name">
           <el-input v-model="form.name" :placeholder="$t('请输入规则名称')" />
         </el-form-item>
+        <el-form-item :label="$t('规则英文名称')" prop="nameEn">
+          <el-input v-model="form.nameEn" :placeholder="$t('请输入规则英文名称')" />
+        </el-form-item>
         <el-form-item :label="$t('规则分类')" prop="type">
           <el-select v-model="form.type" :placeholder="$t('请选择规则分类')">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
@@ -130,6 +137,7 @@ export default {
       // 表单校验
       rules: {
         name: [{ required: true, message: this.$t('规则名称不能为空'), trigger: "blur" }],
+        nameEn: [{ required: true, message: this.$t('规则英文名称不能为空'), trigger: "blur" }],
         type: [{ required: true, message: this.$t('规则分类不能为空'), trigger: "change" }],
         score: [{ required: true, message: this.$t('规则得分不能为空'), trigger: "blur" }],
       }
@@ -244,6 +252,12 @@ export default {
           this.exportLoading = false;
         }).catch(() => {});
     }
+  },
+
+  computed: {
+    isChinese() {
+      return this.$i18n.locale === 'zh_CN'
+    },
   }
 };
 </script>

src/views/ecw/offer/detail.vue

@@ -226,8 +226,12 @@
                 <el-table-column label="">
                     <template slot-scope="scope">
                         {{scope.$index+1}}.
-                        <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="scope.row.type" />
-<!--                        {{$l(productNames[scope.row.prodId], 'title') || $t('未知')}} -->
+                        {{getProductName(scope.row.prodId)}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="">
+                    <template slot-scope="{row}">
+                      <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" />
                     </template>
                 </el-table-column>
                 <el-table-column label="">
@@ -418,6 +422,15 @@
       };
     },
     computed:{
+      // 根据id获取商品名称（显示优惠列表的时候用）
+      getProductName(){
+        return prodId => {
+          if(!this.list) return this.$t('未知')
+          let row = this.list.offerProdRespVOList.find(item => item.prodId == prodId)
+          if(!row) return this.$t('未知')
+          return this.$l(row, 'prodTitle')
+        }
+      },
       currentcyMap(){
           let map = {}
           this.currencyList.forEach(item => {

src/views/ecw/offer/edit.vue

@@ -11,10 +11,10 @@
                 </el-radio-group>
             </el-form-item>
             <br/>
-            <el-form-item :label="$t('订单类型')">
+            <el-form-item :label="$t('订单类型')" v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
                 <el-checkbox-group v-model="form.type">
-                    <el-checkbox label="1">{{$t('集运服务')}}</el-checkbox>
-                    <el-checkbox label="2">{{$t('海外仓')}}</el-checkbox>
+                    <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{$t('集运服务')}}</el-checkbox>
+                    <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1">{{$t('海外仓')}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
 
@@ -355,7 +355,7 @@
                 </el-table-column>
                 <el-table-column label="">
                     <template slot-scope="{row}">
-                        -{{row.reduceTotalAmount}}
+                        -{{row.reduceAmount}}
                         {{currencyMap[row.reduceCurrencyId]}}
                     </template>
                 </el-table-column>
@@ -678,6 +678,7 @@ export default {
                         titleEn: it.titleEn,
                         endTime: it.endTime,
                         reduceTotalAmount: it.reduceTotalAmount,
+                        reduceAmount: it.reduceAmount,
                         reduceCurrencyId: it.reduceCurrencyId
                     })
             }

src/views/ecw/order/detail.vue

@@ -109,6 +109,14 @@
           </template>
 
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('订单类型')">
+          <el-tag v-if="order.type.indexOf('1') > -1">
+            {{ $t('集运服务') }}
+          </el-tag>
+          <el-tag v-if="order.type.indexOf('2') > -1">
+            {{ $t('海外仓') }}
+          </el-tag>
+        </el-descriptions-item>
       </el-descriptions>
     </el-card>
     <el-card class="card">

src/views/ecw/order/edit.vue

@@ -5,10 +5,10 @@
         <el-card>
             <div slot="header" class="card-title">{{ editMode  ? $t('编辑订单') + '-' + form.orderNo  : $t('新建订单')}}</div>
             <!--默认显示类型(selectedRouter==null)，如果选择路线后没开通则隐藏-->
-            <el-form-item :label="$t('订单类型')" v-if="!selectedRouter || routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
+            <el-form-item :label="$t('订单类型')" v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
                 <el-checkbox-group v-model="form.type" :disabled="inWarehouse">
-                    <el-checkbox label="1" v-if="!selectedRouter || routeOtherServices.indexOf('1') > -1">{{$t('集运服务')}}</el-checkbox>
-                    <el-checkbox label="2" v-if="!selectedRouter || routeOtherServices.indexOf('2') > -1">{{$t('海外仓')}}</el-checkbox>
+                    <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{$t('集运服务')}}</el-checkbox>
+                    <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1">{{$t('海外仓')}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
 

src/views/ecw/order/index.vue

@@ -495,7 +495,15 @@ export default {
       currencyList:[]
     };
   },
+  watch:{
+    isChinese(){
+      this.getList()
+    }
+  },
   computed: {
+    isChinese(){
+      return this.$i18n.locale === 'zh_CN'
+    },
     exportWarehouseList(){
       /* tradeType 1 进口，2出口，3进出口 */
       return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)
@@ -680,4 +688,4 @@ export default {
       }
     }
 }
-</style>
\ No newline at end of file
+</style>

src/views/system/helpDoc/info.vue

 <template>
   <div class="infoheader">
-    <el-collapse v-model="activeNames">
-      <div v-for="item in helpData" :key="item.id">
-        <el-collapse-item :title="item.titleZh" :name="item.id">
-          <div v-html="item.contentZh" class="img">{{ item.contentZh }}</div>
+    <el-collapse v-model="activeNames"  @change="handleChange">
+      <div v-for="(item, index) in helpData" :key="item.id">
+        <el-collapse-item :title="(index + 1) + '. ' + (isChinese ? item.titleZh : item.titleEn)" :name="index">
+          <div v-html="isChinese ? item.contentZh : item.contentEn" class="img"></div>
         </el-collapse-item>
       </div>
     </el-collapse>
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { getInternalHelpDocPage} from "@/api/system/internalHelpDoc";
+import {getInternalHelpDoc, getInternalHelpDocPage} from "@/api/system/internalHelpDoc";
 export default {
   data() {
     return {
@@ -22,9 +22,23 @@ export default {
   created() {
     getInternalHelpDocPage({ pageNo: 1, pageSize: 100 }).then((r) => {
       this.helpData = r.data.list
-      this.activeNames = this.helpData.map(m => { return m.id })
     })
-  }
+  },
+  methods: {
+    handleChange(val) {
+      console.log(val)
+      if (val.length > 0 &&!this.helpData[val].contentZh && !this.helpData[val].contentEn){
+        getInternalHelpDoc(this.helpData[val].id).then(r => {
+          this.$set(this.helpData, val, r.data)
+        })
+      }
+    }
+  },
+  computed:{
+    isChinese(){
+      return this.$i18n.locale === 'zh_CN'
+    }
+  },
 }
 </script>