From 9e086c45c71e47e5231dc0e97954e7911237367f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 9 Feb 2023 11:55:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoAuditedOrder.vue      |   2 +-
 src/views/inout/IoCheckErrorOrder.vue   |   2 +-
 src/views/inout/IoCheckSuccessOrder.vue |   2 +-
 src/views/inout/IoUnCheckedOrder.vue    |   2 +-
 src/views/inventory/InvProducts.vue     | 525 ++++++++++--------------
 5 files changed, 222 insertions(+), 311 deletions(-)

diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 0dfa2b79..1c7f8605 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -469,7 +469,7 @@ const formJson = {
 };
 
 export default {
-  name: "IoNewOrder",
+  name: "IoAuditedOrder",
   data() {
     return {
       showSearch: true,
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 82a35483..4f36830a 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -470,7 +470,7 @@ const formJson = {
 };
 
 export default {
-  name: "IoNewOrder",
+  name: "IoCheckErrorOrder",
   data() {
     return {
       showSearch: true,
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 82a35483..f09bcca8 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -470,7 +470,7 @@ const formJson = {
 };
 
 export default {
-  name: "IoNewOrder",
+  name: "IoCheckSuccessOrder",
   data() {
     return {
       showSearch: true,
diff --git a/src/views/inout/IoUnCheckedOrder.vue b/src/views/inout/IoUnCheckedOrder.vue
index acb452f2..e19a88df 100644
--- a/src/views/inout/IoUnCheckedOrder.vue
+++ b/src/views/inout/IoUnCheckedOrder.vue
@@ -469,7 +469,7 @@ const formJson = {
 };
 
 export default {
-  name: "IoNewOrder",
+  name: "IoUnCheckedOrder",
   data() {
     return {
       showSearch: true,
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 23c43553..3b58627d 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -1,131 +1,142 @@
 <template>
   <div>
-    <el-card>
-      <el-form :inline="true" :model="filterQuery" size="mini">
-        <el-row style="width: 100%">
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.productsName" placeholder="产品名称" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select
-              v-model="filterQuery.supId"
-              filterable
-              remote
-              clearable="true"
-              reserve-keyword
-              placeholder="请输入供应商名称"
-              :remote-method="findMethod"
-              size="mini"
-              :loading="loading"
-              @change="corpChange"
-            >
-              <el-option
-                v-for="item in fromOptions"
-                :key="item.name"
-                :label="item.name"
-                :value="item.erpId"
+    <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="6">
+            <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="6">
+            <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="6">
+            <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="6">
+            <el-form-item class="query-form-item" label="供应商名称:">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
               >
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
-        <el-row style="width: 100%">
 
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
-          </el-form-item>
-          <!--          <el-form-item class="query-form-item">-->
-          <!--            <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
-          <!--                       @change="invChange"-->
-          <!--                       size="mini">-->
-          <!--              <el-option-->
-          <!--                  v-for="item in storageList"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.code">-->
-          <!--                <span style="float: left">{{ item.name }}</span>-->
-          <!--              </el-option>-->
-          <!--            </el-select>-->
-          <!--          </el-form-item>-->
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
-                       size="mini">
-              <el-option
-                v-for="item in subInvList"
-                :key="item.name"
-                :label="item.name"
-                :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
-              ></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit"
-              >查询
-              </el-button
+        <el-row>
+          <el-col :span="6">
+            <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="6">
+            <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="6">
+            <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-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
               >
-            </el-button-group>
-          </el-form-item>
+                <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-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%">
+      <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 label="序号" type="index"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" width="180">
-        </el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip>
-        </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">
-          <template slot-scope="scope">
-            {{ (scope.row.inCount - scope.row.outCount) }}
-          </template>
-        </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="companyName" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
-        <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
+        <el-table-column label="部门" prop="deptName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
+        <el-table-column label="仓库" prop="invName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="操作" width="120" fixed="right">
+        <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              @click.native.stop="intentDetail(scope.row)"
+              @click.native.stop="detailDialog(scope.row)"
             >详情
             </el-button
             >
-
             <el-button
               type="text"
               size="small"
@@ -136,94 +147,91 @@
           </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-pagination
-      :page-size="filterQuery.limit"
-      @current-change="handleCurrentChange"
-      layout="prev, pager, next"
-      :total="total"
-    ></el-pagination>
   </div>
 </template>
 
 <script>
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 import {getInvProduct, deleteInvProduct} from "@/api/inventory/invPorduct";
-import draggable from "vuedraggable";
-import store from "../../store";
-import {getBusTypeList} from "@/api/basic/busType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
 
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
 
 export default {
+  name: "InvProducts",
   data() {
     return {
+      showSearch: true,
       filterQuery: {
-        invWarehouseCode: null,
-        invStorageCode: null,
-        productsName: null,
         nameCode: null,
-        relIdFk: null,
+        cpmctymc: null,
+        ggxh: null,
         batchNo: null,
-        page: 1,
-        limit: 20,
-        customerId: null,
         supId: null,
-        unitFk: null,
-      },
-      detailQuery: {
-        code: null,
-        productIdFk: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
         page: 1,
-        limit: 20,
+        limit: 10,
       },
       list: [],
-      storageList: [],
-      subInvList: [],
-      codeDetailVisible: false,
       total: 0,
-      loading: true,
-      index: null,
-      dialogTableVisible: false,
-      invWarehouseDisabled: true,
-      formLoading: false,
+      invList: [],
+      loading: false,
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      corpLoading: false,
       dialogVisible: false,
-      deleteLoading: false,
-      busTypes: [],
-      idQuery: null,
-      showSup: false,
       fromOptions: [],
+      showSup: false,
+
+
     };
   },
-  components: {
-    draggable,
-  },
+  components: {},
   methods: {
     onReset() {
       this.$router.push({
         path: "",
       });
       this.filterQuery = {
-        productsName: null,
         nameCode: null,
-        relIdFk: null,
+        cpmctymc: null,
+        ggxh: null,
         batchNo: null,
-        customerId: null,
-        unitFk: null,
         supId: null,
-        invWarehouseCode: null,
-        invStorageCode: null,
+        zczbhhzbapzbh: null,
+        ylqxzcrbarmc: null,
+        invCode: this.$store.getters.locInvCode,
         page: 1,
-        limit: 20,
+        limit: 10,
       };
       this.getList();
     },
     onSubmit() {
-      this.loading = true;
       this.filterQuery.page = 1;
       this.getList();
     },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     handleSizeChange(val) {
       this.filterQuery.limit = val;
       this.getList();
@@ -232,196 +240,99 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
-    },
-
-    closeDialog() {
-      this.getList();
+    handleSelectionChange(val) {
+      this.getOrderDetails();
     },
     getList() {
       this.loading = true;
-      this.filterQuery.customerId = store.getters.customerId;
-      filterProducts(this.filterQuery)
-        .then((response) => {
-          this.showSup = response.data.showSup;
-          this.loading = false;
-          this.list = response.data.list || [];
-          this.total = response.data.total || 0;
-        })
-        .catch(() => {
-          this.loading = false;
+      getInvProduct(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;
+      })
     },
-
-    deleteInvProducts(data) {
-      this.loading = true;
-      let query = {
-        id: data,
-      }
-      deleteInvProduct(query)
+    getInvList() {
+      findInvByUser()
         .then((response) => {
-          if (response.code == 20000) {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          } else {
-            this.$message.error(response.message);
-          }
-
-        })
-        .catch(() => {
-        });
-    },
-
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.deleteInvProducts(rowId);
+          this.invList = response.data || [];
+          this.getList();
         })
         .catch(() => {
         });
     },
-    findMethod(query) {
+    findMethod(key) {
+      this.corpLoading = true;
       this.fromOptions = [];
-      let cQuery = {
-        key: query,
-        customerName: query,
-        corpType:2,
+      let params = {
+        key: key,
+        corpType: 2,
         page: 1,
-        limit: 20,
+        limit: 20
       };
-      getBasicUnitMaintains(cQuery)
-        .then((response) => {
-          this.loading = false;
-          this.fromOptions = response.data.page.list || [];
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-    getStorage() {
-      this.storageList = [];
-      filterUplLocInv()
-        .then((response) => {
-          this.storageList = response.data || [];
-        })
-        .catch(() => {
-        });
-    },
-
-
-    invChange() {
-      this.filterQuery.invWarehouseCode = "";
-      this.subInvList = [];
-      if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
-        this.invWarehouseDisabled = false;
-        let query = {
-          filter: 3,
-        };
-        filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-          })
-          .catch(() => {
-          });
-      } else {
-        this.invWarehouseDisabled = true;
-      }
-    },
-    intentDetail(row) {
-
-      this.idQuery = row;
-      this.idQuery.customerId = null;
-      this.codeDetailVisible = true;
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
     },
     corpChange(value) {
-      if (isBlank(value)) {
-        this.findMethod();
+      if (!isBlank(value)) {
+        this.findMethod(value);
       }
-    }
-    ,
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getBusTypeList(query)
-        .then((response) => {
-          this.busTypes = response.data.list || [];
-          this.filterQuery.billAction = this.busTypes[0].action;
-          // this.getList();
-        })
-        .catch(() => {
-        });
     },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
+    detailDialog() {
+
     },
-    invWarehouseChange(invWarehouseCode) {
-      this.subInvList.forEach(item => {
-        if (item.code === invWarehouseCode) {
-          this.filterQuery.invStorageCode = item.parentId;
-        }
+    deleteDialog(id) {
+      this.$confirm("此操作将永久删除此库存信息，是否继续？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.deleteInvProduct(id);
+      }).catch(() => {
       });
     },
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        false: "success",
-        true: "danger",
-      };
-      return statusMap[status];
+    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);
+        });
     }
-    ,
-  }
-  ,
+  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
       event.stopPropagation();
     };
-  }
-  ,
+  },
   created() {
     this.findMethod();
-    let query = this.$route.query;
-    this.filterQuery = Object.assign(this.filterQuery, query);
-    this.filterQuery.limit = parseInt(this.filterQuery.limit);
-    // 加载表格数据
-    //获取用户默认仓库信息
-    userInfo().then((res) => {
-      if (res.code === 20000) {
-        if (!isBlank(res.data.locInvCode)) {
-          this.filterQuery.invStorageCode = res.data.locInvCode;
-          this.invChange();
-          this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
-        }
-        this.getList();
-      }
-    }).catch((error) => {
-    });
-  }
-  ,
-}
-;
+    this.getInvList();
+    this.getList();
+  },
+};
 </script>
 
 <style type="text/scss" lang="scss">
 </style>
+