diff --git a/.env.production b/.env.production
index 3198248..6f8ae33 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/api/model/shipment.js b/src/api/model/shipment.js
index cf79125..0cee4de 100644
--- a/src/api/model/shipment.js
+++ b/src/api/model/shipment.js
@@ -24,6 +24,13 @@ export default {
return await http.post(this.url, params);
},
},
+ stockExport:{
+ url: `${config.API_URL}/out.stock.export.list`,
+ name: "出库清单导出",
+ post: async function (params) {
+ return await http.post(this.url,params);
+ }
+ },
deleteImport:{
url: `${config.API_URL}/out.stock.import.delete`,
name: "批量删除出货清单",
@@ -66,5 +73,12 @@ export default {
return await http.post(this.url,params,{'Content-Type': 'multipart/form-data'});
}
},
+ bomExport:{
+ url: `${config.API_URL}/out.stock.export.mes.info`,
+ name: "BOM清单导出",
+ post: async function (params) {
+ return await http.post(this.url,params);
+ }
+ },
}
};
diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue
index 68c7ff1..68e0ce7 100644
--- a/src/components/scExport/index.vue
+++ b/src/components/scExport/index.vue
@@ -35,7 +35,7 @@ export default {
},
data(){
return{
- list:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
+ list:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}],
}
},
mounted() {
@@ -47,7 +47,7 @@ export default {
},
methods:{
getWsResult(res){
- if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11 || res.data.type == 19 || res.data.type == 20 || res.data.type == 29 || res.data.type == 30 || res.data.type == 32 || res.data.type == 33 || res.data.type == 34 || res.data.type == 40 || res.data.type == 43)){
+ if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8 || res.data.type == 11 || res.data.type == 19 || res.data.type == 20 || res.data.type == 29 || res.data.type == 30 || res.data.type == 32 || res.data.type == 33 || res.data.type == 34 || res.data.type == 40 || res.data.type == 43 || res.data.type == 46 || res.data.type == 47 )){
let item = {
type:res.data.type,
type_desc:res.data.type_desc,
@@ -92,9 +92,18 @@ export default {
case 40:
this.list[11] = item;
break;
- default:
+ case 43:
this.list[12] = item;
break;
+ case 46:
+ this.list[13] = item;
+ break;
+ case 47:
+ this.list[14] = item;
+ break;
+ default:
+ this.list[15] = item;
+ break;
}
if(res.data && res.data.status == 1100){
diff --git a/src/views/shipment/shipmentList/bom.vue b/src/views/shipment/shipmentList/bom.vue
index 6e21ead..b65df72 100644
--- a/src/views/shipment/shipmentList/bom.vue
+++ b/src/views/shipment/shipmentList/bom.vue
@@ -9,6 +9,9 @@
查询
重置
+
+ 导出
+
@@ -169,6 +172,19 @@ export default {
selectionChange(selection){
this.selection = selection;
},
+ // 下载导出
+ exportChangeShow(params){
+ if(params.type == 47){
+ this.exportShow = params.status==0?true:false
+ }
+ },
+ async exportData() {
+ if(this.exportShow) return
+ const res = await this.$API.shipment.out.bomExport.post(this.params);
+ if(res.code == 200){
+ this.$message.success('开始导出');
+ }
+ },
upSearch(){
this.$refs.table.upData(this.params);
},
diff --git a/src/views/shipment/shipmentList/list.vue b/src/views/shipment/shipmentList/list.vue
index 93b3e5c..4913e87 100644
--- a/src/views/shipment/shipmentList/list.vue
+++ b/src/views/shipment/shipmentList/list.vue
@@ -20,6 +20,9 @@
下载导入模版
+
+ 导出
+
@@ -235,6 +238,19 @@ export default {
selectionChange(selection){
this.selection = selection;
},
+ // 下载导出
+ exportChangeShow(params){
+ if(params.type == 46){
+ this.exportShow = params.status==0?true:false
+ }
+ },
+ async exportData() {
+ if(this.exportShow) return
+ const res = await this.$API.shipment.out.stockExport.post(this.params);
+ if(res.code == 200){
+ this.$message.success('开始导出');
+ }
+ },
upSearch(){
this.$refs.table.upData(this.params);
},
@@ -262,4 +278,9 @@ export default {
height: 20px;
margin: 0 auto;
}
+.exportView{
+ ::v-deep .btnBox{
+ margin-left: 0;
+ }
+}