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

# Conflicts:
#	src/utils/dict.js

src/api/ecw/consLanguageTemplate.js

+import request from '@/utils/request'
+
+// 创建集运业务的多语言模板
+export function createConsLanguageTemplate(data) {
+  return request({
+    url: '/ecw/cons-language-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新集运业务的多语言模板
+export function updateConsLanguageTemplate(data) {
+  return request({
+    url: '/ecw/cons-language-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除集运业务的多语言模板
+export function deleteConsLanguageTemplate(id) {
+  return request({
+    url: '/ecw/cons-language-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得集运业务的多语言模板
+export function getConsLanguageTemplate(id) {
+  return request({
+    url: '/ecw/cons-language-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得集运业务的多语言模板分页
+export function getConsLanguageTemplatePage(query) {
+  return request({
+    url: '/ecw/cons-language-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出集运业务的多语言模板 Excel
+export function exportConsLanguageTemplateExcel(query) {
+  return request({
+    url: '/ecw/cons-language-template/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/i18n/languages/en_US.json

@@ -1577,6 +1577,7 @@
   "收款数据": "payment data",
   "代收货款": "?",
   "集运仓库": "Consolidation Warehouse",
+  "集运": "Consolidation",
   "装柜地址": "address of container loading",
   "货物详情": "Cargo Details",
   "填单件数": "number of cartons",
@@ -3769,6 +3770,7 @@
   "国家地区": "Country/region",
   "供应商区域": "Supplier Area",
   "会员控货下单要求": "Member Control Order Requirements",
+  "集运始发仓服务": "Cons Warehouse Service",
   "系统类型": "System Type",
   "请选择系统类型": "Please select a system type",
   "强制更新": "Force updates",

src/utils/dict.js

@@ -280,7 +280,9 @@ export const DICT_TYPE = {
   MEMBERSHIP_LEVELS: "membership_levels", //会员等级
   ENABLE_STATUS: "enable_status", //会员等级规则开启状态
   MEMBER_USER_OPERATE_LOG: "member_user_operate_log", //会员等级操作日志
-  CONS_BUSINESS_NODE: "cons_business_node", //包裹业务节点
+  // ========== 集运模块 ==========
+  CONS_BUSINESS_NODE: "cons_business_node",//集运业务节点
+  ECW_LANGUAGE_CODE: "ecw_language_code",//语言编码
   CONS_STATUS: "cons_status", //包裹状态
 };
 

src/views/ecw/warehouse/index.vue

@@ -528,6 +528,12 @@
           </el-radio-group>
         </el-form-item>
 
+        <el-form-item :label="$t('集运始发仓服务')" prop="isConsService">
+          <el-checkbox-group v-model="form.isConsService">
+            <el-checkbox :label="1" :key="1" name="freight">{{ $t('集运') }}</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
         <!--lanbm 2024-06-04 添加控货需要的逻辑字段-->
         <el-form-item :label="$t('仓库免租期')" prop="rentFreeDays">
           <el-input-number
@@ -1002,7 +1008,10 @@ export default {
         status: null,
       },
       // 表单参数
-      form: { checkList: [] },
+      form: {
+        checkList: [],
+        isConsService:  [],
+      },
       ladingform: {
         prefixCounter: null,
         titleZh: null,
@@ -1683,6 +1692,7 @@ export default {
         status: undefined,
         img: undefined,
         checkList: [],
+        isConsService: [],
       };
       this.resetForm("form");
     },
@@ -1725,7 +1735,12 @@ export default {
       this.reset();
       const id = row.id;
       getWarehouse(id).then((response) => {
+        response.data.isConsService = [response.data.isConsService];
+
         this.form = response.data;
+        console.log('form.isConsService type:', typeof this.form.isConsService);
+
+
 
         let ckList = response.data.freight.split(",");
         this.$set(this.form, "checkList", ckList);
@@ -1753,6 +1768,9 @@ export default {
         freight = freight.substring(0, freight.length - 1);
         this.form.freight = freight;
 
+        // 处理集运开通服务，把数组转成字符串
+        this.form.isConsService = this.form.isConsService.includes(1) ? 1 : 0;
+
         // 修改的提交
         if (this.form.id != null) {
           updateWarehouse(this.form).then((response) => {