+
+
+
- {{ dateFormatter(scope.row.orderTime) }}
+ {{ scope.row.courierNumber }}
-
+
+
+
- {{ scope.row.courierNumber }}
+ {{ dateFormatter(scope.row.deliveryTime) }}
-
+
-
+
-
+
+
+ {{ scope.row.endTime ? dateFormatter(scope.row.endTime) : "" }}
+
-
+
-
+
+
{
- if (res.code == 200) {
- this.total = res.total;
- this.expressData = res.data;
- }
-
- })
+ this.loading = true;
+ try {
+ queryExpressList(_param).then(res => {
+ this.loading = false;
+ if (res.code == 200) {
+ this.total = res.total;
+ this.expressData = res.data;
+ }
+ }, err => {
+ this.loading = false;
+ })
+ } catch (error) {
+ this.loading = false;
+ }
},
//分页
handleSizeChange(val) {
@@ -151,8 +174,25 @@ export default {
this.queryList();
},
//excel导入
+ handleBeforeUpload(file) {
+ const isLt10M = file.size / 1024 / 1024 < 10;
+ if (!isLt10M) {
+ this.$message.error('导入文件不能超过 10MB!');
+ } else {
+ this.importLoading = true;
+ }
+ return isLt10M;
+ },
+ UploadChange(file, fileList) {
+ setTimeout(() => {
+ this.importLoading = false;
+ this.$refs.upload.clearFiles();
+ this.$refs.upload.abort();
+ }, 1000 * 60 * 1);//三分钟之后关闭加载
+ },
uploadSuccess(response, file, fileList) {
- if(response.code == 200) {
+ this.importLoading = false;
+ if (response.code == 200) {
this.$message.success('导入成功');
this.$refs.upload.clearFiles();
this.pagination.page = 1;
@@ -160,6 +200,7 @@ export default {
}
},
uploadError(err, file, fileList) {
+ this.importLoading = false;
console.log('导入失败', err)
},
//快递100
diff --git a/vue.config.js b/vue.config.js
index 131f7a2..2eb0f34 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,14 +29,15 @@ module.exports = defineConfig({
changeOrigin: true,
ws: true,
},
- '/sjapi': {
- target: 'http://192.168.1.38:8210',
- changeOrigin: true,
- ws: true,
- pathRewrite: {
- '/sjapi': ''
- }
- },
+ // '/sjapi': {
+ // target: 'http://192.168.1.38:8210',
+ // // target: 'http://127.0.0.1:8210',
+ // changeOrigin: true,
+ // ws: true,
+ // pathRewrite: {
+ // '/sjapi': ''
+ // }
+ // },
'/pollapi': {
target: 'https://poll.kuaidi100.com',
changeOrigin: true,