From 1436535711a575a947d60da5ef000117d824e741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 26 May 2023 11:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=9F=A5=E8=AF=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue           | 37 +++++++++++++++++++
 .../purchase/purApply/pureApplyAudit.vue      |  8 +---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 7b464b90..be11ebf4 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -177,6 +177,19 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="是否在用:">
+                  <el-select
+                      v-model="filterQuery.isDisable"
+                      placeholder="请选择是否在用"
+                      clearable
+                      style="width: 90%"
+                  >
+                    <el-option label="在用" value="false"></el-option>
+                    <el-option label="停用" value="true"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div class="top-right-btn">
@@ -263,6 +276,18 @@
               width="180"
               show-overflow-tooltip
             ></el-table-column>
+            <el-table-column
+                label="是否在用"
+                prop="isDisable"
+                width="180"
+                show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-tag :type="scope.row.isDisable | isDisableFilterType">
+                  {{ isDisableMap[scope.row.isDisable] }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column
               label="集采状态"
               prop="groupBuy"
@@ -1517,6 +1542,10 @@ export default {
         measname: null,
         nameCode: null,
       },
+      isDisableMap: {
+        true: "停用",
+        false: "在用",
+      },
       groupBuyMap: {
         true: "集采",
         false: "非集采",
@@ -1586,6 +1615,14 @@ export default {
       };
       return statusMap[status];
     },
+
+    isDisableFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
   },
 
   methods: {
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index 817ed906..85aa70f5 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -149,7 +149,7 @@
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
-import {getInvListByUser} from "@/api/system/invWarehouse";
+import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {filterSubAll} from "@/api/system/invSubWarehouse";
 
@@ -393,12 +393,8 @@ export default {
         })
       },
       getDeptList() {
-        getDeptListByUser().then((res) => {
+        filterAll().then((res) => {
           this.deptList = res.data || [];
-          if(this.deptList.length>0){
-            this.filterQuery.targetDeptCode=this.deptList[0].code
-            this.invCodebe=this.filterQuery.targetDeptCode
-          }
           this. getInvList();
           this.getList();
         });