Merge branch 'release' into 'jd_dev'

Release最新代码合并入捷道研发分支20241123

See merge request !39

src/api/order.js

@@ -265,3 +265,11 @@ export function getOfferCheck(params) {
     params
   })
 }
+
+// 复制订单/my/order/copy/{copyOrderId}
+export function copyOrder(copyOrderId) {
+  return request({
+    url: '/app-api/my/order/copy/' + copyOrderId,
+    method: 'post'
+  })
+}

src/lang/en.js

@@ -54,6 +54,7 @@ export default {
   route: {
     dashboard: "home page",
     profile: "profile",
+    personalCenter: "Personal Center",
     setting: "setting",
     advice: "advice",
     help: "help",
@@ -148,7 +149,7 @@ export default {
     Id1: "Please upload frontal photo of ID",
     Id2: "Please upload back side photo of ID",
     success: "Submitted successfully",
-    loading: "Uploading..",
+    uploading: "Uploading..",
     newPhone: "new phone",
     edited: "Edited Success",
     company: "company name",
@@ -603,7 +604,7 @@ export default {
     no: "no",
     warehouseNum: "warehouseNum",
     entry: "receipt data ",
-    warehouseType: "warehouseType",
+    warehouseType: "Type of warehouse entry",
     customsType: "Customs declaration",
     isCollection: "collection",
     activeFirst: "Details of the goods",
@@ -626,6 +627,8 @@ export default {
     hiddenText: "Show",
     showText: "Hide",
     transInfo: "Transportation information",
+    packageType: 'special requirements',
+    packageRemarks: 'Special Requirements Remarks',
     own: "selp pickup",
     toRoom: "to door",
     typeName: "value-added services",
@@ -639,15 +642,21 @@ export default {
     tiedanPrice: "Does the bill of lading display the price",
     warehouseName: "Warehouse",
     externalWarehouse: "External warehouse",
+    ownWarehouse: "Own warehouse",
     estLoading: "Loading time",
     loadingAddress: "Loading address",
-    creator: "creator",
+    creator: "Creator",
     customerManage: "Customer Manager",
     prodTitle: "item name",
     inWarehouseInfo: "Warehouse entry information",
     packing: "packing",
+    expressNO: "express no",
     tiandanExpressNO: "prefill express tracking number",
     feeData: "Fee data",
+    member: "Member",
+    admin: "Admin",
+    createTime: "Create Time",
+    customerService: "Customer service",
   },
   customer: {
     none: "none",
@@ -692,9 +701,9 @@ export default {
     addGroup: "add the group",
     updateGroup: "update the group",
     deleteGroup: "Delete the group?",
-    default: "默认",
-    yes: "是",
-    no: "否",
+    default: "default",
+    yes: "Yes",
+    no: "No",
   },
   ecash: {
     time: "time",
@@ -736,6 +745,8 @@ export default {
     refundWarehouse: "Return warehouse",
     abnormal: "abnormal",
     edit: "edit",
+    copy: "copy",
+    delete: "delete",
     cancel: "cancel",
     refundOrderNo: "Return OrderNo",
     refundReason: "Return Reason",
@@ -1068,6 +1079,9 @@ export default {
     orderType1: 'Cargo service',
     orderType2: 'Overseas warehouse',
     consigneeName: 'consigneeName',
+    yes: 'Yes',
+    no: 'No',
+    name: 'Name',
     consigneeNameNotice: 'Please enter the name of the consignee',
     consigneeNameNoticeEn: 'Please enter the name of the consignee in English',
     openConsignee: 'Select the consignee',
@@ -1078,12 +1092,15 @@ export default {
     consigneeCompanyNoticeEn: 'Please enter the company name in English',
     consignorConfirm: 'Please confirm the freight be paid by sender？',
     emailNotice: 'Please enter email address',
+    transportTitle: 'transport info',
     transport: '*transport',
     transportNotice: 'Please select the mode of transportation',
     channel: 'channel',
     channelNotice: 'Please select the shipping channel',
     departure: '*departure',
+    destCountry: 'Destination country',
     destCountryRules: 'destination country must be chosen',
+    destCountryNotice: 'Please select the destination country',
     departureRules: 'The place of origin is mandatory',
     departureNotice: 'Please select the place of departure',
     objective: '*objective',
@@ -1091,6 +1108,7 @@ export default {
     objectiveNotice: 'Please select a destination',
     router: '*Please select a line',
     routerNotice: 'Select a line on the right',
+    addServices:'value-added services',
     goods: 'goods info',
     addPro: 'addPro',
     addPros: 'addPros',
@@ -1128,14 +1146,21 @@ export default {
     issuingMethod: '*issuingMethod',
     deliveryDate: '*deliveryDate',
     deliveryDateRules: 'The delivery date cannot be empty',
+    displayBillLading: 'Does the bill of lading display the price',
+    display: 'display',
+    notDisplay: 'Do not display',
     warehouseType: '*warehouseType',
+    externalWarehouse: 'External warehouse',
     harvestMethod: '*harvestMethod',
+    loadingTime: 'loading time',
+    loadingAddress: 'Loading address',
     deliveryaddress: 'deliveryaddress',
     deliveryaddressRules: 'The receiving area cannot be empty',
     addressdetail: 'addressdetail',
     addressdetailRules: 'The shipping address cannot be blank',
     drawee: '*drawee',
     customDraweeList: 'customDraweeList',
+    other:"Other",
     number: 'number',
     numberNotice: 'Please enter the tracking number of your purchase',
     getNumber: 'getNumber',

src/lang/zh.js

@@ -25,6 +25,7 @@ export default {
   route: {
     dashboard: "首页",
     profile: "个人中心",
+    personalCenter: "个人中心",
     setting: "个人设置",
     advice: "咨询建议",
     help: "帮助",
@@ -115,7 +116,7 @@ export default {
     Id1: "请上传证件正面照",
     Id2: "请上传证件反面照",
     success: "提交成功",
-    loading: "上传中..",
+    uploading: "上传中..",
     newPhone: "请输入您的新手机号",
     edited: "修改成功",
     company: "请输入公司名称",
@@ -606,6 +607,8 @@ export default {
     hiddenText: "隐藏",
     showText: "展示",
     transInfo: "运输信息",
+    packageType: '特殊要求',
+    packageRemarks: '特殊要求备注',
     own: "自提",
     toRoom: "送货上门",
     typeName: "增值服务",
@@ -618,7 +621,8 @@ export default {
     customerUndertakes: "客户承接",
     tiedanPrice: "提单是否显示价格",
     warehouseName: "仓库",
-    externalWarehouse: "外部仓",
+    externalWarehouse: "外部仓库",
+    ownWarehouse: "自有仓",
     estLoading: "装柜时间",
     loadingAddress: "装柜地址",
     creator: "创建人",
@@ -626,8 +630,13 @@ export default {
     prodTitle: "品名",
     inWarehouseInfo: "入仓信息",
     packing: "包装",
+    expressNO: "快递单号",
     tiandanExpressNO: "填单快递单号",
     feeData: "收费数据",
+    member: "会员",
+    admin: "后台用户",
+    createTime: "创建时间",
+    customerService: "客户经理",
   },
   customer: {
     none: "无",
@@ -716,6 +725,8 @@ export default {
     refundWarehouse: "申请退仓",
     abnormal: "处理",
     edit: "编辑",
+    copy: "复制",
+    delete: "删除",
     cancel: "取消订单",
     refundOrderNo: "退仓订单号",
     refundReason: "退仓原因",
@@ -992,6 +1003,9 @@ export default {
     orderType1: '集运服务',
     orderType2: '海外仓',
     consigneeName: '收货人',
+    yes: "是",
+    no: "否",
+    name: '名称',
     consigneeNameNotice: '请输入收货人姓名',
     consigneeNameNoticeEn: '请输入收货人英文名称',
     openConsignee: '选择收货人',
@@ -1001,12 +1015,15 @@ export default {
     consigneeCompanyNotice: '请输入公司名称',
     consigneeCompanyNoticeEn: '请输入公司英文名称',
     emailNotice: '请输入邮箱',
+    transportTitle: '运输',
     transport: '运输方式',
     transportNotice: '请选择运输方式',
     channel: '出货渠道',
     channelNotice: '请选择出货渠道',
     departure: '始发城市',
+    destCountry: '目的国',
     destCountryRules: '目的国必选',
+    destCountryNotice: '请选择目的国',
     departureRules: '始发城市必选',
     departureNotice: '请选择始发地',
     objective: '目的城市',
@@ -1014,6 +1031,7 @@ export default {
     objectiveNotice: '请选择目的地',
     router: '请选择线路',
     routerNotice: '请在右侧选择线路',
+    addServices:'增值服务',
     goods: '商品',
     addPro: '添加货物',
     addPros: '批量添加货物',
@@ -1051,14 +1069,21 @@ export default {
     issuingMethod: '出单方式',
     deliveryDate: '预计送货日期',
     deliveryDateRules: '预计送货日期不能为空',
+    displayBillLading: '提单是否显示价格',
+    display: '显示',
+    notDisplay: '不显示',
     warehouseType: '入仓类型',
+    externalWarehouse: '外部仓库',
     harvestMethod: '收货方式',
+    loadingTime: '装货时间',
+    loadingAddress: '装货地址',
     deliveryaddress: '收货地区',
     deliveryaddressRules: '收货地区不能为空',
     addressdetail: '收货详细地址',
     addressdetailRules: '收货详细地址不能为空',
     drawee: '付款人',
     customDraweeList: '费用类型',
+    other:"其他",
     number: '快递单号',
     numberNotice: '请输入购买商品的快递单号',
     getNumber: '生成单号',

src/layout/components/JdSidebar/index.vue

@@ -130,7 +130,7 @@
               line-height: 42px;
               margin-left: 5px;
             "
-            >{{ $t("个人中心") }}</span
+            >{{ $t("route.personalCenter") }}</span
           >
         </div>
       </div>

src/views/jiedao/profile/coupons.vue

@@ -6,7 +6,7 @@
         <el-option
           v-for="item in options"
           :key="item.value"
-          :label="item.label"
+          :label=" isChinese ? item.labelZh : item.labelEn "
           :value="item.value"
         />
       </el-select>
@@ -77,6 +77,12 @@ export default {
       ]
     }
   },
+  computed: {
+    isChinese() {
+      this.getCode = this.$t("login.getCode");
+      return this.$i18n.locale === "zh_CN";
+    },
+  },
   created() {
     this.getList()
   },

src/views/jiedao/profile/delivery.vue

@@ -32,8 +32,8 @@
       <section-title lang-key="delivery.header">
           {{$t('delivery.consigneeName')}}
           <el-radio-group v-if="noConsignee" v-model="hasConsignee">
-            <el-radio :label="true">{{$t('有')}}</el-radio>
-            <el-radio :label="false">{{$t('无')}}</el-radio>
+            <el-radio :label="true">{{$t('delivery.yes')}}</el-radio>
+            <el-radio :label="false">{{$t('delivery.no')}}</el-radio>
           </el-radio-group>
       </section-title>
 
@@ -41,7 +41,7 @@
       <el-row :gutter="20" style="margin-top: 30px" v-if="hasConsignee">
         <el-col :span="12">
           <el-form-item
-            :label="$t('名称')"
+            :label="$t('delivery.name')"
             prop="consigneeName"
           >
             <el-input
@@ -141,7 +141,7 @@
 
       <el-card style="margin-top:20px;">
         <template #header>
-          <section-title :title="$t('运输')"></section-title>
+          <section-title :title="$t('delivery.transportTitle')"></section-title>
         </template>
         <el-descriptions :column="2" border>
           <el-descriptions-item
@@ -207,18 +207,18 @@
           >
             <span
                 slot="label"
-            ><span style="color: red">*</span>{{ $t("目的国") }}</span>
+            ><span style="color: red">*</span>{{ $t("delivery.destCountry") }}</span>
             <el-form-item
                 label=""
                 label-width="0"
                 style="margin-bottom: 0"
                 prop="destCountryId"
                 required
-                :error="$t('请选择目的国')"
+                :error="$t('delivery.destCountryNotice')"
             >
               <el-select
                   v-model="form.destCountryId"
-                  :placeholder="$t('请选择目的国')"
+                  :placeholder="$t('delivery.destCountryNotice')"
                   clearable
                   @change="handleChangeDestCountry"
               >
@@ -239,13 +239,12 @@
           >
             <span
               slot="label"
-            ><span style="color: red">*</span>{{ $t("delivery.objective") }}</span>
+            >{{ $t("delivery.objective") }}</span>
             <el-form-item
               label=""
               label-width="0"
               style="margin-bottom: 0"
               prop="objectiveId"
-              required
               :error="$t('delivery.objectiveRules')"
             >
               <el-select
@@ -328,7 +327,7 @@
           </el-descriptions-item>
 
           <!--服务-->
-          <el-descriptions-item :label="$t('增值服务')"
+          <el-descriptions-item :label="$t('delivery.addServices')"
                                 v-if="selectedRouter && (routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1)">
             <el-checkbox-group v-model="form.type">
               <el-checkbox label="1"
@@ -476,7 +475,7 @@
                 <el-input-number
                   v-model="scope.row.num"
                   :controls="false"
-                  :min="0"
+                  :min="1"
                   :precision="0"
                   :disabled="!canAddProduct"
                 />
@@ -581,7 +580,7 @@
           >
             <!-- eslint-disable-next-line vue/no-unused-vars -->
             <template slot="header" slot-scope="scope">
-              <span class="red">*</span>{{ $t("delivery.worth") }}
+              <span class="red">*</span>{{ $t("delivery.worth") }}(RMB)
             </template>
             <template slot-scope="scope">
               <el-form-item
@@ -723,10 +722,11 @@
           </el-descriptions-item>
           <!--报价费币种 lanbm 2024-05-14 修改BUG-->
           <el-descriptions-item :label="$t('delivery.insuranceFee')">
-            {{ fee.insuranceFee || 0 }}<div v-if="fee.insuranceCurrencyId == 1">
+            {{ fee.insuranceFee || 0 }}
+            <template v-if="fee.insuranceCurrencyId == 1">
               {{ $t("delivery.dollar") }}
-            </div>
-            <div v-else>(RMB)</div>
+            </template>
+            <template v-else>(RMB)</template>
           </el-descriptions-item>
         </el-descriptions>
       </el-card>
@@ -846,11 +846,11 @@
               </template>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('提单是否显示价格')" >
-            <el-form-item prop="displayBillLadingPrice">
+          <el-descriptions-item :label="$t('delivery.displayBillLading')" >
+            <el-form-item prop="displayBillLadingPrice" class="mb-0">
               <el-radio-group v-model="form.displayBillLadingPrice">
-                <el-radio :label="true">{{$t('显示')}}</el-radio>
-                <el-radio :label="false">{{$t('不显示')}}</el-radio>
+                <el-radio :label="true">{{$t('delivery.display')}}</el-radio>
+                <el-radio :label="false">{{$t('delivery.notDisplay')}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-descriptions-item>
@@ -876,15 +876,15 @@
             </el-form-item>
           </el-descriptions-item>
 
-          <el-descriptions-item :label="$t('外部仓库')" :span="2">
-            <el-form-item prop="isExternalWarehouse">
+          <el-descriptions-item :label="$t('delivery.externalWarehouse')" :span="2">
+            <el-form-item prop="isExternalWarehouse" class="mb-0">
               <el-checkbox label="" v-model="form.isExternalWarehouse" @change="form.isExternalWarehouse=$event" :disabled="false"></el-checkbox>
             </el-form-item>
             <div v-if="form.isExternalWarehouse">
               <div v-for="(item, index) in form.externalWarehouseDtoList" :key="index"
                    style="border-bottom: 1px solid #ccc; margin-bottom: 10px">
                 <div class="flex-1">
-                  <el-form-item :label="$t('装货时间')"
+                  <el-form-item :label="$t('delivery.loadingTime')"
                                 :prop="'externalWarehouseDtoList.' + index + '.estLoadingTime'"
                                 :rules="{
                               required: true, message: '装货时间不能为空', trigger: 'blur'
@@ -894,7 +894,7 @@
                   </el-form-item>
                 </div>
                 <div class="flex-1">
-                  <el-form-item :label="$t('装货地址')"
+                  <el-form-item :label="$t('delivery.loadingAddress')"
                                 :prop="'externalWarehouseDtoList.' + index + '.loadingAddress'"
                                 :rules="{
                               required: true, message: '装货地址不能为空', trigger: 'blur'
@@ -1045,7 +1045,7 @@
       </el-card>
       <el-card class="mt-10">
         <template #header>
-          <section-title :title="$t('其他')"></section-title>
+          <section-title :title="$t('delivery.other')"></section-title>
         </template>
         <el-descriptions :column="2" :label-style="{width: '100px'}" border>
           <el-descriptions-item>
@@ -1061,7 +1061,7 @@
               </el-tooltip>
             </span>
             <!--特殊要求 / 包装类型-->
-            <el-form-item prop="packageType">
+            <el-form-item prop="packageType" class="mb-0">
               <dict-selector
                   v-model="form.packageType"
                   form-type="checkbox"
@@ -1072,13 +1072,13 @@
           </el-descriptions-item>
           <el-descriptions-item :label="$t('特殊要求备注')">
             <!--包装备注-->
-            <el-form-item prop="packageRemarks">
+            <el-form-item prop="packageRemarks" class="mb-0">
               <el-input v-model="form.packageRemarks" type="textarea" class="w-150" />
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item :span="2" :label="$t('delivery.number')">
             <!--快递单号-->
-            <el-form-item prop="number">
+            <el-form-item prop="number" class="mb-0">
               <el-input
                   v-model="form.number"
                   :placeholder="$t('delivery.numberNotice')"
@@ -1094,7 +1094,7 @@
           <template v-if="isAir">
             <el-descriptions-item :label="$t('delivery.customsClearCert')">
               <!--清关证书-->
-              <el-form-item prop="customsClearCert">
+              <el-form-item prop="customsClearCert" class="mb-0">
                 <dict-selector
                     v-model="form.customsClearCert"
                     form-type="radio"
@@ -1106,13 +1106,13 @@
             </el-descriptions-item>
             <el-descriptions-item :label="$t('delivery.clearCertRemark')">
               <!--清关证书备注-->
-              <el-form-item prop="remarks">
+              <el-form-item prop="remarks" class="mb-0">
                 <el-input v-model="form.remarks" />
               </el-form-item>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('delivery.isUnpack')">
               <!--是否拆包-->
-              <el-form-item prop="isUnpack">
+              <el-form-item prop="isUnpack" class="mb-0">
                 <dict-selector
                     v-model="form.isUnpack"
                     form-type="radio"
@@ -1123,7 +1123,7 @@
             </el-descriptions-item>
             <el-descriptions-item :label="$t('delivery.isSingleTicketTransport')">
               <!--单票立刻转运-->
-              <el-form-item prop="isSingleTicketTransport">
+              <el-form-item prop="isSingleTicketTransport" class="mb-0">
                 <dict-selector
                     v-model="form.isSingleTicketTransport"
                     form-type="radio"
@@ -2055,13 +2055,23 @@ export default {
 
     if (this.$route.query.id) {
       await getOrderDetail(this.$route.query.id).then(async (res) => {
-        this.form = Object.assign({}, res.data, { orderItemVOList: [], destCountryId: null })
+        this.form = Object.assign({}, res.data, {
+          orderItemVOList: [],
+          destCountryId: null,
+          consigneeName: '',
+          consigneePhone: ''
+        })
         this.form.deliveryDate = res.data.deliveryDate
+        this.form.hasConsignee  = res.data.hasConsignee
+        if (!this.noConsignee){
+          // 不允许无收货人
+          this.form.hasConsignee = true
+        }
         if(res.data.consigneeVO){
           this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
           this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode)
           this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company)
-          this.$set(this.form,'consigneeCompanyEn', res.data.consigneeVO.companyEn)
+          this.$set(this.form, 'consigneeCompanyEn', res.data.consigneeVO.companyEn)
           this.$set(this.form, 'consigneeEmail', res.data.consigneeVO.email)
           this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
           this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn)
@@ -2361,7 +2371,14 @@ export default {
       })
     },
     addProduct(data) {
-      this.form.orderItemVOList.push(data || { prodAttrArr: [] })
+      this.form.orderItemVOList.push(data || {
+        prodAttrArr: [],
+        prodId: null,
+        worth: '',
+        volume: '',
+        weight: '',
+        num: 1
+      })
     },
     // 计算商品运费(根据货值计算保费)
     calculationPrice() {

src/views/jiedao/profile/orderdetail.vue

@@ -120,66 +120,67 @@
         <el-descriptions-item v-else label="">
           <!--占位-->
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('特殊要求')">
+        <el-descriptions-item :label="$t('orderdetail.packageType')">
           <template v-if="order.packageType">
             <dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" :key="packageType" class="mr-10" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
           </template>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('特殊要求备注')">
+        <el-descriptions-item :label="$t('orderdetail.packageRemarks')">
           {{ order.packageRemarks }}
         </el-descriptions-item>
+        <template v-if="showMore">
+          <el-descriptions-item :label="$t('orderdetail.deliveryDate')">
+            {{ order.deliveryDate }}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.warehouseType')">
+            <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
+          </el-descriptions-item>
 
-        <el-descriptions-item :label="$t('送货时间')">
-          {{ order.deliveryDate }}
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('入仓类型')">
-          <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
-        </el-descriptions-item>
-
-        <!--下面几个是空运特有字段-->
-        <!--清关证书-->
-        <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
-        <!--清关证书备注-->
-        <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.clearCertRemark')">
-          {{ order.clearCertRemark }}
-        </el-descriptions-item>
-        <!--是否拆包-->
-        <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isUnpack')">
-          {{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }}
-        </el-descriptions-item>
-        <!--单票立刻转运-->
-        <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isSingleTicketTransport')">
-          {{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
-        </el-descriptions-item>
+          <!--下面几个是空运特有字段-->
+          <!--清关证书-->
+          <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
+          <!--清关证书备注-->
+          <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.clearCertRemark')">
+            {{ order.clearCertRemark }}
+          </el-descriptions-item>
+          <!--是否拆包-->
+          <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isUnpack')">
+            {{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }}
+          </el-descriptions-item>
+          <!--单票立刻转运-->
+          <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isSingleTicketTransport')">
+            {{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
+          </el-descriptions-item>
 
-        <el-descriptions-item :label="$t('代收货款')">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
-          <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('提单是否显示价格')">
-          {{order.displayBillLadingPrice ? $t('是') : $t('否')}}
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('仓库')">
-          {{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }}
-          <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
-            <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
-              {{$t('装柜时间')}}： {{item.estLoadingTime}}
-              {{$t('装柜地址')}}：{{item.loadingAddress}}
-            </div>
-          </template>
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('快递单号')">
-          {{order.number}}
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('创建人')">
-          {{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}）
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('创建时间')">
-          {{order.createTime|parseTime}}
-        </el-descriptions-item>
-        <el-descriptions-item :label="$t('客户经理')">
-          {{order.salesmanName}}
-        </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.isCollection')">
+            <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
+            <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('delivery.displayBillLading')">
+            {{order.displayBillLadingPrice ? $t('orderdetail.is'):$t('orderdetail.no')}}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.warehouseName')">
+            {{order.isExternalWarehouse ? $t('orderdetail.externalWarehouse') : $t('orderdetail.ownWarehouse') }}
+            <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
+              <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
+                {{$t('orderdetail.estLoading')}}： {{item.estLoadingTime}}
+                {{$t('orderdetail.loadingAddress')}}：{{item.loadingAddress}}
+              </div>
+            </template>
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.expressNO')">
+            {{order.number}}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.creator')">
+            {{order.creatorName}} （{{order.userType == 1 ? $t('orderdetail.member') : $t('orderdetail.admin')}}）
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.createTime')">
+            {{order.createTime|parseTime}}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('orderdetail.customerService')">
+            {{order.salesmanName}}
+          </el-descriptions-item>
+        </template>
       </el-descriptions>
 
       <!--<div v-if="[3, 4].indexOf(+order.transportId) > -1" style="display: flex;margin-top: 20px;">

src/views/jiedao/profile/postorder.vue

@@ -137,7 +137,7 @@
           <el-button v-if="scope.row.status == 2" size="mini" type="text" icon="el-icon-delete" @click="oprateOrder(scope.row.orderId)">{{ $t('postorder.cancel') }}</el-button>
           <el-button v-if="scope.row.status == 5" size="mini" type="text" icon="el-icon-edit" @click="refundWarehouse(scope.row)">{{ $t('postorder.refundWarehouse') }}</el-button>
           <el-button v-if="scope.row.abnormalState>1&&scope.row.status!=88" size="mini" type="text" icon="el-icon-edit" @click="handleAbnormal(scope.row.orderId)">{{ $t('postorder.abnormal') }}</el-button>
-          <el-button v-if="scope.row.status == 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row.orderId)">{{ $t('删除') }}</el-button>
+          <el-button v-if="scope.row.status == 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row.orderId)">{{ $t('postorder.delete') }}</el-button>
           <el-button v-if="scope.row.customsType == 2" size="mini" type="text" icon="el-icon-edit" @click.native="declarationOrderId=scope.row.orderId;declarationOrderNo=scope.row.orderNo">{{ $t('common.uploadDeclaration') }}</el-button>
           <el-button
             v-if="
@@ -150,6 +150,7 @@
             @click.native="printTagOrderId=scope.row.orderId"
           >{{ $t('打印标签') }}
           </el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)">{{ $t('postorder.copy') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -207,7 +208,7 @@
 </template>
 
 <script>
-import { getIssued, cancelOrder, deleteOrder, refundWarehouseApply } from '@/api/order'
+import { getIssued, cancelOrder, deleteOrder, refundWarehouseApply, copyOrder } from '@/api/order'
 import { parseTime } from '@/utils'
 import RightToolbar from '@/components/RightToolbar'
 import Pagination from '@/components/Pagination'
@@ -317,6 +318,11 @@ export default {
         })
       }).catch(() => {})
     },
+    handleCopy(row){
+      copyOrder(row.orderId).then((res) => {
+        this.handleUpdate({ orderId: res.data})
+      })
+    },
     oprateOrder(orderId) {
       this.$confirm(this.$t('postorder.confirm'))
         .then(() => {