t

src/api/shop.js

@@ -86,6 +86,17 @@ export function addGoods(query) {
   })
 }
 
+//外部商城报单列表
+export function orderDecList(query) {
+  return request({
+    url: '/v1/shop/order-dec-list',
+    method: 'get',
+    data: query,
+    params: query
+  })
+}
+
+
 
 
 

src/lang/en.js

@@ -523,6 +523,11 @@ export default {
     enterContentNotice:'Please enter the content',
     order:'Order',
     uploadImages:'Upload Images',
+    orderImport:'Order import',
+    currentImportOrderDate:'Current import order date',
+    selectDate:'Select date',
+    currentImportOrderPeriods:'Current import order periods',
+    totalRowsExcel:'Total rows of Excel file',
   },
 
   // 管理员管理

src/lang/zh.js

@@ -525,6 +525,11 @@ export default {
     enterContentNotice:'请输入内容',
     order:'排序',
     uploadImages:'上传图片',
+    orderImport:'订单导入',
+    currentImportOrderDate:'当前导入订单日期',
+    selectDate:'选择日期',
+    currentImportOrderPeriods:'当前导入订单期数',
+    totalRowsExcel:'Excel 文件总行数',
   },
 
   // 管理员管理

src/views/shop/order-dec-list.vue

@@ -20,26 +20,26 @@
           </el-table-column>
         </el-table>
         <div class="white-box-footer">
-          <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-dec-list-import`)">Order import<!-- 订单导入 --></el-button>
+          <el-button type="success" size="small" @click="handleImport" v-show="permission.hasPermission(`shop/order-dec-list-import`)">{{ $t('shop.orderImport') }}<!-- 订单导入 --></el-button>
   
           <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
                       @current-change="handleCurrentChange"></pagination>
         </div>
       </div>
-      <el-dialog title="Order import" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
+      <el-dialog :title="$t('shop.orderImport')" :visible.sync="importDialogVisible" width="50%"><!-- 订单导入 -->
         <el-form ref="form" :model="excelForm" style="width: 100%;" class="form-page">
-          <el-form-item label="Current import order date"><!-- 当前导入订单日期 -->
-            <el-date-picker  v-model="excelForm.orderDay" type="date" placeholder="Select date"  value-format="yyyy-MM-dd"><!-- 选择日期 -->
+          <el-form-item :label="$t('shop.currentImportOrderDate')"><!-- 当前导入订单日期 -->
+            <el-date-picker  v-model="excelForm.orderDay" type="date" :placeholder="$t('shop.selectDate')"  value-format="yyyy-MM-dd"><!-- 选择日期 -->
             </el-date-picker>
           </el-form-item>
-          <el-form-item v-show="false" label="Current import order periods"><!-- 当前导入订单期数 -->
+          <el-form-item v-show="false" :label="$t('shop.currentImportOrderPeriods')"><!-- 当前导入订单期数 -->
             <el-input v-model="excelForm.periodNum"></el-input>
           </el-form-item>
-          <el-form-item label="Total rows of Excel file"><!-- Excel 文件总行数 -->
+          <el-form-item :label="$t('shop.totalRowsExcel')"><!-- Excel 文件总行数 -->
             <el-input v-model="excelForm.rowCount"></el-input>
           </el-form-item>
           <el-form-item>
-            <leo-excel-uploader
+            <!-- <leo-excel-uploader
                     :request-upload-route="`file/upload-excel`"
                     :request-import-to-excel-table-route="`shop/import-order-dec-to-excel-table`"
                     :request-import-excel-table-to-data-route="`shop/import-order-dec`"
@@ -49,7 +49,8 @@
                     excel-option="addUser"
                     upload-btn-title="Excel import"
                     style="float: left;"
-            ></leo-excel-uploader><!-- Excel导入 -->
+            ></leo-excel-uploader> -->
+            <!-- Excel导入 -->
             <!--          <el-button type="primary" @click="handleExcel" style="float: left; margin-left: 10px;">下载模板</el-button>-->
           </el-form-item>
         </el-form>
@@ -58,19 +59,18 @@
   </template>
   
   <script>
-      import network from '@/utils/network'
       import tool from '@/utils/tool'
-      import baseInfo from '@/utils/baseInfo'
       import FilterUser from '@/components/FilterUser'
       import permission from '@/utils/permission'
-      import LeoExcelUploader from '../../components/ExcelUploader'
+    //   import LeoExcelUploader from '@/components/ExcelUploader'
       import Pagination from '@/components/Pagination'
       import filterHelper from '@/utils/filterHelper'
-      import {CDN_BASE_URL} from "../../utils/config";
+    //   import {CDN_BASE_URL} from "@/utils/config";
+    import { orderDecList } from '@/api/shop'
   
       export default {
           name: 'shop_order_dec-list',
-          components: {FilterUser, Pagination, LeoExcelUploader},
+          components: {FilterUser, Pagination},
           mounted() {
             this.initData()
             this.getData()
@@ -126,10 +126,31 @@
               },
               getData(page, pageSize) {
                   let filterData = this.filterModel
-                  network.getPageData(this, 'shop/order-dec-list', page, pageSize, filterData, response => {
-                      this.filterTypes = response.filterTypes
-                      this.allData = response
+                  let vueObj=this
+                  const paramsData = Object.assign({
+                    page: (page === null || page == undefined) ? 1 : page,
+                    pageSize: (pageSize === null || pageSize == undefined) ? vueObj.pageSize : pageSize
+                    }, filterData)
+                  orderDecList(paramsData).then(response => {
+                    vueObj.tableHeaders = response.data.columnsShow ? response.data.columnsShow : []
+                    vueObj.tableData = response.data.list
+                    vueObj.filterTypes = response.data.filterTypes
+                    vueObj.currentPage = page
+                    vueObj.totalPages = parseInt(response.data.totalPages)
+                    vueObj.totalCount = parseInt(response.data.totalCount)
+                    vueObj.pageSize = pageSize
+                    this.loading = false
+                  }).catch(err => {
+                    this.loading = false
+                    this.$message({
+                        message: err,
+                        type: 'error'
+                    })
                   })
+                //   network.getPageData(this, 'shop/order-dec-list', page, pageSize, filterData, response => {
+                //       this.filterTypes = response.filterTypes
+                //       this.allData = response
+                //   })
               },
               handleExcel() {
                   window.open(CDN_BASE_URL + `/files/order-dec-import.xlsx`)