From e4246536ec8218b0444667cbe457c0d3d6e67bd9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/XhProductModel.vue | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index aecf7aa..e564467 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -12,7 +12,7 @@
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/XhProductModel/page"
delete-url="/basicInfo/XhProductModel/ "
:paging='false'
- v-slot="{ table }">
+ v-slot="{ table }" @refreshMethod="refreshData('tree')">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
@@ -20,7 +20,7 @@
<el-form-item>
<zt-button v-if="productType && productType!=='10'" type="query" @click="table.query()"/>
<zt-button v-if="productType && productType!=='10'" type="add" @click="add()"/>
- <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">瀵煎嚭妯℃澘
+ <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">涓嬭浇妯℃澘
</zt-button>
<zt-button v-if="productType==='3'" type="primary" @click="addCell()">鏂板铏氬崟鍏�</zt-button>
<zt-button v-if="productType && productType!=='10'" type="delete" @click="table.deleteHandle()"/>
@@ -30,6 +30,7 @@
row-key="id"
@selection-change="table.selectionChangeHandle"
:header-cell-style="{'text-align':'center'}">
+ <el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍚嶇О"/>
<el-table-column v-if="productType==='3'|| productType==='4'" prop="equipType" label="璁惧绫诲瀷"/>
<zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
@@ -39,10 +40,13 @@
</template>
</el-table-column>
<el-table-column prop="sort" label="鎺掑簭" width="100px" align="center"/>
- <zt-table-column-handle :table="table" width="180px">
+ <zt-table-column-handle :table="table" width="180px" >
<template v-slot="{ row }">
<zt-table-button v-if="productType==='1'" size="small" type="primary"
@click="importData(row)">瀵煎叆
+ </zt-table-button>
+ <zt-table-button v-if="productType==='1'" size="small" type="primary"
+ @click="exportData(row)">瀵煎嚭
</zt-table-button>
</template>
</zt-table-column-handle>
@@ -65,6 +69,7 @@
import Cookies from "js-cookie";
import TyProductModel from "./TyProductModel-AddOrUpdate";
import ProductImport from "./ProductImport";
+ import qs from 'qs'
export default {
data() {
@@ -77,7 +82,8 @@
type: '',
pid: '',
srcId: '',
- }
+ },
+ productType:''
}
},
components: {
@@ -134,11 +140,26 @@
console.log(data.namePath,'data.namePath')
if (data.productType !== '10') {
this.$refs.tableObj.query()
+ }else{
+ this.$alert("铏氬崟鍏冧笉鍙煡鐪�")
}
},
importData(row) {
this.$refs.ProductImport.$refs.dialog.init(row)
},
+ async exportData(row) {
+ 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