From 713dda4d2a0781c3cc2e5b718b4fc01b73bc696f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 8 Feb 2023 22:39:14 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udIInfoSelect.vue     | 6 +++++-
 src/views/system/dept/authDept.vue            | 2 +-
 src/views/system/param/busTypePreModify.vue   | 2 +-
 src/views/thirdSys/product/thrProductsAdd.vue | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/product/udIInfoSelect.vue b/src/views/basic/product/udIInfoSelect.vue
index bd35ce5d..34b0c448 100644
--- a/src/views/basic/product/udIInfoSelect.vue
+++ b/src/views/basic/product/udIInfoSelect.vue
@@ -59,7 +59,7 @@
           <el-button-group style="display:flex;">
             <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="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="Onsearch">查询</el-button>
             <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
             <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
             <el-button type="primary" icon="el-icon-top-upload" @click="uploadSMP" v-if="selectType==1">选中上传</el-button>
@@ -335,6 +335,10 @@ export default {
         },
       hideSearch() {
         this.showSearch = !this.showSearch;
+      },
+      Onsearch(){
+        this.filterQuery.page=1;
+        this.getList();
       },
         getList() {
             this.loading = true;
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 4064d7f4..943f114e 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -691,7 +691,7 @@ export default {
       filterSubAll(this.invQuery)
         .then((response) => {
           this.loading = false;
-          this.invlist = response.data.list || [];
+          this.invlist = response.data || [];
           this.invTotal = response.data.total;
         })
         .catch(() => {
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 22c29cc2..aa438c2e 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -54,7 +54,7 @@
 
         <el-col :span="11">
           <el-form-item label="目标往来仓库" prop="defaultInvCode">
-            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"
+            <el-select v-model="inputQuery.defaultInvName" placeholder="目标往来仓库" clearable size="small"
                        @change="invChange"
                        style="width: 90%">
               <el-option
diff --git a/src/views/thirdSys/product/thrProductsAdd.vue b/src/views/thirdSys/product/thrProductsAdd.vue
index 4a350bf0..64ae78e4 100644
--- a/src/views/thirdSys/product/thrProductsAdd.vue
+++ b/src/views/thirdSys/product/thrProductsAdd.vue
@@ -209,7 +209,7 @@ export default {
                         this.$message.error(res.message);
                     }
                 }).catch((error) => {
-                    this.$message.error(error.message);
+                   // this.$message.error(error.message);
                 })
             } else if (this.newType == 2) {
                 addProduct(this.newProductData).then((res) => {
@@ -221,7 +221,7 @@ export default {
                         this.$message.error(res.message);
                     }
                 }).catch((error) => {
-                    this.$message.error(error.message);
+                   // this.$message.error(error.message);
                 })
             }
 

From 9f90b6113414ca3228afd9ce87a2cb96cb860cdb Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 09:37:22 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiinfoExport.vue | 6 +++++-
 src/views/thirdSys/inv/index.vue          | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/product/udiinfoExport.vue b/src/views/basic/product/udiinfoExport.vue
index e4bed3a3..6b080dd8 100644
--- a/src/views/basic/product/udiinfoExport.vue
+++ b/src/views/basic/product/udiinfoExport.vue
@@ -15,7 +15,7 @@
           <el-button-group style="display:flex;">
             <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="getList">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="Onsearch">查询</el-button>
             <el-button type="primary" icon="el-icon-upload2" @click="exportExcel">导出医疗器械信息</el-button>
           </el-button-group>
         </div>
@@ -129,6 +129,10 @@ export default {
         hideSearch() {
           this.showSearch = !this.showSearch;
        },
+      Onsearch(){
+        this.filterQuery.page=1;
+          this.getList();
+      },
         getList() {
             this.loading = true;
             filterLog(this.filterQuery)
diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue
index 8c4308ad..05752bde 100644
--- a/src/views/thirdSys/inv/index.vue
+++ b/src/views/thirdSys/inv/index.vue
@@ -561,6 +561,7 @@ export default {
         this.subFormVisible = false;
       });
       this.resetForm();
+
     },
 
 

From e141ca4aada188799238ab5a96ae828b4806d675 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 10:49:21 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiInfoImport.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/basic/product/udiInfoImport.vue b/src/views/basic/product/udiInfoImport.vue
index 2703d2c5..7ed21243 100644
--- a/src/views/basic/product/udiInfoImport.vue
+++ b/src/views/basic/product/udiInfoImport.vue
@@ -12,8 +12,8 @@
                 <el-form-item label="处理状态:">
                     <el-select v-model="filterQuery.status" style="width: 90%" placeholder="请选择处理状态">
                         <el-option label="全部" value=""></el-option>
-                        <el-option label="处理中" value="0"></el-option>
-                        <el-option label="已处理" value="1"></el-option>
+                        <el-option label="处理中" value="1"></el-option>
+                        <el-option label="已处理" value="3"></el-option>
                         <el-option label="异常" value="2"></el-option>
                     </el-select>
                 </el-form-item>

From ef0a9c0e25d3b396d4e642985fdabd946e3d89f7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 10:56:53 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiInfoManageSp.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index dcd31587..fc5849e1 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -278,6 +278,7 @@ export default {
                 addType: 1,
             };
             this.total = 0;
+          this.list=[];
         },
         search() {
             this.filterQuery.page = 1;

From 2b6ee0ef4a68b372f7ea843d5310a77231c443d6 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 11:07:52 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiinfoExport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basic/product/udiinfoExport.vue b/src/views/basic/product/udiinfoExport.vue
index 6b080dd8..61cc9e67 100644
--- a/src/views/basic/product/udiinfoExport.vue
+++ b/src/views/basic/product/udiinfoExport.vue
@@ -116,7 +116,7 @@ export default {
                 path: "",
             });
             this.filterQuery = {
-                type: 1,
+                type: 3,
                 fromType: null,
                 genKey: null,
                 status: null,

From f05f67cfc4549e52840fe609472b7f03e7291fc6 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 11:16:12 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index a99cacf0..dfb589d1 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -323,9 +323,10 @@ export default {
         },
         // 隐藏表单
         hideForm() {
+          debugger
             // 更改值
             this.formVisible = !this.formVisible;
-            this.getList();
+           // this.getList();
             return true;
         },
         // 显示表单

From be4c7e567ba54166e2751efa076915bbf996d2a6 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 11:32:19 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/corpMaintain/corpMaintain.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index dfb589d1..19ed5a0b 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -234,7 +234,7 @@ export default {
                 },
                 {
                     value: 3,
-                    label: "内部科室"
+                    label: "特殊科室"
                 },
                 {
                     value: 4,

From 95ea80d35461e9d771b9697d1a80c9d45a0720b7 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 11:41:58 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/corpMaintain/corpMaintain.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 19ed5a0b..98313169 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -207,7 +207,6 @@ export default {
                 contact: "",
                 mobile: ""
             },
-
             corpData: null,
             checked: false,
             formName: null,
@@ -243,15 +242,15 @@ export default {
 
             ],
             formRules: {
-                // name: [
-                //     {required: true, message: "请输入名称", trigger: "blur"}
-                // ],
+                name: [
+                    {required: true, message: "请输入名称", trigger: "blur"}
+                ],
                 // erpId: [
                 //     {required: true, message: "请输入自定义码", trigger: "blur"}
                 // ],
-                // creditNo: [
-                //     {required: true, message: "请输入社会信用号", trigger: "blur"}
-                // ]
+                creditNo: [
+                    {required: true, message: "请输入社会信用号", trigger: "blur"}
+                ]
             },
             spellUpdate: false,
             editDialogVisible: false,

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 09/11] =?UTF-8?q?1.=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BA=93=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>
+

From c380797bb179749ade6378e49aeaf8d5b42f7d34 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 14:03:25 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/busType/busTypeAdvancedSettings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue
index 6a23d8d8..9dbd95fe 100644
--- a/src/views/basic/busType/busTypeAdvancedSettings.vue
+++ b/src/views/basic/busType/busTypeAdvancedSettings.vue
@@ -54,7 +54,7 @@
                          border>单据默认自动补单
             </el-checkbox>
 
-            <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'" style="width: 200px"
+            <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='1'" style="width: 200px"
                          border>出库时必须校验预验收库存
             </el-checkbox>
 

From 13bc398a2346a32a9db59319924d3195d1960c8b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 9 Feb 2023 14:23:55 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/UdiInfoSelectLocalUdi.vue | 2 +-
 src/views/basic/product/UdiInfoSelectRel.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 32a6b31c..b4dccbcd 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -137,7 +137,7 @@
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" >
             <template slot-scope="scope">
               <el-button
                 type="text"
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index 8742eaca..4df745f1 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -236,7 +236,7 @@
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" >
             <template slot-scope="scope">
               <el-button
                 type="text"