diff --git a/src/views/inventory/supInoutSearchOrderDept.vue b/src/views/inventory/supInoutSearchOrderDept.vue
new file mode 100644
index 00000000..e1a90566
--- /dev/null
+++ b/src/views/inventory/supInoutSearchOrderDept.vue
@@ -0,0 +1,528 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="部门:">
+              <el-select v-model="filterQuery.fromDeptCode" placeholder="请选择部门" clearable="true"
+                         style="width: 90%"
+                         @change="getDeptList"
+              >
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-document" @click="selectExport" :loading="selectExportLoading">选中导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchExport" :loading="searchExportLoading">结果导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="optinPrint" :loading="optinPrintLoading">选中打印</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="selectPrint" :loading="selectPrinttLoading">查询结果打印</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row borderv
+                @selection-change="handleCheckedChange">
+        <el-table-column label="序号" type="index"></el-table-column>
+         <el-table-column label="物资仓库" prop="fromInvName" show-overflow-tooltip  width="120"></el-table-column>
+         <el-table-column label="物资数量" prop="sumCount" width="120">
+         </el-table-column>
+         <el-table-column label="物资金额" prop="sumAmount" width="120">
+         </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  getResultOrderList,
+  verifyTemplateFile,
+  printOrder,
+  excelInoutImport, postExcelInoutImport
+} from '@/api/inout/orderDetailResult'
+import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+import {getDeptListByUser} from "@/api/auth/authDept";
+
+export default {
+  name: "supInoutSearchOrder",
+  data() {
+    return {
+      showSearch: true,
+      list: [],
+      busTypeOptions: [],
+      filterQuery: {
+        id: "",
+        orderIdFk: null,
+        fromCorpName: null,
+        coName: null,
+        spec: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        startAduditTime: null,
+        endAduditTime: null,
+        actionType: null,
+        fromCorp: null,
+        keyWords: null,
+        inoutPrintStatus: null,
+        confirmStarTime:null,  //发票确认起始日期
+        confirmEndTime:null,
+        corpName:null,
+      },
+
+      printMap: {
+        0: "未打印",
+        1: "已打印",
+        null: "未打印",
+      },
+
+      fromOptions: [],
+      loading: false,
+      selectExportLoading: false,
+      searchExportLoading: false,
+      optinPrintLoading: false,
+      selectPrinttLoading: false,
+      total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      options: {
+        getBusTypeByInv:[],
+      },
+      orderSelection: [],
+      showSup: false,
+      customerId: this.$store.getters.customerId,
+      map:{
+        "actDateRange" : this.actDateRange,
+        "confirmDateRange" : this.confirmDateRange,
+      },
+      deptList: [],
+      actDateRange: [],
+      confirmDateRange:[],
+      actionType: null,
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+      });
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        orderIdFk: null,
+        fromCorpName: null,
+        coName: null,
+        spec: null,
+        batchNo: null,
+        page: 1,
+        limit: 10,
+        startAduditTime: null,
+        endAduditTime: null,
+        actionType: null,
+      };
+      this.actDateRange = []
+      this.getList();
+    },
+    handleCheckedChange(val) {
+      this.orderSelection = val;
+    },
+
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startAduditTime = this.actDateRange[0];
+        this.filterQuery.endAduditTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+      if (this.confirmDateRange!== null) {
+        this.filterQuery.confirmStarTime = this.confirmDateRange[0];
+        this.filterQuery.confirmEndTime = this.confirmDateRange[1];
+      } else {
+        this.filterQuery.confirmStarTime = null;
+        this.filterQuery.confirmEndTime = null;
+      }
+      this.filterQuery.page = 1;
+
+      this.getList();
+    },
+
+    statusFilterType(status) {
+      const statusMap = {
+        null: "",
+        1: "success",
+        0: "warning",
+      };
+      return statusMap[status];
+    },
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    //根据仓库,用户获取单据类型
+    getBusTypeByInv(_this) {
+      let query = {
+        code: _this.$store.getters.locInvCode,
+        enabled: true,
+        detailType: _this.actionType
+      };
+      getOrderDetailBusOptimize(query)
+        .then((response) => {
+          _this.options.getBusTypeByInv = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+
+    getList() {
+      this.loading = true;
+      this.filterQuery.actionType = this.actionType;
+      // if (this.filterQuery.actionType == 'preInDetail') {
+      //   this.filterQuery.invCode = '1000001'
+      // } else if (this.filterQuery.actionType == 'preDetail') {
+      //   this.filterQuery.invCode = '1000002'
+      // }
+      getResultOrderList(this.filterQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        page: 1,
+        limit: 10,
+      };
+      getCorrespondence(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
+    },
+    optinPrint() {
+      this.$confirm("是否确定打印选中出入库明细, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择打印的明细！");
+          }
+          let query = {id: 4};
+          this.optinPrintLoading = true
+          verifyTemplateFile(query).then((res) => {
+            this.optinPrintLoading = false
+            if (res.code === 20000) {
+              let printParams = {
+                startAduditTime :this.filterQuery.startAduditTime,
+                endAduditTime: this.filterQuery.endAduditTime,
+                confirmStarTime : this.filterQuery.confirmStarTime ,
+                confirmEndTime : this.filterQuery.confirmEndTime ,
+                corpName : this.filterQuery.corpName ,
+                employeeName: this.$store.getters.user.employeeName,
+                locInvName:this.$store.getters.locInvName,
+                templateId: res.data,
+                list: this.orderSelection
+              };
+              printOrder(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            } else {
+              this.optinPrintLoading = false
+              return this.$message.error(res.message);
+            }
+          }).catch((error) => {
+            this.optinPrintLoading = false
+            this.loading = false;
+            this.$message.error(error.message);
+          })
+        })
+        .catch(() => {
+        });
+
+
+    },
+    selectPrint() {
+      this.$confirm("是否确定打印所有查询结果数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
+          let query = {id: 4};
+          this.selectPrinttLoading = true
+          verifyTemplateFile(query).then((res) => {
+            this.selectPrinttLoading = false
+            if (res.code === 20000) {
+              let printParams = {
+                templateId: res.data,
+                orderIdFk: this.filterQuery.orderIdFk,
+                nameCode: this.filterQuery.nameCode,
+                coName: this.filterQuery.coName,
+                spec: this.filterQuery.spec,
+                batchNo: this.filterQuery.batchNo,
+                zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+                manufacturer: this.filterQuery.manufacturer,
+                actionType: this.filterQuery.actionType,
+                keyWords: this.filterQuery.keyWords,
+                mainAction: this.filterQuery.mainAction,
+                action: this.filterQuery.action,
+                locInvName:this.$store.getters.locInvName,
+                employeeName: this.$store.getters.user.employeeName,
+              };
+              if (this.actDateRange !== null) {
+                printParams.startAduditTime = this.actDateRange[0];
+                printParams.endAduditTime = this.actDateRange[1];
+              } else {
+                printParams.startAduditTime = null;
+                printParams.endAduditTime = null;
+              }
+              if (this.confirmDateRange!== null) {
+                printParams.confirmStarTime = this.confirmDateRange[0];
+                printParams.confirmEndTime = this.confirmDateRange[1];
+              } else {
+                printParams.confirmStarTime = null;
+                printParams.confirmEndTime = null;
+              }
+              printOrder(printParams).then((response) => {
+                //将pdf文件转换为url。
+                const binaryData = [];
+                binaryData.push(response);
+                //获取blob链接。
+                let url = window.URL.createObjectURL(
+                  new Blob(binaryData, {type: "application/pdf"})
+                );
+                this.loading = false;
+                window.open(url);//打开新标签页，预览pdf。
+              })
+            } else {
+              this.$message.error(res.message);
+              return
+            }
+          }).catch((error) => {
+            this.selectPrinttLoading = false
+            this.loading = false;
+            this.$message.error(error.message);
+          })
+
+        })
+        .catch(() => {
+        });
+      return;
+
+
+    },
+
+    selectExport() {
+      this.$confirm("是否确定导出选中出入库明细, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.orderSelection == null || this.orderSelection.length <= 0) {
+            return this.$message.error("请选择需要导出的明细！");
+          }
+          let printParams = {
+            list: this.orderSelection
+          };
+          this.selectExportLoading = true
+          postExcelInoutImport(printParams).then((response) => {
+            this.selectExportLoading = false
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          }).catch(() => {
+            this.selectExportLoading = false
+          })
+        });
+
+
+    },
+    searchExport() {
+      this.$confirm("是否确定导出所有查询结果数据", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+
+          let printParams = {
+            orderIdFk: this.filterQuery.orderIdFk,
+            nameCode: this.filterQuery.nameCode,
+            coName: this.filterQuery.coName,
+            spec: this.filterQuery.spec,
+            batchNo: this.filterQuery.batchNo,
+            zczbhhzbapzbh: this.filterQuery.zczbhhzbapzbh,
+            manufacturer: this.filterQuery.manufacturer,
+            actionType: this.filterQuery.actionType,
+            keyWords: this.filterQuery.keyWords,
+            mainAction: this.filterQuery.mainAction,
+            action: this.filterQuery.action
+          };
+
+          if (this.filterQuery.actionType == 'preInDetail') {
+            printParams.invCode = '1000001'
+          } else if (this.filterQuery.actionType == 'preDetail') {
+            printParams.invCode = '1000002'
+          }
+
+          if (this.actDateRange !== null) {
+            printParams.startAduditTime = this.actDateRange[0];
+            printParams.endAduditTime = this.actDateRange[1];
+          } else {
+            printParams.startAduditTime = null;
+            printParams.endAduditTime = null;
+          }
+          if (this.confirmDateRange!== null) {
+            printParams.confirmStarTime = this.confirmDateRange[0];
+            printParams.confirmEndTime = this.confirmDateRange[1];
+          } else {
+            printParams.confirmStarTime = null;
+            printParams.confirmEndTime = null;
+          }
+          this.searchExportLoading = true
+          excelInoutImport(printParams).then((response) => {
+            this.searchExportLoading = false
+            let blob = new Blob([response], {type: "application/vnd.ms-excel"});
+            let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.click();
+            this.$message("成功")
+          })
+
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    this.getList();
+    this.getDeptList();
+  }
+  ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+