From 34c7760746a49b90fa290bb3b342dbc1f51ed8ac Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 10:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/api/exportExcel.js | 10 +++++-----
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 1 +
admin-web/src/views/mixins/listPage.js | 20 +-------------------
admin-web/src/utils/base.js | 11 +++++------
admin-web/public/static/config.js | 6 +++---
5 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js
index 0def024..547f1bd 100644
--- a/admin-web/public/static/config.js
+++ b/admin-web/public/static/config.js
@@ -7,10 +7,10 @@
ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//娴嬭瘯
// ftpUrl: protocol + '//'+ host + '/file',// 姝ｅ紡,
// 鎺ュ彛璇锋眰鍦板潃
- apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//娴嬭瘯
- // apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//寮�鍙�
+ // apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//娴嬭瘯
+ // apiBaseURL: 'http://127.0.0.1:8083/lowConsum',//寮�鍙�
// apiBaseURL: 'http://172.16.60.155:8083/lowConsum',//寮�鍙�
- // apiBaseURL: protocol + '//'+ host + '/lowConsum',// 姝ｅ紡,
+ apiBaseURL: protocol + '//'+ host + '/lowapi',// 姝ｅ紡,
debug: false //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織
};
diff --git a/admin-web/src/api/exportExcel.js b/admin-web/src/api/exportExcel.js
index ccc2c98..5b21a72 100644
--- a/admin-web/src/api/exportExcel.js
+++ b/admin-web/src/api/exportExcel.js
@@ -13,7 +13,7 @@
export function procureExport(params) {
return request({
url: '/pc/whForm/procure/list/export',
- responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
method: 'get',
params,
});
@@ -22,7 +22,7 @@
export function transferExport(params) {
return request({
url: '/pc/l/wh/form/transfer/list/export',
- responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
method: 'get',
params,
});
@@ -32,7 +32,7 @@
export function inventoryExport(params) {
return request({
url: '/pc/l/wh/form/inventory/list/export',
- responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
method: 'get',
params,
});
@@ -42,7 +42,7 @@
export function scrappedExport(params) {
return request({
url: '/pc/l/wh/form/scrapped/list/export',
- responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
method: 'get',
params,
});
@@ -51,7 +51,7 @@
export function deptScrappedExport(params) {
return request({
url: '/pc/l/wh/form/scrapped/deptList/export',
- responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ // responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
method: 'get',
params,
});
diff --git a/admin-web/src/utils/base.js b/admin-web/src/utils/base.js
index 76b7d74..c3ef085 100644
--- a/admin-web/src/utils/base.js
+++ b/admin-web/src/utils/base.js
@@ -25,14 +25,13 @@
// 涓嬭浇鏂囦欢
-export function downLoad(obj) {
- let url = obj.url
- if (obj.url.indexOf('http') !== 0) {
- url = SettingIplatform.ftpUrl + obj.url
+export function downLoad(url) {
+ let link = url
+ if (link.indexOf('http') !== 0) {
+ link = SettingIplatform.ftpUrl + url
}
- window.open(decodeURI(url))
var doc = document.createElement('a')
- doc.href = url
+ doc.href = link
doc.target = '_blank'
doc.rel = "noreferrer noopener"
doc.click()
diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js
index 11c66fa..5054212 100644
--- a/admin-web/src/views/mixins/listPage.js
+++ b/admin-web/src/views/mixins/listPage.js
@@ -43,7 +43,6 @@
methods: {
// 瀵煎嚭
handleExport(api, fileName, params) {
- console.log(fileName)
let loading = this.$loading({
lock: true,
text: '瀵煎嚭涓紝璇风◢鍊�...',
@@ -53,24 +52,7 @@
// 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
dataExport[api](params)
.then((res) => {
- const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
- /*if ('download' in document.createElement('a')) {
- // 闈濱E涓嬭浇
- const elink = document.createElement('a');
- elink.download = `${fileName}.xls`;
- elink.style.display = 'none';
- const URL = window.URL || window.webkitURL
- const href = URL.createObjectURL(blob)
- elink.href = href;
- document.body.appendChild(elink);
- elink.click();
- URL.revokeObjectURL(elink.href);
- document.body.removeChild(elink);
- window.URL.revokeObjectURL(href)
- } else {
- // IE10+涓嬭浇
- navigator.msSaveBlob(blob, `${fileName}.xls`);
- }*/
+ console.log(res)
downLoad(res)
this.$message.success('瀵煎嚭鎴愬姛锛�');
loading.close();
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 0f58df4..008f32d 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -10,6 +10,7 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px">
+<!-- <my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />-->
<my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />
<my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
</div>
--
Gitblit v1.9.1