From 37bccfc3b157840485830f8fe63132f746d30b68 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 16 Nov 2023 16:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ruoyi.scss                | 13 ++++++++
 src/views/inventory/InvSupPreInProducts.vue | 31 +++++++++++++------
 src/views/inventory/InvSupPreProducts.vue   | 34 +++++++++++++--------
 src/views/inventory/InvSupProuducts.vue     | 33 +++++++++++++-------
 4 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index fd33aeb..448d917 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -357,5 +357,18 @@
   padding: 0px !important;
 }
 
+.order-el-row {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+  margin-top: -10px
+}
+
+.el-form-item {
+  margin-right: 10px;
+  margin-bottom: 1px;
+  margin-top: -5px;
+}
+
 
 
diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue
index 1902eb4..3e219ed 100644
--- a/src/views/inventory/InvSupPreInProducts.vue
+++ b/src/views/inventory/InvSupPreInProducts.vue
@@ -4,7 +4,7 @@
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="18">
-            <el-form-item class="query-form-item" label="扫码查询:">
+            <el-form-item label="扫码查询:">
               <el-input v-model="filterQuery.udiCode"
                         style="width: 97%"
                         placeholder="请扫描或输入UDI码"
@@ -15,28 +15,28 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI/物资编码:">
+            <el-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-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-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-form-item label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="批次号"
                         style="width: 90%"
                         clearable="true"></el-input>
@@ -45,21 +45,21 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="注册/备案号:">
+            <el-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-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-form-item label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
               >
@@ -73,9 +73,20 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+            <el-form-item label="过滤方式:">
+              <el-select
+                v-model="filterQuery.filterNoInv"
+                style="width: 90%"
+                clearable>
+                <el-option label="有库存" :value="1"></el-option>
+                <el-option label="零库存" :value="2"></el-option>
+                <el-option label="负库存" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商名称:" v-if="showSup">
               <el-select
                 v-model="filterQuery.supId"
                 filterable
diff --git a/src/views/inventory/InvSupPreProducts.vue b/src/views/inventory/InvSupPreProducts.vue
index eccf6e3..8e41c68 100644
--- a/src/views/inventory/InvSupPreProducts.vue
+++ b/src/views/inventory/InvSupPreProducts.vue
@@ -4,7 +4,7 @@
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="18">
-            <el-form-item class="query-form-item" label="扫码查询:">
+            <el-form-item label="扫码查询:">
               <el-input v-model="filterQuery.udiCode"
                         style="width: 97%"
                         placeholder="请扫描或输入UDI码"
@@ -15,51 +15,49 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI/物资编码:">
+            <el-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-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-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-form-item label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="批次号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="注册/备案号:">
+            <el-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-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-form-item label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
               >
@@ -73,9 +71,20 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+            <el-form-item label="过滤方式:">
+              <el-select
+                v-model="filterQuery.filterNoInv"
+                style="width: 90%"
+                clearable>
+                <el-option label="有库存" :value="1"></el-option>
+                <el-option label="零库存" :value="2"></el-option>
+                <el-option label="负库存" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商名称:" v-if="showSup">
               <el-select
                 v-model="filterQuery.supId"
                 filterable
@@ -205,6 +214,7 @@ export default {
         invCode: null,
         page: 1,
         limit: 10,
+        filterNoInv: 1,
       },
       list: [],
       total: 0,
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 871f728..9650184 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -4,7 +4,7 @@
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="18">
-            <el-form-item class="query-form-item" label="扫码查询:">
+            <el-form-item label="扫码查询:">
               <el-input v-model="filterQuery.udiCode"
                         style="width: 97%"
                         placeholder="请扫描或输入UDI码"
@@ -15,51 +15,49 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="DI/物资编码:">
+            <el-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-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-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-form-item label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="注册/备案号:">
+            <el-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-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-form-item label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
               >
@@ -74,7 +72,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+            <el-form-item label="过滤方式:">
+              <el-select
+                v-model="filterQuery.filterNoInv"
+                style="width: 90%"
+                clearable>
+                <el-option label="有库存" :value="1"></el-option>
+                <el-option label="零库存" :value="2"></el-option>
+                <el-option label="负库存" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商名称:" v-if="showSup">
               <el-select
                 v-model="filterQuery.supId"
                 filterable
@@ -228,6 +238,7 @@ export default {
         page: 1,
         limit: 10,
         udiCode: null,
+        filterNoInv: 1,
       },
       list: [],
       total: 0,