From b172044df2cfa2ce237f2ee2c5a89984c37b7fd9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 13 Mar 2023 11:08:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E6=9C=AC=E4=BC=81=E4=B8=9A=E5=BA=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93=E5=AD=98=EF=BC=8C=E5=AF=84?=
 =?UTF-8?q?=E5=94=AE=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvSupPreInSerach.vue | 458 ++++++++++++++++++++++
 src/views/inventory/InvSupPreProducts.vue | 344 ++++++++++++++++
 src/views/inventory/InvSupProuducts.vue   | 341 ++++++++++++++++
 3 files changed, 1143 insertions(+)
 create mode 100644 src/views/inventory/InvSupPreInSerach.vue
 create mode 100644 src/views/inventory/InvSupPreProducts.vue
 create mode 100644 src/views/inventory/InvSupProuducts.vue

diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue
new file mode 100644
index 0000000..8bc9e66
--- /dev/null
+++ b/src/views/inventory/InvSupPreInSerach.vue
@@ -0,0 +1,458 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="预验收单号:">
+              <el-input v-model="filterQuery.billNo" placeholder="单号"
+                        clearable="true"></el-input>
+            </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-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border
+                @current-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.orderFromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromCorpName" width="220">
+        </el-table-column>
+        <el-table-column label="当前部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </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>
+
+    <el-tabs type="border-card" style="margin: 15px">
+      <!--单据扫码明细-->
+      <el-tab-pane>
+        <span slot="label">预验收库存详情</span>
+        <el-form :model="codeQuery" class="query-form" size="mini" label-width="100px">
+
+          <el-row>
+            <el-col :span="11">
+              <el-form-item class="query-form-item" label="UDI码:">
+                <el-input
+                  v-model="codeQuery.code"
+                  placeholder="请输入UDI码"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item>
+                <el-button-group>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-refresh"
+                    @click="onCodeReset"
+                  >重置
+                  </el-button>
+                  <el-button type="primary" @click="onCodeSubmit"
+                             icon="el-icon-search"
+                  >查询
+                  </el-button
+                  >
+                </el-button-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+        </el-form>
+
+        <el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="UDI码"
+            prop="code"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="产品名称"
+            prop="productName"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="生产日期"
+            prop="produceDate"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            label="失效日期"
+            prop="expireDate"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            label="批次号"
+            prop="batchNo"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="序列号"
+            prop="serialNo"
+          ></el-table-column>
+          <el-table-column
+            label="扫码数量"
+            prop="reCount"
+          ></el-table-column>
+          <el-table-column
+            label="实际数量"
+            prop="reCount"
+          ></el-table-column>
+        </el-table>
+        <pagination
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+import {
+  deleterPrein,
+  filterPrein, filterDetail
+} from "@/api/inventory/invPreInSearch";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+import {isBlank} from "@/utils/strUtil";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import store from "@/store";
+
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "InvPreInSerach",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        billNo: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+      },
+      invList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "缺量补录单据",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点",
+        "12": "采购计划",
+        "13": "领用单据",
+        "14": "第三方系统单据",
+      },
+      deleteData: {
+        orderId: null,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {},
+      actDateRange: [],
+      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]);
+            },
+          },
+        ],
+      },
+      codeQuery: {
+        orderId: null,
+        page: 1,
+        limit: 10
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      fromOptions: [],
+    };
+  },
+  components: {},
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.filterQuery.fromCorp = store.getters.customerId
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          this.filterQuery.action = this.busTypes[0].action;
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      this.getOrderDetails();
+    },
+
+    getOrderDetails() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    clearDetailList() {
+      this.codeDetailList = [];
+      this.codeTotal = 0;
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.currentRow = {billNo: ""};
+      this.clearDetailList();
+      filterPrein(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      let delQuery = {
+        billNo: data,
+      }
+      deleterPrein(delQuery)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(row.billNo);
+        })
+        .catch(() => {
+        });
+    },
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！")
+        return;
+      }
+
+      this.codeQuery.orderId = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      filterDetail(this.codeQuery).then((res) => {
+        this.codeDetailLoading = false;
+        if (res.code === 20000) {
+          this.codeDetailList = res.data.list || [];
+          this.codeTotal = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        }
+      }).catch((error) => {
+        this.codeDetailLoading = true;
+        this.$message.error(error.message);
+        this.codeDetailList = [];
+        this.codeTotal = 0;
+      })
+    },
+
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        page: 1,
+        limit: 10,
+      };
+      getBasicUnitMaintains(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
+    },
+
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
new file mode 100644
index 0000000..352520a
--- /dev/null
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -0,0 +1,344 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="产品标识DI:">
+              <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="产品名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :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-row>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="批准文号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="生产厂家:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </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-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
+        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="部门" prop="deptName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="仓库" prop="invName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="detailDialog(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </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>
+
+    <el-dialog
+      title="库存详情"
+      :visible.sync="detailDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="detailDialogVisible"
+    >
+      <invPreProductsDetail
+        :inputQuery="inputQuery"
+        v-on:closeDetailDialog="closeDetailDialog"
+      ></invPreProductsDetail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvPreProduct, deleteInvPreProduct} from "@/api/inventory/invPreProduct";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {isBlank} from "@/utils/strUtil";
+import invPreProductsDetail from "@/views/inventory/InvPreProductsDetail.vue";
+
+export default {
+  name: "InvPreProducts",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        supId: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 10,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      loading: false,
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      corpLoading: false,
+      dialogVisible: false,
+      fromOptions: [],
+      showSup: false,
+      detailDialogVisible: false,
+      inputQuery: {
+        relId: null,
+        cpmctymc: null,
+        nameCode: null,
+        batchNo: null,
+        ggxh: null,
+        productionDate: null,
+        expireDate: null,
+        supId: null,
+        deptCode: null,
+        invCode: null
+      }
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        supId: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.supId = this.$store.getters.customerId;
+      getInvPreProduct(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.list = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    getInvList() {
+      let query = {
+        advanceType: true,
+      };
+      getInvListByUser(query)
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    findMethod(key) {
+      this.corpLoading = true;
+      this.fromOptions = [];
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
+    },
+    corpChange(value) {
+      if (!isBlank(value)) {
+        this.findMethod(value);
+      }
+    },
+    detailDialog(row) {
+      this.detailDialogVisible = true;
+      this.inputQuery = {
+        relId: row.relIdFk,
+        cpmctymc: row.cpmctymc,
+        nameCode: row.nameCode,
+        batchNo: row.batchNo,
+        ggxh: row.ggxh,
+        productionDate: row.productionDate,
+        expireDate: row.expireDate,
+        supId: row.supId,
+        deptCode: row.deptCode,
+        invCode: row.invCode
+      }
+    },
+    closeDetailDialog() {
+      this.detailDialogVisible = false;
+    },
+    deleteDialog(id) {
+      this.$confirm("此操作将永久删除此库存信息，是否继续？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.deleteInvPreProduct(id);
+      }).catch(() => {
+      });
+    },
+    deleteInvPreProduct(id) {
+      let params = {id: id};
+      deleteInvPreProduct(params).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("删除成功！");
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
+    }
+  },
+  components: {
+    invPreProductsDetail
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.findMethod();
+    this.getInvList();
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
new file mode 100644
index 0000000..2d508a5
--- /dev/null
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -0,0 +1,341 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="产品标识DI:">
+              <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="产品名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :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-row>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="批准文号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="query-form-item" label="生产厂家:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </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-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
+        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
+        <el-table-column label="部门" prop="deptName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="仓库" prop="invName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="操作" width="150">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="detailDialog(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </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>
+
+    <el-dialog
+      title="库存详情"
+      :visible.sync="detailDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="detailDialogVisible"
+    >
+      <invProductsDetail
+        :inputQuery="inputQuery"
+        v-on:closeDetailDialog="closeDetailDialog"
+      ></invProductsDetail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvProduct, deleteInvProduct, getProduct} from "@/api/inventory/invPorduct";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {isBlank} from "@/utils/strUtil";
+import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
+
+export default {
+  name: "InvProducts",
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        supId: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 10,
+      },
+      list: [],
+      total: 0,
+      invList: [],
+      loading: false,
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      corpLoading: false,
+      dialogVisible: false,
+      fromOptions: [],
+      showSup: false,
+      detailDialogVisible: false,
+      inputQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        batchNo: null,
+        ggxh: null,
+        productionDate: null,
+        expireDate: null,
+        supId: null,
+        deptCode: null,
+        invCode: null
+      }
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        supId: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSizeChange(val) {
+      this.filterQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.supId = this.$store.getters.customerId;
+      getProduct(this.filterQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.list = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    getInvList() {
+      let query = {
+        advanceType: false,
+      };
+      getInvListByUser(query)
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    findMethod(key) {
+      this.corpLoading = true;
+      this.fromOptions = [];
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
+    },
+    corpChange(value) {
+      if (!isBlank(value)) {
+        this.findMethod(value);
+      }
+    },
+    detailDialog(row) {
+      this.detailDialogVisible = true;
+      this.inputQuery = {
+        relId: row.relIdFk,
+        cpmctymc: row.cpmctymc,
+        nameCode: row.nameCode,
+        batchNo: row.batchNo,
+        ggxh: row.ggxh,
+        productionDate: row.productionDate,
+        expireDate: row.expireDate,
+        supId: row.supId,
+        deptCode: row.deptCode,
+        invCode: row.invCode
+      }
+    },
+    closeDetailDialog() {
+      this.detailDialogVisible = false;
+    },
+    deleteDialog(id) {
+      this.$confirm("此操作将永久删除此库存信息，是否继续？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.deleteInvProduct(id);
+      }).catch(() => {
+      });
+    },
+    deleteInvProduct(id) {
+      let params = {id: id};
+      deleteInvProduct(params).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("删除成功！");
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
+    }
+  },
+  components: {
+    invProductsDetail
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.findMethod();
+    this.getInvList();
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+

From 356d021c4c6c157a86a89b8d92e328581b2454af Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 13 Mar 2023 11:17:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E6=9C=AC=E4=BC=81=E4=B8=9A=E5=BA=93=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93=E5=AD=98=EF=BC=8C=E5=AF=84?=
 =?UTF-8?q?=E5=94=AE=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvSupPreInSerach.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/inventory/InvSupPreInSerach.vue b/src/views/inventory/InvSupPreInSerach.vue
index 8bc9e66..6fd10c5 100644
--- a/src/views/inventory/InvSupPreInSerach.vue
+++ b/src/views/inventory/InvSupPreInSerach.vue
@@ -286,7 +286,7 @@ export default {
         this.filterQuery.endTime = null;
       }
       this.filterQuery.page = 1;
-      this.filterQuery.fromCorp = store.getters.customerId
+
       this.getList();
     },
     hideSearch() {
@@ -323,6 +323,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
+      this.filterQuery.fromCorp = store.getters.customerId
       filterPrein(this.filterQuery)
         .then((response) => {
           this.loading = false;