feat: 修复

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",

src/views/inventory/supInoutSearchOrderDept.vue

@@ -6,12 +6,12 @@
 
           <el-col :span="8">
             <el-form-item class="query-form-item"  label="当前仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+              <el-select v-model="filterQuery.invCode" placeholder="请选择当前仓库" clearable="true"
                          size="mini"
                          style="width: 90%"
               >
                 <el-option
-                  v-for="item in invList"
+                  v-for="item in invListAllFlagInv"
                   :key="item.code"
                   :label="item.label"
                   :value="item.code">
@@ -22,8 +22,8 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item class="query-form-item"  label="往来仓库:">
+            <el-form-item class="query-form-item"  label="物资仓库:">
-              <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
+              <el-select v-model="filterQuery.fromInvCode" placeholder="请选择物资仓库" clearable="true"
                          size="mini"
                          style="width: 90%"
               >
@@ -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();
   }
   ,

src/views/inventory/supInoutSearchOrderSup.vue

@@ -6,12 +6,12 @@
 
           <el-col :span="8">
             <el-form-item class="query-form-item"  label="当前仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择仓库" clearable="true"
+              <el-select v-model="filterQuery.invCode" placeholder="请选择当前仓库" clearable="true"
                          size="mini"
                          style="width: 90%"
               >
                 <el-option
-                  v-for="item in invList"
+                  v-for="item in invListAllFlagInv"
                   :key="item.code"
                   :label="item.label"
                   :value="item.code">
@@ -23,7 +23,7 @@
 
           <el-col :span="8">
             <el-form-item class="query-form-item"  label="往来仓库:">
-              <el-select v-model="filterQuery.fromInvCode" placeholder="请选择仓库" clearable="true"
+              <el-select v-model="filterQuery.fromInvCode" placeholder="请选择往来仓库" clearable="true"
                          size="mini"
                          style="width: 90%"
               >
@@ -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' }">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-         <el-table-column label="往来单位" prop="fromCorpName" show-overflow-tooltip  width="240"></el-table-column>
+        <el-table-column label="当前仓库" prop="fromInvName" show-overflow-tooltip  width="240"></el-table-column>
-         <el-table-column label="物资仓库" prop="fromInvName" show-overflow-tooltip  width="240"></el-table-column>
+         <el-table-column label="往来单位/仓库" prop="fromCorpName" show-overflow-tooltip  width="240"></el-table-column>
          <el-table-column label="物资数量" prop="count" width="180">
          </el-table-column>
          <el-table-column label="物资金额" prop="amount" width="180">
@@ -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();
   }
   ,