en_US.json文件冲突

.prettierignore

+zall-sdk-javascript-master/
\ No newline at end of file

.prettierrc

+{
+  "printWidth": 800,
+  "semi": false,
+  "psingleQuote": true,
+  "trailingComma": "none"
+}
\ No newline at end of file

package.json

@@ -45,6 +45,7 @@
     "@riophae/vue-treeselect": "0.4.0",
     "@vue/runtime-dom": "latest",
     "axios": "0.24.0",
+    "bluebird": "^3.5.5",
     "bpmn-js-token-simulation": "^0.10.0",
     "clipboard": "2.0.8",
     "core-js": "^3.21.1",

src/api/ecw/orderCargoControl.js

-import request from '@/utils/request'
+import request from "@/utils/request"
 
 // 获得控货分页
-export function getCargoControlOrderPage(params){
-    return request({
-      url:'ecw/order-cargo-control/cargo/control/order',
-      method:'get',
-      params
-    })
+export function getCargoControlOrderPage(params) {
+  return request({
+    url: "ecw/order-cargo-control/cargo/control/order",
+    method: "get",
+    params
+  })
 }
 
-export function getWarningCargoControlOrderPage(params){
+export function getWarningCargoControlOrderPage(params) {
   return request({
-    url:'ecw/order-cargo-control/warning/cargo/control/order',
-    method:'get',
+    url: "ecw/order-cargo-control/warning/cargo/control/order",
+    method: "get",
     params
   })
 }
 
 // 发送手机验证码
-export function sendSmsCode(data){
-    return request({
-      url: '/ecw/order-cargo-control/send-sms-code',
-      method: 'post',
-      data
-    })
+export function sendSmsCode(data) {
+  return request({
+    url: "/ecw/order-cargo-control/send-sms-code",
+    method: "post",
+    data
+  })
 }
 
 // 创建订单控货人信息
-export function create(data){
-    return request({
-      url: '/ecw/order-cargo-control/create',
-      method: 'post',
-      data
-    })
+export function create(data) {
+  return request({
+    url: "/ecw/order-cargo-control/create",
+    method: "post",
+    data
+  })
 }
 
 // 创建订单控货人放货记录
-export function createPick(data){
+export function createPick(data) {
   return request({
-    url: '/ecw/order-cargo-control-pick/create',
-    method: 'post',
+    url: "/ecw/order-cargo-control-pick/create",
+    method: "post",
     data
   })
 }
 
 //获得控货订单放货编辑详情
-export function getReleaseInfo(orderId){
+export function getReleaseInfo(orderId) {
   return request({
-    url:'/ecw/order-cargo-control/release/info/' + orderId,
-    method:'get'
+    url: "/ecw/order-cargo-control/release/info/" + orderId,
+    method: "get"
   })
 }
 
 // 获得控货订单放货详情
-export function getPickRleaseInfo(orderId){
+export function getPickRleaseInfo(orderId) {
   return request({
-    url:'/ecw/order-cargo-control-pick/release/info/' + orderId,
-    method:'get'
+    url: "/ecw/order-cargo-control-pick/release/info/" + orderId,
+    method: "get"
   })
 }
 
 // 放货修改与反复核申请
-export function updateApply(data){
+export function updateApply(data) {
   return request({
-    url: '/ecw/order-cargo-control-pick/update/apply',
-    method: 'put',
+    url: "/ecw/order-cargo-control-pick/update/apply",
+    method: "put",
     data
   })
 }
 
 // 复核(放货复核)
-export function review(id){
+export function review(id) {
   return request({
-    url: '/ecw/order-cargo-control-pick/review/' + id,
-    method: 'put'
+    url: "/ecw/order-cargo-control-pick/review/" + id,
+    method: "put"
   })
 }
 
 // 取消放货
-export function cancel(id){
+export function cancel(id) {
   return request({
-    url: '/ecw/order-cargo-control-pick/cancel/' + id,
-    method: 'put'
+    url: "/ecw/order-cargo-control-pick/cancel/" + id,
+    method: "put"
   })
 }
 
 // 取消审批
-export function cancelApproval(approvalId, params){
+export function cancelApproval(approvalId, params) {
   return request({
-    url: '/ecw/order-cargo-control-pick/cancel/approval/' + approvalId,
-    method: 'get',
+    url: "/ecw/order-cargo-control-pick/cancel/approval/" + approvalId,
+    method: "get",
     params
   })
 }
 
 // 订单复核
-export function orderReview(orderId){
+export function orderReview(orderId) {
   return request({
-    url: '/ecw/order-cargo-control/review/' + orderId,
-    method: 'put'
+    url: "/ecw/order-cargo-control/review/" + orderId,
+    method: "put"
   })
 }
 
-
 // 根据订单id批量复合订单控货人放货
-export function batchReview(data){
+export function batchReview(data) {
   return request({
-    url: '/ecw/order-cargo-control-pick/review/',
-    method: 'put',
+    url: "/ecw/order-cargo-control-pick/review/",
+    method: "put",
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
+      "Content-Type": "application/x-www-form-urlencoded"
     },
     data
   })
 }
 
 // 获得可调货的控货订单列表
-export function seasoningCondimentsSelect(params){
+export function seasoningCondimentsSelect(params) {
   return request({
-    url: '/ecw/order-cargo-control-pick/seasoning-condiments/cargo-control/order/select',
-    method: 'get',
+    url: "/ecw/order-cargo-control-pick/seasoning-condiments/cargo-control/order/select",
+    method: "get",
     params
   })
 }
 
 // 根据放货ID查询控货订单放货修改审核详情
-export function getPickUpdateInfo(id){
+export function getPickUpdateInfo(id) {
   return request({
-    url: '/ecw/order-cargo-control-pick/update/info/' + id,
-    method: 'get'
+    url: "/ecw/order-cargo-control-pick/update/info/" + id,
+    method: "get"
   })
 }
 
 // 获得控货订单放货修改申请详情 {approveId: 1}
-export function getPickUpdateApproveInfo(params){
+export function getPickUpdateApproveInfo(params) {
   return request({
-    url: '/ecw/order-cargo-control-pick/update/info',
-    method: 'get',
+    url: "/ecw/order-cargo-control-pick/update/info",
+    method: "get",
     params
   })
 }
 
-export function getCondimentsIno(cargoControlPickId){
+export function getCondimentsIno(cargoControlPickId) {
   return request({
-    url: '/ecw/order-cargo-control-pick/seasoning/condiments/info/' + cargoControlPickId,
-    method: 'get'
+    url: "/ecw/order-cargo-control-pick/seasoning/condiments/info/" + cargoControlPickId,
+    method: "get"
   })
 }
 
 // 参数搜索导出控货订单列表
-export function exportCargoControl(params){
+export function exportCargoControl(params) {
   return request({
-    url: '/ecw/order/export/cargo/control/search',
-    method: 'get',
-    responseType: 'arraybuffer',
+    url: "/ecw/order/export/cargo/control/search",
+    method: "get",
+    responseType: "arraybuffer",
     params
   })
 }
 
 // 控货日志
-export function getControlLogList(orderId){
+export function getControlLogList(orderId) {
   return request({
-    url: '/order/order-control-log/list/' + orderId,
-    method: 'get'
+    url: "/order/order-control-log/list/" + orderId,
+    method: "get"
   })
 }
 
 // 控货业务审批申请
-export function applyCargoControlApproval(data){
+export function applyCargoControlApproval(data) {
   return request({
-    url: 'ecw/order-cargo-control/update/apply',
-    method: 'put',
+    url: "ecw/order-cargo-control/update/apply",
+    method: "put",
     data
   })
 }
 
 //根据订单ID查询控货订单放货限制修改审核详情
-export function getLimitUpdateInfo(orderId){
+export function getLimitUpdateInfo(orderId) {
+  return request({
+    url: "/ecw/order-cargo-control/limit-update/info/" + orderId,
+    method: "get"
+  })
+}
+
+//根据订单ID查询海外仓模式修改审核详情
+export function getReleaseTypeUpdateInfo(orderId) {
   return request({
-    url: '/ecw/order-cargo-control/limit-update/info/' + orderId,
-    method: 'get'
+    url: "/ecw/order-cargo-control/overseas-warehouse-update/info/" + orderId,
+    method: "get"
   })
 }

src/i18n/languages/en_US.json

@@ -4708,6 +4708,7 @@
   "提交结果": "Submit result",
   "增加计划": "add plan",
   "是否确认导出客户跟进记录数据项?": "Are you sure to export all customer follow-up record data items?",
+  "海外仓模式修改": "Modify overseas warehouse mode",
   "合并客户": "Merge customer",
   "保留客户": "Retained customer",
   "​被合并客户-非主客户": "Consolidated customer - Non-principal customer",

src/views/ecw/giftManagement/index.vue

@@ -494,7 +494,7 @@ export default {
     },
     handleExchange(row) {
       this.$router.push({
-        path: "/giftManagement/bulkExchange",
+        path: "/member/giftManagement/bulkExchange",
         query: { rewardsID: row.id },
       });
     },

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -420,7 +420,7 @@
         </el-form-item>
         <el-form-item :label="$t('创建时间')">
           <el-date-picker
-            type="date"
+            type="datetime"
             :placeholder="$t('选择创建时间')"
             v-model="queryParams.createTime"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -429,6 +429,7 @@
         </el-form-item>
         <el-form-item :label="$t('最后更新人')">
           <el-input
+            
             v-model.number="queryParams.updater"
             :placeholder="$t('请输入最后更新人')"
             clearable
@@ -437,7 +438,7 @@
         </el-form-item>
         <el-form-item :label="$t('最后更新时间')">
           <el-date-picker
-            type="date"
+            type="datetime"
             :placeholder="$t('选择最后更新时间')"
             v-model="queryParams.updateTime"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -1024,7 +1025,7 @@ export default {
           params.extraRegister.registerPlatform =
             this.queryParams.extraRegister.registerPlatform?.join();
           if (
-            (this.queryParams.type =
+            (this.queryParams.type ==
               1 &&
               this.queryParams.extraOrderV.receiveAddrList?.[0]?.[0] == "000")
           ) {
@@ -1053,8 +1054,8 @@ export default {
           }
         );
 
-        params.createTime = parseTime(res.data.createTime);
-        params.updateTime = parseTime(res.data.updateTime);
+        params.createTime = parseTime(res.data.createTime, '{y}-{m}-{d} {h}:{i}:{s}');
+        params.updateTime = parseTime(res.data.updateTime, '{y}-{m}-{d} {h}:{i}:{s}');
 
         if (isNumber(res.data.extraOrderV?.firstOrder)) {
           params.extraOrderV.firstOrder =

src/views/ecw/memberManagement/exchangeRecord/index.vue

@@ -28,6 +28,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('会员编号')">
+        <el-input
+          v-model.trim="queryParams.memberCode"
+          style="width: 300px"
+          :placeholder="$t('请输入会员编号')"
+          clearable
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="$t('领取方式')">
         <dict-selector
           v-model="queryParams.redeemType"
@@ -179,8 +189,16 @@
         width="140"
         :label="$t('兑换记录ID')"
         align="center"
-        prop="redemptionNumber"
-      />
+      >
+      <template #default="{ row }">
+        <el-button
+            size="mini"
+            type="text"
+            @click="handleViewRecord(row )"
+            >{{ row.redemptionNumber}}</el-button
+          >
+      </template>
+      </el-table-column>
       <el-table-column
         width="140"
         :label="$t('礼品ID')"
@@ -297,14 +315,14 @@
             @click="handleRewardEdit(scope.row)"
             >{{ $t("编辑") }}</el-button
           >
-          <el-button
+          <!-- <el-button
             v-hasPermi="['ecw:memberManagement:view']"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleViewRecord(scope.row)"
             >{{ $t("查看") }}</el-button
-          >
+          > -->
           <el-button
             v-hasPermi="['ecw:memberManagement:verification']"
             size="mini"
@@ -494,6 +512,7 @@ export default {
       queryParams: {
         rewardTitle: "",
         memberName: "", // 会员昵称
+        memberCode:"", //会员编号
         redeemType: "", // 兑换方式
         status: "",
         rewardCount: "",
@@ -525,8 +544,17 @@ export default {
       },
       immediate: true,
     },
+    "$route.query.memberCode": {
+      handler(val) {
+        if (val) {
+          this.queryParams.memberCode= val;
+        }
+      },
+      immediate: true,
+    },
   },
   created() {
+   
     this.getNodeListAPI();
     this.handleQuery();
   },
@@ -573,21 +601,21 @@ export default {
     // 核销
     handleVerify(row) {
       this.$router.push({
-        path: "/memberManagement/exchangeRecordOperation",
+        path: "/member/memberManagement/exchangeRecordOperation",
         query: { exchangeRewardID: row.id, pageStatus: "verify" },
       });
     },
     // 查看按钮操作
     handleViewRecord(row) {
       this.$router.push({
-        path: "/memberManagement/exchangeRecordOperation",
+        path: "/member/memberManagement/exchangeRecordOperation",
         query: { exchangeRewardID: row.id, pageStatus: "view" },
       });
     },
     // 兑换记录编辑操作
     handleRewardEdit(row) {
       this.$router.push({
-        path: "/memberManagement/exchangeRecordOperation",
+        path: "/member/memberManagement/exchangeRecordOperation",
         query: { exchangeRewardID: row.id, pageStatus: "edit" },
       });
     },
@@ -721,7 +749,7 @@ export default {
     // 新增兑换
     handleNewExchange() {
       this.$router.push({
-        path: "/memberManagement/exchangeRecordOperation",
+        path: "/member/memberManagement/exchangeRecordOperation",
       });
     },
     getNodeListAPI() {
@@ -766,6 +794,7 @@ export default {
         city: null,
         endTime: null,
         holdScore: null,
+        memberCode:'',
         holdScoreOperate: null,
         key: null,
         redemptionNumber: null,
@@ -808,6 +837,7 @@ export default {
         country: null,
         city: null,
         endTime: null,
+        memberCode:'',
         holdScore: null,
         holdScoreOperate: null,
         key: null,

src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue

@@ -153,7 +153,7 @@
         ></el-table-column>
         <el-table-column :label="$t('礼品名称')" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleView(scope.row)">{{
+            <el-button type="text" >{{
               isChinese ? scope.row.titleZh : scope.row.titleEn
             }}</el-button>
           </template>
@@ -415,7 +415,7 @@ export default {
     },
     handleExchange(row) {
       this.$router.push({
-        path: "/giftManagement/bulkExchange",
+        path: "/member/giftManagement/bulkExchange",
         query: { rewardsID: row.id },
       });
     },

src/views/ecw/memberManagement/exchangeRecordOperation/index.vue

@@ -360,7 +360,7 @@ import {
   verifyRedeem,
 } from "@/api/ecw/memberManagement";
 import { memberUserGet } from "@/api/member/user";
-
+import { getDictDatas, DICT_TYPE } from "@/utils/dict";
 export default {
   name: "exchangeRecordOperation",
   components: {
@@ -549,6 +549,7 @@ export default {
     getDetails() {
       memberUserGet({ id: this.$route.query.memberId }).then((r) => {
         // this.details = r.data;
+
         this.isChinese
           ? (this.queryParamsList[0].memberName = r.data.nickname)
           : (this.queryParamsList[0].memberName = r.data.englishName);
@@ -571,6 +572,7 @@ export default {
           if (this.isChinese) {
             this.queryParamsList[0].memberName = data.memberNameZh;
             this.queryParamsList[0].rewardName = data.rewardTitleZh;
+           
           } else {
             this.queryParamsList[0].memberName = data.memberNameEn;
             this.queryParamsList[0].rewardName = data.rewardTitleEn;
@@ -666,7 +668,7 @@ export default {
     },
     onGetSelectRewardsInfo(item) {
       this.queryParamsList[0].rewardId = item.id;
-      this.queryParamsList[0];
+      this.queryParamsList[0].redeemType = item.pickMethod.split(",")[0]
       if (this.isChinese) {
         this.queryParamsList[0].rewardName = item.titleZh;
       } else {

src/views/ecw/memberManagement/integralRecord/index.vue

@@ -174,6 +174,12 @@
           {{ parseTime(row.createTime) || "/" }}</template
         >
       </el-table-column>
+      <el-table-column :label="$t('积分到期时间')" align="center">
+        <template v-slot="{ row }">
+          {{ parseTime(row.expireTime) || "/" }}</template
+        >
+      </el-table-column>
+      
       <el-table-column width="300" :label="$t('详细信息')" align="center">
         <template v-slot="{ row }">
           <!--  人工操作-->
@@ -186,7 +192,7 @@
             type="text"
             @click="
               $router.push({
-                path: '/memberManagement/exchangeRecordOperation',
+                path: '/member/memberManagement/exchangeRecordOperation',
                 query: {
                   pageStatus: 'view',
                   exchangeRewardID: row.extParamJson.redeemId,
@@ -230,7 +236,7 @@
             type="text"
             @click="
               $router.push({
-                path: '/memberManagement/addIntegrationRuleOperation',
+                path: '/member/memberManagement/addIntegrationRuleOperation',
                 query: {
                   id: row.extParamJson.scoreRuleId,
                   pageStatus: 'view',
@@ -258,6 +264,9 @@ import { queryMemberScoreRecord } from "@/api/ecw/memberManagement";
 
 export default {
   name: "EcwMembermanagementIntegralrecord",
+  props:{
+    memberCode:[String, Number],
+  },
   data() {
     return {
       dateRangeCreateTime: [],
@@ -285,7 +294,27 @@ export default {
       return this.$i18n.locale === "zh_CN";
     },
   },
+  watch:{
+    memberCode:{
+      handler: function (newVal, oldVal) {
+        if(newVal){
+          this.queryParams.memberId= newVal
+        }
+      },
+      immediate: true,
+    },
+    $route: {
+      handler: function (route) {
+        const query = route.query;
+        if (query.memberCode) {
+          this.queryParams.key = this.$route.query.memberCode
+        }
+      },
+      immediate: true,
+    },
+  },
   created() {
+   
     this.handleQuery();
   },
   activated() {

src/views/ecw/memberManagement/integrationRule/index.vue

@@ -385,14 +385,14 @@ export default {
     // 编辑操作按钮
     handleUpdate(row) {
       this.$router.push({
-        path: "/memberManagement/addIntegrationRuleOperation",
+        path: "/member/memberManagement/addIntegrationRuleOperation",
         query: { id: row.id, pageStatus: "edit" },
       });
     },
     // 查看按钮操作
     handleViewDetails(row) {
       this.$router.push({
-        path: "/memberManagement/addIntegrationRuleOperation",
+        path: "/member/memberManagement/addIntegrationRuleOperation",
         query: { id: row.id, pageStatus: "view" },
       });
     },

src/views/ecw/memberManagement/memberPointsSummary/index.vue

@@ -149,7 +149,10 @@
         <template #default="{ row }">
           <el-button
             type="text"
-            @click="$router.push('/memberManagement/integralRecord')"
+            @click="$router.push(
+              {path:'/member/memberManagement/integralRecord',
+              query: {memberCode:row.memberCode}
+              })"
             >{{ row.holdScore }}</el-button
           >
         </template>
@@ -158,7 +161,9 @@
         <template #default="{ row }">
           <el-button
             type="text"
-            @click="$router.push('/memberManagement/exchangeRecord')"
+            @click="$router.push({path:'/member/giftManagement/exchangeRecord',
+              query: {memberCode:row.memberCode}
+              })"
             >{{ row.usedScore }}</el-button
           >
         </template>

src/views/ecw/memberManagement/sharingDetails/index.vue

@@ -197,7 +197,7 @@ export default {
     goShareDetails(row) {
       if (row.triggerCount != "0") {
         this.$router.push({
-          path: "/memberManagement/sharingStatisticalDetails",
+          path: "/member/memberManagement/sharingStatisticalDetails",
           query: {
             id: row.id,
           },

src/views/ecw/memberManagement/sharingStatistics/index.vue

@@ -207,7 +207,7 @@ export default {
     goShareDetails(row) {
       if (row.triggerCount != "0") {
         this.$router.push({
-          path: "/memberManagement/sharingStatisticalDetails",
+          path: "/member/memberManagement/sharingStatisticalDetails",
           query: {
             id: row.id,
           },

src/views/ecw/order/components/updateReleaseType.vue

+<template>
+  <el-dialog :visible="show" @close="handleClose" :title="$t('海外仓修改申请')" width="1000px">
+    <el-form label-position="left" label-width="150px" :model="form" :disabled="applyStatus === 1">
+      <el-row :gutter="20">
+        <!-- 订单号 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('订单号')">
+            <span>{{ order.orderNo }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 总箱数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('总箱数')">
+            <span>{{ order.sumNum }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 体积 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('体积')">
+            <span>{{ order.sumVolume }}m³</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 重量 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('重量')">
+            <span>{{ order.sumWeight }}Kg</span>
+          </el-form-item>
+        </el-col>
+        <!-- 总控箱数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('总控货箱数')">
+            <span>{{ order.sumNum }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 剩余放货箱数 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('剩余放货箱数')">
+            <span>{{ order.sumNum - order.releaseNum }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 邮库/到仓时间 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('卸柜/到仓时间')">
+            <span>{{ order.unloadTime }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 订单限制修改收货人 -->
+        <el-col :span="8">
+          <el-form-item :label="$t('订单限制修改收货人')">
+            <span>{{ order.isLimitUpdateConsignee ? $t("是") : $t("否") }}</span>
+          </el-form-item>
+        </el-col>
+        <!-- 订单锁定收货人天数 -->
+        <el-col :span="8" v-if="order.isLimitUpdateConsignee">
+          <el-form-item :label="$t('订单锁定收货人天数')">
+            <span>{{ order.lockConsigneeDay }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('增值服务')">
+            <span>{{ order.orgIsOverseasWarehouse ? $t("海外仓") : $t("非海外仓") }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20" v-if="order.isLimitUpdateConsignee">
+        <!-- 放货锁定收货人到期时间 -->
+        <el-col :span="12">
+          <el-form-item :label="$t('放货锁定收货人到期时间')" label-width="180px">
+            <span>{{ order.lockConsigneeTime }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider>{{ $t("修改信息") }}</el-divider>
+
+      <el-row :gutter="20">
+        <!-- 修改海外仓模式 -->
+        <el-col :span="24">
+          <el-form-item :label="$t('增值服务')">
+            <el-tag>{{ form.newIsOverseasWarehouse ? $t("海外仓") : $t("非海外仓") }}</el-tag>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 修改原因 -->
+        <el-col :span="24">
+          <el-form-item :label="$t('修改原因')">
+            <el-input type="textarea" v-model="form.reasonZh"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <!-- 附件 -->
+        <el-col :span="24">
+          <el-form-item :label="$t('附件')">
+            <file-upload v-model="form.annex" :fileType="fileType"></file-upload>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <work-flow xmlkey="order_consignee_limit_change" v-model="form.ccIds"></work-flow>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">{{ $t("取消") }}</el-button>
+      <el-button v-if="applyStatus === 1" type="primary" @click="handleGoBpm">{{ $t("审批中") }}</el-button>
+      <el-button v-else type="primary" @click="handleSubmit" :loading="loading">{{ $t("确定") }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import WorkFlow from "@/components/WorkFlow/index.vue"
+import FileUpload from "@/components/FileUpload/index.vue"
+import { applyCargoControlApproval, getReleaseTypeUpdateInfo } from "@/api/ecw/orderCargoControl"
+import dayjs from "dayjs"
+import { getApproval } from "@/api/ecw/order"
+export default {
+  components: {
+    FileUpload,
+    WorkFlow
+  },
+  props: {
+    order: Object
+  },
+  data() {
+    return {
+      // 是否显示弹窗
+      show: true,
+      fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf", "jpg", "jpeg", "png", "mp4", "mov", "avi", "mp3"],
+      applyStatus: 0, // 审批状态: 1 处理中 2 通过 3 不通过 4 已取消
+      bpmId: null, // 审批流程ID
+      form: {
+        // 申请类型：此处应该是 61 放货限制修改申请 62 海外仓修改申请
+        applyType: 62,
+        newIsOverseasWarehouse: null,
+        // 修改原因
+        reasonZh: "",
+        // 附件
+        annex: "",
+        ccIds: []
+      },
+      // 审批信息
+      approvalDetail: null,
+      loading: false
+    }
+  },
+  mounted() {
+    // 根据订单获取审批详情
+    this.getApply()
+  },
+  methods: {
+    getApply() {
+      // 先重置
+      this.applyStatus = 0
+      getReleaseTypeUpdateInfo(this.order.orderId).then((res) => {
+        const data = res.data
+        console.log({ data })
+        this.form.applyType = 62
+        this.form.newIsOverseasWarehouse = data.newIsOverseasWarehouse
+        this.form.reasonZh = data.reasonZh
+        this.form.annex = data.annex
+        this.form.ccIds =
+          data.ccIds
+            ?.split(",")
+            .filter((item) => !!item)
+            .map((item) => Number(item)) || []
+
+        this.applyStatus = data.applyStatus
+        this.bpmId = data.formId
+      })
+    },
+    /* getApproval(){
+      getApproval(this.id).then(res => {
+        this.approvalDetail = res.data
+      })
+    }, */
+    handleGoBpm() {
+      console.log("跳转审批页面，待完善")
+      this.handleClose()
+      this.$router.push({
+        path: "/bpm/process-instance/detail",
+        query: {
+          id: this.bpmId
+        }
+      })
+    },
+    handleClose() {
+      this.show = false
+      this.$emit("close")
+    },
+    handleSubmit() {
+      const data = {
+        ...this.form,
+        ccIds: this.form.ccIds.join(","),
+        orderId: this.order.orderId
+      }
+      this.loading = true
+      applyCargoControlApproval(data)
+        .then((res) => {
+          this.$message.success(this.$t("操作成功"))
+          this.$emit("success")
+          this.handleClose()
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    }
+  }
+}
+</script>

src/views/ecw/order/components/updateReleaseTypeApproval.vue

+<script>
+import { getApproval, getOrderDetail } from "@/api/ecw/order"
+import { getPickRleaseInfo } from "@/api/ecw/orderCargoControl"
+import Template from "@/views/cms/template/index.vue"
+import dayjs from "dayjs"
+
+export default {
+  name: "updateReleaseTypeApproval",
+  components: { Template },
+  props: {
+    // 审批ID
+    id: Number
+  },
+  data() {
+    return {
+      detail: null,
+      releaseInfo: null
+    }
+  },
+  mounted() {
+    this.getApprovalDetail()
+  },
+  computed: {
+    showExpireTime() {
+      return (days) => {
+        if (!this.releaseInfo?.unloadTime || !days) {
+          return "-"
+        }
+        return dayjs(this.releaseInfo.unloadTime).add(this.detail.newLockConsigneeDay, "day").format("YYYY-MM-DD HH:mm:ss")
+      }
+    }
+  },
+  methods: {
+    getApprovalDetail() {
+      getApproval(this.id).then((res) => {
+        try {
+          this.detail = JSON.parse(res.data?.details)
+          this.getPickRleaseInfo(this.detail.orderId)
+        } catch (e) {
+          console.error("审核详情解析失败", e)
+          this.$message.error("审核详情数据解析失败")
+        }
+      })
+    },
+    getPickRleaseInfo(orderId) {
+      getPickRleaseInfo(orderId).then((res) => {
+        this.releaseInfo = res.data
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <div v-if="detail && releaseInfo">
+    <el-descriptions>
+      <el-descriptions-item :label="$t('订单号')">
+        {{ detail.orderNo }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('总箱数')">
+        {{ detail.sumNum }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('总体积')"> {{ detail.sumVolume }}m³ </el-descriptions-item>
+      <el-descriptions-item :label="$t('总重量')"> {{ detail.sumWeight }}Kg </el-descriptions-item>
+      <el-descriptions-item :label="$t('总控货箱数')">
+        {{ detail.sumNum }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('剩余放货箱数')">
+        {{ detail.sumNum - detail.releaseNum }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('卸柜/到仓时间')">
+        {{ releaseInfo.unloadTime || "-" }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('订单限制修改收货人')">
+        {{ releaseInfo.isLimitUpdateConsignee ? $t("是") : $t("否") }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('订单锁定收货人天数')" v-if="releaseInfo.isLimitUpdateConsignee">
+        {{ releaseInfo.lockConsigneeDay }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('放货锁定收货人到期时间')" v-if="releaseInfo.isLimitUpdateConsignee">
+        {{ showExpireTime(releaseInfo.lockConsigneeDay) }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider>{{ $t("修改内容") }}</el-divider>
+    <el-descriptions :column="3">
+      <el-descriptions-item :label="$t('增值服务')">
+        {{ detail.newIsLimitUpdateConsignee ? $t("海外仓") : $t("非海外仓") }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('修改原因')" :span="3">
+        {{ detail.reasonZh }}
+      </el-descriptions-item>
+      <el-descriptions-item :label="$t('附件')" :span="3">
+        <div v-if="detail.annex">
+          <div v-for="url in detail.annex.split(',').filter((item) => !!item)">
+            <el-link :href="url" target="_blank">{{ url.split("/").pop() }}</el-link>
+          </div>
+        </div>
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<style scoped lang="scss"></style>

src/views/ecw/region/index.vue

@@ -43,6 +43,11 @@
       <el-table-column prop="titleZh" :label="$t('中文名称')" width="200"></el-table-column>
       <el-table-column prop="titleEn" :label="$t('英文名称')" width="200"></el-table-column>
       <el-table-column prop="shortName" :label="$t('简称')"  width="120"/>
+      <el-table-column prop="areaCode" :label="$t('区号')" width="120">
+        <template slot-scope="scope" v-if="scope.row.areaCode">
+          <span>+{{ scope.row.areaCode }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('语言')" width="120" align="center" prop="language" />
       <el-table-column prop="sort" :label="$t('排序')" width="50"></el-table-column>
       <el-table-column prop="type" :label="$t('类型')" width="120">
@@ -77,7 +82,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="876px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-row>
           <el-col :span="24">
@@ -162,6 +167,10 @@
                             :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
               </el-select>
             </el-form-item>
+
+            <el-form-item :label="$t('区号')" prop="areaCode">
+              <area-code-selector v-model="form.areaCode"  />
+            </el-form-item>
           </div>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item :label="$t('部门状态')" prop="status">-->
@@ -201,10 +210,11 @@ import {
 import {changeUserStatus} from "@/api/system/user";
 import {updateBankAccount} from "@/api/ecw/bankAccount";
 import { getCurrencyList } from '@/api/ecw/currency'
+import AreaCodeSelector from '@/components/AreaCodeSelector'
 
 export default {
   name: "Region",
-  components: { Treeselect },
+  components: { Treeselect, AreaCodeSelector },
   data() {
     return {
       // 遮罩层

src/views/member/user/memberDetails.vue

@@ -237,7 +237,10 @@
     </el-menu>
     <div class="table-container">
       <div class="reward" v-show="activeIndex == 'reward'">
-        <el-form
+        <!-- 积分记录 -->
+
+        <IntegralRecord :memberCode="$route.params.id"></IntegralRecord>
+        <!-- <el-form
           :model="queryParams"
           ref="queryForm"
           size="small"
@@ -334,7 +337,7 @@
           :page.sync="queryParams.pageNo"
           :limit.sync="queryParams.pageSize"
           @pagination="handleQueryPagination"
-        />
+        /> -->
       </div>
       <div class="exchange" v-show="activeIndex != 'reward'">
         <el-form
@@ -868,9 +871,10 @@ import {
 } from "@/api/ecw/memberManagement";
 import { getNodeList, getRewardsDetails } from '@/api/ecw/giftManagement'
 import OperatingGift from '@/views/ecw/giftManagement/components/operatingGift.vue'
+import IntegralRecord from "@/views/ecw/memberManagement/integralRecord"
 export default {
   name: "memberDetails",
-  components: { ImageUpload, FileUpload, OperatingGift },
+  components: { ImageUpload, FileUpload, OperatingGift, IntegralRecord },
   data() {
     return {
       // 网点
@@ -1070,7 +1074,7 @@ export default {
   methods: {
     handleViewRecord(row) {
       this.$router.push({
-        path: '/memberManagement/exchangeRecordOperation',
+        path: '/member/memberManagement/exchangeRecordOperation',
         query: { exchangeRewardID: row.id, pageStatus: 'view' }
       })
     },
@@ -1214,7 +1218,7 @@ export default {
     },
     handleExchangeRewards(details) {
       this.$router.push({
-        path: "/memberManagement/exchangeRecordOperation",
+        path: "/member/memberManagement/exchangeRecordOperation",
         query: {
           memberId: details.userScoreLevelInfo.memberId,
           pageStatus: "add",