diff --git a/.env.production b/.env.production
index 6f8ae33..3198248 100644
--- a/.env.production
+++ b/.env.production
@@ -5,15 +5,15 @@ NODE_ENV = production
VUE_APP_TITLE = 象纬云科
# 测试环境
- VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1
- VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1
- VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss
- VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss
+# VUE_APP_API_BASEURL = https://dev.api.linkwing.com/api/v1
+# VUE_APP_API_DEV = https://dev.api.linkwing.com/api/v1
+# VUE_APP_WS_URL = wss://dev.api.linkwing.com/wss
+# VUE_APP_WSS_URL = wss://dev.api.linkwing.com/wss
# 线上环境
# 接口地址 # WS地址
-# VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1
-# VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1
-# VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss
-# VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss
+ VUE_APP_API_BASEURL = https://prod.api.linkwing.com/api/v1
+ VUE_APP_API_DEV = https://prod.api.linkwing.com/api/v1
+ VUE_APP_WS_URL = wss://prod.api.linkwing.com/wss
+ VUE_APP_WSS_URL = wss://prod.api.linkwing.com/wss
diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue
index de6331e..1f76ae5 100644
--- a/src/components/scImport/index.vue
+++ b/src/components/scImport/index.vue
@@ -58,7 +58,7 @@
取 消
- 确定导入
+ 确定导入
@@ -72,6 +72,7 @@ export default {
props:{
size:{type:String, default:'small'},
title:{type:String, default: ""},
+ type:{type:[String, Number], default: ""}
},
data(){
return{
@@ -90,7 +91,9 @@ export default {
progressShow:false,
errorShow:false,
importInfo:{},
- errorList:[]
+ errorList:[],
+
+ // 按数组的形式展示
}
},
setup(){
@@ -108,16 +111,18 @@ export default {
methods:{
getWsResult(res){
if(res.data && (res.data.type == 4 || res.data.type == 5 || res.data.type == 10 || res.data.type == 17 || res.data.type == 18 || res.data.type == 27 || res.data.type == 28 || res.data.type == 31 || res.data.type == 42)){
- this.importInfo = res.data;
- this.progressShow = true;
- if(res.data.status == 0){
- this.errorShow = true;
- let text = res.data;
- this.errorList.push(text);
- }
- if(res.data.rate == 100){
- this.progressShow = false;
- this.$emit('importSuccess');
+ if(this.type == res.data.type){
+ this.importInfo = res.data;
+ this.progressShow = true;
+ if(res.data.status == 0){
+ this.errorShow = true;
+ let text = res.data;
+ this.errorList.push(text);
+ }
+ if(res.data.rate == 100){
+ this.progressShow = false;
+ this.$emit('importSuccess');
+ }
}
}
},
@@ -163,12 +168,11 @@ export default {
},
save(){
this.errorClick();
-
this.$emit('parentParams',this.params);
},
// 上传成功
handleSuccess(){
- // this.$message.success('上传成功,马上开始导入数据');
+
},
// 上传失败
handleError(){
diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue
index a929aec..a569217 100644
--- a/src/views/cost/feeRecords/index.vue
+++ b/src/views/cost/feeRecords/index.vue
@@ -4,7 +4,7 @@
新增
-
+
批量导入
diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue
index 9911b2e..4dfc2db 100644
--- a/src/views/order/inventoryList/index.vue
+++ b/src/views/order/inventoryList/index.vue
@@ -2,7 +2,7 @@
-
+
批量导入
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index c5828ee..2091805 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -3,7 +3,7 @@