通用搜索组件多语言、导出文件域名修正

src/components/FilterUser.vue

@@ -337,75 +337,75 @@ export default {
           values: baseInfo.empLevels()
         },
         decRole: {
-          placeholder: '请选择报单中心级别',
+          placeholder: this.$t('filter.selectStockistHint'),
           labelField: 'ROLE_NAME',
           valueField: 'ID',
           values: baseInfo.decRoles()
         },
-        subCompany: {
-          placeholder: '请选择分公司',
-          labelField: 'COM_NAME',
-          valueField: 'ID',
-          values: baseInfo.subCompanies()
-        },
+        // subCompany: {
+        //   placeholder: '请选择分公司',
+        //   labelField: 'COM_NAME',
+        //   valueField: 'ID',
+        //   values: baseInfo.subCompanies()
+        // },
         status: {
-          placeholder: '请选择会员状态',
+          placeholder: this.$t('filter.selectMemberStatusHint'),
           labelField: 'label',
           valueField: 'value',
           values: baseInfo.allStatus()
         },
         dealTypes: {
-          placeholder: '请选择交易类型',
+          placeholder: this.$t('filter.selectHint'),
           labelField: 'TYPE_NAME',
           valueField: 'ID',
           values: baseInfo.dealTypes()
         },
-        systems: {
-          placeholder: '请选择体系',
-          labelField: 'SYSTEM_NAME',
-          valueField: 'ID',
-          values: baseInfo.systems()
-        },
+        // systems: {
+        //   placeholder: '请选择体系',
+        //   labelField: 'SYSTEM_NAME',
+        //   valueField: 'ID',
+        //   values: baseInfo.systems()
+        // },
         sex: {
-          placeholder: '请选择性别',
+          placeholder: this.$t('filter.selectGenderHint'),
           labelField: 'label',
           valueField: 'value',
           values: {
-            '男': { label: '男', value: '男' },
-            '女': { label: '女', value: '女' }
+            '男': { label: this.$t('filter.man'), value: '男' },
+            '女': { label: this.$t('filter.woman'), value: '女' }
           }
         },
         yesOrNo: {
-          placeholder: '请选择是否',
+          placeholder: this.$t('filter.selectWhetherOrNotHint'),
           labelField: 'label',
           valueField: 'value',
           values: {
-            1: { label: '是', value: 1 },
-            0: { label: '否', value: 0 }
+            1: { label: this.$t('filter.yes'), value: 1 },
+            0: { label: this.$t('filter.not'), value: 0 }
           }
         },
         banks: {
-          placeholder: '请选择开户行',
+          placeholder: this.$t('filter.selectBankHint'),
           labelField: 'BANK_NAME',
           valueField: 'BANK_CODE',
           values: baseInfo.allOpenBank()
         },
-        nations: {
-          placeholder: '请选择民族',
-          labelField: 'name',
-          valueField: 'id',
-          values: baseInfo.allNation()
-        },
+        // nations: {
+        //   placeholder: '请选择民族',
+        //   labelField: 'name',
+        //   valueField: 'id',
+        //   values: baseInfo.allNation()
+        // },
         location: {
-          placeholder: '请选择市场',
+          placeholder: this.$t('filter.selectMarketHint'),
           labelField: 'label',
           valueField: 'value',
           values: {
-            1: { label: '一市场', value: 1 },
-            2: { label: '二市场', value: 2 },
-            3: { label: '三市场', value: 3 },
-            4: { label: '四市场', value: 4 },
-            5: { label: '五市场', value: 5 }
+            1: { label: this.$t('filter.marketI'), value: 1 },
+            2: { label: this.$t('filter.marketII'), value: 2 },
+            // 3: { label: '三市场', value: 3 },
+            // 4: { label: '四市场', value: 4 },
+            // 5: { label: '五市场', value: 5 }
           }
         }
       }

src/lang/en.js

@@ -426,7 +426,20 @@ export default {
     and: 'and',
     or: 'or',
     selectContentNotice: 'Please fill in the complete selected content',
-    areaSelectNotice: 'Regions are limited to "equal to" filters'
+    areaSelectNotice: 'Regions are limited to "equal to" filters',
+    selectStockistHint: 'Please select the Stockist Level',
+    selectMemberStatusHint: 'Please select the member status',
+    selectHint: 'Please select the transaction type',
+    selectGenderHint: 'Please select the gender',
+    selectWhetherOrNotHint: 'Please select whether or not',
+    selectBankHint: 'Please select the bank',
+    selectMarketHint: 'Please select the market',
+    marketI: 'I. Market',
+    marketII: 'II. Market',
+    yes: 'Yes',
+    not: 'Not',
+    man: 'man',
+    woman: 'woman',
   },
 
   menu: {

src/lang/zh.js

@@ -426,7 +426,20 @@ export default {
     and: '并且',
     or: '或者',
     selectContentNotice: '请填写完整筛选内容',
-    areaSelectNotice: '地区仅限于"等于"的筛选方式'
+    areaSelectNotice: '地区仅限于"等于"的筛选方式',
+    selectStockistHint: '请选择报单中心级别',
+    selectMemberStatusHint: '请选择会员状态',
+    selectHint: '请选择交易类型',
+    selectGenderHint: '请选择性别',
+    selectWhetherOrNotHint: '请选择是否',
+    selectBankHint: '请选择开户行',
+    selectMarketHint: '请选择市场',
+    marketI: 'I. Market',
+    marketII: 'II. Market',
+    yes: '是',
+    not: '否',
+    man: '男',
+    woman: '女',
   },
 
   // 菜单

src/views/file/export.vue

@@ -104,7 +104,7 @@
           <!--            </el-dropdown>-->
           <!--          </template>-->
           <!--        </el-table-column>-->
-        </el-table-column>
+<!--        </el-table-column>-->
       </el-table>
       <!--      <div class="white-box-footer"
       >-->
@@ -168,7 +168,7 @@ export default {
   },
   methods: {
     singleDownload(row) {
-      const url = (row.REMOTE_URL) ? row.REMOTE_URL : process.env.VUE_APP_CDN_API + '/' + 'upload/excel_export' + '/' + row.FILE_NAME
+      const url = (row.REMOTE_URL) ? row.REMOTE_URL : process.env.VUE_APP_BASE_DO_API + '/' + 'upload/excel_export' + '/' + row.FILE_NAME
       window.open(url)
     },
     handleSelectionChange(val) {