From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/XhProductModel.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 3673ff5..5683acf 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -69,6 +69,7 @@
import Cookies from "js-cookie";
import TyProductModel from "./TyProductModel-AddOrUpdate";
import ProductImport from "./ProductImport";
+ import qs from 'qs'
export default {
data() {
@@ -81,7 +82,8 @@
type: '',
pid: '',
srcId: '',
- }
+ },
+ productType:''
}
},
components: {
@@ -99,14 +101,15 @@
this.dataForm.type = this.productType
if (this.dataForm.type !== '1') {
- this.$refs.SelectTyModel.$refs.dialog.init(null, {
+ /*this.$refs.SelectTyModel.$refs.dialog.init(null, {
type: this.dataForm.type,
id: this.dataForm.pid,
shipId: this.shipId,
namePath: this.namePath
- })
+ })*/
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, productType: parseInt(this.dataForm.type)+1 , pid: this.dataForm.pid,shipId: this.shipId,namePath: this.namePath})
} else {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid,shipId: this.shipId})
}
},
addCell() {
@@ -146,12 +149,14 @@
this.$refs.ProductImport.$refs.dialog.init(row)
},
async exportData(row) {
- let params = {
- shipId:row.id
- }
- let res = await this.$http.get(`/basicInfo/XhProductModel/exportData`,{params:params})
-
-
+ console.log(row)
+ let params = qs.stringify({
+ 'token': Cookies.get('token'),
+ shipId:row.id,
+ fileName:row.name
+ })
+ let apiURL = `/basicInfo/XhProductModel/exportData`
+ window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
},
exportProduct() {
window.location.href = './浜у搧缁撴瀯鏍戝鍏ユā鏉�.xlsx'
--
Gitblit v1.9.1