From c4e130fd592d29f0f0dd3117cd7beaf98d57d174 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 10 Oct 2024 17:49:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inout/orderDetailResult.js | 10 +++++++
.../inventory/supInoutSearchOrderDept.vue | 20 ++++++++++----
.../inventory/supInoutSearchOrderSup.vue | 27 +++++++++++++------
3 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js
index 8620a4c7..6fe3e9ae 100644
--- a/src/api/inout/orderDetailResult.js
+++ b/src/api/inout/orderDetailResult.js
@@ -67,6 +67,16 @@ export function printOrderDept(data) {
});
}
+export function printOrderDeptSup(data) {
+ return axios({
+ url: "/udiwms/inout/resultDetail/filterOrderPrintDeptSup",
+ method: "post",
+ headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+ responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf
+ data: data
+ });
+}
+
export function printDev(data) {
return axios({
url: "/udiwms/inout/resultDetail/filterDevPrint",
diff --git a/src/views/inventory/supInoutSearchOrderDept.vue b/src/views/inventory/supInoutSearchOrderDept.vue
index c0e9f909..26458f10 100644
--- a/src/views/inventory/supInoutSearchOrderDept.vue
+++ b/src/views/inventory/supInoutSearchOrderDept.vue
@@ -6,12 +6,12 @@
-
@@ -22,8 +22,8 @@
-
-
+
@@ -46,7 +46,7 @@
remote
clearable="true"
reserve-keyword
- placeholder="请输入供应商名称"
+ placeholder="请输入往来单位名称"
:remote-method="findMethod"
size="mini"
style="width: 90%"
@@ -245,6 +245,7 @@ export default {
"confirmDateRange" : this.confirmDateRange,
},
invList: [],
+ invListAllFlagInv: [],
deptList: [],
actDateRange: [],
confirmDateRange:[],
@@ -292,6 +293,14 @@ export default {
.catch(() => {
});
},
+ getInvListAllFlagInv() {
+ filterSubAllOptimize({allFlagInvType:true})
+ .then((response) => {
+ this.invListAllFlagInv = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
@@ -656,6 +665,7 @@ export default {
this.actionType = 'norDetail';
this.getList();
this.getInvList();
+ this.getInvListAllFlagInv();
this.getBusTypeByInv();
}
,
diff --git a/src/views/inventory/supInoutSearchOrderSup.vue b/src/views/inventory/supInoutSearchOrderSup.vue
index d0046fef..00525573 100644
--- a/src/views/inventory/supInoutSearchOrderSup.vue
+++ b/src/views/inventory/supInoutSearchOrderSup.vue
@@ -6,12 +6,12 @@
-
@@ -23,7 +23,7 @@
-
@@ -46,7 +46,7 @@
remote
clearable="true"
reserve-keyword
- placeholder="请输入供应商名称"
+ placeholder="请输入往来单位名称"
:remote-method="findMethod"
size="mini"
style="width: 90%"
@@ -150,8 +150,8 @@
@selection-change="handleCheckedChange" :row-style="{ height: '32px' }">
-
-
+
+
@@ -177,6 +177,7 @@ import {
getResultOrderDeptSupList,
verifyTemplateFile,
printOrderDept,
+ printOrderDeptSup,
excelInoutImport, postExcelInoutImport
} from '@/api/inout/orderDetailResult'
import {getCorrespondence,getBasicUnitMaintainsOptimize} from "@/api/basic/basicUnitMaintain";
@@ -247,6 +248,7 @@ export default {
"confirmDateRange" : this.confirmDateRange,
},
invList: [],
+ invListAllFlagInv: [],
deptList: [],
actDateRange: [],
confirmDateRange:[],
@@ -294,6 +296,14 @@ export default {
.catch(() => {
});
},
+ getInvListAllFlagInv() {
+ filterSubAllOptimize({allFlagInvType:true})
+ .then((response) => {
+ this.invListAllFlagInv = response.data || [];
+ })
+ .catch(() => {
+ });
+ },
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
@@ -453,7 +463,7 @@ export default {
templateId: res.data,
list: this.orderSelection
};
- printOrderDept(printParams).then((response) => {
+ printOrderDeptSup(printParams).then((response) => {
//将pdf文件转换为url。
const binaryData = [];
binaryData.push(response);
@@ -524,7 +534,7 @@ export default {
printParams.confirmStarTime = null;
printParams.confirmEndTime = null;
}
- printOrderDept(printParams).then((response) => {
+ printOrderDeptSup(printParams).then((response) => {
//将pdf文件转换为url。
const binaryData = [];
binaryData.push(response);
@@ -658,6 +668,7 @@ export default {
this.actionType = 'norDetail';
this.getList();
this.getInvList();
+ this.getInvListAllFlagInv();
this.getBusTypeByInv();
}
,