From eb0a11ecf1f876518779cf8bd3f368ed2fa13293 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 03 三月 2025 16:38:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/rawMaterialInspection/index.vue | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 2ea2eb7..78cf124 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -310,7 +310,7 @@
tableData1: [],
tableLoading1: false,
column1: [
- {label: '濮旀墭缂栧彿', prop: 'entrustCode'},
+ {label: '濮旀墭缂栧彿', prop: 'entrustCode', width: '160px'},
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -549,7 +549,7 @@
// 寰呮姤妫�銆佸緟涓嬪崟鏌ヨ
getWarehouseSubmitApi () {
this.tableLoading = true
- const params = {...this.componentData, isInspect: this.tabIndex, state: this.tabIndex === 0 ? null : 0}
+ const params = {...this.componentData, isInspect: this.tabIndex, state: this.tabIndex === 0 ? null : 0, ...this.page}
getWarehouseSubmit(params).then(res => {
this.tableLoading = false
if (res.code === 200) {
@@ -563,7 +563,7 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList () {
this.tableLoading1 = true
- getIfsByFinish({...this.componentData}).then(res => {
+ getIfsByFinish({...this.componentData, ...this.page1}).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
this.tableData1 = res.data.records
@@ -576,7 +576,7 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList () {
this.tableLoading1 = true
- getIfsByAll({...this.componentData}).then(res => {
+ getIfsByAll({...this.componentData, ...this.page1}).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
this.tableData1 = res.data.records
@@ -795,16 +795,11 @@
this.outLoading = true
rawAllExport({
entity:entity
- },{
- responseType: "blob"}).then(res => {
+ }).then(res => {
this.outLoading = false
this.$message.success('瀵煎嚭鎴愬姛')
- const blob = new Blob([res],{ type: 'application/octet-stream' });
- const url = URL.createObjectURL(blob);
- const link = document.createElement('a');
- link.href = url;
- link.download = '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx';
- link.click();
+ let url = this.javaApi + '/word/' + res.data
+ this.$download.saveAs(url, "鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx");
})
},
clear() {
--
Gitblit v1.9.3