订单期数调整

src/lang/en.js

@@ -87,7 +87,7 @@ export default {
     shopOrderShopList:'External mall order list',
     shopFlowRemainPv:'Remain BV Flow',
     shopRemainPv:'Remain BV',
-    shopOrderlList:'Order list',
+    shopOrderList:'Order List',
     moveNetworkManagement:'Move Network Management',
     memberLevelAdjustmentList:'Member Level Adjustment List',
     modifyStockistLevel:'Modify Stockist Level',
@@ -113,6 +113,7 @@ export default {
     metaAdminHandle:'Administrator operation log',
     metaUserHandle:'Member operation log',
     metaSystemLog:'System log',
+    metaOrderPeriodAdjust: 'Order Period Adjust',
   },
   navbar: {
     dashboard: 'Dashboard',
@@ -818,7 +819,14 @@ export default {
     courierNumber: 'courier number',
     selectOrderExportNotice: 'Please select an order to export',
     pdfOnlyOneOrderExported: 'Only one order can be exported at a time',
-    sureDeleteOrder: 'Are you sure to delete the order? Order number:'
+    sureDeleteOrder: 'Are you sure to delete the order? Order number:',
+    orderNumber: 'Order No.',
+    orderType: 'Order Type',
+    orderAmount: 'Order Amount',
+    afterAdjustmentPcNo: 'After adjust Pc No.',
+    pleaseSelectPcNo: 'Please select Period No.',
+    modifyOrderPcNoHits: 'Do you want to modify the order period No.？',
+    consignee: 'consignee',
   },
 
   // Administrator management

src/lang/zh.js

@@ -87,7 +87,7 @@ export default {
     shopOrderShopList:'外部商城订单列表',
     shopFlowRemainPv:'剩余BV流水',
     shopRemainPv:'剩余BV',
-    shopOrderlList:'订单列表',
+    shopOrderList:'订单列表',
     moveNetworkManagement:'移网管理',
     memberLevelAdjustmentList:'会员级别调整列表',
     modifyStockistLevel:'修改报单中心级别',
@@ -113,6 +113,7 @@ export default {
     metaAdminHandle:'管理员操作日志',
     metaUserHandle:'会员操作日志',
     metaSystemLog:'系统日志',
+    metaOrderPeriodAdjust: '订单期数调整',
   },
   navbar: {
     dashboard: '首页',
@@ -812,7 +813,13 @@ export default {
     courierNumber: '快递单号',
     selectOrderExportNotice: '请选择一条订单导出',
     pdfOnlyOneOrderExported: '每次只能导出一条订单',
-    sureDeleteOrder: '确定要删除订单吗？订单编号：'
+    sureDeleteOrder: '确定要删除订单吗？订单编号：',
+    orderNumber: '订单编号',
+    orderType: '订单类型',
+    orderAmount: '订单金额',
+    afterAdjustmentPcNo: '调整后期数',
+    pleaseSelectPcNo: '请选择要调整到的期数',
+    modifyOrderPcNoHits: '是否要修改当前订单期数？',
   },
 
   // 管理员管理

src/router/index.js

@@ -209,16 +209,16 @@ export const constantRoutes = [
         meta: {title: 'shopRemainPv',},
       },
       {
-        path: '/shop/order-list',
+        path: '/shop/order-list', // 订单列表
         component: () => import('@/views/shop/order-list'),
         name: 'shop_order-list',
-        meta: {title: 'shopOrderlList',},
+        meta: {title: 'shopOrderList',},
       },
       {
-        path: '/shop/order-period-adjust',
+        path: '/shop/order-period-adjust',  // 订单期数调整
         component: () => import('@/views/shop/order-period-adjust'),
         name: 'shop_order-period-adjust',
-        meta: {title: 'shopOrderPeriodAdjust',},
+        meta: {title: 'metaOrderPeriodAdjust',},
       },
     ]
   },

src/views/shop/order-period-adjust.vue

@@ -17,41 +17,41 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="primary" size="small" @click="visible = true" v-show="permission.hasPermission(`shop/order-adjust-period`)">调整订单期数</el-button>
+        <el-button type="primary" size="small" @click="visible = true" v-show="permission.hasPermission(`shop/order-adjust-period`)">{{ $t('menu.shopOrderPeriodAdjust') }}</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>
 
-    <el-dialog title="调整订单期数" :visible.sync="visible" width="50%">
-      <el-form ref="form" :model="form" label-width="250px" class="form-page">
-        <el-form-item label="订单编号" required clearable>
-          <el-input v-model="form.orderSn" @change="handleOrderSnChange"></el-input>
+    <el-dialog :title="$t('menu.shopOrderPeriodAdjust')" :visible.sync="visible" :width="screenWidth" style="margin-top: -80px">
+      <el-form ref="form" :model="form" label-width="150px" :label-position="labelPosition">
+        <el-form-item :label="$t('shop.orderNumber')" required clearable>
+          <el-input v-model.trim="form.orderSn" @change="handleOrderSnChange"></el-input>
         </el-form-item>
-        <el-form-item label="会员编号" v-show="order.USER_NAME">
+        <el-form-item :label="$t('member.memberCode')" v-show="order.USER_NAME">
           <el-input v-model="order.USER_NAME" disabled></el-input>
         </el-form-item>
-        <el-form-item label="订单类型" v-show="order.ORDER_TYPE">
+        <el-form-item :label="$t('shop.orderType')" v-show="order.ORDER_TYPE">
           <el-input v-model="order.ORDER_TYPE" disabled></el-input>
         </el-form-item>
         <el-form-item label="PV" v-show="order.PV">
           <el-input v-model="order.PV" disabled></el-input>
         </el-form-item>
-        <el-form-item label="订单金额" v-show="order.PAY_AMOUNT">
+        <el-form-item :label="$t('shop.orderAmount')" v-show="order.PAY_AMOUNT">
           <el-input v-model="order.PAY_AMOUNT" disabled></el-input>
         </el-form-item>
-        <el-form-item label="创建人编号" v-show="order.CREATE_USER">
+        <el-form-item :label="$t('Administrator.creatUser')" v-show="order.CREATE_USER">
           <el-input v-model="order.CREATE_USER" disabled></el-input>
         </el-form-item>
-        <el-form-item label="期数" v-show="order.PERIOD_NUM">
+        <el-form-item :label="$t('bonus.periodNo')" v-show="order.PERIOD_NUM">
           <el-input v-model="order.PERIOD_NUM" disabled></el-input>
         </el-form-item>
-        <el-form-item label="调整期数" required>
-          <el-select v-model="form.modernPeriod" placeholder="请选择要调整到的期数">
+        <el-form-item :label="$t('shop.afterAdjustmentPcNo')" required>
+          <el-select v-model="form.modernPeriod" :placeholder="$t('shop.pleaseSelectPcNo')" style="width: 100%;">
             <el-option v-for="item in availablePeriod" :key="item.PERIOD_NUM" :label="item.PERIOD_NUM" :value="item.PERIOD_NUM" :disabled="item.disabled"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">提交</el-button>
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat">{{ $t('common.confirm') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -65,6 +65,7 @@
   import Pagination from '@/components/Pagination'
   import filterHelper from '@/utils/filterHelper'
   import {orderPeriodAdjustList, orderDetail, orderPeriodAdjust} from '@/api/shop'
+	import {getScreenWidth} from "@/utils";
 
   export default {
     name: 'shop_order-period-adjust',
@@ -94,6 +95,8 @@
         },
         order: {},
         availablePeriod: null,
+				screenWidth: getScreenWidth() > 500 ? '500px' : getScreenWidth() + 'px',
+				labelPosition: getScreenWidth() >= 500 ? 'right' : 'top',
       }
     },
     methods: {
@@ -159,9 +162,9 @@
         }
       },
       onSubmit() {
-        this.$confirm('是否要修改当前订单期数？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm(this.$t('member.modifyOrderPcNoHits'), this.$t('common.hint'), {
+					confirmButtonText: this.$t('common.confirm'),
+					cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this._handleSubmit()